treehouse
/
mastodon
21
8
Fork 5
Code Issues 32 Pull Requests Projects 1 Releases Wiki Activity

make sure reblogged's filter is set correctly

lolsob-rspec
Thibaut Girka 2018-07-09 23:44:01 +02:00 committed by ThibG
parent aec11a568e
commit b7b718df0d
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
app/javascript/flavours/glitch/selectors/index.js
View File

@ -66,14 +66,18 @@ export const makeGetStatus = () => {
return null; return null;
} }
const regex = regexFromFilters(filters);
let filtered = false;
if (statusReblog) { if (statusReblog) {
filtered = regex && regex.test(statusReblog.get('search_index'));
statusReblog = statusReblog.set('account', accountReblog); statusReblog = statusReblog.set('account', accountReblog);
statusReblog = statusReblog.set('filtered', filtered);
} else { } else {
statusReblog = null; statusReblog = null;
} }
const regex = regexFromFilters(filters); filtered = filtered || regex && regex.test(statusBase.get('search_index'));
const filtered = regex && regex.test(statusBase.get('reblog') ? statusReblog.get('search_index') : statusBase.get('search_index'));
return statusBase.withMutations(map => { return statusBase.withMutations(map => {
map.set('reblog', statusReblog); map.set('reblog', statusReblog);