From 89c5d8ec4e5798763de44adec79e6e065bb59b9c Mon Sep 17 00:00:00 2001 From: multiple creatures Date: Wed, 15 May 2019 13:12:55 -0500 Subject: Custom filters: resolve bug where filter is erronously ignored when media filtering flags are unset. --- app/javascript/flavours/glitch/selectors/index.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'app/javascript/flavours/glitch') diff --git a/app/javascript/flavours/glitch/selectors/index.js b/app/javascript/flavours/glitch/selectors/index.js index 01f318108..e785a7d68 100644 --- a/app/javascript/flavours/glitch/selectors/index.js +++ b/app/javascript/flavours/glitch/selectors/index.js @@ -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; } -- cgit