|
|
@ -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);
|
|
|
|