summaryrefslogtreecommitdiffstats
path: root/app/user.go
diff options
context:
space:
mode:
authorGeorge Goldberg <george@gberg.me>2017-04-03 18:11:12 +0100
committerHarrison Healey <harrisonmhealey@gmail.com>2017-04-03 13:11:12 -0400
commit232a99f0c7b9364cb4386264f9ff7f97549a4378 (patch)
tree8f90f7e4fae36b7043e6ab360aafe9e0769060ac /app/user.go
parentda5265681d42549ad9072d762fec67293d742d43 (diff)
downloadchat-232a99f0c7b9364cb4386264f9ff7f97549a4378.tar.gz
chat-232a99f0c7b9364cb4386264f9ff7f97549a4378.tar.bz2
chat-232a99f0c7b9364cb4386264f9ff7f97549a4378.zip
PLT-6162: Search for users not in a given team. (#5943)
Diffstat (limited to 'app/user.go')
-rw-r--r--app/user.go16
1 files changed, 16 insertions, 0 deletions
diff --git a/app/user.go b/app/user.go
index 8e0615508..00f6df471 100644
--- a/app/user.go
+++ b/app/user.go
@@ -1299,6 +1299,8 @@ func SearchUsers(props *model.UserSearch, searchOptions map[string]bool, asAdmin
return SearchUsersInChannel(props.InChannelId, props.Term, searchOptions, asAdmin)
} else if props.NotInChannelId != "" {
return SearchUsersNotInChannel(props.TeamId, props.NotInChannelId, props.Term, searchOptions, asAdmin)
+ } else if props.NotInTeamId != "" {
+ return SearchUsersNotInTeam(props.NotInTeamId, props.Term, searchOptions, asAdmin)
} else {
return SearchUsersInTeam(props.TeamId, props.Term, searchOptions, asAdmin)
}
@@ -1346,6 +1348,20 @@ func SearchUsersInTeam(teamId string, term string, searchOptions map[string]bool
}
}
+func SearchUsersNotInTeam(notInTeamId string, term string, searchOptions map[string]bool, asAdmin bool) ([]*model.User, *model.AppError) {
+ if result := <-Srv.Store.User().SearchNotInTeam(notInTeamId, term, searchOptions); result.Err != nil {
+ return nil, result.Err
+ } else {
+ users := result.Data.([]*model.User)
+
+ for _, user := range users {
+ SanitizeProfile(user, asAdmin)
+ }
+
+ return users, nil
+ }
+}
+
func SearchUsersWithoutTeam(term string, searchOptions map[string]bool, asAdmin bool) ([]*model.User, *model.AppError) {
if result := <-Srv.Store.User().SearchWithoutTeam(term, searchOptions); result.Err != nil {
return nil, result.Err