#468 - clean up

src/components/status/status.js

@@ -362,7 +362,9 @@ const Status = {
       this.$store.state.api.backendInteractor.pinOwnStatus(this.status.id).then((status) => {
         if (status.error) {
           this.error = status.error
-          setTimeout(() => this.error = null, 5000)
+          setTimeout(() => {
+            this.error = null
+          }, 5000)
         } else {
           this.$store.dispatch('updatePinned', status)
         }

src/modules/statuses.js

@@ -367,25 +367,17 @@ const addNewNotifications = (state, { dispatch, notifications, older, visibleNot
 
 const removeStatus = (state, { timeline, userId, statusId }) => {
   const timelineObject = state.timelines[timeline]
-  let removed = false
+  const status = userId ? { user: { id: userId } } : { id: statusId }
-  if (userId) {
+  remove(timelineObject.statuses, status)
-    remove(timelineObject.statuses, { user: { id: userId } })
+  remove(timelineObject.visibleStatuses, status)
-    remove(timelineObject.visibleStatuses, { user: { id: userId } })
+  if (statusId) {
-    removed = true
-  } else if (statusId) {
-    remove(timelineObject.statuses, { id: statusId })
-    remove(timelineObject.visibleStatuses, { id: statusId })
-    removed = true
     delete timelineObject.statusesObject[statusId]
     delete timelineObject.visibleStatusesObject[statusId]
     sortTimeline(timelineObject)
   }
-
-  if (removed) {
   timelineObject.minVisibleId = timelineObject.visibleStatuses.length > 0 ? last(timelineObject.visibleStatuses).id : 0
   timelineObject.maxId = timelineObject.statuses.length > 0 ? first(timelineObject.statuses).id : 0
 }
-}
 
 export const mutations = {
   addNewStatuses,