From 3210283ae2783952c3724be188f2db8132885a38 Mon Sep 17 00:00:00 2001
From: dtluna <dtluna@openmailbox.org>
Date: Tue, 22 Nov 2016 21:45:18 +0300
Subject: Add audio player

---
 src/components/attachment/attachment.js  | 4 ++++
 src/components/attachment/attachment.vue | 6 ++++++
 2 files changed, 10 insertions(+)

(limited to 'src/components')

diff --git a/src/components/attachment/attachment.js b/src/components/attachment/attachment.js
index 99958589..47ca03de 100644
--- a/src/components/attachment/attachment.js
+++ b/src/components/attachment/attachment.js
@@ -23,6 +23,10 @@ const Attachment = {
         type = 'video'
       };
 
+      if (this.attachment.mimetype.match(/ogg|audio/)) {
+        type = 'audio'
+      }
+
       return type
     }
   },
diff --git a/src/components/attachment/attachment.vue b/src/components/attachment/attachment.vue
index 0e2a228a..4e8c1407 100644
--- a/src/components/attachment/attachment.vue
+++ b/src/components/attachment/attachment.vue
@@ -8,6 +8,8 @@
 
     <video v-if="type === 'video' && !nsfw" :src="attachment.url" controls></video>
 
+    <audio v-if="type === 'audio'" :src="attachment.url" controls></audio>
+
     <span v-if="type === 'unknown'">Don't know how to display this...</span>
 
     <div v-if="type === 'html' && attachment.oembed" class="oembed">
@@ -42,6 +44,10 @@
               width: 100%;
           }
 
+          audio {
+              width: 100%;
+          }
+
           img.media-upload {
               width: 100%;
               height: 100%;
-- 
cgit v1.2.3-70-g09d2


From 81c6f6e21f904e2889aa1b1d603f57c8f2772bfc Mon Sep 17 00:00:00 2001
From: Roger Braun <roger@rogerbraun.net>
Date: Thu, 24 Nov 2016 18:14:54 +0100
Subject: Remove example component.

---
 src/components/hello/Hello.css  |  0
 src/components/hello/Hello.html |  0
 src/components/hello/Hello.js   |  8 --------
 src/components/hello/Hello.vue  | 44 -----------------------------------------
 4 files changed, 52 deletions(-)
 delete mode 100644 src/components/hello/Hello.css
 delete mode 100644 src/components/hello/Hello.html
 delete mode 100644 src/components/hello/Hello.js
 delete mode 100644 src/components/hello/Hello.vue

(limited to 'src/components')

diff --git a/src/components/hello/Hello.css b/src/components/hello/Hello.css
deleted file mode 100644
index e69de29b..00000000
diff --git a/src/components/hello/Hello.html b/src/components/hello/Hello.html
deleted file mode 100644
index e69de29b..00000000
diff --git a/src/components/hello/Hello.js b/src/components/hello/Hello.js
deleted file mode 100644
index c701c560..00000000
--- a/src/components/hello/Hello.js
+++ /dev/null
@@ -1,8 +0,0 @@
-export default {
-  name: 'hello',
-  data () {
-    return {
-      msg: 'Welcome to Your Vue.js app'
-    }
-  }
-}
diff --git a/src/components/hello/Hello.vue b/src/components/hello/Hello.vue
deleted file mode 100644
index 828136a8..00000000
--- a/src/components/hello/Hello.vue
+++ /dev/null
@@ -1,44 +0,0 @@
-<template>
-  <div class="hello">
-    <h1>{{ msg }}</h1>
-    <h2>Essential Links</h2>
-    <ul>
-      <li><a href="https://vuejs.org" target="_blank">Core Docs</a></li>
-      <li><a href="https://forum.vuejs.org" target="_blank">Forum</a></li>
-      <li><a href="https://gitter.im/vuejs/vue" target="_blank">Gitter Chat</a></li>
-      <li><a href="https://twitter.com/vuejs" target="_blank">Twitter</a></li>
-      <br>
-      <li><a href="http://vuejs-templates.github.io/webpack/" target="_blank">Docs for This template</a></li>
-    </ul>
-    <h2>Ecosystem</h2>
-    <ul>
-      <li><a href="http://router.vuejs.org/" target="_blank">vue-router</a></li>
-      <li><a href="http://vuex.vuejs.org/" target="_blank">vuex</a></li>
-      <li><a href="http://vue-loader.vuejs.org/" target="_blank">vue-loader</a></li>
-      <li><a href="https://github.com/vuejs/awesome-vue" target="_blank">awesome-vue</a></li>
-    </ul>
-  </div>
-</template>
-
-<script src='./Hello.js'></script>
-
-<!-- Add "scoped" attribute to limit CSS to this component only -->
-<style scoped>
-h1, h2 {
-  font-weight: normal;
-}
-
-ul {
-  list-style-type: none;
-  padding: 0;
-}
-
-li {
-  display: inline-block;
-  margin: 0 10px;
-}
-
-a {
-  color: #42b983;
-}
-</style>
-- 
cgit v1.2.3-70-g09d2


From e245074ef70e0a98c79168cb7e04390dc8d5e97c Mon Sep 17 00:00:00 2001
From: Roger Braun <roger@rogerbraun.net>
Date: Thu, 24 Nov 2016 18:17:09 +0100
Subject: Add status / conversation component.

And wire it up.
---
 src/components/conversation/conversation.js  | 48 ++++++++++++++++++++++++++++
 src/components/conversation/conversation.vue | 12 +++++++
 src/main.js                                  |  4 ++-
 3 files changed, 63 insertions(+), 1 deletion(-)
 create mode 100644 src/components/conversation/conversation.js
 create mode 100644 src/components/conversation/conversation.vue

(limited to 'src/components')

diff --git a/src/components/conversation/conversation.js b/src/components/conversation/conversation.js
new file mode 100644
index 00000000..ea26d958
--- /dev/null
+++ b/src/components/conversation/conversation.js
@@ -0,0 +1,48 @@
+import { find, filter, sortBy, toInteger } from 'lodash'
+import Status from '../status/status.vue'
+import apiService from '../../services/api/api.service.js'
+
+const conversation = {
+  computed: {
+    status () {
+      const id = toInteger(this.$route.params.id)
+      const statuses = this.$store.state.statuses.allStatuses
+      const status = find(statuses, {id})
+
+      return status
+    },
+    conversation () {
+      if (!this.status) {
+        return false
+      }
+
+      const conversationId = this.status.statusnet_conversation_id
+      const statuses = this.$store.state.statuses.allStatuses
+      const conversation = filter(statuses, { statusnet_conversation_id: conversationId })
+      return sortBy(conversation, 'id')
+    }
+  },
+  components: {
+    Status
+  },
+  created () {
+    this.fetchConversation()
+  },
+  methods: {
+    fetchConversation () {
+      if (this.status) {
+        const conversationId = this.status.statusnet_conversation_id
+        apiService.fetchConversation({id: conversationId})
+          .then((statuses) => this.$store.dispatch('addNewStatuses', { statuses }))
+          .then(() => this.$store.commit('updateTimestamps'))
+      } else {
+        const id = this.$route.params.id
+        apiService.fetchStatus({id})
+          .then((status) => this.$store.dispatch('addNewStatuses', { statuses: [status] }))
+          .then(() => this.fetchConversation())
+      }
+    }
+  }
+}
+
+export default conversation
diff --git a/src/components/conversation/conversation.vue b/src/components/conversation/conversation.vue
new file mode 100644
index 00000000..60b3f044
--- /dev/null
+++ b/src/components/conversation/conversation.vue
@@ -0,0 +1,12 @@
+<template>
+  <div class="timeline panel panel-default">
+    <div class="panel-heading">Status</div>
+    <div class="panel-body">
+      <div class="timeline">
+        <status v-for="status in conversation" :key="status.id" v-bind:statusoid="status"></status>
+      </div>
+    </div>
+  </div>
+</template>
+
+<script src="./conversation.js"></script>
diff --git a/src/main.js b/src/main.js
index de3b2af1..64d331f1 100644
--- a/src/main.js
+++ b/src/main.js
@@ -5,6 +5,7 @@ import App from './App.vue'
 import PublicTimeline from './components/public_timeline/public_timeline.vue'
 import PublicAndExternalTimeline from './components/public_and_external_timeline/public_and_external_timeline.vue'
 import FriendsTimeline from './components/friends_timeline/friends_timeline.vue'
+import Conversation from './components/conversation/conversation.vue'
 
 import statusesModule from './modules/statuses.js'
 import usersModule from './modules/users.js'
@@ -23,7 +24,8 @@ const routes = [
   { path: '/', redirect: '/main/all' },
   { path: '/main/all', component: PublicAndExternalTimeline },
   { path: '/main/public', component: PublicTimeline },
-  { path: '/main/friends', component: FriendsTimeline }
+  { path: '/main/friends', component: FriendsTimeline },
+  { name: 'conversation', path: '/notice/:id', component: Conversation }
 ]
 
 const router = new VueRouter({
-- 
cgit v1.2.3-70-g09d2


From 2341a3692a31f40c484a3b027f757c84551bf1fe Mon Sep 17 00:00:00 2001
From: Roger Braun <roger@rogerbraun.net>
Date: Thu, 24 Nov 2016 18:19:01 +0100
Subject: Add link to conversation in status.

---
 src/components/status/status.vue | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

(limited to 'src/components')

diff --git a/src/components/status/status.vue b/src/components/status/status.vue
index d4bcc279..a84917e6 100644
--- a/src/components/status/status.vue
+++ b/src/components/status/status.vue
@@ -20,7 +20,11 @@
           <small><a :href="status.user.statusnet_profile_url">{{status.user.screen_name}}</a></small>
           <small v-if="status.in_reply_to_screen_name"> &gt; <a :href="status.in_reply_to_profileurl">{{status.in_reply_to_screen_name}}</a></small>
           -
-          <small>{{status.created_at_parsed}}</small>
+          <small>
+            <router-link :to="{ name: 'conversation', params: { id: status.id } }">
+              {{status.created_at_parsed}}
+            </router-link>
+          </small>
         </h4>
 
         <div class="status-content" v-html="status.statusnet_html"></div>
-- 
cgit v1.2.3-70-g09d2


From 4f0155c5eb532fea6cde2aea870824f936923132 Mon Sep 17 00:00:00 2001
From: Roger Braun <roger@rogerbraun.net>
Date: Thu, 24 Nov 2016 18:31:18 +0100
Subject: Timeline status adding fixes.

Don't show new statuses immediately if we already have something in there.
---
 src/components/timeline/timeline.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'src/components')

diff --git a/src/components/timeline/timeline.js b/src/components/timeline/timeline.js
index 4ebc383f..8799e69c 100644
--- a/src/components/timeline/timeline.js
+++ b/src/components/timeline/timeline.js
@@ -12,12 +12,13 @@ const Timeline = {
   created () {
     const store = this.$store
     const credentials = store.state.users.currentUser.credentials
+    const showImmediately = this.timeline.visibleStatuses.length === 0
 
     timelineFetcher.fetchAndUpdate({
       store,
       credentials,
       timeline: this.timelineName,
-      showImmediately: true
+      showImmediately
     })
   },
   methods: {
-- 
cgit v1.2.3-70-g09d2


From c8d25eab61450340039374f0ffc4b2388825714b Mon Sep 17 00:00:00 2001
From: Roger Braun <roger@rogerbraun.net>
Date: Thu, 24 Nov 2016 20:49:30 +0100
Subject: Image CSS fix for Firefox.

---
 src/components/attachment/attachment.vue | 1 -
 1 file changed, 1 deletion(-)

(limited to 'src/components')

diff --git a/src/components/attachment/attachment.vue b/src/components/attachment/attachment.vue
index 4e8c1407..d5578c04 100644
--- a/src/components/attachment/attachment.vue
+++ b/src/components/attachment/attachment.vue
@@ -97,7 +97,6 @@
 
               img {
                   width: 100%;
-                  flex: 1;
                   border: 1px solid;
                   border-radius: 0.5em;
                   width: 100%;
-- 
cgit v1.2.3-70-g09d2


From 08393b8580385d2627da2ebd9e3a09455d101a3a Mon Sep 17 00:00:00 2001
From: Roger Braun <roger@rogerbraun.net>
Date: Fri, 25 Nov 2016 13:42:33 +0100
Subject: Fix word wrapping on Firefox.

Also, move some css around.

See https://bugzilla.mozilla.org/show_bug.cgi?id=1136818 for the word
wrapping stuff.
---
 src/App.scss                     | 28 ++--------------------------
 src/components/status/status.vue | 24 ++++++++++++++++++++++++
 2 files changed, 26 insertions(+), 26 deletions(-)

(limited to 'src/components')

diff --git a/src/App.scss b/src/App.scss
index a97ad56d..47886e31 100644
--- a/src/App.scss
+++ b/src/App.scss
@@ -145,10 +145,6 @@ status.ng-enter.ng-enter-active {
 }
 
 
-.media-body {
-    flex: 1
-}
-
 #content {
     margin: auto;
     max-width: 920px;
@@ -163,34 +159,14 @@ status.ng-enter.ng-enter-active {
     padding-left: 0.3em;
 }
 
-.status .avatar {
-    width: 48px;
-}
-
-.status.compact .avatar {
-    width: 32px;
-}
-
-.status {
-    padding: 0.5em;
-    padding-right: 1em;
-    border-bottom: 1px solid silver;
-}
-
-.status-el:last-child .status {
-    border: none
+.container > * {
+    min-width: 0px;
 }
 
 [ng-click] {
     cursor: pointer;
 }
 
-.status-el p {
-    margin: 0;
-    margin-top: 0.2em;
-    margin-bottom: 0.5em;
-}
-
 .user-info {
     padding: 1em;
     img {
diff --git a/src/components/status/status.vue b/src/components/status/status.vue
index a84917e6..e74be215 100644
--- a/src/components/status/status.vue
+++ b/src/components/status/status.vue
@@ -71,6 +71,12 @@
          margin-top: 3px;
          margin-bottom: 3px;
      }
+
+     p {
+       margin: 0;
+       margin-top: 0.2em;
+       margin-bottom: 0.5em;
+     }
   }
 
   .status-actions {
@@ -80,4 +86,22 @@
   .icon-reply:hover {
      color: $blue;
   }
+
+  .status .avatar {
+    width: 48px;
+  }
+
+  .status.compact .avatar {
+    width: 32px;
+  }
+
+  .status {
+    padding: 0.5em;
+    padding-right: 1em;
+    border-bottom: 1px solid silver;
+  }
+
+  .status-el:last-child .status {
+    border: none
+  }
 </style>
-- 
cgit v1.2.3-70-g09d2


From 5986afbb201e2a42bd0954c35e284c932b2e993c Mon Sep 17 00:00:00 2001
From: Roger Braun <roger@rogerbraun.net>
Date: Fri, 25 Nov 2016 17:19:46 +0100
Subject: Re-indent style.

---
 src/components/status/status.vue | 48 ++++++++++++++++++++--------------------
 1 file changed, 24 insertions(+), 24 deletions(-)

(limited to 'src/components')

diff --git a/src/components/status/status.vue b/src/components/status/status.vue
index e74be215..b00f97ca 100644
--- a/src/components/status/status.vue
+++ b/src/components/status/status.vue
@@ -55,8 +55,8 @@
 <script src="./status.js" ></script>
 
 <style lang="scss">
-  @import '../../_variables.scss';
-  .status-el {
+ @import '../../_variables.scss';
+ .status-el {
      hyphens: auto;
      overflow-wrap: break-word;
      word-wrap: break-word;
@@ -73,35 +73,35 @@
      }
 
      p {
-       margin: 0;
-       margin-top: 0.2em;
-       margin-bottom: 0.5em;
+         margin: 0;
+         margin-top: 0.2em;
+         margin-bottom: 0.5em;
      }
-  }
+ }
 
-  .status-actions {
+ .status-actions {
      padding-top: 5px;
-  }
+ }
 
-  .icon-reply:hover {
+ .icon-reply:hover {
      color: $blue;
-  }
+ }
 
-  .status .avatar {
-    width: 48px;
-  }
+ .status .avatar {
+     width: 48px;
+ }
 
-  .status.compact .avatar {
-    width: 32px;
-  }
+ .status.compact .avatar {
+     width: 32px;
+ }
 
-  .status {
-    padding: 0.5em;
-    padding-right: 1em;
-    border-bottom: 1px solid silver;
-  }
+ .status {
+     padding: 0.5em;
+     padding-right: 1em;
+     border-bottom: 1px solid silver;
+ }
 
-  .status-el:last-child .status {
-    border: none
-  }
+ .status-el:last-child .status {
+     border: none
+ }
 </style>
-- 
cgit v1.2.3-70-g09d2


From b515586485fab7030e02cad3cf1ce2c6e451c7d9 Mon Sep 17 00:00:00 2001
From: Roger Braun <roger@rogerbraun.net>
Date: Fri, 25 Nov 2016 17:34:41 +0100
Subject: Show link to status source url.

---
 src/components/status/status.vue | 7 +++++++
 1 file changed, 7 insertions(+)

(limited to 'src/components')

diff --git a/src/components/status/status.vue b/src/components/status/status.vue
index b00f97ca..14792cae 100644
--- a/src/components/status/status.vue
+++ b/src/components/status/status.vue
@@ -25,6 +25,9 @@
               {{status.created_at_parsed}}
             </router-link>
           </small>
+          <small v-if="!status.is_local" class="source_url">
+            <a :href="status.external_url" >Source</a>
+          </small>
         </h4>
 
         <div class="status-content" v-html="status.statusnet_html"></div>
@@ -62,6 +65,10 @@
      word-wrap: break-word;
      word-break: break-word;
 
+     .source_url {
+       float: right;
+     }
+
      a {
          display: inline-block;
          word-break: break-all;
-- 
cgit v1.2.3-70-g09d2


From 1be1d7563c94fa961c1cc0cef03e7e4e69df178a Mon Sep 17 00:00:00 2001
From: Roger Braun <roger@rogerbraun.net>
Date: Fri, 25 Nov 2016 17:34:59 +0100
Subject: Greentext.

---
 src/components/status/status.vue | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'src/components')

diff --git a/src/components/status/status.vue b/src/components/status/status.vue
index 14792cae..9d17b8a7 100644
--- a/src/components/status/status.vue
+++ b/src/components/status/status.vue
@@ -69,6 +69,10 @@
        float: right;
      }
 
+     .greentext {
+         color: green;
+     }
+
      a {
          display: inline-block;
          word-break: break-all;
-- 
cgit v1.2.3-70-g09d2