|
|
@ -54,15 +54,13 @@ func Search(ctx *context.APIContext) { |
|
|
|
|
|
|
|
|
|
|
|
listOptions := utils.GetListOptions(ctx) |
|
|
|
listOptions := utils.GetListOptions(ctx) |
|
|
|
|
|
|
|
|
|
|
|
opts := &models.SearchUserOptions{ |
|
|
|
users, maxResults, err := models.SearchUsers(&models.SearchUserOptions{ |
|
|
|
Actor: ctx.User, |
|
|
|
Actor: ctx.User, |
|
|
|
Keyword: ctx.FormTrim("q"), |
|
|
|
Keyword: ctx.FormTrim("q"), |
|
|
|
UID: ctx.FormInt64("uid"), |
|
|
|
UID: ctx.FormInt64("uid"), |
|
|
|
Type: models.UserTypeIndividual, |
|
|
|
Type: models.UserTypeIndividual, |
|
|
|
ListOptions: listOptions, |
|
|
|
ListOptions: listOptions, |
|
|
|
} |
|
|
|
}) |
|
|
|
|
|
|
|
|
|
|
|
users, maxResults, err := models.SearchUsers(opts) |
|
|
|
|
|
|
|
if err != nil { |
|
|
|
if err != nil { |
|
|
|
ctx.JSON(http.StatusInternalServerError, map[string]interface{}{ |
|
|
|
ctx.JSON(http.StatusInternalServerError, map[string]interface{}{ |
|
|
|
"ok": false, |
|
|
|
"ok": false, |
|
|
|