diff options
| author | enahum <nahumhbl@gmail.com> | 2017-02-27 18:50:30 -0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-02-27 18:50:30 -0300 |
| commit | 55752fb359f805196e9acc1497cee658d30fa6ed (patch) | |
| tree | e267b44d1c658bfececfd91589b619233f329705 | |
| parent | f07571d79de1c00529136cd74c075ddfc4784b41 (diff) | |
| download | chat-55752fb359f805196e9acc1497cee658d30fa6ed.tar.gz chat-55752fb359f805196e9acc1497cee658d30fa6ed.tar.bz2 chat-55752fb359f805196e9acc1497cee658d30fa6ed.zip | |
Fix channel created WS event (#5552)
| -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); } } |