From cf277bc4fa6c470972cc84e42e94c081c2080c35 Mon Sep 17 00:00:00 2001 From: Gabriel Delavald Date: Tue, 24 Apr 2018 17:36:58 -0300 Subject: [PATCH] Regression: Remove added mentions on quote/reply (#10571) --- packages/rocketchat-lib/client/MessageAction.js | 3 ++- packages/rocketchat-ui/client/lib/chatMessages.js | 6 ++++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/packages/rocketchat-lib/client/MessageAction.js b/packages/rocketchat-lib/client/MessageAction.js index 225baa5f4eb..b61ec1d0685 100644 --- a/packages/rocketchat-lib/client/MessageAction.js +++ b/packages/rocketchat-lib/client/MessageAction.js @@ -114,9 +114,9 @@ Meteor.startup(function() { action() { const message = this._arguments[1]; const {input} = chatMessages[message.rid]; - input.value = `@${ message.u.username } `; $(input) .focus() + .data('mention-user', true) .data('reply', message) .trigger('dataChange'); }, @@ -277,6 +277,7 @@ Meteor.startup(function() { const {input} = chatMessages[message.rid]; $(input) .focus() + .data('mention-user', false) .data('reply', message) .trigger('dataChange'); }, diff --git a/packages/rocketchat-ui/client/lib/chatMessages.js b/packages/rocketchat-ui/client/lib/chatMessages.js index 98a7eeb4e0b..0014a78189b 100644 --- a/packages/rocketchat-ui/client/lib/chatMessages.js +++ b/packages/rocketchat-ui/client/lib/chatMessages.js @@ -187,11 +187,13 @@ this.ChatMessages = class ChatMessages { let msg = ''; const reply = $(input).data('reply'); - if (reply!==undefined) { + const mentionUser = $(input).data('mention-user') || false; + + if (reply !== undefined) { const url = RocketChat.MessageAction.getPermaLink(reply._id); msg = `[ ](${ url }) `; const roomInfo = RocketChat.models.Rooms.findOne(reply.rid, { fields: { t: 1 } }); - if (roomInfo.t !== 'd' && reply.u.username !== Meteor.user().username) { + if (roomInfo.t !== 'd' && reply.u.username !== Meteor.user().username && mentionUser) { msg += `@${ reply.u.username } `; } }