From 4921fda79ff12b5e61cf66662932ab254535e16c Mon Sep 17 00:00:00 2001 From: Martin Kraft Date: Thu, 19 Apr 2018 06:28:04 -0400 Subject: MM-10122: Adds a mention for added-to-channel messages even when 'username mentions' are disabled. (#8648) --- app/channel.go | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) (limited to 'app/channel.go') diff --git a/app/channel.go b/app/channel.go index 7c14538f4..76eb4d337 100644 --- a/app/channel.go +++ b/app/channel.go @@ -1140,10 +1140,10 @@ func (a *App) PostAddToChannelMessage(user *model.User, addedUser *model.User, c UserId: user.Id, RootId: postRootId, Props: model.StringInterface{ - "userId": user.Id, - "username": user.Username, - "addedUserId": addedUser.Id, - "addedUsername": addedUser.Username, + "userId": user.Id, + "username": user.Username, + model.POST_PROPS_ADDED_USER_ID: addedUser.Id, + "addedUsername": addedUser.Username, }, } @@ -1162,10 +1162,10 @@ func (a *App) postAddToTeamMessage(user *model.User, addedUser *model.User, chan UserId: user.Id, RootId: postRootId, Props: model.StringInterface{ - "userId": user.Id, - "username": user.Username, - "addedUserId": addedUser.Id, - "addedUsername": addedUser.Username, + "userId": user.Id, + "username": user.Username, + model.POST_PROPS_ADDED_USER_ID: addedUser.Id, + "addedUsername": addedUser.Username, }, } -- cgit v1.2.3-1-g7c22