From 734597b43f0376c8df1f64c54f9fec592ffea51f Mon Sep 17 00:00:00 2001
From: hakui <hakui@airmail.cc>
Date: Sat, 18 Feb 2017 01:48:35 -0600
Subject: hello world

---
 src/components/attachment/attachment.vue             |  3 ++-
 src/components/nav_panel/nav_panel.vue               |  3 +--
 src/components/notifications/notifications.scss      | 13 +++++++------
 src/components/post_status_form/post_status_form.vue | 10 +++++++++-
 src/components/settings/settings.vue                 |  2 +-
 src/components/status/status.vue                     |  7 +++----
 src/components/user_profile/user_profile.vue         |  8 ++++++++
 7 files changed, 31 insertions(+), 15 deletions(-)

(limited to 'src/components')

diff --git a/src/components/attachment/attachment.vue b/src/components/attachment/attachment.vue
index 311e36b8..7f6622b4 100644
--- a/src/components/attachment/attachment.vue
+++ b/src/components/attachment/attachment.vue
@@ -39,7 +39,7 @@
       .attachment {
           flex: 1 0 30%;
           display: flex;
-          margin: 0.2em;
+          margin: 0.5em 0.8em 0.6em 0.1em;
           align-self: flex-start;
 
           &.html {
@@ -79,6 +79,7 @@
               img {
                   width: 100%;
               }
+              margin-right: 15px;
           }
 
           .oembed {
diff --git a/src/components/nav_panel/nav_panel.vue b/src/components/nav_panel/nav_panel.vue
index 2082f41a..d8604a7b 100644
--- a/src/components/nav_panel/nav_panel.vue
+++ b/src/components/nav_panel/nav_panel.vue
@@ -39,8 +39,7 @@
 
  .nav-panel li {
      border-bottom: 1px solid;
-     padding: 0.5em;
-     padding-left: 1em;
+     padding: 0.75em 0.85em 0.6em;
  }
 
  .nav-panel li:last-child {
diff --git a/src/components/notifications/notifications.scss b/src/components/notifications/notifications.scss
index 687a4f0f..517afeaa 100644
--- a/src/components/notifications/notifications.scss
+++ b/src/components/notifications/notifications.scss
@@ -1,13 +1,13 @@
 @import '../../_variables.scss';
 .notification {
-  padding: 0.5em;
-  padding-left: 1em;
+  padding: 0.4em 0 0 0.7em;
   display: flex;
   border-bottom: 1px solid silver;
 
   .text {
     min-width: 0px;
     word-wrap: break-word;
+    line-height:18px;
 
     .icon-retweet {
       color: $green;
@@ -18,21 +18,22 @@
     }
 
     h1 {
-      margin: 0;
+      margin: 0 0 0.3em;
       padding: 0;
       font-size: 1em;
+      line-height:20px;
     }
 
-    padding-left: 0.5em;
+    padding: 0.3em 0.8em 0.5em;
     p {
       margin: 0;
       margin-top: 0;
-      margin-bottom: 0.5em;
+      margin-bottom: 0.3em;
     }
   }
 
   .avatar {
-    padding-top: 3px;
+    padding-top: 0.3em;
     width: 32px;
     height: 32px;
     border-radius: 50%;
diff --git a/src/components/post_status_form/post_status_form.vue b/src/components/post_status_form/post_status_form.vue
index a6aaf511..6caa8dae 100644
--- a/src/components/post_status_form/post_status_form.vue
+++ b/src/components/post_status_form/post_status_form.vue
@@ -57,13 +57,21 @@
      form {
          display: flex;
          flex-direction: column;
-         padding: 0.5em;
+         padding: 0.6em;
      }
 
      .form-group {
          display: flex;
          flex-direction: column;
+         padding: 0.3em 0.5em 0.6em;
+         line-height:24px;
+     }
+     
+     form textarea {
+         border: none;
+         border-radius: 2px;
          padding: 0.5em;
+         resize: vertical;
      }
 
      .btn {
diff --git a/src/components/settings/settings.vue b/src/components/settings/settings.vue
index 8bb0ffb1..57aafac8 100644
--- a/src/components/settings/settings.vue
+++ b/src/components/settings/settings.vue
@@ -17,6 +17,6 @@
 
 <style>
  .setting-item {
-   margin: 1em
+   margin: 1em 1em 1.4em;
  }
 </style>
diff --git a/src/components/status/status.vue b/src/components/status/status.vue
index 0c004936..47e14d28 100644
--- a/src/components/status/status.vue
+++ b/src/components/status/status.vue
@@ -94,6 +94,7 @@
 
      .user-content {
        min-height: 52px;
+       padding-top: 1px;
      }
 
      .source_url {
@@ -110,8 +111,7 @@
      }
 
      .status-content {
-         margin-top: 3px;
-         margin-bottom: 3px;
+         margin: 3px 15px 4px 0;
      }
 
      p {
@@ -138,8 +138,7 @@
  }
 
  .status {
-     padding: 0.5em;
-     padding-right: 1em;
+     padding: 0.65em 0.7em 0.8em 0.8em;
      border-bottom: 1px solid;
  }
  .muted button {
diff --git a/src/components/user_profile/user_profile.vue b/src/components/user_profile/user_profile.vue
index fe9fd3a9..962318e4 100644
--- a/src/components/user_profile/user_profile.vue
+++ b/src/components/user_profile/user_profile.vue
@@ -19,6 +19,14 @@
          div {
              flex: 1;
          }
+         margin-top: 1em;
+         margin-bottom: -1.2em;
+     }
+     .muteinfo{
+     	margin: 0.5em 0;
+     }
+     .user-screen-name {
+     	margin-top: 0.4em;
      }
  }
 </style>
-- 
cgit v1.2.3-70-g09d2


From 0faaeb02f3188986cbfbad942d3c3194f2e5c387 Mon Sep 17 00:00:00 2001
From: hakui <hakui@airmail.cc>
Date: Sat, 18 Feb 2017 01:54:54 -0600
Subject: fixed line-height for text box

---
 src/components/post_status_form/post_status_form.vue | 1 +
 1 file changed, 1 insertion(+)

(limited to 'src/components')

diff --git a/src/components/post_status_form/post_status_form.vue b/src/components/post_status_form/post_status_form.vue
index 6caa8dae..b6836b13 100644
--- a/src/components/post_status_form/post_status_form.vue
+++ b/src/components/post_status_form/post_status_form.vue
@@ -70,6 +70,7 @@
      form textarea {
          border: none;
          border-radius: 2px;
+         line-height:16px;
          padding: 0.5em;
          resize: vertical;
      }
-- 
cgit v1.2.3-70-g09d2


From a4592445a36d1985ecfb66659103916e32a0842e Mon Sep 17 00:00:00 2001
From: hakui <hakui@airmail.cc>
Date: Sat, 18 Feb 2017 02:58:44 -0600
Subject: making link thumbnails fit the whole box

---
 src/components/attachment/attachment.vue | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'src/components')

diff --git a/src/components/attachment/attachment.vue b/src/components/attachment/attachment.vue
index 7f6622b4..a294901b 100644
--- a/src/components/attachment/attachment.vue
+++ b/src/components/attachment/attachment.vue
@@ -92,6 +92,8 @@
                   img {
                       border: 0px;
                       border-radius: 0;
+                      height: 100%;
+                      object-fit: cover;
                   }
               }
 
-- 
cgit v1.2.3-70-g09d2


From 2f4d8110797b903920ae821bbc3c6419609acb5e Mon Sep 17 00:00:00 2001
From: hakui <hakui@airmail.cc>
Date: Sat, 18 Feb 2017 03:10:02 -0600
Subject: removed break-line for links because it didn't seem to make sense

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

(limited to 'src/components')

diff --git a/src/components/status/status.vue b/src/components/status/status.vue
index 47e14d28..85d78d2e 100644
--- a/src/components/status/status.vue
+++ b/src/components/status/status.vue
@@ -107,7 +107,6 @@
 
      a {
          display: inline-block;
-         word-break: break-all;
      }
 
      .status-content {
-- 
cgit v1.2.3-70-g09d2


From e86b1d71ee325a47fdcc10ffe1912e81fe7de9b5 Mon Sep 17 00:00:00 2001
From: shpuld <shpuld@gmail.com>
Date: Sat, 18 Feb 2017 15:48:27 +0200
Subject: Changed following-info to user-interactions and moved muting there,
 made everything in user-interactions look a bit neater

---
 .../user_card_content/user_card_content.vue        | 30 ++++++++++++----------
 src/components/user_profile/user_profile.vue       | 26 ++++++++++++++++---
 2 files changed, 39 insertions(+), 17 deletions(-)

(limited to 'src/components')

diff --git a/src/components/user_card_content/user_card_content.vue b/src/components/user_card_content/user_card_content.vue
index 2c32406b..0ee1d86f 100644
--- a/src/components/user_card_content/user_card_content.vue
+++ b/src/components/user_card_content/user_card_content.vue
@@ -3,30 +3,34 @@
     <div class="base00-background panel-heading text-center" v-bind:style="style">
       <div class='user-info'>
         <img :src="user.profile_image_url">
-        <div v-if='user.muted' class='muteinfo'>Muted</div>
-        <div class='muteinfo' v-if='isOtherUser'>
-          <button @click="toggleMute">Mute/Unmute</button>
-        </div>
         <span class="glyphicon glyphicon-user"></span>
         <div class='user-name'>{{user.name}}</div>
         <div class='user-screen-name'>@{{user.screen_name}}</div>
-        <div v-if="isOtherUser" class="following-info">
-          <div v-if="user.follows_you" class="following">
+        <div v-if="isOtherUser" class="user-interactions">
+          <div v-if="user.follows_you" class="following base06">
             Follows you!
           </div>
-          <div class="followed">
+          <div class="follow">
             <span v-if="user.following">
-              Following them!
-              <button @click="unfollowUser">
-                Unfollow!
+              <!--Following them!-->
+              <button @click="unfollowUser" class="base06 base01-background base06-border">
+                Unfollow
               </button>
             </span>
-            <span v-if="!user.following" >
-              <button @click="followUser">
-                Follow!
+            <span v-if="!user.following">
+              <button @click="followUser" class="base01 base04-background base01-border">
+                Follow
               </button>
             </span>
           </div>
+          <div class='mute' v-if='isOtherUser'>
+            <span v-if='user.muted'>
+              <button @click="toggleMute" class="base04 base01-background base06-border">Unmute</button>
+            </span>
+            <span v-if='!user.muted'>
+              <button @click="toggleMute" class="base01 base04-background base01-border">Mute</button>
+            </span>
+          </div>
         </div>
       </div>
     </div>
diff --git a/src/components/user_profile/user_profile.vue b/src/components/user_profile/user_profile.vue
index 962318e4..7bed9ee0 100644
--- a/src/components/user_profile/user_profile.vue
+++ b/src/components/user_profile/user_profile.vue
@@ -13,20 +13,38 @@
  }
 
  .user-info {
-     .following-info {
+     .user-interactions {
          display: flex;
+         flex-flow: row wrap;
 
          div {
              flex: 1;
          }
-         margin-top: 1em;
+         margin-top: 0.5em;
          margin-bottom: -1.2em;
+
+         .following {
+            font-size: 14px;
+            flex: 0 0 100%;
+            margin-bottom: 0.5em;
+         }
      }
-     .muteinfo{
-     	margin: 0.5em 0;
+
+     .mute {
+     	margin-right: 4em;
+     }
+
+     .follow {
+        margin-left: 4em;
      }
      .user-screen-name {
      	margin-top: 0.4em;
      }
+
+     button {
+         width: 80%;
+         height: 100%;
+         border: 1px solid;
+     }
  }
 </style>
-- 
cgit v1.2.3-70-g09d2


From 15c82dea62120b097e35f1443748c5996141a730 Mon Sep 17 00:00:00 2001
From: shpuld <shpuld@gmail.com>
Date: Sat, 18 Feb 2017 15:49:27 +0200
Subject: moved around classes in the user-info css

---
 src/components/user_profile/user_profile.vue | 30 ++++++++++++++--------------
 1 file changed, 15 insertions(+), 15 deletions(-)

(limited to 'src/components')

diff --git a/src/components/user_profile/user_profile.vue b/src/components/user_profile/user_profile.vue
index 7bed9ee0..08221ac8 100644
--- a/src/components/user_profile/user_profile.vue
+++ b/src/components/user_profile/user_profile.vue
@@ -24,27 +24,27 @@
          margin-bottom: -1.2em;
 
          .following {
-            font-size: 14px;
-            flex: 0 0 100%;
-            margin-bottom: 0.5em;
+             font-size: 14px;
+             flex: 0 0 100%;
+             margin-bottom: 0.5em;
          }
-     }
 
-     .mute {
-     	margin-right: 4em;
-     }
+         .mute {
+             margin-right: 4em;
+         }
+
+         .follow {
+             margin-left: 4em;
+         }
 
-     .follow {
-        margin-left: 4em;
+         button {
+             width: 80%;
+             height: 100%;
+             border: 1px solid;
+         }
      }
      .user-screen-name {
      	margin-top: 0.4em;
      }
-
-     button {
-         width: 80%;
-         height: 100%;
-         border: 1px solid;
-     }
  }
 </style>
-- 
cgit v1.2.3-70-g09d2


From 8a0197d68224e816b3e569c36ed3dfd931088386 Mon Sep 17 00:00:00 2001
From: shpuld <shpuld@gmail.com>
Date: Sat, 18 Feb 2017 19:58:16 +0200
Subject: Fix follow/mute buttons from getting squished on mobile

---
 src/components/user_profile/user_profile.vue | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'src/components')

diff --git a/src/components/user_profile/user_profile.vue b/src/components/user_profile/user_profile.vue
index 08221ac8..b0d6db85 100644
--- a/src/components/user_profile/user_profile.vue
+++ b/src/components/user_profile/user_profile.vue
@@ -16,6 +16,7 @@
      .user-interactions {
          display: flex;
          flex-flow: row wrap;
+         justify-content: center;
 
          div {
              flex: 1;
@@ -30,11 +31,11 @@
          }
 
          .mute {
-             margin-right: 4em;
+             max-width: 200px;
          }
 
          .follow {
-             margin-left: 4em;
+             max-width: 200px;
          }
 
          button {
-- 
cgit v1.2.3-70-g09d2


From 1ccc9dd629b2ecfe3883f337f39120da810813d0 Mon Sep 17 00:00:00 2001
From: hakui <hakui@airmail.cc>
Date: Sat, 18 Feb 2017 12:51:47 -0600
Subject: wrap long urls while not breaking normal words. also practicing the
 new branch thing

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

(limited to 'src/components')

diff --git a/src/components/status/status.vue b/src/components/status/status.vue
index 85d78d2e..4d4f7046 100644
--- a/src/components/status/status.vue
+++ b/src/components/status/status.vue
@@ -107,6 +107,7 @@
 
      a {
          display: inline-block;
+         word-wrap: break-word;
      }
 
      .status-content {
-- 
cgit v1.2.3-70-g09d2


From 963a0035e5e3f35ee790aeb3db64cb8dd32a84a4 Mon Sep 17 00:00:00 2001
From: Roger Braun <roger@rogerbraun.net>
Date: Sat, 18 Feb 2017 20:42:00 +0100
Subject: Make page title dynamic, better notification handling.

---
 src/components/notifications/notifications.js  | 26 ++++++++++++++++++++++++--
 src/components/notifications/notifications.vue |  5 +++--
 src/modules/config.js                          |  7 +++++--
 src/modules/statuses.js                        |  7 ++++++-
 4 files changed, 38 insertions(+), 7 deletions(-)

(limited to 'src/components')

diff --git a/src/components/notifications/notifications.js b/src/components/notifications/notifications.js
index 10f987a8..7dbbf588 100644
--- a/src/components/notifications/notifications.js
+++ b/src/components/notifications/notifications.js
@@ -1,4 +1,4 @@
-import { sortBy, take } from 'lodash'
+import { sortBy, take, filter } from 'lodash'
 
 const Notifications = {
   data () {
@@ -7,8 +7,30 @@ const Notifications = {
     }
   },
   computed: {
+    notifications () {
+      return this.$store.state.statuses.notifications
+    },
+    unseenNotifications () {
+      return filter(this.notifications, ({seen}) => !seen)
+    },
     visibleNotifications () {
-      return take(sortBy(this.$store.state.statuses.notifications, ({action}) => -action.id), this.visibleNotificationCount)
+      // Don't know why, but sortBy([seen, -action.id]) doesn't work.
+      let sortedNotifications = sortBy(this.notifications, ({action}) => -action.id)
+      sortedNotifications = sortBy(sortedNotifications, 'seen')
+      return take(sortedNotifications, this.visibleNotificationCount)
+    },
+    unseenCount () {
+      return this.unseenNotifications.length
+    }
+  },
+  watch: {
+    unseenCount (count) {
+      this.$store.dispatch('setPageTitle', `(${count})`)
+    }
+  },
+  methods: {
+    markAsSeen () {
+      this.$store.commit('markNotificationsAsSeen', this.visibleNotifications)
     }
   }
 }
diff --git a/src/components/notifications/notifications.vue b/src/components/notifications/notifications.vue
index 0846c27b..785cc019 100644
--- a/src/components/notifications/notifications.vue
+++ b/src/components/notifications/notifications.vue
@@ -1,13 +1,14 @@
 <template>
   <div class="notifications">
     <div class="panel panel-default base00-background">
-      <div class="panel-heading base01-background base04">Notifications ({{visibleNotifications.length}})</div>
+      <div class="panel-heading base01-background base04">Notifications ({{unseenCount}}) <button @click.prevent="markAsSeen">Read!</button></div>
       <div class="panel-body">
-        <div v-for="notification in visibleNotifications" class="notification">
+        <div v-for="notification in visibleNotifications" class="notification" :class='{"base01-background": notification.seen}'>
           <a :href="notification.action.user.statusnet_profile_url">
             <img class='avatar' :src="notification.action.user.profile_image_url_original">
           </a>
           <div class='text'>
+            <timeago :since="notification.action.created_at" :auto-update="240"></timeago>
             <div v-if="notification.type === 'favorite'">
               <h1>{{ notification.action.user.name }}<br><i class="fa icon-star"></i> favorited your <router-link :to="{ name: 'conversation', params: { id: notification.status.id } }">status</h1>
               <p>{{ notification.status.text }}</p>
diff --git a/src/modules/config.js b/src/modules/config.js
index 4365d554..8d850f2a 100644
--- a/src/modules/config.js
+++ b/src/modules/config.js
@@ -13,11 +13,14 @@ const config = {
     }
   },
   actions: {
-    setOption ({ commit }, { name, value }) {
+    setPageTitle ({state}, option = '') {
+      document.title = `${state.name} ${option}`
+    },
+    setOption ({ commit, dispatch }, { name, value }) {
       commit('setOption', {name, value})
       switch (name) {
         case 'name':
-          document.title = value
+          dispatch('setPageTitle')
           break
         case 'theme':
           const fullPath = `/static/css/${value}`
diff --git a/src/modules/statuses.js b/src/modules/statuses.js
index 871172b5..0967f77a 100644
--- a/src/modules/statuses.js
+++ b/src/modules/statuses.js
@@ -173,7 +173,7 @@ const addNewStatuses = (state, { statuses, showImmediately = false, timeline, us
   }
 
   const addNotification = ({type, status, action}) => {
-    state.notifications.push({type, status, action})
+    state.notifications.push({type, status, action, seen: false})
   }
 
   const favoriteStatus = (favorite) => {
@@ -276,6 +276,11 @@ export const mutations = {
   setNsfw (state, { id, nsfw }) {
     const newStatus = find(state.allStatuses, { id })
     newStatus.nsfw = nsfw
+  },
+  markNotificationsAsSeen (state, notifications) {
+    each(notifications, (notification) => {
+      notification.seen = true
+    })
   }
 }
 
-- 
cgit v1.2.3-70-g09d2


From 14237cff777acee47cf060aa81823b0dc25f3afa Mon Sep 17 00:00:00 2001
From: hakui <hakui@airmail.cc>
Date: Sat, 18 Feb 2017 17:33:00 -0600
Subject: clears notif number from title when marking as read

---
 src/components/notifications/notifications.js | 1 +
 1 file changed, 1 insertion(+)

(limited to 'src/components')

diff --git a/src/components/notifications/notifications.js b/src/components/notifications/notifications.js
index 7dbbf588..3f9fe3b4 100644
--- a/src/components/notifications/notifications.js
+++ b/src/components/notifications/notifications.js
@@ -26,6 +26,7 @@ const Notifications = {
   watch: {
     unseenCount (count) {
       this.$store.dispatch('setPageTitle', `(${count})`)
+      if (count==0) this.$store.dispatch('setPageTitle', '')
     }
   },
   methods: {
-- 
cgit v1.2.3-70-g09d2


From af913463289d27155993e1621e47ee9a57681079 Mon Sep 17 00:00:00 2001
From: hakui <hakui@airmail.cc>
Date: Sat, 18 Feb 2017 17:38:56 -0600
Subject: changed to if-else to save on one line

---
 src/components/notifications/notifications.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'src/components')

diff --git a/src/components/notifications/notifications.js b/src/components/notifications/notifications.js
index 3f9fe3b4..e872a2e5 100644
--- a/src/components/notifications/notifications.js
+++ b/src/components/notifications/notifications.js
@@ -25,8 +25,8 @@ const Notifications = {
   },
   watch: {
     unseenCount (count) {
-      this.$store.dispatch('setPageTitle', `(${count})`)
-      if (count==0) this.$store.dispatch('setPageTitle', '')
+      if (count>0) this.$store.dispatch('setPageTitle', `(${count})`)
+      else this.$store.dispatch('setPageTitle', '')
     }
   },
   methods: {
-- 
cgit v1.2.3-70-g09d2


From 2639427236ec78a5db5540700da0b631cbba5b28 Mon Sep 17 00:00:00 2001
From: shpuld <shpuld@gmail.com>
Date: Sun, 19 Feb 2017 01:41:51 +0200
Subject: Ctrl-enter posts status

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

(limited to 'src/components')

diff --git a/src/components/post_status_form/post_status_form.vue b/src/components/post_status_form/post_status_form.vue
index b6836b13..1bad41c7 100644
--- a/src/components/post_status_form/post_status_form.vue
+++ b/src/components/post_status_form/post_status_form.vue
@@ -2,7 +2,7 @@
   <div class="post-status-form">
     <form @submit.prevent="postStatus(newStatus)">
       <div class="form-group" >
-        <textarea v-model="newStatus.status" placeholder="Just landed in L.A." rows="3" class="form-control"></textarea>
+        <textarea v-model="newStatus.status" placeholder="Just landed in L.A." rows="3" class="form-control"  @keyup.ctrl.enter="postStatus(newStatus)"></textarea>
       </div>
       <div class="attachments">
         <div class="attachment" v-for="file in newStatus.files">
@@ -66,7 +66,7 @@
          padding: 0.3em 0.5em 0.6em;
          line-height:24px;
      }
-     
+
      form textarea {
          border: none;
          border-radius: 2px;
-- 
cgit v1.2.3-70-g09d2


From 5f74ae8de5bb94fa3a277dc2f0b0a8dbdb0bf879 Mon Sep 17 00:00:00 2001
From: Roger Braun <roger@rogerbraun.net>
Date: Sun, 19 Feb 2017 12:13:56 +0100
Subject: Revert "removed break-line for links because it didn't seem to make
 sense"

This reverts commit 2f4d8110797b903920ae821bbc3c6419609acb5e.
---
 src/components/status/status.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/components')

diff --git a/src/components/status/status.vue b/src/components/status/status.vue
index 4d4f7046..47e14d28 100644
--- a/src/components/status/status.vue
+++ b/src/components/status/status.vue
@@ -107,7 +107,7 @@
 
      a {
          display: inline-block;
-         word-wrap: break-word;
+         word-break: break-all;
      }
 
      .status-content {
-- 
cgit v1.2.3-70-g09d2


From df3ffdd9056ef7ebe451eaed4beaeafe20257818 Mon Sep 17 00:00:00 2001
From: Roger Braun <roger@rogerbraun.net>
Date: Sun, 19 Feb 2017 12:19:47 +0100
Subject: Follow style guide (https://github.com/feross/standard)

---
 src/components/notifications/notifications.js | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

(limited to 'src/components')

diff --git a/src/components/notifications/notifications.js b/src/components/notifications/notifications.js
index e872a2e5..d6a6bdb5 100644
--- a/src/components/notifications/notifications.js
+++ b/src/components/notifications/notifications.js
@@ -25,8 +25,11 @@ const Notifications = {
   },
   watch: {
     unseenCount (count) {
-      if (count>0) this.$store.dispatch('setPageTitle', `(${count})`)
-      else this.$store.dispatch('setPageTitle', '')
+      if (count > 0) {
+        this.$store.dispatch('setPageTitle', `(${count})`)
+      } else {
+        this.$store.dispatch('setPageTitle', '')
+      }
     }
   },
   methods: {
-- 
cgit v1.2.3-70-g09d2


From 04c4ad9a6572167f049b833fc343b8eba819ac46 Mon Sep 17 00:00:00 2001
From: Roger Braun <roger@rogerbraun.net>
Date: Sun, 19 Feb 2017 12:58:25 +0100
Subject: Open clicked links the statusnet_html in a new window.

---
 src/components/attachment/attachment.js  | 5 +++++
 src/components/attachment/attachment.vue | 2 +-
 src/components/status/status.js          | 5 +++++
 src/components/status/status.vue         | 2 +-
 4 files changed, 12 insertions(+), 2 deletions(-)

(limited to 'src/components')

diff --git a/src/components/attachment/attachment.js b/src/components/attachment/attachment.js
index c88497a2..57d21b28 100644
--- a/src/components/attachment/attachment.js
+++ b/src/components/attachment/attachment.js
@@ -20,6 +20,11 @@ const Attachment = {
     }
   },
   methods: {
+    linkClicked ({target}) {
+      if (target.tagName === 'A') {
+        window.open(target.href, '_blank')
+      }
+    },
     toggleHidden () {
       this.showHidden = !this.showHidden
     }
diff --git a/src/components/attachment/attachment.vue b/src/components/attachment/attachment.vue
index a294901b..738a1e86 100644
--- a/src/components/attachment/attachment.vue
+++ b/src/components/attachment/attachment.vue
@@ -18,7 +18,7 @@
 
     <span v-if="type === 'unknown'">Don't know how to display this...</span>
 
-    <div v-if="type === 'html' && attachment.oembed" class="oembed">
+    <div @click.prevent="linkClicked" v-if="type === 'html' && attachment.oembed" class="oembed">
       <div v-if="attachment.thumb_url" class="image">
         <img :src="attachment.thumb_url"></img>
       </div>
diff --git a/src/components/status/status.js b/src/components/status/status.js
index 030e22b5..e75400cb 100644
--- a/src/components/status/status.js
+++ b/src/components/status/status.js
@@ -40,6 +40,11 @@ const Status = {
     UserCardContent
   },
   methods: {
+    linkClicked ({target}) {
+      if (target.tagName === 'A') {
+        window.open(target.href, '_blank')
+      }
+    },
     toggleReplying () {
       this.replying = !this.replying
     },
diff --git a/src/components/status/status.vue b/src/components/status/status.vue
index 47e14d28..162ab140 100644
--- a/src/components/status/status.vue
+++ b/src/components/status/status.vue
@@ -54,7 +54,7 @@
               </small>
             </h4>
 
-            <div class="status-content" v-html="status.statusnet_html"></div>
+            <div @click.prevent="linkClicked" class="status-content" v-html="status.statusnet_html"></div>
 
             <div v-if='status.attachments' class='attachments'>
               <attachment :status-id="status.id" :nsfw="status.nsfw" :attachment="attachment" v-for="attachment in status.attachments">
-- 
cgit v1.2.3-70-g09d2


From 56e036b4de1b3d92c0de3f18a0b3ada707ba4c2f Mon Sep 17 00:00:00 2001
From: Roger Braun <roger@rogerbraun.net>
Date: Sun, 19 Feb 2017 13:25:30 +0100
Subject: Add special case for mastodon user links.

They have a span embedded in the link, so let's look at the parent, too.
---
 src/components/status/status.js | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'src/components')

diff --git a/src/components/status/status.js b/src/components/status/status.js
index e75400cb..46add8aa 100644
--- a/src/components/status/status.js
+++ b/src/components/status/status.js
@@ -41,6 +41,9 @@ const Status = {
   },
   methods: {
     linkClicked ({target}) {
+      if (target.tagName === 'SPAN') {
+        target = target.parentNode
+      }
       if (target.tagName === 'A') {
         window.open(target.href, '_blank')
       }
-- 
cgit v1.2.3-70-g09d2


From 2933dc30a5de82469ee81720bc78c61f0db7cc4a Mon Sep 17 00:00:00 2001
From: Roger Braun <roger@rogerbraun.net>
Date: Sun, 19 Feb 2017 13:37:21 +0100
Subject: Only display 10 notifications at a time, 20 is too much.

---
 src/components/notifications/notifications.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/components')

diff --git a/src/components/notifications/notifications.js b/src/components/notifications/notifications.js
index d6a6bdb5..c8d5e212 100644
--- a/src/components/notifications/notifications.js
+++ b/src/components/notifications/notifications.js
@@ -3,7 +3,7 @@ import { sortBy, take, filter } from 'lodash'
 const Notifications = {
   data () {
     return {
-      visibleNotificationCount: 20
+      visibleNotificationCount: 10
     }
   },
   computed: {
-- 
cgit v1.2.3-70-g09d2


From b29a094e38f8957e5a11844e19caf434fc8c78e9 Mon Sep 17 00:00:00 2001
From: hakui <hakui@airmail.cc>
Date: Mon, 20 Feb 2017 09:28:50 -0600
Subject: set top and bottom padding on the bars to be equal because it was too
 top-heavy

---
 src/App.scss                           | 2 +-
 src/components/nav_panel/nav_panel.vue | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

(limited to 'src/components')

diff --git a/src/App.scss b/src/App.scss
index d7f0c8ab..431aeb32 100644
--- a/src/App.scss
+++ b/src/App.scss
@@ -108,7 +108,7 @@ main-router {
 .panel-heading {
     border-radius: 0.5em 0.5em 0 0;
     background-size: cover;
-    padding: 0.6em 0 0.5em;
+    padding: 0.6em 0;
     text-align: center;
     font-size: 1.3em;
     line-height: 24px;
diff --git a/src/components/nav_panel/nav_panel.vue b/src/components/nav_panel/nav_panel.vue
index d8604a7b..85ed163c 100644
--- a/src/components/nav_panel/nav_panel.vue
+++ b/src/components/nav_panel/nav_panel.vue
@@ -39,7 +39,7 @@
 
  .nav-panel li {
      border-bottom: 1px solid;
-     padding: 0.75em 0.85em 0.6em;
+     padding: 0.8em 0.85em;
  }
 
  .nav-panel li:last-child {
-- 
cgit v1.2.3-70-g09d2


From 9c1093b6ca695d00794c7db08f5ce0568717af59 Mon Sep 17 00:00:00 2001
From: Roger Braun <roger@rogerbraun.net>
Date: Mon, 20 Feb 2017 18:01:45 +0100
Subject: Grab mutes from server on patched servers.

---
 .../user_card_content/user_card_content.vue        |  1 +
 src/modules/users.js                               |  6 +++++
 src/services/api/api.service.js                    | 31 ++++++++++++++++++++--
 .../backend_interactor_service.js                  | 10 ++++++-
 4 files changed, 45 insertions(+), 3 deletions(-)

(limited to 'src/components')

diff --git a/src/components/user_card_content/user_card_content.vue b/src/components/user_card_content/user_card_content.vue
index 0ee1d86f..59cee734 100644
--- a/src/components/user_card_content/user_card_content.vue
+++ b/src/components/user_card_content/user_card_content.vue
@@ -82,6 +82,7 @@
       toggleMute () {
         const store = this.$store
         store.commit('setMuted', {user: this.user, muted: !this.user.muted})
+        store.state.api.backendInteractor.setUserMute(this.user)
       }
     }
   }
diff --git a/src/modules/users.js b/src/modules/users.js
index ae90abbd..31731880 100644
--- a/src/modules/users.js
+++ b/src/modules/users.js
@@ -82,6 +82,12 @@ const users = {
                 // Start getting fresh tweets.
                 store.dispatch('startFetching', 'friends')
 
+                // Get user mutes and follower info
+                store.rootState.api.backendInteractor.fetchMutes().then((mutedUsers) => {
+                  each(mutedUsers, (user) => { user.muted = true })
+                  store.commit('addNewUsers', mutedUsers)
+                })
+
                 // Fetch our friends
                 store.rootState.api.backendInteractor.fetchFriends()
                   .then((friends) => commit('addNewUsers', friends))
diff --git a/src/services/api/api.service.js b/src/services/api/api.service.js
index de89f503..f172f769 100644
--- a/src/services/api/api.service.js
+++ b/src/services/api/api.service.js
@@ -16,6 +16,7 @@ const MENTIONS_URL = '/api/statuses/mentions.json'
 const FRIENDS_URL = '/api/statuses/friends.json'
 const FOLLOWING_URL = '/api/friendships/create.json'
 const UNFOLLOWING_URL = '/api/friendships/destroy.json'
+const QVITTER_USER_PREF_URL = '/api/qvitter/set_profile_pref.json'
 // const USER_URL = '/api/users/show.json'
 
 const oldfetch = window.fetch
@@ -58,7 +59,7 @@ const fetchFriends = ({credentials}) => {
 const fetchAllFollowing = ({username, credentials}) => {
   const url = `${ALL_FOLLOWING_URL}/${username}.json`
   return fetch(url, { headers: authHeaders(credentials) })
-    .then((data) => data.json().users)
+    .then((data) => data.json())
 }
 
 const fetchMentions = ({username, sinceId = 0, credentials}) => {
@@ -79,6 +80,22 @@ const fetchStatus = ({id, credentials}) => {
     .then((data) => data.json())
 }
 
+const setUserMute = ({id, credentials, muted = true}) => {
+  const form = new FormData()
+
+  const muteInteger = muted ? 1 : 0
+
+  form.append('namespace', 'qvitter')
+  form.append('data', muteInteger)
+  form.append('topic', `mute:${id}`)
+
+  return fetch(QVITTER_USER_PREF_URL, {
+    method: 'POST',
+    headers: authHeaders(credentials),
+    body: form
+  })
+}
+
 const fetchTimeline = ({timeline, credentials, since = false, until = false}) => {
   const timelineUrls = {
     public: PUBLIC_TIMELINE_URL,
@@ -162,6 +179,14 @@ const uploadMedia = ({formData, credentials}) => {
     .then((text) => (new DOMParser()).parseFromString(text, 'application/xml'))
 }
 
+const fetchMutes = ({credentials}) => {
+  const url = '/api/qvitter/mutes.json'
+
+  return fetch(url, {
+    headers: authHeaders(credentials)
+  }).then((data) => data.json())
+}
+
 const apiService = {
   verifyCredentials,
   fetchTimeline,
@@ -177,7 +202,9 @@ const apiService = {
   postStatus,
   deleteStatus,
   uploadMedia,
-  fetchAllFollowing
+  fetchAllFollowing,
+  setUserMute,
+  fetchMutes
 }
 
 export default apiService
diff --git a/src/services/backend_interactor_service/backend_interactor_service.js b/src/services/backend_interactor_service/backend_interactor_service.js
index d335bfb7..d379e602 100644
--- a/src/services/backend_interactor_service/backend_interactor_service.js
+++ b/src/services/backend_interactor_service/backend_interactor_service.js
@@ -34,6 +34,12 @@ const backendInteractorService = (credentials) => {
     return timelineFetcherService.startFetching({timeline, store, credentials})
   }
 
+  const setUserMute = ({id, muted = true}) => {
+    return apiService.setUserMute({id, muted, credentials})
+  }
+
+  const fetchMutes = () => apiService.fetchMutes({credentials})
+
   const backendInteractorServiceInstance = {
     fetchStatus,
     fetchConversation,
@@ -43,7 +49,9 @@ const backendInteractorService = (credentials) => {
     unfollowUser,
     fetchAllFollowing,
     verifyCredentials: apiService.verifyCredentials,
-    startFetching
+    startFetching,
+    setUserMute,
+    fetchMutes
   }
 
   return backendInteractorServiceInstance
-- 
cgit v1.2.3-70-g09d2