diff options
| author | Martin Kraft <mkraft@users.noreply.github.com> | 2018-04-19 06:28:04 -0400 |
|---|---|---|
| committer | George Goldberg <george@gberg.me> | 2018-04-19 11:28:04 +0100 |
| commit | 4921fda79ff12b5e61cf66662932ab254535e16c (patch) | |
| tree | 0fd1d0e2de393ef9cf35eb6a575b4959ea6c3fb3 /app/channel.go | |
| parent | 2b83f8c48f1bd84c06fe6dacc41d3013cbc3e1d0 (diff) | |
| download | chat-4921fda79ff12b5e61cf66662932ab254535e16c.tar.gz chat-4921fda79ff12b5e61cf66662932ab254535e16c.tar.bz2 chat-4921fda79ff12b5e61cf66662932ab254535e16c.zip | |
MM-10122: Adds a mention for added-to-channel messages even when 'username mentions' are disabled. (#8648)
Diffstat (limited to 'app/channel.go')
| -rw-r--r-- | app/channel.go | 16 |
1 files changed, 8 insertions, 8 deletions
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, }, } |