[FIX] REST endpoint chat.syncMessages returning an error with delet…

…ed messages (RocketChat#15824)
vickychu · Nov 20, 2019 · b918d40 · b918d40
1 parent 65a7b73
commit b918d40
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 1 deletion.
diff --git a/app/api/server/v1/chat.js b/app/api/server/v1/chat.js
@@ -71,7 +71,7 @@ API.v1.addRoute('chat.syncMessages', { authRequired: true }, {
 		return API.v1.success({
 			result: {
 				updated: normalizeMessagesForUser(result.updated, this.userId),
-				deleted: normalizeMessagesForUser(result.deleted, this.userId),
+				deleted: result.deleted,
 			},
 		});
 	},

diff --git a/app/utils/server/lib/normalizeMessagesForUser.js b/app/utils/server/lib/normalizeMessagesForUser.js
@@ -22,6 +22,9 @@ export const normalizeMessagesForUser = (messages, uid) => {
 	messages.forEach((message) => {
 		message = filterStarred(message, uid);
 
+		if (!message.u || !message.u.username) {
+			return;
+		}
 		usernames.add(message.u.username);
 
 		(message.mentions || []).forEach(({ username }) => { usernames.add(username); });
@@ -42,6 +45,9 @@ export const normalizeMessagesForUser = (messages, uid) => {
 	});
 
 	messages.forEach((message) => {
+		if (!message.u) {
+			return;
+		}
 		message.u.name = users[message.u.username];
 
 		(message.mentions || []).forEach((mention) => { mention.name = users[mention.username]; });