Merge branch 'master' into rate-limit

Author: marceloschmidt

client/views/app/messagePopupConfig.coffee

@@ -116,6 +116,27 @@ Template.messagePopupConfig.helpers
 				getInput: self.getInput
 				getFilter: (collection, filter) ->
 					results = []
+
+					# show common used emojis, when use input a single ':'
+					if filter == ''
+						commonEmojis = [
+					            ':laughing:',
+					            ':smiley:',
+					            ':sunglasses:',
+					            ':wink:',
+					            ':innocent:',
+					            ':flushed:',
+					            ':disappointed:',
+					            ':cry:',
+					            ':heart:',
+					            ':broken_heart:'
+					        ]
+						for shortname in commonEmojis
+							results.push
+								_id: shortname
+								data: collection[shortname]
+						return results;
+
 					for shortname, data of collection
 						if shortname.indexOf(filter) > -1
 							results.push

client/views/app/room.coffee

@@ -209,7 +209,7 @@ Template.room.helpers
 		return RocketChat.TabBar.getTemplate()
 
 	flexData: ->
-		return RocketChat.TabBar.getData()
+		return _.extend { rid: this._id }, RocketChat.TabBar.getData()
 
 	adminClass: ->
 		return 'admin' if RocketChat.authz.hasRole(Meteor.userId(), 'admin')

client/views/app/tabBar/membersList.coffee

@@ -3,19 +3,16 @@ Template.membersList.helpers
 		return t('Add_users')
 
 	isGroupChat: ->
-		room = ChatRoom.findOne(Session.get('openedRoom'), { reactive: false })
-		return room?.t in ['c', 'p']
+		return ChatRoom.findOne(this.rid, { reactive: false })?.t in ['c', 'p']
 
 	isDirectChat: ->
-		room = ChatRoom.findOne(Session.get('openedRoom'), { reactive: false })
-		return room?.t is 'd'
+		return ChatRoom.findOne(this.rid, { reactive: false })?.t is 'd'
 
 	roomUsers: ->
-		room = ChatRoom.findOne(Session.get('openedRoom'), { reactive: false })
 		users = []
 		onlineUsers = RoomManager.onlineUsers.get()
 
-		for username in room?.usernames or []
+		for username in ChatRoom.findOne(this.rid)?.usernames or []
 			if onlineUsers[username]?
 				utcOffset = onlineUsers[username]?.utcOffset
 				if utcOffset?
@@ -32,15 +29,15 @@ Template.membersList.helpers
 		users = _.sortBy users, 'username'
 
 		ret =
-			_id: Session.get('openedRoom')
-			total: room?.usernames?.length or 0
+			_id: this.rid
+			total: ChatRoom.findOne(this.rid)?.usernames?.length or 0
 			totalOnline: users.length
 			users: users
 
 		return ret
 
 	canAddUser: ->
-		roomData = Session.get('roomData' + Session.get('openedRoom'))
+		roomData = Session.get('roomData' + this._id)
 		return '' unless roomData
 		return roomData.t in ['p', 'c'] and roomData.u?._id is Meteor.userId()
 
@@ -67,7 +64,7 @@ Template.membersList.helpers
 		return Meteor.users.findOne({ username: String(username) }) or { username: String(username) }
 
 	showUserInfo: ->
-		webrtc = WebRTC.getInstanceByRoomId(Session.get('openedRoom'))
+		webrtc = WebRTC.getInstanceByRoomId(this.rid)
 		videoActive = webrtc?.localUrl?.get()? or webrtc?.remoteItems?.get()?.length > 0
 		return Session.get('showUserInfo') and not videoActive
 
@@ -77,7 +74,8 @@ Template.membersList.events
 		Session.set('showUserInfo', $(e.currentTarget).data('username'))
 
 	'autocompleteselect #user-add-search': (event, template, doc) ->
-		roomData = Session.get('roomData' + Session.get('openedRoom'))
+
+		roomData = Session.get('roomData' + template.data.rid)
 
 		if roomData.t is 'd'
 			Meteor.call 'createGroupRoom', roomData.usernames, doc.username, (error, result) ->

client/views/app/tabBar/uploadedFilesList.coffee

@@ -2,10 +2,10 @@ roomFiles = new Mongo.Collection 'room_files'
 
 Template.uploadedFilesList.helpers
   files: ->
-    return roomFiles.find().fetch()
+    return roomFiles.find({ rid: this.rid }).fetch()
 
   hasFiles: ->
-      return roomFiles.find().count() > 0
+    return roomFiles.find({ rid: this.rid }).count() > 0
 
   getFileIcon: (type) ->
     if type.match(/^image\/.+$/)
@@ -23,11 +23,8 @@ Template.uploadedFilesList.events
     if $(e.currentTarget).siblings('.icon-picture').length
       e.preventDefault()
 
-
 Template.uploadedFilesList.onCreated ->
-  instance = this
-  this.autorun ->
-    instance.subscribe 'roomFiles', Session.get('openedRoom')
+  this.subscribe 'roomFiles', Template.currentData().rid
 
 Template.uploadedFilesList.onRendered ->
   $('.room-files-swipebox').swipebox()

client/views/login/form.coffee

@@ -44,7 +44,7 @@ Template.loginForm.helpers
 
 	loginTerms: ->
 		return RocketChat.settings.get 'Layout_Login_Terms'
-		
+
 Template.loginForm.events
 	'submit #login-card': (event, instance) ->
 		event.preventDefault()
@@ -98,7 +98,7 @@ Template.loginForm.events
 						if error.error is 'no-valid-email'
 							instance.state.set 'email-verification'
 						else
-							toastr.error error.reason
+							toastr.error t 'User_not_found_or_incorrect_password'
 						return
 					FlowRouter.go 'index'
 

i18n/en.i18n.json

@@ -364,6 +364,7 @@
   "User_left_female" : "User <em>__user_left__</em> left.",
   "User_left_male" : "User <em>__user_left__</em> left.",
   "User_logged_out" : "User is logged out",
+  "User_not_found_or_incorrect_password": "User not found or incorrect password",
   "User_removed_by" : "User <em>__user_removed__</em> removed by <em>__user_by__</em>.",
   "User_Settings" : "User Settings",
   "User_updated_successfully" : "User updated successfully",

packages/rocketchat-file/file.server.coffee

@@ -91,6 +91,7 @@ RocketChatFile.GridFS = class
 			readStream: rs
 			contentType: file.contentType
 			length: file.length
+			uploadDate: file.uploadDate
 		}
 
 	deleteFile: (fileName) ->

packages/rocketchat-lib/client/Notifications.coffee

@@ -37,7 +37,6 @@ RocketChat.Notifications = new class
 		@streamAll.on eventName, callback
 
 	onRoom: (room, eventName, callback) ->
-		console.log 'onRoom'
 		if @debug is true
 			@streamRoom.on room, -> console.log "RocketChat.Notifications: onRoom #{room}", arguments
 

packages/rocketchat-message-star/client/tabBar.coffee

@@ -1,5 +1,4 @@
 Meteor.startup ->
 	RocketChat.callbacks.add 'enter-room', ->
-		console.log 'adding tabbar'
 		RocketChat.TabBar.addButton({ id: 'starred-messages', i18nTitle: 'Starred_Messages', icon: 'icon-star', template: 'starredMessages', order: 3 })
 	, RocketChat.callbacks.priority.MEDIUM, 'enter-room-tabbar-star'

server/publications/roomFiles.coffee

@@ -2,7 +2,7 @@ Meteor.publish 'roomFiles', (rid) ->
   unless this.userId
     return this.ready()
 
-  console.log '[publish] roomFiles'.green, rid
+  console.log '[publish] roomFiles '.green, rid
 
   pub = this
 
@@ -14,6 +14,7 @@ Meteor.publish 'roomFiles', (rid) ->
   fileOptions =
     fields:
       _id: 1
+      rid: 1
       name: 1
       type: 1
       url: 1
@@ -22,6 +23,12 @@ Meteor.publish 'roomFiles', (rid) ->
     added: (_id, record) ->
       pub.added('room_files', _id, record)
 
+    changed: (_id, record) ->
+      pub.changed('room_files', _id, record)
+
+    removed: (_id, record) ->
+      pub.removed('room_files', _id, record)
+
   this.ready()
   this.onStop ->
     cursorFileListHandle.stop()

server/startup/avatar.coffee

@@ -38,12 +38,10 @@ Meteor.startup ->
 			this.params.username = this.params.username.replace '@', ''
 
 		res.setHeader 'Content-Disposition', 'inline'
-		res.setHeader 'Cache-Control', 'no-cache'
-		res.setHeader 'Pragma', 'no-cache'
-		res.setHeader 'Expires', '0'
 
 		if not file?
 			res.setHeader 'content-type', 'image/svg+xml'
+			res.setHeader 'cache-control', 'public, max-age=31536000'
 
 			colors = ['#F44336','#E91E63','#9C27B0','#673AB7','#3F51B5','#2196F3','#03A9F4','#00BCD4','#009688','#4CAF50','#8BC34A','#CDDC39','#FFC107','#FF9800','#FF5722','#795548','#9E9E9E','#607D8B']
 
@@ -74,6 +72,15 @@ Meteor.startup ->
 			res.end()
 			return
 
+		reqModifiedHeader = req.headers["if-modified-since"];
+		if reqModifiedHeader?
+			if reqModifiedHeader == file.uploadDate?.toUTCString()
+				res.setHeader 'Last-Modified', reqModifiedHeader
+				res.writeHead 304
+				res.end()
+				return
+
+		res.setHeader 'Last-Modified', file.uploadDate?.toUTCString() or new Date().toUTCString()
 		res.setHeader 'content-type', 'image/jpeg'
 		res.setHeader 'Content-Length', file.length