From 235fe9efe384a2ff64ddd08831b9be8177fc9ea8 Mon Sep 17 00:00:00 2001
From: barisusakli <barisusakli@gmail.com>
Date: Fri, 14 Oct 2016 13:22:30 +0300
Subject: [PATCH] fix chat modal title

---
 src/messaging.js         | 13 ++++++++++---
 src/messaging/rooms.js   |  2 +-
 src/socket.io/modules.js |  1 +
 3 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/src/messaging.js b/src/messaging.js
index d179c14cbe..2c0649b8d0 100644
--- a/src/messaging.js
+++ b/src/messaging.js
@@ -304,9 +304,7 @@ var userNotifications = require('./user/notifications');
 					});
 					room.lastUser = room.users[0];
 
-					room.usernames = room.users.map(function (user) {
-						return user.username;
-					}).join(', ');
+					room.usernames = Messaging.generateUsernames(room.users, uid);
 				});
 
 				next(null, {rooms: results.roomData, nextStart: stop + 1});
@@ -314,6 +312,15 @@ var userNotifications = require('./user/notifications');
 		], callback);
 	};
 
+	Messaging.generateUsernames = function (users, excludeUid) {
+		users = users.filter(function(user) {
+			return user && parseInt(user.uid, 10) !== excludeUid;
+		});
+		return users.map(function (user) {
+			return user.username;
+		}).join(', ');
+	};
+
 	function canGetRecentChats(callerUid, uid, callback) {
 		plugins.fireHook('filter:messaging.canGetRecentChats', {
 			callerUid: callerUid,
diff --git a/src/messaging/rooms.js b/src/messaging/rooms.js
index b20369cb8a..f16843662f 100644
--- a/src/messaging/rooms.js
+++ b/src/messaging/rooms.js
@@ -183,7 +183,7 @@ module.exports = function (Messaging) {
 				Messaging.getUidsInRoom(roomId, start, stop, next);
 			},
 			function (uids, next) {
-				user.getUsersFields(uids, ['username', 'uid', 'picture', 'status'], next);
+				user.getUsersFields(uids, ['uid', 'username', 'picture', 'status'], next);
 			}
 		], callback);
 	};
diff --git a/src/socket.io/modules.js b/src/socket.io/modules.js
index b838623e7b..011a68567f 100644
--- a/src/socket.io/modules.js
+++ b/src/socket.io/modules.js
@@ -126,6 +126,7 @@ SocketModules.chats.loadRoom = function (socket, data, callback) {
 		},
 		function (results, next) {
 			results.roomData.users = results.users;
+			results.roomData.usernames = Messaging.generateUsernames(results.users, socket.uid);
 			results.roomData.messages = results.messages;
 			results.roomData.groupChat = results.roomData.hasOwnProperty('groupChat') ? results.roomData.groupChat : results.users.length > 2;
 			results.roomData.isOwner = parseInt(results.roomData.owner, 10) === socket.uid;