Merge branch 'master' into rocket-packages

* master: Respond a transparent pixel if avatar doesn't exists. Fixes #149 Sort usernames in room closes #151 Remove unused code rename config file
RocketChat · Jun 5, 2015 · e2bf20d · e2bf20d
2 parents 47b6512 + 093fcb9
commit e2bf20d
Show file tree

Hide file tree

Showing 6 changed files with 22 additions and 44 deletions.
diff --git a/public/images/transparent-pixel.gif b/public/images/transparent-pixel.gif
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/forwardRoom.coffee b/server/methods/forwardRoom.coffee
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

diff --git a/server/startup/AvatarFileConfig.coffee → server/startup/avatar.coffee b/server/startup/AvatarFileConfig.coffee → server/startup/avatar.coffee
@@ -35,8 +35,17 @@ Meteor.startup ->
 				this.params.username
 				file = RocketChatFileAvatarInstance.getFileWithReadStream this.params.username
 
-				this.setContentType 'image/jpeg'
 				this.addHeader 'Content-Disposition', 'inline'
+
+				if not file?
+					this.setContentType 'image/gif'
+					ws = this.createWriteStream()
+					Meteor.defer ->
+						ws.write 'R0lGODlhAQABAIAAAP///////yH5BAEHAAEALAAAAAABAAEAAAICTAEAOw==', 'base64'
+						ws.end()
+					return 
+
+				this.setContentType 'image/jpeg'
 				this.addHeader 'Content-Length', file.length
 
 				file.readStream.pipe this.createWriteStream()