summaryrefslogtreecommitdiffstats
path: root/routers/api/v1/users.go
diff options
context:
space:
mode:
Diffstat (limited to 'routers/api/v1/users.go')
-rw-r--r--routers/api/v1/users.go22
1 files changed, 15 insertions, 7 deletions
diff --git a/routers/api/v1/users.go b/routers/api/v1/users.go
index fe67033748..062c3680fc 100644
--- a/routers/api/v1/users.go
+++ b/routers/api/v1/users.go
@@ -17,21 +17,29 @@ type user struct {
}
func SearchUsers(ctx *middleware.Context) {
- q := ctx.Query("q")
- limit, err := com.StrTo(ctx.Query("limit")).Int()
- if err != nil {
- limit = 10
+ opt := models.SearchOption{
+ Keyword: ctx.Query("q"),
+ Limit: com.StrTo(ctx.Query("limit")).MustInt(),
+ }
+ if opt.Limit == 0 {
+ opt.Limit = 10
}
- us, err := models.SearchUserByName(q, limit)
+ us, err := models.SearchUserByName(opt)
if err != nil {
- ctx.JSON(500, nil)
+ ctx.JSON(500, map[string]interface{}{
+ "ok": false,
+ "error": err.Error(),
+ })
return
}
results := make([]*user, len(us))
for i := range us {
- results[i] = &user{us[i].Name, us[i].AvatarLink()}
+ results[i] = &user{
+ UserName: us[i].Name,
+ AvatarLink: us[i].AvatarLink(),
+ }
}
ctx.Render.JSON(200, map[string]interface{}{