Fix sound notification playing current opened room sound

client/notifications/notification.js

@@ -27,12 +27,12 @@ Meteor.startup(function() {
 				if (RocketChat.Layout.isEmbedded()) {
 					if (!hasFocus && messageIsInOpenedRoom) {
 						// Play a sound and show a notification.
-						KonchatNotification.newMessage();
+						KonchatNotification.newMessage(notification.payload.rid);
 						KonchatNotification.showDesktop(notification);
 					}
 				} else if (!(hasFocus && messageIsInOpenedRoom)) {
 					// Play a sound and show a notification.
-					KonchatNotification.newMessage();
+					KonchatNotification.newMessage(notification.payload.rid);
 					KonchatNotification.showDesktop(notification);
 				}
 			});

packages/rocketchat-ui/lib/notification.coffee

@@ -47,10 +47,10 @@
 			notification.icon = avatarAsPng
 			KonchatNotification.notify(notification)
 
-	newMessage: ->
+	newMessage: (rid) ->
 		if not Session.equals('user_' + Meteor.userId() + '_status', 'busy')
 			newMessageNotification = Meteor.user()?.settings?.preferences?.newMessageNotification || 'chime'
-			sub = ChatSubscription.findOne({ rid: Session.get('openedRoom') }, { fields: { audioNotification: 1 } });
+			sub = ChatSubscription.findOne({ rid: rid }, { fields: { audioNotification: 1 } });
 			if sub?.audioNotification isnt 'none'
 				if sub?.audioNotification
 					$("audio##{sub.audioNotification}")[0].play()