about summary refs log tree commit diff
path: root/app/javascript/flavours/glitch/selectors
diff options
context:
space:
mode:
authorThibaut Girka <thib@sitedethib.com>2018-07-09 23:44:01 +0200
committerThibG <thib@sitedethib.com>2018-07-10 14:06:04 +0200
commitef1d660596e7d760911a0467454d35318c73c398 (patch)
tree3cfceeddbe4f857310cec9acce7b4723df8b6daf /app/javascript/flavours/glitch/selectors
parentfaa4db7975c7ec2ca1bbed19047fe6900d3d5599 (diff)
make sure reblogged's filter is set correctly
Diffstat (limited to 'app/javascript/flavours/glitch/selectors')
-rw-r--r--app/javascript/flavours/glitch/selectors/index.js8
1 files changed, 6 insertions, 2 deletions
diff --git a/app/javascript/flavours/glitch/selectors/index.js b/app/javascript/flavours/glitch/selectors/index.js
index d0212c379..b713a13a6 100644
--- a/app/javascript/flavours/glitch/selectors/index.js
+++ b/app/javascript/flavours/glitch/selectors/index.js
@@ -66,14 +66,18 @@ export const makeGetStatus = () => {
         return null;
       }
 
+      const regex  = regexFromFilters(filters);
+      let filtered = false;
+
       if (statusReblog) {
+        filtered     = regex && regex.test(statusReblog.get('search_index'));
         statusReblog = statusReblog.set('account', accountReblog);
+        statusReblog = statusReblog.set('filtered', filtered);
       } else {
         statusReblog = null;
       }
 
-      const regex    = regexFromFilters(filters);
-      const filtered = regex && regex.test(statusBase.get('reblog') ? statusReblog.get('search_index') : statusBase.get('search_index'));
+      filtered = filtered || regex && regex.test(statusBase.get('search_index'));
 
       return statusBase.withMutations(map => {
         map.set('reblog', statusReblog);