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/selectors/index.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/selectors/index.js')
-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; |