Skip to content

Commit

Permalink
PLT-5612: Don't show error on invalid search query.
Browse files Browse the repository at this point in the history
Log a warning to the logs, but don't show an error to the user in the
WebUI, just an empty set of query results, when the fulltext search
query they enter generates a syntax error from the database.
  • Loading branch information
grundleborg committed Mar 2, 2017
1 parent c1d5e9a commit 25933df
Show file tree
Hide file tree
Showing 2 changed files with 20 additions and 18 deletions.
4 changes: 2 additions & 2 deletions i18n/en.json
Expand Up @@ -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",
Expand Down
34 changes: 18 additions & 16 deletions store/sql_post_store.go
Expand Up @@ -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"
Expand Down Expand Up @@ -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()
Expand Down

0 comments on commit 25933df

Please sign in to comment.