diff options
| author | Joram Wilander <jwawilander@gmail.com> | 2016-11-03 11:24:45 -0400 |
|---|---|---|
| committer | Corey Hulen <corey@hulen.com> | 2016-11-03 08:24:45 -0700 |
| commit | 6da0ccd94447ddc5bcf51285ebac411dd3188cce (patch) | |
| tree | 9334fa81ebbd23463134c6e5673e089ebf222836 /api | |
| parent | 1b141681ae6a169272003fa83fb83ba245dbafc7 (diff) | |
| download | chat-6da0ccd94447ddc5bcf51285ebac411dd3188cce.tar.gz chat-6da0ccd94447ddc5bcf51285ebac411dd3188cce.tar.bz2 chat-6da0ccd94447ddc5bcf51285ebac411dd3188cce.zip | |
Update user search to match against username, full name, nickname and email (#4421)
Diffstat (limited to 'api')
| -rw-r--r-- | api/user.go | 4 | ||||
| -rw-r--r-- | api/user_test.go | 1 |
2 files changed, 3 insertions, 2 deletions
diff --git a/api/user.go b/api/user.go index 787039355..e0507f399 100644 --- a/api/user.go +++ b/api/user.go @@ -2615,7 +2615,6 @@ func searchUsers(c *Context, w http.ResponseWriter, r *http.Request) { } searchOptions := map[string]bool{} - searchOptions[store.USER_SEARCH_OPTION_USERNAME_ONLY] = true searchOptions[store.USER_SEARCH_OPTION_ALLOW_INACTIVE] = props.AllowInactive var uchan store.StoreChannel @@ -2680,6 +2679,9 @@ func autocompleteUsersInChannel(c *Context, w http.ResponseWriter, r *http.Reque return } + searchOptions := map[string]bool{} + searchOptions[store.USER_SEARCH_OPTION_NAMES_ONLY] = true + uchan := Srv.Store.User().SearchInChannel(channelId, term, map[string]bool{}) nuchan := Srv.Store.User().SearchNotInChannel(teamId, channelId, term, map[string]bool{}) diff --git a/api/user_test.go b/api/user_test.go index 5f7cc375d..1ffb2140c 100644 --- a/api/user_test.go +++ b/api/user_test.go @@ -2205,7 +2205,6 @@ func TestSearchUsers(t *testing.T) { } if _, err := Client.SearchUsers(model.UserSearch{Term: th.BasicUser.Username, NotInChannelId: th.BasicChannel.Id}); err == nil { - t.Fatal("should not have access") } } |