Merge pull request #7895 from RocketChat/hotifx/brk-realtime-api-noti…

…fications [FIX] Remove break change in Realtime API
RocketChat · Aug 25, 2017 · adec1e0 · adec1e0
2 parents 512f102 + 6c19ecf
commit adec1e0
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/client/notifications/notification.js b/client/notifications/notification.js
@@ -7,7 +7,7 @@
 Meteor.startup(function() {
 	Tracker.autorun(function() {
 		if (Meteor.userId()) {
-			RocketChat.Notifications.onUser('desktopNotification', function(notification) {
+			RocketChat.Notifications.onUser('notification', function(notification) {
 
 				let openedRoomId = undefined;
 				if (['channel', 'group', 'direct'].includes(FlowRouter.getRouteName())) {

diff --git a/packages/rocketchat-lib/server/lib/sendNotificationsOnMessage.js b/packages/rocketchat-lib/server/lib/sendNotificationsOnMessage.js
@@ -58,7 +58,7 @@ function notifyDesktopUser(userId, user, message, room, duration) {
 	if (room.t !== 'd' && room.name) {
 		title += ` @ #${ room.name }`;
 	}
-	RocketChat.Notifications.notifyUser(userId, 'desktopNotification', {
+	RocketChat.Notifications.notifyUser(userId, 'notification', {
 		title,
 		text: message.msg,
 		duration,