Merge pull request #1413 from graywolf336/fix-gear

Fix for #1411 and #1407. Corrected ill-referenced variables

packages/rocketchat-lib/server/models/Messages.coffee

@@ -110,9 +110,9 @@ RocketChat.models.Messages = new class extends RocketChat.models._Base
 		record.editedBy =
 			_id: Meteor.userId()
 			username: me.username
-		message.pinned = record.pinned
-		message.pinnedAt = record.pinnedAt
-		message.pinnedBy =
+		record.pinned = record.pinned
+		record.pinnedAt = record.pinnedAt
+		record.pinnedBy =
 			_id: record.pinnedBy?._id
 			username: record.pinnedBy?.username
 		delete record._id

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

@@ -16,7 +16,7 @@ Meteor.startup ->
 			if RocketChat.settings.get('Message_AllowPinningByAnyone') or RocketChat.authz.hasRole Meteor.userId(), 'admin'
 				return true
 
-			return room.u?._id is Meteor.userId()
+			return ChatRoom.findOne(message.rid).u?._id is Meteor.userId()
 		order: 20
 
 	RocketChat.MessageAction.addButton
@@ -36,5 +36,5 @@ Meteor.startup ->
 			if RocketChat.settings.get('Message_AllowPinningByAnyone') or RocketChat.authz.hasRole Meteor.userId(), 'admin'
 				return true
 
-			return room.u?._id is Meteor.userId()
+			return ChatRoom.findOne(message.rid).u?._id is Meteor.userId()
 		order: 21