diff options
author | ThibG <thib@sitedethib.com> | 2019-06-20 19:19:30 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2019-06-20 19:19:30 +0200 |
commit | f717d7a92da83703d270af50310fa3483b503417 (patch) | |
tree | e512bfc11eae35fa601522672f47261a0972c484 /app/javascript/flavours/glitch/actions/notifications.js | |
parent | f4b008906dcfc3333ec533884aa10b65f8ae41a2 (diff) | |
parent | 3771a993b7e19bc0e756e7f727f10ddd14c10c93 (diff) |
Merge pull request #1134 from ThibG/glitch-soc/merge-upstream
Merge upstream changes
Diffstat (limited to 'app/javascript/flavours/glitch/actions/notifications.js')
-rw-r--r-- | app/javascript/flavours/glitch/actions/notifications.js | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/app/javascript/flavours/glitch/actions/notifications.js b/app/javascript/flavours/glitch/actions/notifications.js index 57fecf63d..2107503db 100644 --- a/app/javascript/flavours/glitch/actions/notifications.js +++ b/app/javascript/flavours/glitch/actions/notifications.js @@ -62,9 +62,14 @@ export function updateNotifications(notification, intlMessages, intlLocale) { let filtered = false; if (notification.type === 'mention') { + const dropRegex = regexFromFilters(filters.filter(filter => filter.get('irreversible'))); const regex = regexFromFilters(filters); const searchIndex = notification.status.spoiler_text + '\n' + unescapeHTML(notification.status.content); + if (dropRegex && dropRegex.test(searchIndex)) { + return; + } + filtered = regex && regex.test(searchIndex); } |