[IMPROVE] [Apps-Engine] App user as the default notifier (#17050)

* App user as the default notifier * Move changes to the apps-engine side Co-authored-by: Douglas Gubert <d-gubert@users.noreply.github.com>
RocketChat · May 1, 2020 · 40e2f53 · 40e2f53
1 parent 629cbfb
commit 40e2f53
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 8 deletions.
diff --git a/app/apps/server/bridges/messages.js b/app/apps/server/bridges/messages.js
@@ -1,6 +1,6 @@
 import { Random } from 'meteor/random';
 
-import { Messages, Users, Subscriptions } from '../../../models';
+import { Messages, Users, Subscriptions } from '../../../models/server';
 import { Notifications } from '../../../notifications';
 import { updateMessage } from '../../../lib/server/functions/updateMessage';
 import { executeSendMessage } from '../../../lib/server/methods/sendMessage';
@@ -48,12 +48,15 @@ export class AppMessageBridge {
 
 		const msg = this.orch.getConverters().get('messages').convertAppMessage(message);
 
-		Notifications.notifyUser(user.id, 'message', Object.assign(msg, {
+		if (!msg) {
+			return;
+		}
+
+		Notifications.notifyUser(user.id, 'message', {
+			...msg,
 			_id: Random.id(),
 			ts: new Date(),
-			u: undefined,
-			editor: undefined,
-		}));
+		});
 	}
 
 	async notifyRoom(room, message, appId) {
@@ -68,8 +71,6 @@ export class AppMessageBridge {
 			_id: Random.id(),
 			rid: room.id,
 			ts: new Date(),
-			u: undefined,
-			editor: undefined,
 		});
 
 		const users = Subscriptions.findByRoomIdWhenUserIdExists(room.id, { fields: { 'u._id': 1 } })

diff --git a/app/apps/server/converters/messages.js b/app/apps/server/converters/messages.js
@@ -78,7 +78,7 @@ export class AppMessagesConverter {
 	}
 
 	convertAppMessage(message) {
-		if (!message) {
+		if (!message || !message.room) {
 			return undefined;
 		}