diff options
author | Corey Hulen <corey@hulen.com> | 2017-06-29 07:51:15 -0700 |
---|---|---|
committer | Christopher Speller <crspeller@gmail.com> | 2017-06-29 07:51:15 -0700 |
commit | eb7561e05bb797a0f925ac69079040016926eef5 (patch) | |
tree | de1406e5fad24b3559cd05e7e1e47c3636895b82 /app/channel.go | |
parent | bf81fea9f8999c0b8949a9c464ef37b13ba0712b (diff) | |
download | chat-eb7561e05bb797a0f925ac69079040016926eef5.tar.gz chat-eb7561e05bb797a0f925ac69079040016926eef5.tar.bz2 chat-eb7561e05bb797a0f925ac69079040016926eef5.zip |
PLT-6610 sending websocket event for last channel viewed (#6787)
Diffstat (limited to 'app/channel.go')
-rw-r--r-- | app/channel.go | 16 |
1 files changed, 15 insertions, 1 deletions
diff --git a/app/channel.go b/app/channel.go index c9f89eb1a..5dafa1f76 100644 --- a/app/channel.go +++ b/app/channel.go @@ -266,7 +266,7 @@ func createGroupChannel(userIds []string, creatorId string) (*model.Channel, *mo } if len(users) != len(userIds) { - return nil, model.NewAppError("CreateGroupChannel", "api.channel.create_group.bad_user.app_error", nil, "user_ids=" + model.ArrayToJson(userIds), http.StatusBadRequest) + return nil, model.NewAppError("CreateGroupChannel", "api.channel.create_group.bad_user.app_error", nil, "user_ids="+model.ArrayToJson(userIds), http.StatusBadRequest) } group := &model.Channel{ @@ -1091,6 +1091,14 @@ func UpdateChannelLastViewedAt(channelIds []string, userId string) *model.AppErr return result.Err } + if *utils.Cfg.ServiceSettings.EnablChannelViewedMessages { + for _, channelId := range channelIds { + message := model.NewWebSocketEvent(model.WEBSOCKET_EVENT_CHANNEL_VIEWED, "", "", userId, nil) + message.Add("channel_id", channelId) + go Publish(message) + } + } + return nil } @@ -1150,6 +1158,12 @@ func ViewChannel(view *model.ChannelView, userId string, clearPushNotifications return result.Err } + if *utils.Cfg.ServiceSettings.EnablChannelViewedMessages { + message := model.NewWebSocketEvent(model.WEBSOCKET_EVENT_CHANNEL_VIEWED, "", "", userId, nil) + message.Add("channel_id", view.ChannelId) + go Publish(message) + } + return nil } |