diff options
| author | Saturnino Abril <saturnino.abril@gmail.com> | 2017-08-01 20:16:45 +0800 |
|---|---|---|
| committer | Joram Wilander <jwawilander@gmail.com> | 2017-08-01 08:16:45 -0400 |
| commit | 88f398ffddbcbb58265d085c09cb72008be3f3d5 (patch) | |
| tree | 6db22e220a781a144808e113505ce040c7e2eac7 /store/sql_post_store.go | |
| parent | b023b891550cd8fb2f874e822f05921d13f51fb2 (diff) | |
| download | chat-88f398ffddbcbb58265d085c09cb72008be3f3d5.tar.gz chat-88f398ffddbcbb58265d085c09cb72008be3f3d5.tar.bz2 chat-88f398ffddbcbb58265d085c09cb72008be3f3d5.zip | |
Revert " #4755 Combining consecutive user join/leave system messages to single message and few other changes." (#7072)
* Revert "PLT-6603: Don't return all posts on invalid query. (#7061)"
This reverts commit 25a2013890c7e07b4621fa9b18342e7f35363049.
* Revert " #4755 Combining consecutive user join/leave system messages to single message and few other changes. (#5945)"
This reverts commit 8a91235fb3cdc8d094dbc2eaa0d7baa447132b3c.
Diffstat (limited to 'store/sql_post_store.go')
| -rw-r--r-- | store/sql_post_store.go | 29 |
1 files changed, 2 insertions, 27 deletions
diff --git a/store/sql_post_store.go b/store/sql_post_store.go index c66e44274..e89b5e042 100644 --- a/store/sql_post_store.go +++ b/store/sql_post_store.go @@ -97,7 +97,8 @@ func (s SqlPostStore) Save(post *model.Post) StoreChannel { } else { time := post.UpdateAt - if !post.IsUserActivitySystemMessage() { + if post.Type != model.POST_JOIN_LEAVE && post.Type != model.POST_JOIN_CHANNEL && post.Type != model.POST_LEAVE_CHANNEL && + post.Type != model.POST_ADD_REMOVE && post.Type != model.POST_ADD_TO_CHANNEL && post.Type != model.POST_REMOVE_FROM_CHANNEL { s.GetMaster().Exec("UPDATE Channels SET LastPostAt = :LastPostAt, TotalMsgCount = TotalMsgCount + 1 WHERE Id = :ChannelId", map[string]interface{}{"LastPostAt": time, "ChannelId": post.ChannelId}) } else { // don't update TotalMsgCount for unimportant messages so that the channel isn't marked as unread @@ -1354,29 +1355,3 @@ func (s SqlPostStore) GetPostsBatchForIndexing(startTime int64, limit int) Store return storeChannel } - -func (s SqlPostStore) GetLastPostForChannel(channelId string) StoreChannel { - storeChannel := make(StoreChannel, 1) - - go func() { - result := StoreResult{} - - var post model.Post - query := ` - SELECT * FROM Posts - WHERE ChannelId = :channelId AND DeleteAt = 0 - ORDER BY CreateAt DESC - LIMIT 1 - ` - - if err := s.GetReplica().SelectOne(&post, query, map[string]interface{}{"channelId": channelId}); err != nil { - l4g.Error(err) - } - - result.Data = &post - storeChannel <- result - close(storeChannel) - }() - - return storeChannel -} |