incorporate channel updateAt into channel counts and pull channel data on channel update

1 files changed, 6 insertions, 4 deletions

diff --git a/store/sql_channel_store.go b/store/sql_channel_store.go
index 6caa6fc70..7b2d9df24 100644
--- a/store/sql_channel_store.go
+++ b/store/sql_channel_store.go
@@ -281,9 +281,10 @@ func (s SqlChannelStore) GetMoreChannels(teamId string, userId string) StoreChan
 	return storeChannel
 }
 
-type channelIdWithCount struct {
+type channelIdWithCountandUpdateAt struct {
 	Id            string
 	TotalMsgCount int64
+	UpdateAt      int64
 }
 
 func (s SqlChannelStore) GetChannelCounts(teamId string, userId string) StoreChannel {
@@ -292,16 +293,17 @@ func (s SqlChannelStore) GetChannelCounts(teamId string, userId string) StoreCha
 	go func() {
 		result := StoreResult{}
 
-		var data []channelIdWithCount
-		_, err := s.GetReplica().Select(&data, "SELECT Id, TotalMsgCount FROM Channels WHERE Id IN (SELECT ChannelId FROM ChannelMembers WHERE UserId = :UserId) AND TeamId = :TeamId AND DeleteAt = 0 ORDER BY DisplayName", map[string]interface{}{"TeamId": teamId, "UserId": userId})
+		var data []channelIdWithCountandUpdateAt
+		_, err := s.GetReplica().Select(&data, "SELECT Id, TotalMsgCount, UpdateAt FROM Channels WHERE Id IN (SELECT ChannelId FROM ChannelMembers WHERE UserId = :UserId) AND TeamId = :TeamId AND DeleteAt = 0 ORDER BY DisplayName", map[string]interface{}{"TeamId": teamId, "UserId": userId})
 
 		if err != nil {
 			result.Err = model.NewAppError("SqlChannelStore.GetChannelCounts", "We couldn't get the channel counts", "teamId="+teamId+", userId="+userId+", err="+err.Error())
 		} else {
-			counts := &model.ChannelCounts{Counts: make(map[string]int64)}
+			counts := &model.ChannelCounts{Counts: make(map[string]int64), UpdateTimes: make(map[string]int64)}
 			for i := range data {
 				v := data[i]
 				counts.Counts[v.Id] = v.TotalMsgCount
+				counts.UpdateTimes[v.Id] = v.UpdateAt
 			}
 
 			result.Data = counts