From 3daf5207c8ca58f192381453bb61e5259d42780f Mon Sep 17 00:00:00 2001 From: Aaron Ogle Date: Mon, 26 Jun 2017 16:31:58 -0500 Subject: [PATCH 1/5] [Fix] Don't @ mention when doing reply in DM --- packages/rocketchat-lib/client/MessageAction.js | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/packages/rocketchat-lib/client/MessageAction.js b/packages/rocketchat-lib/client/MessageAction.js index 5dd9021a8b60..bbab7c185901 100644 --- a/packages/rocketchat-lib/client/MessageAction.js +++ b/packages/rocketchat-lib/client/MessageAction.js @@ -103,7 +103,12 @@ Meteor.startup(function() { const message = this._arguments[1]; const input = instance.find('.input-message'); const url = RocketChat.MessageAction.getPermaLink(message._id); - const text = `[ ](${ url }) @${ message.u.username } `; + let text = `[ ](${ url }) `; + + if (Session.get('openedRoom').indexOf(Meteor.userId()) === -1) { + text += `@${ message.u.username }` + } + if (input.value) { input.value += input.value.endsWith(' ') ? '' : ' '; } From eaf6d6d7961bb754fcefabbb5faefc97b094e4e6 Mon Sep 17 00:00:00 2001 From: Aaron Ogle Date: Mon, 26 Jun 2017 16:54:11 -0500 Subject: [PATCH 2/5] add missing semi-colon --- packages/rocketchat-lib/client/MessageAction.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/rocketchat-lib/client/MessageAction.js b/packages/rocketchat-lib/client/MessageAction.js index bbab7c185901..39b8c3968152 100644 --- a/packages/rocketchat-lib/client/MessageAction.js +++ b/packages/rocketchat-lib/client/MessageAction.js @@ -106,7 +106,7 @@ Meteor.startup(function() { let text = `[ ](${ url }) `; if (Session.get('openedRoom').indexOf(Meteor.userId()) === -1) { - text += `@${ message.u.username }` + text += `@${ message.u.username }`; } if (input.value) { From 56db7349bc88c752e4707b21e6a773d08c47e04b Mon Sep 17 00:00:00 2001 From: Aaron Ogle Date: Tue, 27 Jun 2017 11:13:54 -0500 Subject: [PATCH 3/5] Add space after mention --- packages/rocketchat-lib/client/MessageAction.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/rocketchat-lib/client/MessageAction.js b/packages/rocketchat-lib/client/MessageAction.js index 39b8c3968152..c7bb8a6fc78d 100644 --- a/packages/rocketchat-lib/client/MessageAction.js +++ b/packages/rocketchat-lib/client/MessageAction.js @@ -106,7 +106,7 @@ Meteor.startup(function() { let text = `[ ](${ url }) `; if (Session.get('openedRoom').indexOf(Meteor.userId()) === -1) { - text += `@${ message.u.username }`; + text += `@${ message.u.username } `; } if (input.value) { From 50356345ded879cff6ad39e58b982e27567f7a2d Mon Sep 17 00:00:00 2001 From: Aaron Ogle Date: Tue, 27 Jun 2017 11:19:47 -0500 Subject: [PATCH 4/5] Switch to using query to get room type --- packages/rocketchat-lib/client/MessageAction.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/packages/rocketchat-lib/client/MessageAction.js b/packages/rocketchat-lib/client/MessageAction.js index c7bb8a6fc78d..ae3f68edd982 100644 --- a/packages/rocketchat-lib/client/MessageAction.js +++ b/packages/rocketchat-lib/client/MessageAction.js @@ -103,9 +103,10 @@ Meteor.startup(function() { const message = this._arguments[1]; const input = instance.find('.input-message'); const url = RocketChat.MessageAction.getPermaLink(message._id); + const roomInfo = RocketChat.models.Rooms.findOne(message.rid, { fields: { t: 1 } }); let text = `[ ](${ url }) `; - if (Session.get('openedRoom').indexOf(Meteor.userId()) === -1) { + if (roomInfo.t !== 'd') { text += `@${ message.u.username } `; } From fc4fbe74b1be1ac39f35051992d4c0f3f1f06d01 Mon Sep 17 00:00:00 2001 From: Aaron Ogle Date: Thu, 29 Jun 2017 17:03:01 -0500 Subject: [PATCH 5/5] Dont mention if replying to self --- packages/rocketchat-lib/client/MessageAction.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/rocketchat-lib/client/MessageAction.js b/packages/rocketchat-lib/client/MessageAction.js index ae3f68edd982..993cc6fe97c9 100644 --- a/packages/rocketchat-lib/client/MessageAction.js +++ b/packages/rocketchat-lib/client/MessageAction.js @@ -106,7 +106,7 @@ Meteor.startup(function() { const roomInfo = RocketChat.models.Rooms.findOne(message.rid, { fields: { t: 1 } }); let text = `[ ](${ url }) `; - if (roomInfo.t !== 'd') { + if (roomInfo.t !== 'd' && message.u.username !== Meteor.user().username) { text += `@${ message.u.username } `; }