Skip to content

CF20 - part 2 #173

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Jan 27, 2020
Merged

CF20 - part 2 #173

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d03dbaa
#3455 In app notifications are sent though they are turned off #3455
yoution Jan 22, 2020
905abe8
Merge pull request #170 from yoution/dev
maxceem Jan 25, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions src/services/NotificationService.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -205,8 +205,8 @@ function* listNotifications(query, userId) {
if (_.keys(notificationSettings).length > 0) {
// only filter out notifications types which were explicitly set to 'no' - so we return notification by default
const notifications = _.keys(notificationSettings).filter((notificationType) =>
!notificationSettings[notificationType] &&
!notificationSettings[notificationType].web &&
notificationSettings[notificationType] &&
notificationSettings[notificationType].web &&
notificationSettings[notificationType].web.enabled === 'no'
);
filter.where.type = Object.assign(filter.where.type || {}, { $notIn: notifications });
Expand Down