diff options
author | ThibG <thib@sitedethib.com> | 2020-12-10 10:25:52 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-12-10 10:25:52 +0100 |
commit | cbe9b0640ba4d466c8b24fb233dff60e9f8d00f0 (patch) | |
tree | 4e814a622966f1b71f18c1ff41116c75f0728afc /app/javascript/flavours/glitch/features/notifications | |
parent | b27d11dd3320cb005561f0bb1b81baecea8a7c43 (diff) | |
parent | 9a5825f864b9e9c545e995249518bb50a74f4359 (diff) |
Merge pull request #1473 from ThibG/glitch-soc/merge-upstream
Merge upstream changes
Diffstat (limited to 'app/javascript/flavours/glitch/features/notifications')
-rw-r--r-- | app/javascript/flavours/glitch/features/notifications/index.js | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/app/javascript/flavours/glitch/features/notifications/index.js b/app/javascript/flavours/glitch/features/notifications/index.js index 97434b586..73d969517 100644 --- a/app/javascript/flavours/glitch/features/notifications/index.js +++ b/app/javascript/flavours/glitch/features/notifications/index.js @@ -37,10 +37,16 @@ const messages = defineMessages({ markAsRead : { id: 'notifications.mark_as_read', defaultMessage: 'Mark every notification as read' }, }); +const getExcludedTypes = createSelector([ + state => state.getIn(['settings', 'notifications', 'shows']), +], (shows) => { + return ImmutableList(shows.filter(item => !item).keys()); +}); + const getNotifications = createSelector([ state => state.getIn(['settings', 'notifications', 'quickFilter', 'show']), state => state.getIn(['settings', 'notifications', 'quickFilter', 'active']), - state => ImmutableList(state.getIn(['settings', 'notifications', 'shows']).filter(item => !item).keys()), + getExcludedTypes, state => state.getIn(['notifications', 'items']), ], (showFilterBar, allowedType, excludedTypes, notifications) => { if (!showFilterBar || allowedType === 'all') { |