Merge pull request RocketChat#359 from WideChat/karan_pwa_develop

Resolve pwa-push merge conflicts.
shubhsherl · Jul 20, 2020 · 5c6d2d6 · 5c6d2d6
2 parents 73b7d93 + 4cd441d
commit 5c6d2d6
Show file tree

Hide file tree

Showing 5 changed files with 35 additions and 1 deletion.
diff --git a/app/api/server/v1/chat.js b/app/api/server/v1/chat.js
@@ -128,7 +128,23 @@ API.v1.addRoute('chat.pinMessage', { authRequired: true }, {
 
 API.v1.addRoute('chat.postMessage', { authRequired: true }, {
 	post() {
-		const messageReturn = processWebhookMessage(this.bodyParams, this.user)[0];
+		// WIDECHAT only
+		let messageReturn;
+		if (this.user.username === settings.get('Notification_Service_User_Username')) {
+			const { hostname_id } = this.requestParams();
+			if (!hostname_id) {
+				throw new Meteor.Error('error-hostname-id-not-provided', 'Body param "hostname_id" is required');
+			}
+			const hostuser = Users.findOneById(hostname_id);
+			messageReturn = processWebhookMessage(this.bodyParams, hostuser, undefined, true)[0];
+		} else {
+			messageReturn = processWebhookMessage(this.bodyParams, this.user, undefined, true)[0];
+		}
+		//
+
+		// RC code
+		// const messageReturn = processWebhookMessage(this.bodyParams, this.user)[0];
+
 
 		if (!messageReturn) {
 			return API.v1.failure('unknown-error');

diff --git a/app/lib/server/functions/insertMessage.js b/app/lib/server/functions/insertMessage.js
@@ -88,6 +88,7 @@ export const insertMessage = function(user, message, room, upsert = false) {
 		alias: String,
 		emoji: String,
 		avatar: String,
+		pushm: Boolean,
 		attachments: [Match.Any],
 	}));
 

diff --git a/app/lib/server/functions/processWebhookMessage.js b/app/lib/server/functions/processWebhookMessage.js
@@ -99,6 +99,11 @@ export const processWebhookMessage = function(messageObj, user, defaultValues =
 			}, error);
 		}
 
+		if (messageObj.pushm && messageObj.pushm === 'true') {
+			message.pushm = true;
+			message.pushm_encrypted = true;
+		}
+
 		const messageReturn = sendMessage(user, message, room);
 		sentData.push({ channel, message: messageReturn });
 	}

diff --git a/app/lib/server/startup/settings.js b/app/lib/server/startup/settings.js
@@ -949,6 +949,14 @@ settings.addGroup('General', function() {
 			public: true,
 			i18nDescription: 'Notifications_Max_Room_Members_Description',
 		});
+		this.add('Notifications_Always_Notify_Mobile', false, {
+			type: 'boolean',
+			public: true,
+			i18nDescription: 'Notifications_Always_Notify_Mobile_Description',
+		});
+		this.add('Notification_Service_User_Username', 'viasat.notification.service', {
+			type: 'string',
+		});
 	});
 	this.section('REST API', function() {
 		return this.add('API_User_Limit', 500, {

diff --git a/app/models/server/models/Messages.js b/app/models/server/models/Messages.js
@@ -32,6 +32,10 @@ export class Messages extends Base {
 		this.tryEnsureIndex({ tcount: 1, tlm: 1 }, { sparse: true });
 		// livechat
 		this.tryEnsureIndex({ 'navigation.token': 1 }, { sparse: true });
+
+		// push-message
+		this.tryEnsureIndex({ pushm: 1 }, { sparse: true });
+		this.tryEnsureIndex({ pushm_encrypted: 1 }, { sparse: true });
 	}
 
 	setReactions(messageId, reactions) {