Merge pull request RocketChat#544 from WideChat/push_message_post_pro…

…cess

[NEW] Add feature to post process push message and display as a rich message

app/lib/server/functions/notifications/mobile.js

@@ -101,6 +101,7 @@ export function getNotificationPayload({
 				t: message.t,
 			},
 		},
+		isPushMessage: message.pushm,
 		userId,
 	};
 }
@@ -110,6 +111,10 @@ export function sendWebPush(notification, platform) {
 		return;
 	}
 
+	if (notification.isPushMessage) {
+		return;
+	}
+
 	const gcmKey = settings.get('Push_gcm_api_key');
 	const vapidPublic = settings.get('Vapid_public_key');
 	const vapidPrivate = settings.get('Vapid_private_key');

app/lib/server/functions/processWebhookMessage.js

@@ -101,7 +101,9 @@ export const processWebhookMessage = function(messageObj, user, defaultValues =
 
 		if (messageObj.pushm && messageObj.pushm === 'true') {
 			message.pushm = true;
-			message.pushm_encrypted = true;
+			message.pushm_post_processed = false;
+			message.pushm_scope = messageObj.pushm_scope;
+			message.pushm_origin = messageObj.pushm_origin;
 		}
 
 		const messageReturn = sendMessage(user, message, room);

app/lib/server/index.js

@@ -55,6 +55,7 @@ import './methods/removeOAuthService';
 import './methods/removeUserFromPushSubscription';
 import './methods/restartServer';
 import './methods/robotMethods';
+import './methods/savePostProcessedMessage';
 import './methods/savePushNotificationSubscription';
 import './methods/saveSetting';
 import './methods/saveSettings';

app/lib/server/methods/savePostProcessedMessage.js

@@ -0,0 +1,15 @@
+import { Meteor } from 'meteor/meteor';
+
+import { Messages } from '../../../models';
+
+Meteor.methods({
+	savePostProcessedMessage(_id, message) {
+		const originalMessage = Messages.findOneById(_id);
+
+		if (!originalMessage || !originalMessage._id) {
+			return;
+		}
+
+		return Messages.updatePostProcessedPushMessageById(_id, message);
+	},
+});

app/models/server/models/Messages.js

@@ -743,6 +743,20 @@ export class Messages extends Base {
 		return this.update(query, update, { multi: true });
 	}
 
+	updatePostProcessedPushMessageById(_id, post_processed_message) {
+		const query = { _id };
+
+		const update = {
+			$set: {
+				post_processed_message,
+				pushm_post_processed: true,
+				msg: '',
+			},
+		};
+
+		return this.update(query, update);
+	}
+
 	// INSERT
 	createWithTypeRoomIdMessageAndUser(type, roomId, message, user, extraData) {
 		const record = {

app/ui-message/client/message.js

@@ -452,7 +452,7 @@ Template.message.helpers({
 	},
 	isPushMessage() {
 		const { msg } = this;
-		return msg.isPushMessage;
+		return msg.pushm;
 	},
 	showStar() {
 		const { msg } = this;

app/ui-message/client/pushMessage.js

@@ -1,16 +1,32 @@
+import { Meteor } from 'meteor/meteor';
 import { Template } from 'meteor/templating';
 
 import { timeAgo } from '../../lib/client/lib/formatDate';
 import './pushMessage.html';
 
 Template.pushMessage.helpers({
 	data() {
-		const { title, options } = this.msg.pushMessage;
-		const data = {
-			title,
-			...options,
-		};
-		return data;
+		const { _id, pushm_post_processed, pushm_scope, pushm_origin, msg, post_processed_message } = this.msg;
+
+		if (!pushm_post_processed) {
+			navigator.serviceWorker.ready.then((serviceWorkerRegistration) => {
+				console.log('Pushing message to service worker for post processing');
+				const promise = serviceWorkerRegistration.monitorNotification(pushm_origin);
+				serviceWorkerRegistration.pushManager.dispatchMessage(pushm_scope, msg);
+				promise.then((post_processed_message) => {
+					const newMsg = {};
+					console.log(post_processed_message);
+					newMsg.title = post_processed_message.title;
+					newMsg.body = post_processed_message.body;
+					newMsg.icon = post_processed_message.icon;
+					newMsg.actions = post_processed_message.actions;
+					newMsg.timestamp = post_processed_message.timestamp;
+					Meteor.call('savePostProcessedMessage', _id, newMsg);
+				});
+			});
+		} else {
+			return post_processed_message;
+		}
 	},
 	timeAgo(date) {
 		return timeAgo(date);