diff options
author | Christopher Speller <crspeller@gmail.com> | 2015-07-07 13:36:05 -0400 |
---|---|---|
committer | Christopher Speller <crspeller@gmail.com> | 2015-07-07 13:36:05 -0400 |
commit | 4e856c29b20270997ef54bdcc4260ff28390873f (patch) | |
tree | 1a99970afbfb384df22ad52e22d602926c38f972 /store | |
parent | 95b9f872882b367556ca2330eea8c8309db542e6 (diff) | |
parent | 23e527978ed3e889bebe5c879de2d4835509626a (diff) | |
download | chat-4e856c29b20270997ef54bdcc4260ff28390873f.tar.gz chat-4e856c29b20270997ef54bdcc4260ff28390873f.tar.bz2 chat-4e856c29b20270997ef54bdcc4260ff28390873f.zip |
Merge pull request #138 from hmhealey/mm756
MM-756 Don't mark channels as unread after user joined/left messages
Diffstat (limited to 'store')
-rw-r--r-- | store/sql_post_store.go | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/store/sql_post_store.go b/store/sql_post_store.go index 01900023f..7ada515d7 100644 --- a/store/sql_post_store.go +++ b/store/sql_post_store.go @@ -72,7 +72,13 @@ func (s SqlPostStore) Save(post *model.Post) StoreChannel { result.Err = model.NewAppError("SqlPostStore.Save", "We couldn't save the Post", "id="+post.Id+", "+err.Error()) } else { time := model.GetMillis() - s.GetMaster().Exec("UPDATE Channels SET LastPostAt = ?, TotalMsgCount = TotalMsgCount + 1 WHERE Id = ?", time, post.ChannelId) + + if post.Type != model.POST_JOIN_LEAVE { + s.GetMaster().Exec("UPDATE Channels SET LastPostAt = ?, TotalMsgCount = TotalMsgCount + 1 WHERE Id = ?", time, post.ChannelId) + } else { + // don't update TotalMsgCount for unimportant messages so that the channel isn't marked as unread + s.GetMaster().Exec("UPDATE Channels SET LastPostAt = ? WHERE Id = ?", time, post.ChannelId) + } if len(post.RootId) > 0 { s.GetMaster().Exec("UPDATE Posts SET UpdateAt = ? WHERE Id = ?", time, post.RootId) @@ -361,8 +367,8 @@ func (s SqlPostStore) Search(teamId string, userId string, terms string, isHasht searchType := "Message" if isHashtagSearch { searchType = "Hashtags" - for _,term := range strings.Split(terms, " ") { - termMap[term] = true; + for _, term := range strings.Split(terms, " ") { + termMap[term] = true } } |