Merge branch 'feature/streaming-posts' into 'develop'

Streaming posts

See merge request pleroma/pleroma-fe!151

1 files changed, 5 insertions, 3 deletions

diff --git a/src/modules/statuses.js b/src/modules/statuses.js
index 884ba0ef..6d4b4843 100644
--- a/src/modules/statuses.js
+++ b/src/modules/statuses.js
@@ -131,7 +131,7 @@ export const statusType = (status) => {
     return 'favorite'
   }
 
-  if (status.text.match(/deleted notice {{tag/)) {
+  if (status.text.match(/deleted notice {{tag/) || status.qvitter_delete_notice) {
     return 'deletion'
   }
 
@@ -211,8 +211,10 @@ const addNewStatuses = (state, { statuses, showImmediately = false, timeline, us
 
           sortTimeline(mentions)
         }
-
-        addNotification({ type: 'mention', status, action: status })
+        // Don't add notification for self-mention
+        if (status.user.id !== user.id) {
+          addNotification({ type: 'mention', status, action: status })
+        }
       }
     }