diff options
| -rw-r--r-- | app/channel.go | 1 | ||||
| -rw-r--r-- | webapp/actions/websocket_actions.jsx | 3 |
2 files changed, 3 insertions, 1 deletions
diff --git a/app/channel.go b/app/channel.go index 71e8cee2c..8352b3b9d 100644 --- a/app/channel.go +++ b/app/channel.go @@ -107,6 +107,7 @@ func CreateChannelWithUser(channel *model.Channel, userId string) (*model.Channe message := model.NewWebSocketEvent(model.WEBSOCKET_EVENT_CHANNEL_CREATED, "", "", userId, nil) message.Add("channel_id", channel.Id) + message.Add("team_id", channel.TeamId) Publish(message) return rchannel, nil diff --git a/webapp/actions/websocket_actions.jsx b/webapp/actions/websocket_actions.jsx index e6403839d..c181a5e3a 100644 --- a/webapp/actions/websocket_actions.jsx +++ b/webapp/actions/websocket_actions.jsx @@ -286,8 +286,9 @@ function handleUserUpdatedEvent(msg) { function handleChannelCreatedEvent(msg) { const channelId = msg.data.channel_id; + const teamId = msg.data.team_id; - if (!ChannelStore.getChannelById(channelId)) { + if (TeamStore.getCurrentId() === teamId && !ChannelStore.getChannelById(channelId)) { AsyncClient.getChannel(channelId); } } |