Fix: Missing checks for Troubleshoot > Disable Notifications (#17155)

RocketChat · Apr 3, 2020 · ff8017a · ff8017a
1 parent 6e27845
commit ff8017a
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 3 deletions.
diff --git a/app/lib/server/functions/notifications/audio.js b/app/lib/server/functions/notifications/audio.js
@@ -22,8 +22,13 @@ export function shouldNotifyAudio({
 		return false;
 	}
 
-	if (!audioNotifications && settings.get('Accounts_Default_User_Preferences_audioNotifications') === 'all') {
-		return true;
+	if (!audioNotifications) {
+		if (settings.get('Accounts_Default_User_Preferences_audioNotifications') === 'all') {
+			return true;
+		}
+		if (settings.get('Accounts_Default_User_Preferences_audioNotifications') === 'nothing') {
+			return false;
+		}
 	}
 
 	return roomType === 'd' || (!disableAllMessageNotifications && (hasMentionToAll || hasMentionToHere)) || isHighlighted || audioNotifications === 'all' || hasMentionToUser || hasReplyToThread;

diff --git a/app/lib/server/lib/sendNotificationsOnMessage.js b/app/lib/server/lib/sendNotificationsOnMessage.js
@@ -12,6 +12,8 @@ import { sendSinglePush, shouldNotifyMobile } from '../functions/notifications/m
 import { notifyDesktopUser, shouldNotifyDesktop } from '../functions/notifications/desktop';
 import { notifyAudioUser, shouldNotifyAudio } from '../functions/notifications/audio';
 
+let TroubleshootDisableNotifications;
+
 export const sendNotification = async ({
 	subscription,
 	sender,
@@ -24,6 +26,10 @@ export const sendNotification = async ({
 	mentionIds,
 	disableAllMessageNotifications,
 }) => {
+	if (TroubleshootDisableNotifications === true) {
+		return;
+	}
+
 	// don't notify the sender
 	if (subscription.u._id === sender._id) {
 		return;
@@ -187,6 +193,10 @@ const lookup = {
 };
 
 export async function sendMessageNotifications(message, room, usersInThread = []) {
+	if (TroubleshootDisableNotifications === true) {
+		return;
+	}
+
 	const sender = roomTypes.getConfig(room.t).getMsgSender(message.u._id);
 	if (!sender) {
 		return message;
@@ -287,6 +297,10 @@ export async function sendMessageNotifications(message, room, usersInThread = []
 }
 
 export async function sendAllNotifications(message, room) {
+	if (TroubleshootDisableNotifications === true) {
+		return;
+	}
+
 	// threads
 	if (message.tmid) {
 		return message;
@@ -353,7 +367,6 @@ export async function sendAllNotifications(message, room) {
 	return message;
 }
 
-let TroubleshootDisableNotifications;
 settings.get('Troubleshoot_Disable_Notifications', (key, value) => {
 	if (TroubleshootDisableNotifications === value) { return; }
 	TroubleshootDisableNotifications = value;