summaryrefslogtreecommitdiffstats
path: root/app/channel.go
diff options
context:
space:
mode:
authorChris <ccbrown112@gmail.com>2018-03-02 10:49:18 -0600
committerJoram Wilander <jwawilander@gmail.com>2018-03-02 16:49:18 +0000
commit4ebf9746905c845ee3874f87478d7450391680d8 (patch)
tree03163cd0809b2ae8c11e774ea5fbec2dff9d4e59 /app/channel.go
parent2b3b6051d265edf131d006b2eb14f55284faf1e5 (diff)
downloadchat-4ebf9746905c845ee3874f87478d7450391680d8.tar.gz
chat-4ebf9746905c845ee3874f87478d7450391680d8.tar.bz2
chat-4ebf9746905c845ee3874f87478d7450391680d8.zip
remove `go Publish(...)` idiom (#8373)
Diffstat (limited to 'app/channel.go')
-rw-r--r--app/channel.go17
1 files changed, 4 insertions, 13 deletions
diff --git a/app/channel.go b/app/channel.go
index 8ac1f421c..131e242fb 100644
--- a/app/channel.go
+++ b/app/channel.go
@@ -545,7 +545,6 @@ func (a *App) DeleteChannel(channel *model.Channel, userId string) *model.AppErr
message := model.NewWebSocketEvent(model.WEBSOCKET_EVENT_CHANNEL_DELETED, channel.TeamId, "", "", nil)
message.Add("channel_id", channel.Id)
-
a.Publish(message)
}
@@ -1166,17 +1165,13 @@ func (a *App) removeUserFromChannel(userIdToRemove string, removerUserId string,
message := model.NewWebSocketEvent(model.WEBSOCKET_EVENT_USER_REMOVED, "", channel.Id, "", nil)
message.Add("user_id", userIdToRemove)
message.Add("remover_id", removerUserId)
- a.Go(func() {
- a.Publish(message)
- })
+ a.Publish(message)
// because the removed user no longer belongs to the channel we need to send a separate websocket event
userMsg := model.NewWebSocketEvent(model.WEBSOCKET_EVENT_USER_REMOVED, "", "", userIdToRemove, nil)
userMsg.Add("channel_id", channel.Id)
userMsg.Add("remover_id", removerUserId)
- a.Go(func() {
- a.Publish(userMsg)
- })
+ a.Publish(userMsg)
return nil
}
@@ -1246,9 +1241,7 @@ func (a *App) UpdateChannelLastViewedAt(channelIds []string, userId string) *mod
for _, channelId := range channelIds {
message := model.NewWebSocketEvent(model.WEBSOCKET_EVENT_CHANNEL_VIEWED, "", "", userId, nil)
message.Add("channel_id", channelId)
- a.Go(func() {
- a.Publish(message)
- })
+ a.Publish(message)
}
}
@@ -1325,9 +1318,7 @@ func (a *App) ViewChannel(view *model.ChannelView, userId string, clearPushNotif
if *a.Config().ServiceSettings.EnableChannelViewedMessages && model.IsValidId(view.ChannelId) {
message := model.NewWebSocketEvent(model.WEBSOCKET_EVENT_CHANNEL_VIEWED, "", "", userId, nil)
message.Add("channel_id", view.ChannelId)
- a.Go(func() {
- a.Publish(message)
- })
+ a.Publish(message)
}
return times, nil