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

5 files changed, 22 insertions, 11 deletions

diff --git a/model/channel_count.go b/model/channel_count.go
index 05d8401e1..f53e6acaf 100644
--- a/model/channel_count.go
+++ b/model/channel_count.go
@@ -11,7 +11,8 @@ import (
 )
 
 type ChannelCounts struct {
-	Counts map[string]int64 `json:"counts"`
+	Counts      map[string]int64 `json:"counts"`
+	UpdateTimes map[string]int64 `json:"update_times"`
 }
 
 func (o *ChannelCounts) Etag() string {
@@ -20,9 +21,16 @@ func (o *ChannelCounts) Etag() string {
 		str += id + strconv.FormatInt(count, 10)
 	}
 
-	data := []byte(str)
+	md5Counts := md5.Sum([]byte(str))
 
-	return Etag(md5.Sum(data))
+	var update int64 = 0
+	for _, u := range o.UpdateTimes {
+		if u > update {
+			update = u
+		}
+	}
+
+	return Etag(md5Counts, update)
 }
 
 func (o *ChannelCounts) ToJson() string {
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
diff --git a/web/react/components/more_channels.jsx b/web/react/components/more_channels.jsx
index e851283ae..5261ed6a7 100644
--- a/web/react/components/more_channels.jsx
+++ b/web/react/components/more_channels.jsx
@@ -74,7 +74,7 @@ module.exports = React.createClass({
                     moreChannels = (
                         <table className='more-channel-table table'>
                             <tbody>
-                                {moreChannels.map(function cMap(channel) {
+                                {channels.map(function cMap(channel) {
                                     return (
                                         <tr key={channel.id}>
                                             <td>
diff --git a/web/react/components/sidebar.jsx b/web/react/components/sidebar.jsx
index 6ad606e5e..f6ac36f50 100644
--- a/web/react/components/sidebar.jsx
+++ b/web/react/components/sidebar.jsx
@@ -161,7 +161,6 @@ module.exports = React.createClass({
                     AsyncClient.updateLastViewedAt();
                 }
             } else {
-                console.log('hit');
                 AsyncClient.getChannels();
             }
 
diff --git a/web/react/utils/async_client.jsx b/web/react/utils/async_client.jsx
index 545c85fc2..7e8a6116c 100644
--- a/web/react/utils/async_client.jsx
+++ b/web/react/utils/async_client.jsx
@@ -99,11 +99,13 @@ function getChannels(force, updateLastViewed, checkVersion) {
                 }
 
                 var countMap = data.counts;
+                var updateAtMap = data.update_times;
 
                 for (var id in countMap) {
-                    var chan = ChannelStore.get(id);
+                    var c = ChannelStore.get(id);
                     var count = countMap[id];
-                    if (!chan || chan.total_msg_count !== count) {
+                    var updateAt = updateAtMap[id];
+                    if (!c || c.total_msg_count !== count || updateAt > c.update_at) {
                         getChannel(id);
                     }
                 }