[FIX] Loading user list from room messages (#13769)

RocketChat · Mar 18, 2019 · db32757 · db32757
1 parent 5851725
commit db32757
Showing 1 changed file with 8 additions and 5 deletions.
diff --git a/app/ui-message/client/popup/messagePopupConfig.js b/app/ui-message/client/popup/messagePopupConfig.js
@@ -14,15 +14,13 @@ import _ from 'underscore';
 
 const usersFromRoomMessages = new Mongo.Collection(null);
 
-const reloadUsersFromRoomMessages = (userId, rid) => {
-	const user = Meteor.users.findOne(userId, { fields: { username: 1 } });
-
+const reloadUsersFromRoomMessages = (fromUsername, rid) => {
 	usersFromRoomMessages.remove({});
 	const uniqueMessageUsersControl = {};
 
 	Messages.find({
 		rid,
-		'u.username': { $ne: user.username },
+		'u.username': { $ne: fromUsername },
 		t: { $exists: false },
 	},
 	{
@@ -56,7 +54,12 @@ Meteor.startup(function() {
 			return;
 		}
 
-		reloadUsersFromRoomMessages(userId, rid);
+		const user = Meteor.users.findOne(userId, { fields: { username: 1 } });
+		if (!user || !user.username) {
+			return;
+		}
+
+		reloadUsersFromRoomMessages(user.username, rid);
 	});
 });