diff options
author | Reverite <github@reverite.sh> | 2019-06-22 14:15:02 -0600 |
---|---|---|
committer | Reverite <github@reverite.sh> | 2019-06-22 14:15:02 -0600 |
commit | 714940de498e93a8bf40dcda1835217df18741bf (patch) | |
tree | eafc1d01710ba978f133216d8d1a6e4d585606c6 /app/javascript/flavours/glitch/selectors | |
parent | b2ffaa9f2909c83f23691a02b2843bf41a1a12c0 (diff) | |
parent | 38d28824475056766c97385b66f4e04a5123e3a2 (diff) |
Merge branch 'glitch' into production
Diffstat (limited to 'app/javascript/flavours/glitch/selectors')
-rw-r--r-- | app/javascript/flavours/glitch/selectors/index.js | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/app/javascript/flavours/glitch/selectors/index.js b/app/javascript/flavours/glitch/selectors/index.js index d1a88a2fc..2d4f3f7b4 100644 --- a/app/javascript/flavours/glitch/selectors/index.js +++ b/app/javascript/flavours/glitch/selectors/index.js @@ -78,6 +78,12 @@ export const makeGetStatus = () => { return null; } + const dropRegex = (accountReblog || accountBase).get('id') !== me && regexFromFilters(filters.filter(filter => filter.get('irreversible'))); + + if (dropRegex && dropRegex.test(statusBase.get('reblog') ? statusReblog.get('search_index') : statusBase.get('search_index'))) { + return null; + } + const regex = (accountReblog || accountBase).get('id') !== me && regexFromFilters(filters); let filtered = false; |