aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorshpuld <shp@cock.li>2017-11-12 23:15:47 +0200
committershpuld <shp@cock.li>2017-11-12 23:15:47 +0200
commitc682a4b007cc55ce627e7c7331443905e473c4a7 (patch)
treebd2660f227da76543c41eb3c7e448fc896b7feb1 /src
parent58135410063477e708e0dca090a67fe6a3e6b4c4 (diff)
Don't add notification on self mention, (and fix that pesky pleroma vs gs delete bug)
Diffstat (limited to 'src')
-rw-r--r--src/modules/statuses.js8
1 files changed, 5 insertions, 3 deletions
diff --git a/src/modules/statuses.js b/src/modules/statuses.js
index 5f2f8152..403abd23 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 })
+ }
}
}