Unfloyded/Legamunt
0
0
Fork 0
Code Activity

Completely hide toots matched by “irreversible” filters even if they got to the client (#11113)

Browse source 
Fixes #11090
This commit is contained in:
ThibG 2019-06-18 18:23:08 +02:00 • committed by Eugen Rochko
parent 17747e2cd7
commit c8fae508cf
2 changed files with 12 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

9
app/javascript/mastodon/selectors/index.js
View file

@ -84,8 +84,13 @@ export const makeGetStatus = () => {
statusReblog = null;
}
const regex = (accountReblog || accountBase).get('id') !== me && regexFromFilters(filters);
const filtered = regex && regex.test(statusBase.get('reblog') ? statusReblog.get('search_index') : statusBase.get('search_index'));
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);
const filtered = regex && regex.test(statusBase.get('reblog') ? statusReblog.get('search_index') : statusBase.get('search_index'));
return statusBase.withMutations(map => {
map.set('reblog', statusReblog);