marrub
/
mastodon
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Custom filters: resolve bug where filter is erronously ignored when media filtering flags are unset.

staging
multiple creatures 2019-05-15 13:12:55 -05:00
parent a680595ecb
commit 89c5d8ec4e
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -44,10 +44,10 @@ const escapeRegExp = string =>
export const regexFromFilters = (status, filters) => {
if (filters === undefined || filters.size === 0) { return null; }
let has_media = status.get('media_attachments').size > 0;
let has_media = status.get('media_attachments').size !== 0;
filters = filters.filter(filter => {
return (!has_media && filter.get('exclude_media')) || (has_media && filter.get('media_only'))
return (!has_media && filter.get('exclude_media')) || (has_media && filter.get('media_only')) || (!filter.get('exclude_media') && !filter.get('media_only'))
});
if (filters.size === 0) { return null; }