]> cat aescling's git repositories - mastodon.git/commitdiff
Fix notification filters not applying to poll options
authorThibaut Girka <thib@sitedethib.com>
Tue, 15 Oct 2019 20:57:38 +0000 (22:57 +0200)
committerThibG <thib@sitedethib.com>
Thu, 17 Oct 2019 09:43:58 +0000 (11:43 +0200)
app/javascript/flavours/glitch/actions/notifications.js

index be48b1c77c4526233b4260eca4f8f174884df794..7effb07d1c021453dfbfbd5ad4ed1235398996e7 100644 (file)
@@ -14,6 +14,7 @@ import { unescapeHTML } from 'flavours/glitch/util/html';
 import { getFiltersRegex } from 'flavours/glitch/selectors';
 import { usePendingItems as preferPendingItems } from 'flavours/glitch/util/initial_state';
 import compareId from 'flavours/glitch/util/compare_id';
+import { searchTextFromRawStatus } from 'flavours/glitch/actions/importer/normalizer';
 
 export const NOTIFICATIONS_UPDATE = 'NOTIFICATIONS_UPDATE';
 
@@ -71,7 +72,7 @@ export function updateNotifications(notification, intlMessages, intlLocale) {
     if (notification.type === 'mention') {
       const dropRegex   = filters[0];
       const regex       = filters[1];
-      const searchIndex = notification.status.spoiler_text + '\n' + unescapeHTML(notification.status.content);
+      const searchIndex = searchTextFromRawStatus(notification.status);
 
       if (dropRegex && dropRegex.test(searchIndex)) {
         return;