diff options
Diffstat (limited to 'routers/api/v1/user.go')
| -rw-r--r-- | routers/api/v1/user.go | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/routers/api/v1/user.go b/routers/api/v1/user.go index feecda483d..60b6adcd12 100644 --- a/routers/api/v1/user.go +++ b/routers/api/v1/user.go @@ -18,7 +18,7 @@ import ( // ToApiUser converts user to API format. func ToApiUser(u *models.User) *api.User { return &api.User{ - Id: u.Id, + ID: u.Id, UserName: u.Name, AvatarUrl: string(setting.Protocol) + u.AvatarLink(), } @@ -45,10 +45,14 @@ func SearchUsers(ctx *middleware.Context) { results := make([]*api.User, len(us)) for i := range us { results[i] = &api.User{ + ID: us[i].Id, UserName: us[i].Name, AvatarUrl: us[i].AvatarLink(), FullName: us[i].FullName, } + if ctx.IsSigned { + results[i].Email = us[i].Email + } } ctx.Render.JSON(200, map[string]interface{}{ |