Merge pull request #364 from RocketChat/sort-of-users-in-view

Sort of users in view

Author: engelgabriel

client/views/app/room.coffee

@@ -192,6 +192,8 @@ Template.room.helpers
 					username: username
 					status: onlineUsers[username]
 
+		users = _.sortBy users, 'username'
+
 		ret =
 			_id: this._id
 			total: room.usernames.length

packages/rocketchat-irc/irc.server.coffee

@@ -195,10 +195,10 @@ class IrcClient
 					$in: removeMembers
 		ChatRoom.update room._id, update
 		update =
-			$push:
+			$addToSet:
 				usernames:
 					$each: appendMembers
-					$sort: 1
+
 		ChatRoom.update room._id, update
 		@isJoiningRoom = false
 		roomName = @pendingJoinRoomBuf.shift()
@@ -277,10 +277,9 @@ class IrcClient
 		console.log '[irc] onAddMemberToRoom -> '.yellow, 'roomName:', roomName, 'member:', member
 		@createUserWhenNotExist member
 		update =
-			$push:
-				usernames:
-					$each: [member]
-					$sort: 1
+			$addToSet:
+				usernames: member
+
 		ChatRoom.update {name: roomName}, update
 
 	onRemoveMemberFromRoom: (member, roomName)->

server/methods/addUserToRoom.coffee

@@ -16,10 +16,8 @@ Meteor.methods
 		now = new Date()
 
 		update =
-			$push:
-				usernames:
-					$each: [data.username]
-					$sort: 1
+			$addToSet:
+				usernames: data.username
 
 		newUser = Meteor.users.findOne username: data.username
 

server/methods/joinRoom.coffee

@@ -17,10 +17,8 @@ Meteor.methods
 		RocketChat.callbacks.run 'beforeJoinRoom', user, room
 
 		update =
-			$push:
-				usernames:
-					$each: [user.username]
-					$sort: 1
+			$addToSet:
+				usernames: user.username
 
 		ChatRoom.update rid, update
 

server/methods/setUsername.coffee

@@ -19,10 +19,8 @@ Meteor.methods
 		if not user.username?
 			# put user in general channel
 			ChatRoom.update 'GENERAL',
-				$push:
-					usernames:
-						$each: [username]
-						$sort: 1
+				$addToSet:
+					usernames: username
 
 			if not ChatSubscription.findOne(rid: 'GENERAL', 'u._id': user._id)?
 				ChatSubscription.insert

server/startup/migrations/v10.coffee

@@ -0,0 +1,16 @@
+Meteor.startup ->
+	Migrations.add
+		version: 10
+		up: ->
+			###
+			# Remove duplicated usernames from rooms
+			###
+
+			count = 0
+			ChatRoom.find({'usernames.0': {$exists: true}}, {fields: {usernames: 1}}).forEach (room) ->
+				newUsernames = _.uniq room.usernames
+				if newUsernames.length isnt room.usernames.length
+					count++
+					ChatRoom.update {_id: room._id}, {$set: {usernames: newUsernames}}
+
+			console.log "Removed duplicated usernames from #{count} rooms"