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: [PATCH] Be strict about putting changes in mutations.

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

diff --git a/src/main.js b/src/main.js
index 84db5c86a7..20489d42f2 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 dd65afe1b0..ae90abbddf 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) {