Merge branch 'notifications-thru-sw' into shigusegubu-vue3

src/modules/notifications.js

@@ -113,7 +113,7 @@ export const notifications = {
         }
       })
     },
-    notificationClicked ({ state, commit }, id) {
+    notificationClicked ({ state, commit }, { id }) {
       const notification = state.idStore[id]
       const { type, seen } = notification
 

src/modules/statuses.js

@@ -139,19 +139,6 @@ const addStatusToGlobalStorage = (state, data) => {
   return result
 }
 
-// XXX: this isn't actually really used anymore since deletes just don't appear outside streaming, thanks masto
-// Remove status from the global storages (arrays and objects maintaining statuses) except timelines
-const removeStatusFromGlobalStorage = (state, status) => {
-  remove(state.allStatuses, { id: status.id })
-  delete state.allStatusesObject[status.id]
-
-  // Remove from conversation
-  const conversationId = status.statusnet_conversation_id
-  if (state.conversationsObject[conversationId]) {
-    remove(state.conversationsObject[conversationId], { id: status.id })
-  }
-}
-
 const addNewStatuses = (state, { statuses, showImmediately = false, timeline, user = {}, noIdUpdate = false, userId, pagination = {} }) => {
   // Sanity check
   if (!isArray(statuses)) {
@@ -285,20 +272,6 @@ const addNewStatuses = (state, { statuses, showImmediately = false, timeline, us
         favoriteStatus(favorite)
       }
     },
-    deletion: (deletion) => {
-      const uri = deletion.uri
-      const status = find(allStatuses, { uri })
-      if (!status) {
-        return
-      }
-
-      removeStatusFromGlobalStorage(state, status)
-
-      if (timeline) {
-        remove(timelineObject.statuses, { uri })
-        remove(timelineObject.visibleStatuses, { uri })
-      }
-    },
     follow: (follow) => {
       // NOOP, it is known status but we don't do anything about it for now
     },