Merge branch 'develop' into set-realname-to-alias

packages/rocketchat-lib/client/MessageAction.coffee

@@ -51,18 +51,32 @@ RocketChat.MessageAction = new class
 	resetButtons = ->
 		buttons.set {}
 
+	getPermaLink = (msgId) ->
+		roomData = ChatSubscription.findOne({rid: Session.get('openedRoom')})
+		if roomData
+			routePath = RocketChat.roomTypes.getRouteLink(roomData.t, roomData)
+		else
+			routePath = document.location.pathname
+		return Meteor.absoluteUrl().replace(/\/$/, '') + routePath + '?msg=' + msgId
+
+	hideDropDown = () ->
+		$('.message-dropdown:visible').hide()
+
 	addButton: addButton
 	removeButton: removeButton
 	updateButton: updateButton
 	getButtons: getButtons
 	getButtonById: getButtonById
 	resetButtons: resetButtons
+	getPermaLink: getPermaLink
+	hideDropDown: hideDropDown
 
 Meteor.startup ->
 
 	$(document).click (event) =>
-		if !$(event.target).closest('.message-cog-container').length and !$(event.target).is('.message-cog-container')
-			$('.message-dropdown:visible').hide()
+		target = $(event.target)
+		if !target.closest('.message-cog-container').length and !target.is('.message-cog-container')
+			RocketChat.MessageAction.hideDropDown()
 
 	RocketChat.MessageAction.addButton
 		id: 'edit-message'
@@ -73,12 +87,9 @@ Meteor.startup ->
 			'message-mobile'
 		]
 		action: (e, instance) ->
-			console.log e
-			console.log e.currentTarget
 			message = $(e.currentTarget).closest('.message')[0]
-			console.log message
 			chatMessages[Session.get('openedRoom')].edit(message)
-			$("\##{message.id} .message-dropdown").hide()
+			RocketChat.MessageAction.hideDropDown()
 			input = instance.find('.input-message')
 			Meteor.setTimeout ->
 				input.focus()
@@ -115,9 +126,7 @@ Meteor.startup ->
 		]
 		action: (event, instance) ->
 			message = @_arguments[1]
-			msg = $(event.currentTarget).closest('.message')[0]
-			$("\##{msg.id} .message-dropdown").hide()
-
+			RocketChat.MessageAction.hideDropDown()
 			chatMessages[Session.get('openedRoom')].confirmDeleteMsg(message)
 		validation: (message) ->
 			room = RocketChat.models.Rooms.findOne({ _id: message.rid })
@@ -151,16 +160,15 @@ Meteor.startup ->
 		]
 		action: (event, instance) ->
 			message = @_arguments[1]
-			msg = $(event.currentTarget).closest('.message')[0]
-			$("\##{msg.id} .message-dropdown").hide()
-			$(event.currentTarget).attr('data-clipboard-text', document.location.origin + document.location.pathname + '?msg=' + msg.id);
+			RocketChat.MessageAction.hideDropDown()
+			$(event.currentTarget).attr('data-clipboard-text', RocketChat.MessageAction.getPermaLink(message._id));
 			toastr.success(TAPi18n.__('Copied'))
 		validation: (message) ->
 			room = RocketChat.models.Rooms.findOne({ _id: message.rid })
 
 			if Array.isArray(room.usernames) && room.usernames.indexOf(Meteor.user().username) is -1
 				return false
-			
+
 			return true
 		order: 3
 
@@ -175,16 +183,15 @@ Meteor.startup ->
 		]
 		action: (event, instance) ->
 			message = @_arguments[1].msg
-			msg = $(event.currentTarget).closest('.message')[0]
-			$("\##{msg.id} .message-dropdown").hide()
+			RocketChat.MessageAction.hideDropDown()
 			$(event.currentTarget).attr('data-clipboard-text', message)
 			toastr.success(TAPi18n.__('Copied'))
 		validation: (message) ->
 			room = RocketChat.models.Rooms.findOne({ _id: message.rid })
 
 			if Array.isArray(room.usernames) && room.usernames.indexOf(Meteor.user().username) is -1
 				return false
-				
+
 			return true
 		order: 4
 
@@ -199,16 +206,19 @@ Meteor.startup ->
 		action: (event, instance) ->
 			message = @_arguments[1]
 			input = instance.find('.input-message')
-			url = Meteor.absoluteUrl().replace(/\/$/, '') + document.location.pathname + '?msg=' + message._id
+			url = RocketChat.MessageAction.getPermaLink(message._id)
 			text = '[ ](' + url + ') '
-			input.value = text
+			if input.value
+				input.value += if input.value.endsWith(' ') then '' else ' '
+			input.value += text
 			input.focus()
 			$(input).keyup()
+			RocketChat.MessageAction.hideDropDown()
 		validation: (message) ->
 			room = RocketChat.models.Rooms.findOne({ _id: message.rid })
 
 			if Array.isArray(room.usernames) && room.usernames.indexOf(Meteor.user().username) is -1
 				return false
-			
+
 			return true
 		order: 5

packages/rocketchat-mentions-flextab/client/actionButton.coffee

@@ -8,7 +8,7 @@ Meteor.startup ->
 		]
 		action: (event, instance) ->
 			message = @_arguments[1]
-			$('.message-dropdown:visible').hide()
+			RocketChat.MessageAction.hideDropDown()
 			RoomHistoryManager.getSurroundingMessages(message, 50)
 
 		validation: (message) ->

packages/rocketchat-mentions-flextab/client/views/mentionsFlexTab.coffee

@@ -27,7 +27,7 @@ Template.mentionsFlexTab.events
 		e.stopPropagation()
 		e.preventDefault()
 		message_id = $(e.currentTarget).closest('.message').attr('id')
-		$('.message-dropdown:visible').hide()
+		RocketChat.MessageAction.hideDropDown()
 		t.$("\##{message_id} .message-dropdown").remove()
 		message = MentionedMessage.findOne message_id
 		actions = RocketChat.MessageAction.getButtons message, 'mentions'

packages/rocketchat-message-attachments/client/messageAttachment.html

@@ -13,7 +13,7 @@
 						{{/if}}
 						<a href="{{fixCordova author_link}}" target="_blank">{{author_name}}</a>
 						{{#if ts}}
-							<span class="time">{{time}}</span>
+                            <span class="time">{{#if message_link}}<a href="{{message_link}}">{{time}}</a>{{else}}{{time}}{{/if}}</span>
 						{{/if}}
 					</div>
 				{{else}}
@@ -23,7 +23,7 @@
 						{{/if}}
 						{{author_name}}
 					{{#if ts}}
-						<span class="time">{{time}}</span>
+						<span class="time">{{#if message_link}}<a href="{{message_link}}">{{time}}</a>{{else}}{{time}}{{/if}}</span>
 					{{/if}}
 					</div>
 				{{/if}}

packages/rocketchat-message-attachments/client/stylesheets/messageAttachments.less

@@ -42,6 +42,12 @@
 			font-weight: normal;
 			font-size: .8em;
 			color: #aaa;
+			a{
+				&:hover{
+					text-decoration: underline;
+				}
+				color: #aaa;
+			}
 		}
 	}
 

packages/rocketchat-message-pin/client/actionButton.coffee

@@ -60,7 +60,7 @@ Meteor.startup ->
 		]
 		action: (event, instance) ->
 			message = @_arguments[1]
-			$('.message-dropdown:visible').hide()
+			RocketChat.MessageAction.hideDropDown()
 			RoomHistoryManager.getSurroundingMessages(message, 50)
 		validation: (message) ->
 			room = RocketChat.models.Rooms.findOne({ _id: message.rid })
@@ -81,9 +81,8 @@ Meteor.startup ->
 		]
 		action: (event, instance) ->
 			message = @_arguments[1]
-			msg = $(event.currentTarget).closest('.message')[0]
-			$("\##{msg.id} .message-dropdown").hide()
-			$(event.currentTarget).attr('data-clipboard-text', document.location.origin + document.location.pathname + '?msg=' + msg.id);
+			RocketChat.MessageAction.hideDropDown()
+			$(event.currentTarget).attr('data-clipboard-text', RocketChat.MessageAction.getPermaLink(message._id));
 			toastr.success(TAPi18n.__('Copied'))
 		validation: (message) ->
 			room = RocketChat.models.Rooms.findOne({ _id: message.rid })

packages/rocketchat-message-pin/client/views/pinnedMessages.coffee

@@ -25,7 +25,7 @@ Template.pinnedMessages.events
 		e.stopPropagation()
 		e.preventDefault()
 		message_id = $(e.currentTarget).closest('.message').attr('id')
-		$('.message-dropdown:visible').hide()
+		RocketChat.MessageAction.hideDropDown()
 		t.$("\##{message_id} .message-dropdown").remove()
 		message = PinnedMessage.findOne message_id
 		actions = RocketChat.MessageAction.getButtons message, 'pinned'

packages/rocketchat-message-pin/server/pinMessage.coffee

@@ -32,7 +32,7 @@ Meteor.methods
 				"text" : message.msg
 				"author_name" : message.u.username,
 				"author_icon" : getAvatarUrlFromUsername(message.u.username),
-				"ts" : new Date()
+				"ts" : message.ts
 			]
 
 	unpinMessage: (message) ->

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

@@ -56,7 +56,7 @@ Meteor.startup ->
 		]
 		action: (event, instance) ->
 			message = @_arguments[1]
-			$('.message-dropdown:visible').hide()
+			RocketChat.MessageAction.hideDropDown()
 			RoomHistoryManager.getSurroundingMessages(message, 50)
 		validation: (message) ->
 			room = RocketChat.models.Rooms.findOne({ _id: message.rid })
@@ -77,9 +77,8 @@ Meteor.startup ->
 		]
 		action: (event, instance) ->
 			message = @_arguments[1]
-			msg = $(event.currentTarget).closest('.message')[0]
-			$("\##{msg.id} .message-dropdown").hide()
-			$(event.currentTarget).attr('data-clipboard-text', document.location.origin + document.location.pathname + '?msg=' + msg.id);
+			RocketChat.MessageAction.hideDropDown()
+			$(event.currentTarget).attr('data-clipboard-text', RocketChat.MessageAction.getPermaLink(message._id));
 			toastr.success(TAPi18n.__('Copied'))
 		validation: (message) ->
 			room = RocketChat.models.Rooms.findOne({ _id: message.rid })

packages/rocketchat-message-star/client/views/starredMessages.coffee

@@ -25,7 +25,7 @@ Template.starredMessages.events
 		e.stopPropagation()
 		e.preventDefault()
 		message_id = $(e.currentTarget).closest('.message').attr('id')
-		$('.message-dropdown:visible').hide()
+		RocketChat.MessageAction.hideDropDown()
 		t.$("\##{message_id} .message-dropdown").remove()
 		message = StarredMessage.findOne message_id
 		actions = RocketChat.MessageAction.getButtons message, 'starred'

packages/rocketchat-oembed/server/jumpToMessage.js

@@ -18,7 +18,8 @@ RocketChat.callbacks.add('beforeSaveMessage', (msg) => {
 								'text' : jumpToMessage.msg,
 								'author_name' : jumpToMessage.u.username,
 								'author_icon' : getAvatarUrlFromUsername(jumpToMessage.u.username),
-								'ts': new Date()
+								'message_link' : item.url,
+								'ts': jumpToMessage.ts
 							});
 							item.ignoreParse = true;
 						}

packages/rocketchat-theme/assets/stylesheets/base.less

@@ -3160,6 +3160,12 @@ body:not(.is-cordova) {
 			font-size: 12px;
 			font-weight: 300;
 		}
+		.role-tag {
+			background-color: #ccc;
+			padding: 1px 4px;
+			border-radius: 2px;
+			color: white;
+		}
 	}
 	.stats {
 		li {

packages/rocketchat-ui-flextab/flex-tab/tabs/messageSearch.coffee

@@ -8,7 +8,7 @@ Meteor.startup ->
 		]
 		action: (event, instance) ->
 			message = @_arguments[1]
-			$('.message-dropdown:visible').hide()
+			RocketChat.MessageAction.hideDropDown()
 			RoomHistoryManager.getSurroundingMessages(message, 50)
 		order: 100
 
@@ -56,7 +56,7 @@ Template.messageSearch.events
 		e.stopPropagation()
 		e.preventDefault()
 		message_id = $(e.currentTarget).closest('.message').attr('id')
-		$('.message-dropdown:visible').hide()
+		RocketChat.MessageAction.hideDropDown()
 		t.$("\##{message_id} .message-dropdown").remove()
 		message = _.findWhere(t.searchResult.get()?.messages, { _id: message_id })
 		actions = RocketChat.MessageAction.getButtons message, 'search'

packages/rocketchat-ui-flextab/flex-tab/tabs/userInfo.coffee

@@ -103,6 +103,11 @@ Template.userInfo.helpers
 						instance.loadedUsername.set username
 		}
 
+	roleTags: ->
+		uid = Template.instance().user.get()?._id
+		roles = _.union(UserRoles.findOne(uid)?.roles, RoomRoles.findOne({'u._id': uid, rid: Session.get('openedRoom') })?.roles)
+		return RocketChat.models.Roles.find({ _id: { $in: roles }, description: { $exists: 1 } }, { fields: { description: 1 } })
+
 Template.userInfo.events
 	'click .thumb': (e) ->
 		$(e.currentTarget).toggleClass('bigger')
@@ -380,4 +385,3 @@ Template.userInfo.onCreated ->
 		user = Meteor.users.findOne(filter)
 
 		@user.set user
-

packages/rocketchat-ui-flextab/flex-tab/tabs/userInfo.html

@@ -13,6 +13,11 @@
 				<div class="info">
 					<h3 title="{{username}}"><i class="status-{{status}}"></i> {{username}}</h3>
 					<p>{{name}}</p>
+					<p>
+						{{#each roleTags}}
+							<span class="role-tag" data-role="{{description}}">{{description}}</span>
+						{{/each}}
+					</p>
 					{{#if utc}}<p><i class="icon-clock"></i>{{userTime}} (UTC {{utc}})</p>{{/if}}
 					{{#if hasPermission 'view-full-other-user-info'}}
 						{{#if hasEmails}}

packages/rocketchat-ui-message/message/message.coffee

@@ -5,7 +5,7 @@ Template.message.helpers
 		unless RocketChat.settings.get('UI_DisplayRoles')
 			return []
 		roles = _.union(UserRoles.findOne(this.u?._id)?.roles, RoomRoles.findOne({'u._id': this.u?._id, rid: this.rid })?.roles)
-		return _.compact(_.map(roles, (role) -> return RocketChat.models.Roles.findOne({ _id: role, description: { $exists: 1 } })?.description));
+		return RocketChat.models.Roles.find({ _id: { $in: roles }, description: { $exists: 1, $ne: '' } }, { fields: { description: 1 } })
 	isGroupable: ->
 		return 'false' if this.groupable is false
 	isSequential: ->
@@ -175,7 +175,6 @@ Template.message.onViewRendered = (context) ->
 		previousNode = currentNode.previousElementSibling
 		nextNode = currentNode.nextElementSibling
 		$currentNode = $(currentNode)
-		$previousNode = $(previousNode)
 		$nextNode = $(nextNode)
 
 		unless previousNode?

packages/rocketchat-ui-message/message/message.html

@@ -28,7 +28,7 @@
 		{{/if}}
 		<span class="info">
 			{{#each roleTags}}
-				<span class="role-tag" data-role="{{.}}">{{.}}</span>
+				<span class="role-tag" data-role="{{description}}">{{description}}</span>
 			{{/each}}
 			{{#if isBot}}
 				<span class="is-bot">BOT</span>

packages/rocketchat-ui/views/app/room.coffee

@@ -294,7 +294,7 @@ Template.room.events
 
 	'click .message-cog': (e) ->
 		message = @_arguments[1]
-		$('.message-dropdown:visible').hide()
+		RocketChat.MessageAction.hideDropDown()
 
 		dropDown = $(".messages-box \##{message._id} .message-dropdown")
 
@@ -318,7 +318,7 @@ Template.room.events
 			button.action.call @, e, t
 
 	'click .message-dropdown-close': ->
-		$('.message-dropdown:visible').hide()
+		RocketChat.MessageAction.hideDropDown()
 
 	"click .mention-link": (e, instance) ->
 		channel = $(e.currentTarget).data('channel')