diff options
| author | Christopher Speller <crspeller@gmail.com> | 2016-01-27 09:28:09 -0500 |
|---|---|---|
| committer | Christopher Speller <crspeller@gmail.com> | 2016-01-27 09:28:09 -0500 |
| commit | b7606da40f5403896dfbf930837530b4b22abacd (patch) | |
| tree | bf75a53ebee6ed60cbe791a3e8c6238b88928b4d /store | |
| parent | 18a634a751b2b9b12c90eb581890c85060599180 (diff) | |
| parent | c4cca4d41835bb5a2532adb8be05bdd2c97d2544 (diff) | |
| download | chat-b7606da40f5403896dfbf930837530b4b22abacd.tar.gz chat-b7606da40f5403896dfbf930837530b4b22abacd.tar.bz2 chat-b7606da40f5403896dfbf930837530b4b22abacd.zip | |
Merge pull request #1988 from mattermost/plt-1475
PLT-1475 Update search query to ignore system messages
Diffstat (limited to 'store')
| -rw-r--r-- | store/sql_post_store.go | 1 | ||||
| -rw-r--r-- | store/sql_post_store_test.go | 7 |
2 files changed, 8 insertions, 0 deletions
diff --git a/store/sql_post_store.go b/store/sql_post_store.go index a2b18a163..2d5d66e0d 100644 --- a/store/sql_post_store.go +++ b/store/sql_post_store.go @@ -642,6 +642,7 @@ func (s SqlPostStore) Search(teamId string, userId string, params *model.SearchP Posts WHERE DeleteAt = 0 + AND Type NOT LIKE '` + model.POST_SYSTEM_MESSAGE_PREFIX + `%' POST_FILTER AND ChannelId IN ( SELECT diff --git a/store/sql_post_store_test.go b/store/sql_post_store_test.go index a3e3e10dd..46b8d7678 100644 --- a/store/sql_post_store_test.go +++ b/store/sql_post_store_test.go @@ -676,6 +676,13 @@ func TestPostStoreSearch(t *testing.T) { o1.Message = "corey mattermost new york" o1 = (<-store.Post().Save(o1)).Data.(*model.Post) + o1a := &model.Post{} + o1a.ChannelId = c1.Id + o1a.UserId = model.NewId() + o1a.Message = "corey mattermost new york" + o1a.Type = model.POST_JOIN_LEAVE + o1a = (<-store.Post().Save(o1a)).Data.(*model.Post) + o2 := &model.Post{} o2.ChannelId = c1.Id o2.UserId = model.NewId() |