Merge branch 'master' of https://github.com/RocketChat/Rocket.Chat

.meteor/packages

@@ -105,3 +105,5 @@ spacebars
 check
 rocketchat:github-enterprise
 rocketchat:chatops
+# sanjo:jasmine@0.20.2
+# velocity:html-reporter

.meteor/versions

@@ -8,6 +8,7 @@ accounts-password@1.1.3
 accounts-twitter@1.0.6
 alanning:roles@1.2.13
 aldeed:simple-schema@1.3.3
+amplify@1.0.0
 arunoda:streams@0.1.17
 autoupdate@1.2.3
 babel-compiler@5.8.24_1
@@ -101,11 +102,14 @@ oauth1@1.1.5
 oauth2@1.1.5
 observe-sequence@1.0.7
 ordered-dict@1.0.4
+package-version-parser@3.0.4
 pauli:accounts-linkedin@1.1.2
 pauli:linkedin@1.1.2
 perak:codemirror@1.2.7
 percolate:migrations@0.9.6
 percolate:synced-cron@1.3.0
+practicalmeteor:chai@2.1.0_1
+practicalmeteor:loglevel@1.2.0_2
 promise@0.5.0
 qnub:emojione@0.0.3
 raix:eventemitter@0.1.3
@@ -146,6 +150,11 @@ rocketchat:statistics@0.0.1
 rocketchat:webrtc@0.0.1
 rocketchat:wordpress@0.0.1
 routepolicy@1.0.6
+sanjo:jasmine@0.20.2
+sanjo:karma@3.0.2
+sanjo:long-running-child-process@1.1.3
+sanjo:meteor-files-helpers@1.2.0_1
+sanjo:meteor-version@1.0.0
 service-configuration@1.0.5
 session@1.1.1
 sha@1.0.4
@@ -169,6 +178,13 @@ ui@1.0.8
 underscore@1.0.4
 underscorestring:underscore.string@3.2.2
 url@1.0.5
+velocity:chokidar@1.2.0_1
+velocity:core@0.10.4
+velocity:html-reporter@0.9.0
+velocity:meteor-internals@1.1.0_7
+velocity:meteor-stubs@1.1.0
+velocity:shim@0.1.0
+velocity:source-map-support@0.3.2_1
 webapp@1.2.2
 webapp-hashing@1.0.5
 yasaricli:slugify@0.0.7

README.md

@@ -14,7 +14,7 @@ Get the app for your Android phone:
 
 [![Rocket.Chat on Google Play](https://developer.android.com/images/brand/en_app_rgb_wo_45.png)](https://play.google.com/store/apps/details?id=com.konecty.rocket.chat)
 
-Now compatible with all Android devices as old as version 4.0.x - [dowload here](https://github.com/RocketChat/Rocket.Chat/wiki/Build-the-Android-Cordova-Web-App-and-connect-to-your-own-Rocket.Chat-Server), even on BlackBerry Passport!
+Now compatible with all Android devices as old as version 4.0.x - [download here](https://github.com/RocketChat/Rocket.Chat/wiki/Build-the-Android-Cordova-Web-App-and-connect-to-your-own-Rocket.Chat-Server), even on BlackBerry Passport!
 
 Host your own Rocket.Chat server in four seconds flat:
 
@@ -134,7 +134,7 @@ Please head over to the [Hubot Integration Project](https://github.com/RocketCha
 
 #### Many, many, many more to come!
 
-We are developing the APIs based on the competition, so stay tunned and you will see a lot happening here.
+We are developing the APIs based on the competition, so stay tuned and you will see a lot happening here.
 
 ### Documentation
 

client/lib/cordova/push.coffee

@@ -29,7 +29,7 @@ if Meteor.isCordova
 				when 'p'
 					FlowRouter.go 'group', name: notification.payload.name
 				when 'd'
-					FlowRouter.go 'direct', username: notification.payload.name
+					FlowRouter.go 'direct', username: notification.payload.sender.username
 
 	Push.addListener 'message', (notification) ->
 		Meteor.call 'log', 'CLIENT', 'message', arguments

client/lib/notification.coffee

 # @TODO implementar 'clicar na notificacao' abre a janela do chat
 @KonchatNotification =
+	notificationStatus: new ReactiveVar
+
 	# notificacoes HTML5
 	getDesktopPermission: ->
 		if window.Notification && Notification.permission != "granted"
 			Notification.requestPermission (status) ->
+				KonchatNotification.notificationStatus.set status
 				if Notification.permission != status
 					Notification.permission = status
 

client/views/account/accountPreferences.coffee

@@ -7,6 +7,12 @@ Template.accountPreferences.helpers
 
 		return currentValue is value
 
+	desktopNotificationEnabled: ->
+		return (KonchatNotification.notificationStatus.get() is 'granted') or (window.Notification && Notification.permission is "granted")
+
+	desktopNotificationDisabled: ->
+		return (KonchatNotification.notificationStatus.get() is 'denied') or (window.Notification && Notification.permission is "denied")
+
 Template.accountPreferences.onCreated ->
 	settingsTemplate = this.parentTemplate(3)
 	settingsTemplate.child ?= []
@@ -54,3 +60,6 @@ Template.accountPreferences.events
 
 	'change input[name=useEmojis]': (e, t) ->
 		t.useEmojis.set $(e.currentTarget).val() is '1'
+
+	'click .enable-notifications': ->
+		KonchatNotification.getDesktopPermission()

client/views/account/accountPreferences.html

@@ -12,6 +12,18 @@
 					<div class="section">
 						<h1>{{_ "Messages"}}</h1>
 						<div class="section-content">
+							<div class="input-line double-col">
+								<label>{{_ "Desktop_Notifications"}}</label>
+								<div>
+									{{#if desktopNotificationEnabled}}
+										<label>{{_ "Desktop_Notifications_Enabled"}}</label>
+									{{else}} {{#if desktopNotificationDisabled}}
+										<label>{{_ "Desktop_Notifications_Disabled"}}</label>
+									{{else}}
+										<label><button class="button enable-notifications"><i class="octicon octicon-comment"></i> <span>{{_ "Enable_Desktop_Notifications"}}</span></button></label>
+									{{/if}} {{/if}}
+								</div>
+							</div>
 							<div class="input-line double-col">
 								<label>{{_ "Use_Emojis"}}</label>
 								<div>

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/roomSearch.html

 <template name="roomSearch">
-	<i class="{{roomIcon}} {{userStatus}}"></i> {{name}}
+	<i class="{{roomIcon}} {{userStatus}}"></i> {{username}}
 </template>
 <template name="roomSearchEmpty">
 	<p>{{_ "Nothing_found"}}.</p>

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()
 
@@ -52,12 +49,12 @@ Template.membersList.helpers
 				{
 					collection: 'UserAndRoom'
 					subscription: 'roomSearch'
-					field: 'name'
+					field: 'username'
 					template: Template.roomSearch
 					noMatchTemplate: Template.roomSearchEmpty
 					matchAll: true
 					filter: { type: 'u', uid: { $ne: Meteor.userId() }, active: { $eq: true } }
-					sort: 'name'
+					sort: 'username'
 				}
 			]
 		}
@@ -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()

i18n/en.i18n.json

@@ -88,6 +88,9 @@
   "Delete_User_Warning" : "Deleting a user will delete all messages from that user as well. This cannot be undone.",
   "Delete" : "Delete",
   "Deleted" : "Deleted!",
+  "Desktop_Notifications": "Desktop Notifications",
+  "Desktop_Notifications_Disabled": "Desktop Notifications are Disabled. Change your browser preferences if you need Notifications enabled.",
+  "Desktop_Notifications_Enabled": "Desktop Notifications are Enabled",
   "Direct_Messages" : "Direct Messages",
   "Disable_Favorite_Rooms" : "Disable Favorites",
   "Disable_New_Message_Notification" : "Disable New Message Notification",
@@ -102,6 +105,7 @@
   "Email_or_username" : "Email or username",
   "Email_verified" : "Email verified",
   "Emoji" : "Emoji",
+  "Enable_Desktop_Notifications": "Enable Desktop Notifications",
   "Enter_info" : "Enter your information",
   "Enter_to" : "Enter to",
   "Error_changing_password" : "Error changing password",
@@ -185,6 +189,7 @@
   "Message_pinned" : "Message pinned",
   "Message_ShowDeletedStatus" : "Show Deleted Status",
   "Message_ShowEditedStatus" : "Show Edited Status",
+  "Messages": "Messages",
   "Meta" : "Meta",
   "Meta_fb_app_id" : "Facebook APP ID",
   "Meta_google-site-verification" : "Google Site Verification",

i18n/pt.i18n.json

@@ -84,6 +84,9 @@
   "Delete_User_Warning" : "Excluir um usuário irá apagar todas as mensagens desse usuário também. Isso não poderá ser desfeito.",
   "Delete" : "Deletar",
   "Deleted" : "Deletado!",
+  "Desktop_Notifications": "Notificações Desktop",
+  "Desktop_Notifications_Disabled": "Notificações Desktop estão Desativadas. Mude as preferências do seu navegador se quiser habilitar as notificações.",
+  "Desktop_Notifications_Enabled": "Notificações Desktop estão Habilitadas",
   "Direct_Messages" : "Mensagens Diretas",
   "Disable_Favorite_Rooms" : "Desabilitar Favoritos",
   "Disable_New_Message_Notification" : "Desativar notificações de nova mensagem",
@@ -97,6 +100,7 @@
   "Email_already_exists" : "Email já cadastrado",
   "Email_or_username" : "Email ou nome de usuário",
   "Email_verified" : "Email verificado",
+  "Enable_Desktop_Notifications": "Habilitar Notificações Desktop",
   "Enter_info" : "Entre com seus dados de login",
   "Enter_to" : "Enter para",
   "Error_changing_password" : "Erro ao alterar senha",
@@ -178,6 +182,7 @@
   "Message_pinned" : "Mensagem fixada",
   "Message_ShowDeletedStatus" : "Mostrar Status Excluído",
   "Message_ShowEditedStatus" : "Mostrar Status Editado",
+  "Messages": "Mensagens",
   "Meta" : "Meta",
   "Meta_fb_app_id" : "Facebook APP ID",
   "Meta_google-site-verification" : "Verificação de Site do Google",
@@ -367,4 +372,4 @@
   "You_will_not_be_able_to_recover" : "Você não será capaz de desfazer!",
   "Your_entry_has_been_deleted" : "Sua mensagem foi excluída.",
   "Your_Open_Source_solution" : "Sua própria solução Open Source"
-}
\ No newline at end of file
+}

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/server/models/Messages.coffee

@@ -201,19 +201,19 @@ RocketChat.models.Messages = new class extends RocketChat.models._Base
 		return record
 
 	createUserJoinWithRoomIdAndUser: (roomId, user, extraData) ->
-		message = user.name or user.username
+		message = user.username
 		return @createWithTypeRoomIdMessageAndUser 'uj', roomId, message, user, extraData
 
 	createUserLeaveWithRoomIdAndUser: (roomId, user, extraData) ->
-		message = user.name or user.username
+		message = user.username
 		return @createWithTypeRoomIdMessageAndUser 'ul', roomId, message, user, extraData
 
 	createUserRemovedWithRoomIdAndUser: (roomId, user, extraData) ->
-		message = user.name or user.username
+		message = user.username
 		return @createWithTypeRoomIdMessageAndUser 'ru', roomId, message, user, extraData
 
 	createUserAddedWithRoomIdAndUser: (roomId, user, extraData) ->
-		message = user.name or user.username
+		message = user.username
 		return @createWithTypeRoomIdMessageAndUser 'au', roomId, message, user, extraData
 
 	createRoomRenamedWithRoomIdRoomNameAndUser: (roomId, roomName, user, extraData) ->

packages/rocketchat-markdown/markdown.coffee

@@ -25,4 +25,4 @@ class Markdown
 		return message
 
 RocketChat.callbacks.add 'renderMessage', Markdown, RocketChat.callbacks.priority.LOW
-RocketChat.Markdown = true
+RocketChat.Markdown = Markdown

server/methods/addUserToRoom.coffee

@@ -31,7 +31,11 @@ Meteor.methods
 			alert: true
 			unread: 1
 
+		fromUser = RocketChat.models.Users.findOneById fromId
 		RocketChat.models.Messages.createUserAddedWithRoomIdAndUser data.rid, newUser,
 			ts: now
+			u:
+				_id: fromUser._id
+				username: fromUser.username
 
 		return true

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()
 		res.setHeader 'content-type', 'image/jpeg'
 		res.setHeader 'Content-Length', file.length