From d688088bda2c6d2b65bcab3c92760405d1456bb5 Mon Sep 17 00:00:00 2001 From: Matheus Cardoso Date: Thu, 29 Nov 2018 12:01:53 -0300 Subject: [PATCH 1/4] Include message type in notification payload --- packages/rocketchat-lib/server/functions/notifications/mobile.js | 1 + 1 file changed, 1 insertion(+) diff --git a/packages/rocketchat-lib/server/functions/notifications/mobile.js b/packages/rocketchat-lib/server/functions/notifications/mobile.js index d772f7ea7b91..bf0bd001d7bb 100644 --- a/packages/rocketchat-lib/server/functions/notifications/mobile.js +++ b/packages/rocketchat-lib/server/functions/notifications/mobile.js @@ -46,6 +46,7 @@ export async function sendSinglePush({ room, message, userId, receiverUsername, sender: message.u, type: room.t, name: room.name, + messageType: message.t }, roomName: RocketChat.settings.get('Push_show_username_room') && room.t !== 'd' ? `#${ RocketChat.roomTypes.getRoomName(room.t, room) }` : '', username, From 66474ec281aa6b7becd9313f3f2bc84c1c81e7f8 Mon Sep 17 00:00:00 2001 From: Matheus Cardoso Date: Thu, 29 Nov 2018 12:07:11 -0300 Subject: [PATCH 2/4] Add missing comma --- .../rocketchat-lib/server/functions/notifications/mobile.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/rocketchat-lib/server/functions/notifications/mobile.js b/packages/rocketchat-lib/server/functions/notifications/mobile.js index bf0bd001d7bb..04c83917902f 100644 --- a/packages/rocketchat-lib/server/functions/notifications/mobile.js +++ b/packages/rocketchat-lib/server/functions/notifications/mobile.js @@ -46,7 +46,7 @@ export async function sendSinglePush({ room, message, userId, receiverUsername, sender: message.u, type: room.t, name: room.name, - messageType: message.t + messageType: message.t, }, roomName: RocketChat.settings.get('Push_show_username_room') && room.t !== 'd' ? `#${ RocketChat.roomTypes.getRoomName(room.t, room) }` : '', username, From ff0367fedb090fb7663cb0e3c21fbf29c82db6c5 Mon Sep 17 00:00:00 2001 From: Matheus Cardoso Date: Thu, 29 Nov 2018 12:09:33 -0300 Subject: [PATCH 3/4] Add message id to notification payload --- packages/rocketchat-lib/server/functions/notifications/mobile.js | 1 + 1 file changed, 1 insertion(+) diff --git a/packages/rocketchat-lib/server/functions/notifications/mobile.js b/packages/rocketchat-lib/server/functions/notifications/mobile.js index 04c83917902f..477cf09b879a 100644 --- a/packages/rocketchat-lib/server/functions/notifications/mobile.js +++ b/packages/rocketchat-lib/server/functions/notifications/mobile.js @@ -47,6 +47,7 @@ export async function sendSinglePush({ room, message, userId, receiverUsername, type: room.t, name: room.name, messageType: message.t, + messageId: message.id, }, roomName: RocketChat.settings.get('Push_show_username_room') && room.t !== 'd' ? `#${ RocketChat.roomTypes.getRoomName(room.t, room) }` : '', username, From fc7a6ee878364a99d3e619cb4ace6955852a323a Mon Sep 17 00:00:00 2001 From: Matheus Cardoso Date: Thu, 29 Nov 2018 12:41:25 -0300 Subject: [PATCH 4/4] Fix message.id -> _id --- .../rocketchat-lib/server/functions/notifications/mobile.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/rocketchat-lib/server/functions/notifications/mobile.js b/packages/rocketchat-lib/server/functions/notifications/mobile.js index 477cf09b879a..8e5f4292f0dc 100644 --- a/packages/rocketchat-lib/server/functions/notifications/mobile.js +++ b/packages/rocketchat-lib/server/functions/notifications/mobile.js @@ -47,7 +47,7 @@ export async function sendSinglePush({ room, message, userId, receiverUsername, type: room.t, name: room.name, messageType: message.t, - messageId: message.id, + messageId: message._id, }, roomName: RocketChat.settings.get('Push_show_username_room') && room.t !== 'd' ? `#${ RocketChat.roomTypes.getRoomName(room.t, room) }` : '', username,