Sort usernames in room closes #151

RocketChat · Jun 4, 2015 · f21e455 · f21e455
1 parent 8645763
commit f21e455
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 5 deletions.
diff --git a/server/methods/addUserToRoom.coffee b/server/methods/addUserToRoom.coffee
@@ -13,8 +13,10 @@ Meteor.methods
 			return
 
 		update =
-			$addToSet:
-				usernames: data.username
+			$push:
+				usernames:
+					$each: [data.username]
+					$sort: 1
 
 		newUser = Meteor.users.findOne username: data.username
 

diff --git a/server/methods/sendMessage.coffee b/server/methods/sendMessage.coffee
@@ -20,7 +20,10 @@ Meteor.methods
 		roomUpdate = { $set: { lm: now }, $inc: { msgs: 1 } }
 
 		if Meteor.userId() and not Meteor.user().username in roomData.usernames
-			roomUpdate.$push = { usernames: Meteor.user().username }
+			roomUpdate.$push =
+				usernames:
+					$each: [ Meteor.user().username ]
+					$sort: 1
 
 		ChatRoom.update rid, roomUpdate
 

diff --git a/server/methods/setUsername.coffee b/server/methods/setUsername.coffee
@@ -27,8 +27,10 @@ Meteor.methods
 		if not user.username?
 			# put user in general channel
 			ChatRoom.update '57om6EQCcFami9wuT',
-				$addToSet:
-					usernames: username
+				$push:
+					usernames:
+						$each: [username]
+						$sort: 1
 
 			if not ChatSubscription.findOne(rid: '57om6EQCcFami9wuT', 'u._id': user._id)?
 				ChatSubscription.insert