From e892fffda797c4d5e6aef54a488f15f55526a29d Mon Sep 17 00:00:00 2001
From: Roger Braun <roger@rogerbraun.net>
Date: Thu, 16 Feb 2017 12:51:24 +0100
Subject: Correctly calculate the newStatusesCount.

Fixes a bug when viewing an updating twkn while logged in.
---
 src/modules/statuses.js | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

(limited to 'src/modules')

diff --git a/src/modules/statuses.js b/src/modules/statuses.js
index b1aa404a..871172b5 100644
--- a/src/modules/statuses.js
+++ b/src/modules/statuses.js
@@ -153,16 +153,18 @@ const addNewStatuses = (state, { statuses, showImmediately = false, timeline, us
       }
     }
 
+    // Decide if we should treat the status as new for this timeline.
+    let resultForCurrentTimeline
     // Some statuses should only be added to the global status repository.
     if (timeline && addToTimeline) {
-      mergeOrAdd(timelineObject.statuses, status)
+      resultForCurrentTimeline = mergeOrAdd(timelineObject.statuses, status)
     }
 
     if (timeline && showImmediately) {
       // Add it directly to the visibleStatuses, don't change
       // newStatusCount
       mergeOrAdd(timelineObject.visibleStatuses, status)
-    } else if (timeline && addToTimeline && result.new) {
+    } else if (timeline && addToTimeline && resultForCurrentTimeline.new) {
       // Just change newStatuscount
       timelineObject.newStatusCount += 1
     }
-- 
cgit v1.2.3-70-g09d2


From ae388d79278157e33d9818f6365d0d2fb1c116b5 Mon Sep 17 00:00:00 2001
From: Roger Braun <roger@rogerbraun.net>
Date: Thu, 16 Feb 2017 14:23:59 +0100
Subject: Be strict about putting changes in mutations.

---
 src/main.js          | 3 ++-
 src/modules/users.js | 7 +++++--
 2 files changed, 7 insertions(+), 3 deletions(-)

(limited to 'src/modules')

diff --git a/src/main.js b/src/main.js
index 84db5c86..20489d42 100644
--- a/src/main.js
+++ b/src/main.js
@@ -38,7 +38,8 @@ const store = new Vuex.Store({
     api: apiModule,
     config: configModule
   },
-  plugins: [createPersistedState(persistedStateOptions)]
+  plugins: [createPersistedState(persistedStateOptions)],
+  strict: process.env.NODE_ENV !== 'production'
 })
 
 const routes = [
diff --git a/src/modules/users.js b/src/modules/users.js
index dd65afe1..ae90abbd 100644
--- a/src/modules/users.js
+++ b/src/modules/users.js
@@ -33,6 +33,9 @@ export const mutations = {
   },
   addNewUsers (state, users) {
     each(users, (user) => mergeOrAdd(state.users, user))
+  },
+  setUserForStatus (state, status) {
+    status.user = find(state.users, status.user)
   }
 }
 
@@ -54,11 +57,11 @@ const users = {
 
       // Reconnect users to statuses
       each(statuses, (status) => {
-        status.user = find(store.state.users, status.user)
+        store.commit('setUserForStatus', status)
       })
       // Reconnect users to retweets
       each(compact(map(statuses, 'retweeted_status')), (status) => {
-        status.user = find(store.state.users, status.user)
+        store.commit('setUserForStatus', status)
       })
     },
     loginUser (store, userCredentials) {
-- 
cgit v1.2.3-70-g09d2