From 42b59b730b291e733f5920a77f8d58dd9d24e764 Mon Sep 17 00:00:00 2001
From: Thibaut Girka <thib@sitedethib.com>
Date: Fri, 12 Jul 2019 18:33:55 +0200
Subject: Implement option to completely hide filtered toots
---
app/javascript/flavours/glitch/selectors/index.js | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
(limited to 'app')
diff --git a/app/javascript/flavours/glitch/selectors/index.js b/app/javascript/flavours/glitch/selectors/index.js
index 3424058d3..551a3ae31 100644
--- a/app/javascript/flavours/glitch/selectors/index.js
+++ b/app/javascript/flavours/glitch/selectors/index.js
@@ -89,10 +89,11 @@ export const makeGetStatus = () => {
(state, { id }) => state.getIn(['statuses', state.getIn(['statuses', id, 'reblog'])]),
(state, { id }) => state.getIn(['accounts', state.getIn(['statuses', id, 'account'])]),
(state, { id }) => state.getIn(['accounts', state.getIn(['statuses', state.getIn(['statuses', id, 'reblog']), 'account'])]),
+ (state, _) => state.getIn(['local_settings', 'filtering_behavior']),
getFiltersRegex,
],
- (statusBase, statusReblog, accountBase, accountReblog, filtersRegex) => {
+ (statusBase, statusReblog, accountBase, accountReblog, filteringBehavior, filtersRegex) => {
if (!statusBase) {
return null;
}
@@ -116,6 +117,10 @@ export const makeGetStatus = () => {
filtered = filtered || regex && regex.test(statusBase.get('search_index'));
+ if (filtered && filteringBehavior === 'drop') {
+ return null;
+ }
+
return statusBase.withMutations(map => {
map.set('reblog', statusReblog);
map.set('account', accountBase);
--
cgit