[FIX] Notification not working for group mentions and not respecting ignored users #11024
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
ggazzo
reviewed
Jun 8, 2018
| @@ -199,11 +199,15 @@ function sendAllNotifications(message, room) { | |||
| [notificationField]: 'mentions', | |||
| 'u._id': { $in: mentionIdsWithoutGroups } | |||
| }); | |||
| } else if ((hasMentionToAll || hasMentionToHere) && !disableAllMessageNotifications) { | |||
There was a problem hiding this comment.
I like to make small tests before
} else if (!disableAllMessageNotifications && (hasMentionToAll || hasMentionToHere))what do you think?
ggazzo
reviewed
Jun 8, 2018
| } | ||
|
|
||
| const serverField = kind === 'email' ? 'emailNotificationMode' : `${ kind }Notifications`; | ||
| const serverPreference = RocketChat.settings.get(`Accounts_Default_User_Preferences_${ serverField }`); | ||
| if ((room.t === 'd' && serverPreference === 'mentions') || (serverPreference === 'all' && !disableAllMessageNotifications)) { | ||
| if ((room.t === 'd' && serverPreference === 'mentions') || ((serverPreference === 'all' || hasMentionToAll || hasMentionToHere) && !disableAllMessageNotifications)) { |
There was a problem hiding this comment.
we really need room.t === 'd' && serverPreference === 'mentions' or just room.t === 'd' here? Because I think as we have serverPreference === 'all' that I think take care of the problem :)
There was a problem hiding this comment.
yes we do.. because serverPreference can be nothing
Hudell
approved these changes
Jun 8, 2018
ggazzo
approved these changes
Jun 8, 2018
trongthanh
added a commit
to goalifyplus/Goalify.Chat
that referenced
this pull request
Jun 11, 2018
* develop: (215 commits) [FIX] Rooms list sorting by activity multiple re-renders and case sensitive sorting alphabetically (RocketChat#9959) [FIX] Notification not working for group mentions and not respecting ignored users (RocketChat#11024) fixed searchbar icon and text overlap (RocketChat#10294) [FIX] Link previews not being removed from messages after removed on editing (RocketChat#11063) avoid send presence without loggin Fix: Exception in metrics generation Update release template Update issue templates Update pt-BR.i18n.json LingoHub Update 🚀 update import capnp update build for Sandstorm, add dependence capnp. LingoHub Update 🚀 Fixing HTML on translation files Fixing HTML on translation files LingoHub Update 🚀 Fixing HTML on translation files Fixing HTML on translation files Fixing HTML on translation files LingoHub Update 🚀 ... # Conflicts: # .meteor/packages # README.md # client/startup/startup.js # package-lock.json # packages/rocketchat-error-handler/server/lib/RocketChat.ErrorHandler.js # packages/rocketchat-i18n/i18n/en.i18n.json # packages/rocketchat-i18n/i18n/vi-VN.i18n.json # packages/rocketchat-livechat/config.js # server/startup/initialData.js
trongthanh
added a commit
to goalifyplus/Goalify.Chat
that referenced
this pull request
Jun 11, 2018
* goalify: (217 commits) Add more scripts to reduce mannual interaction during server init [FIX] Rooms list sorting by activity multiple re-renders and case sensitive sorting alphabetically (RocketChat#9959) [FIX] Notification not working for group mentions and not respecting ignored users (RocketChat#11024) fixed searchbar icon and text overlap (RocketChat#10294) [FIX] Link previews not being removed from messages after removed on editing (RocketChat#11063) avoid send presence without loggin Fix: Exception in metrics generation Update release template Update issue templates Update pt-BR.i18n.json LingoHub Update 🚀 update import capnp update build for Sandstorm, add dependence capnp. LingoHub Update 🚀 Fixing HTML on translation files Fixing HTML on translation files LingoHub Update 🚀 Fixing HTML on translation files Fixing HTML on translation files Fixing HTML on translation files ...
Merged
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Closes #11018