summaryrefslogtreecommitdiffstats
path: root/app/channel.go
diff options
context:
space:
mode:
authorPhilippe GRANET <philippe.granet@gmail.com>2018-03-07 14:00:35 +0100
committerSaturnino Abril <saturnino.abril@gmail.com>2018-03-07 21:00:35 +0800
commit09713ff4eadd3d706df45cb69f096b66c5b283fd (patch)
treed1514423b90bf06751a6156c3bdb3ea5dd866fdd /app/channel.go
parent309594cedf9f39be5f557de34cc741e218cd3668 (diff)
downloadchat-09713ff4eadd3d706df45cb69f096b66c5b283fd.tar.gz
chat-09713ff4eadd3d706df45cb69f096b66c5b283fd.tar.bz2
chat-09713ff4eadd3d706df45cb69f096b66c5b283fd.zip
Add addedUser IDs to render correctly in client based on teammate name display setting (#8400)
See PLT-7776 on mattermost-webapp: https://github.com/mattermost/mattermost-webapp/pull/353
Diffstat (limited to 'app/channel.go')
-rw-r--r--app/channel.go5
1 files changed, 5 insertions, 0 deletions
diff --git a/app/channel.go b/app/channel.go
index 131e242fb..edece8c98 100644
--- a/app/channel.go
+++ b/app/channel.go
@@ -1092,7 +1092,9 @@ 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,
},
}
@@ -1112,7 +1114,9 @@ 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,
},
}
@@ -1131,6 +1135,7 @@ func (a *App) postRemoveFromChannelMessage(removerUserId string, removedUser *mo
Type: model.POST_REMOVE_FROM_CHANNEL,
UserId: removerUserId,
Props: model.StringInterface{
+ "removedUserId": removedUser.Id,
"removedUsername": removedUser.Username,
},
}