From 09713ff4eadd3d706df45cb69f096b66c5b283fd Mon Sep 17 00:00:00 2001
From: Philippe GRANET <philippe.granet@gmail.com>
Date: Wed, 7 Mar 2018 14:00:35 +0100
Subject: 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
---
 app/channel.go | 5 +++++
 1 file changed, 5 insertions(+)

(limited to 'app/channel.go')

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,
 		},
 	}
-- 
cgit v1.2.3-1-g7c22