diff options
Diffstat (limited to 'api')
-rw-r--r-- | api/channel.go | 71 | ||||
-rw-r--r-- | api/channel_test.go | 4 | ||||
-rw-r--r-- | api/deprecated.go | 2 | ||||
-rw-r--r-- | api/post.go | 2 |
4 files changed, 38 insertions, 41 deletions
diff --git a/api/channel.go b/api/channel.go index 44efc5efb..9c2baf50c 100644 --- a/api/channel.go +++ b/api/channel.go @@ -919,10 +919,6 @@ func SetActiveChannel(userId string, channelId string) *model.AppError { AddStatusCache(status) - if result := <-Srv.Store.Status().SaveOrUpdate(status); result.Err != nil { - return result.Err - } - return nil } @@ -1067,7 +1063,7 @@ func addMember(c *Context, w http.ResponseWriter, r *http.Request) { go PostUserAddRemoveMessage(c, channel.Id, fmt.Sprintf(utils.T("api.channel.add_member.added"), nUser.Username, oUser.Username), model.POST_ADD_REMOVE) - <-Srv.Store.Channel().UpdateLastViewedAt(id, oUser.Id) + <-Srv.Store.Channel().UpdateLastViewedAt([]string{id}, oUser.Id) w.Write([]byte(cm.ToJson())) } } @@ -1258,47 +1254,48 @@ func autocompleteChannels(c *Context, w http.ResponseWriter, r *http.Request) { func viewChannel(c *Context, w http.ResponseWriter, r *http.Request) { view := model.ChannelViewFromJson(r.Body) - go func() { - if err := SetActiveChannel(c.Session.UserId, view.ChannelId); err != nil { - l4g.Error(err.Error()) - } - }() + if err := SetActiveChannel(c.Session.UserId, view.ChannelId); err != nil { + c.Err = err + return + } - if len(view.ChannelId) > 0 { + if len(view.ChannelId) == 0 { + ReturnStatusOK(w) + return + } - if view.Time == 0 { - if result := <-Srv.Store.Channel().UpdateLastViewedAt(view.ChannelId, c.Session.UserId); result.Err != nil { - c.Err = result.Err - return - } - } else { - if result := <-Srv.Store.Channel().SetLastViewedAt(view.ChannelId, c.Session.UserId, view.Time); result.Err != nil { - c.Err = result.Err - return - } + channelIds := []string{view.ChannelId} + + var pchan store.StoreChannel + if len(view.PrevChannelId) > 0 { + channelIds = append(channelIds, view.PrevChannelId) + + if *utils.Cfg.EmailSettings.SendPushNotifications && !c.Session.IsMobileApp() { + pchan = Srv.Store.User().GetUnreadCountForChannel(c.Session.UserId, view.ChannelId) } + } + + uchan := Srv.Store.Channel().UpdateLastViewedAt(channelIds, c.Session.UserId) - if len(view.PrevChannelId) > 0 { - Srv.Store.Channel().UpdateLastViewedAt(view.PrevChannelId, c.Session.UserId) - - // Only clear push notifications if a channel switch occured - if *utils.Cfg.EmailSettings.SendPushNotifications && !c.Session.IsMobileApp() { - go func() { - if result := <-Srv.Store.User().GetUnreadCountForChannel(c.Session.UserId, view.ChannelId); result.Err != nil { - l4g.Error(utils.T("api.channel.update_last_viewed_at.get_unread_count_for_channel.error"), c.Session.UserId, view.ChannelId, result.Err.Error()) - } else { - if result.Data.(int64) > 0 { - clearPushNotification(c.Session.UserId, view.ChannelId) - } - } - }() + if pchan != nil { + if result := <-pchan; result.Err != nil { + c.Err = result.Err + return + } else { + if result.Data.(int64) > 0 { + clearPushNotification(c.Session.UserId, view.ChannelId) } } + } - message := model.NewWebSocketEvent(model.WEBSOCKET_EVENT_CHANNEL_VIEWED, c.TeamId, "", c.Session.UserId, nil) - message.Add("channel_id", view.ChannelId) + if result := <-uchan; result.Err != nil { + c.Err = result.Err + return } + message := model.NewWebSocketEvent(model.WEBSOCKET_EVENT_CHANNEL_VIEWED, c.TeamId, "", c.Session.UserId, nil) + message.Add("channel_id", view.ChannelId) + ReturnStatusOK(w) } diff --git a/api/channel_test.go b/api/channel_test.go index dae4feab6..25fd885ca 100644 --- a/api/channel_test.go +++ b/api/channel_test.go @@ -1862,14 +1862,12 @@ func TestViewChannel(t *testing.T) { } view.PrevChannelId = "" - view.Time = 1234567890 if _, resp := Client.ViewChannel(view); resp.Error != nil { t.Fatal(resp.Error) } view.PrevChannelId = "junk" - view.Time = 0 if _, resp := Client.ViewChannel(view); resp.Error != nil { t.Fatal(resp.Error) @@ -1878,6 +1876,8 @@ func TestViewChannel(t *testing.T) { rdata := Client.Must(Client.GetChannel(th.BasicChannel.Id, "")).Data.(*model.ChannelData) if rdata.Channel.TotalMsgCount != rdata.Member.MsgCount { + t.Log(rdata.Channel.Id) + t.Log(rdata.Member.UserId) t.Log(rdata.Channel.TotalMsgCount) t.Log(rdata.Member.MsgCount) t.Fatal("message counts don't match") diff --git a/api/deprecated.go b/api/deprecated.go index 183552414..4865ab5e0 100644 --- a/api/deprecated.go +++ b/api/deprecated.go @@ -76,7 +76,7 @@ func updateLastViewedAt(c *Context, w http.ResponseWriter, r *http.Request) { } }() - Srv.Store.Channel().UpdateLastViewedAt(id, c.Session.UserId) + Srv.Store.Channel().UpdateLastViewedAt([]string{id}, c.Session.UserId) // Must be after update so that unread count is correct if doClearPush { diff --git a/api/post.go b/api/post.go index acbd0acd7..5cce766c0 100644 --- a/api/post.go +++ b/api/post.go @@ -95,7 +95,7 @@ func createPost(c *Context, w http.ResponseWriter, r *http.Request) { } else { // Update the LastViewAt only if the post does not have from_webhook prop set (eg. Zapier app) if _, ok := post.Props["from_webhook"]; !ok { - if result := <-Srv.Store.Channel().UpdateLastViewedAt(post.ChannelId, c.Session.UserId); result.Err != nil { + if result := <-Srv.Store.Channel().UpdateLastViewedAt([]string{post.ChannelId}, c.Session.UserId); result.Err != nil { l4g.Error(utils.T("api.post.create_post.last_viewed.error"), post.ChannelId, c.Session.UserId, result.Err) } } |