summaryrefslogtreecommitdiffstats
path: root/api/user.go
diff options
context:
space:
mode:
Diffstat (limited to 'api/user.go')
-rw-r--r--api/user.go16
1 files changed, 3 insertions, 13 deletions
diff --git a/api/user.go b/api/user.go
index 24a9025e4..795e83a2a 100644
--- a/api/user.go
+++ b/api/user.go
@@ -1535,22 +1535,12 @@ func searchUsers(c *Context, w http.ResponseWriter, r *http.Request) {
}
}
- var profiles []*model.User
- var err *model.AppError
- if props.InChannelId != "" {
- profiles, err = app.SearchUsersInChannel(props.InChannelId, props.Term, searchOptions, c.IsSystemAdmin())
- } else if props.NotInChannelId != "" {
- profiles, err = app.SearchUsersNotInChannel(props.TeamId, props.NotInChannelId, props.Term, searchOptions, c.IsSystemAdmin())
- } else {
- profiles, err = app.SearchUsersInTeam(props.TeamId, props.Term, searchOptions, c.IsSystemAdmin())
- }
-
- if err != nil {
+ if profiles, err := app.SearchUsers(props, searchOptions, c.IsSystemAdmin()); err != nil {
c.Err = err
return
+ } else {
+ w.Write([]byte(model.UserListToJson(profiles)))
}
-
- w.Write([]byte(model.UserListToJson(profiles)))
}
func getProfilesByIds(c *Context, w http.ResponseWriter, r *http.Request) {