Merge branch 'develop' into feature/hash-routed

3 files changed, 20 insertions, 3 deletions

diff --git a/src/modules/config.js b/src/modules/config.js
index 4365d554..a1276519 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 = `${option} ${state.name}`
+    },
+    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..491d0024 100644
--- a/src/modules/statuses.js
+++ b/src/modules/statuses.js
@@ -173,7 +173,10 @@ const addNewStatuses = (state, { statuses, showImmediately = false, timeline, us
   }
 
   const addNotification = ({type, status, action}) => {
-    state.notifications.push({type, status, action})
+    // Only add a new notification if we don't have one for the same action
+    if (!find(state.notifications, (oldNotification) => oldNotification.action.id === action.id)) {
+      state.notifications.push({type, status, action, seen: false})
+    }
   }
 
   const favoriteStatus = (favorite) => {
@@ -276,6 +279,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
+    })
   }
 }
 
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))