diff options
| -rw-r--r-- | i18n/en.json | 4 | ||||
| -rw-r--r-- | store/sql_post_store.go | 34 |
2 files changed, 20 insertions, 18 deletions
diff --git a/i18n/en.json b/i18n/en.json index f2417a8f5..472d30d5f 100644 --- a/i18n/en.json +++ b/i18n/en.json @@ -5032,8 +5032,8 @@ "translation": "You cannot update an existing Post" }, { - "id": "store.sql_post.search.app_error", - "translation": "We encountered an error while searching for posts" + "id": "store.sql_post.search.warn", + "translation": "Query error searching posts: %v" }, { "id": "store.sql_post.update.app_error", diff --git a/store/sql_post_store.go b/store/sql_post_store.go index e224f60bd..eefd251e5 100644 --- a/store/sql_post_store.go +++ b/store/sql_post_store.go @@ -9,6 +9,7 @@ import ( "strconv" "strings" + l4g "github.com/alecthomas/log4go" "github.com/mattermost/platform/einterfaces" "github.com/mattermost/platform/model" "github.com/mattermost/platform/utils" @@ -961,27 +962,28 @@ func (s SqlPostStore) Search(teamId string, userId string, params *model.SearchP queryParams["Terms"] = terms - _, err := s.GetReplica().Select(&posts, searchQuery, queryParams) - if err != nil { - result.Err = model.NewLocAppError("SqlPostStore.Search", "store.sql_post.search.app_error", nil, "teamId="+teamId+", err="+err.Error()) - } - list := model.NewPostList() - for _, p := range posts { - if searchType == "Hashtags" { - exactMatch := false - for _, tag := range strings.Split(p.Hashtags, " ") { - if termMap[strings.ToUpper(tag)] { - exactMatch = true + _, err := s.GetReplica().Select(&posts, searchQuery, queryParams) + if err != nil { + l4g.Warn(utils.T("store.sql_post.search.warn"), err.Error()) + // Don't return the error to the caller as it is of no use to the user. Instead return an empty set of search results. + } else { + for _, p := range posts { + if searchType == "Hashtags" { + exactMatch := false + for _, tag := range strings.Split(p.Hashtags, " ") { + if termMap[strings.ToUpper(tag)] { + exactMatch = true + } + } + if !exactMatch { + continue } } - if !exactMatch { - continue - } + list.AddPost(p) + list.AddOrder(p.Id) } - list.AddPost(p) - list.AddOrder(p.Id) } list.MakeNonNil() |