From ccb034382850b7e8ea924a4559e47ef44203155c Mon Sep 17 00:00:00 2001 From: Joram Wilander Date: Fri, 3 Feb 2017 09:30:57 -0500 Subject: Implement POST /users/ids endpoint for APIv4 (#5274) --- app/user.go | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) (limited to 'app') diff --git a/app/user.go b/app/user.go index 5422d0b67..f9137b1e9 100644 --- a/app/user.go +++ b/app/user.go @@ -417,11 +417,17 @@ func GetUsersNotInChannel(teamId string, channelId string, offset int, limit int } } -func GetUsersByIds(userIds []string) (map[string]*model.User, *model.AppError) { +func GetUsersByIds(userIds []string, asAdmin bool) ([]*model.User, *model.AppError) { if result := <-Srv.Store.User().GetProfileByIds(userIds, true); result.Err != nil { return nil, result.Err } else { - return result.Data.(map[string]*model.User), nil + users := result.Data.([]*model.User) + + for _, u := range users { + SanitizeProfile(u, asAdmin) + } + + return users, nil } } -- cgit v1.2.3-1-g7c22