1 files changed, 35 insertions, 13 deletions

diff --git a/src/modules/statuses.js b/src/modules/statuses.js
index a3031b31..37115506 100644
--- a/src/modules/statuses.js
+++ b/src/modules/statuses.js
@@ -1,4 +1,4 @@
-import { remove, map, slice, sortBy, toInteger, each, find, flatten, maxBy, last, merge, max } from 'lodash'
+import { remove, map, slice, sortBy, toInteger, each, find, flatten, maxBy, last, merge, max, isArray } from 'lodash'
 import moment from 'moment'
 import apiService from '../services/api/api.service.js'
 // import parse from '../services/status_parser/status_parser.js'
@@ -7,6 +7,7 @@ export const defaultState = {
   allStatuses: [],
   maxId: 0,
   notifications: [],
+  favorites: new Set(),
   timelines: {
     public: {
       statuses: [],
@@ -100,11 +101,17 @@ const mergeOrAdd = (arr, item) => {
 }
 
 const addNewStatuses = (state, { statuses, showImmediately = false, timeline, user = {} }) => {
+  // Sanity check
+  if (!isArray(statuses)) {
+    return false
+  }
+
   const allStatuses = state.allStatuses
   const timelineObject = state.timelines[timeline]
 
   // Set the maxId to the new id if it's larger.
   const updateMaxId = ({id}) => {
+    if (!timeline) { return false }
     timelineObject.maxId = max([id, timelineObject.maxId])
   }
 
@@ -117,15 +124,15 @@ const addNewStatuses = (state, { statuses, showImmediately = false, timeline, us
     }
 
     // Some statuses should only be added to the global status repository.
-    if (addToTimeline) {
+    if (timeline && addToTimeline) {
       mergeOrAdd(timelineObject.statuses, status)
     }
 
-    if (showImmediately) {
+    if (timeline && showImmediately) {
       // Add it directly to the visibleStatuses, don't change
       // newStatusCount
       mergeOrAdd(timelineObject.visibleStatuses, status)
-    } else if (addToTimeline && result.new) {
+    } else if (timeline && addToTimeline && result.new) {
       // Just change newStatuscount
       timelineObject.newStatusCount += 1
     }
@@ -141,6 +148,13 @@ const addNewStatuses = (state, { statuses, showImmediately = false, timeline, us
     const status = find(allStatuses, { id: toInteger(favorite.in_reply_to_status_id) })
     if (status) {
       status.fave_num += 1
+
+      // This is our favorite, so the relevant bit.
+      if (favorite.user.id === user.id) {
+        status.favorited = true
+      }
+
+      // Add a notification if the user's status is favorited
       if (status.user.id === user.id) {
         addNotification({type: 'favorite', status, action: favorite})
       }
@@ -159,7 +173,7 @@ const addNewStatuses = (state, { statuses, showImmediately = false, timeline, us
       let retweet
       // If the retweeted status is already there, don't add the retweet
       // to the timeline.
-      if (find(timelineObject.visibleStatuses, {id: retweetedStatus.id})) {
+      if (timeline && find(timelineObject.visibleStatuses, {id: retweetedStatus.id})) {
         // Already have it visible, don't add to timeline, don't show.
         retweet = addStatus(status, false, false)
       } else {
@@ -169,16 +183,22 @@ const addNewStatuses = (state, { statuses, showImmediately = false, timeline, us
       retweet.retweeted_status = retweetedStatus
     },
     'favorite': (favorite) => {
-      updateMaxId(favorite)
-      favoriteStatus(favorite)
+      // Only update if this is a new favorite.
+      if (!state.favorites.has(favorite.id)) {
+        state.favorites.add(favorite.id)
+        updateMaxId(favorite)
+        favoriteStatus(favorite)
+      }
     },
     'deletion': (deletion) => {
       const uri = deletion.uri
       updateMaxId(deletion)
 
       remove(allStatuses, { uri })
-      remove(timelineObject.statuses, { uri })
-      remove(timelineObject.visibleStatuses, { uri })
+      if (timeline) {
+        remove(timelineObject.statuses, { uri })
+        remove(timelineObject.visibleStatuses, { uri })
+      }
     },
     'default': (unknown) => {
       console.log(unknown)
@@ -192,9 +212,11 @@ const addNewStatuses = (state, { statuses, showImmediately = false, timeline, us
   })
 
   // Keep the visible statuses sorted
-  timelineObject.visibleStatuses = sortBy(timelineObject.visibleStatuses, ({id}) => -id)
-  timelineObject.statuses = sortBy(timelineObject.statuses, ({id}) => -id)
-  timelineObject.minVisibleId = (last(timelineObject.statuses) || {}).id
+  if (timeline) {
+    timelineObject.visibleStatuses = sortBy(timelineObject.visibleStatuses, ({id}) => -id)
+    timelineObject.statuses = sortBy(timelineObject.statuses, ({id}) => -id)
+    timelineObject.minVisibleId = (last(timelineObject.statuses) || {}).id
+  }
 }
 
 export const mutations = {
@@ -228,7 +250,7 @@ export const mutations = {
 const statuses = {
   state: defaultState,
   actions: {
-    addNewStatuses ({ rootState, commit }, { statuses, showImmediately = false, timeline }) {
+    addNewStatuses ({ rootState, commit }, { statuses, showImmediately = false, timeline = false }) {
       commit('addNewStatuses', { statuses, showImmediately, timeline, user: rootState.users.currentUser })
     },
     favorite ({ rootState, commit }, status) {