Merge pull request RocketChat#228 from WideChat/karan_develop_push

Add pushm and pushm_encrypted to Message object
shubhsherl · Apr 14, 2020 · 5867272 · 5867272
2 parents df02d81 + 5b29060
commit 5867272
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 0 deletions.
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
@@ -82,6 +82,11 @@ export const processWebhookMessage = function(messageObj, user, defaultValues =
 			}
 		}
 
+		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/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) {