Skip to content
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

Jump to bottom

[FIX] DM email notifications always being sent regardless of account setting #8917

Merged
merged 2 commits into from
Dec 4, 2017
Merged

[FIX] DM email notifications always being sent regardless of account setting #8917

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
35f094d
Small tweak to PR #8810 to take into account if the subscription sett…
Nov 22, 2017
4d250c8
Fixed an issue where a new user wouldn't receive DM notifications
ashward Nov 23, 2017
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 packages/rocketchat-lib/server/lib/sendEmailOnMessage.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -121,14 +121,14 @@ RocketChat.callbacks.add('afterSaveMessage', function(message, room) {
}

if (usersToSendEmail[user._id] === 'direct') {
const userEmailPreferenceIsDisable = !user.settings || !user.settings.preferences || !user.settings.preferences.emailNotificationMode || user.settings.preferences.emailNotificationMode === 'disabled';
const userEmailPreferenceIsDisabled = user.settings && user.settings.preferences && user.settings.preferences.emailNotificationMode && (user.settings.preferences.emailNotificationMode === 'disabled');
const directMessageEmailPreference = RocketChat.models.Subscriptions.findOneByRoomIdAndUserId(message.rid, message.rid.replace(message.u._id, '')).emailNotifications;

if (directMessageEmailPreference === 'nothing') {
return;
}

if (directMessageEmailPreference === 'default' && userEmailPreferenceIsDisable) {
if ((directMessageEmailPreference === 'default' || directMessageEmailPreference == null) && userEmailPreferenceIsDisabled) {
return;
}
}
Expand Down