2 files changed, 7 insertions, 6 deletions
diff --git a/src/modules/statuses.js b/src/modules/statuses.js
index 2b0215f0..4ee75d48 100644
--- a/src/modules/statuses.js
+++ b/src/modules/statuses.js
@@ -135,6 +135,7 @@ const addNewStatuses = (state, { statuses, showImmediately = false, timeline, us
   // This makes sure that user timeline won't get data meant for other
   // user. I.e. opening different user profiles makes request which could
   // return data late after user already viewing different user profile
+  console.log('TIMEINLINE', timelineObject.userId)
   if ((timeline === 'user' || timeline === 'media') && timelineObject.userId !== userId) {
     return
   }
diff --git a/src/modules/users.js b/src/modules/users.js
index a81ed964..4e17ebf2 100644
--- a/src/modules/users.js
+++ b/src/modules/users.js
@@ -138,12 +138,7 @@ export const mutations = {
 }
 
 export const getters = {
-  userById: state => id =>
-    state.users.find(user => user.id === id),
-  userByName: state => name =>
-    state.users.find(user => user.screen_name &&
-      (user.screen_name.toLowerCase() === name.toLowerCase())
-    )
+  findUser: state => query => state.usersObject[query]
 }
 
 export const defaultState = {
@@ -165,6 +160,11 @@ const users = {
       return store.rootState.api.backendInteractor.fetchUser({ id })
         .then((user) => store.commit('addNewUsers', [user]))
     },
+    fetchUserByScreenName (store, screenName) {
+      return store.rootState.api.backendInteractor.figureOutUserId({ screenName })
+        .then((qvitterUserData) => store.rootState.api.backendInteractor.fetchUser({ id: qvitterUserData.id }))
+        .then((user) => store.commit('addNewUsers', [user]) || user.id)
+    },
     fetchUserRelationship (store, id) {
       return store.rootState.api.backendInteractor.fetchUserRelationship({ id })
         .then((relationships) => store.commit('updateUserRelationship', relationships))