aboutsummaryrefslogtreecommitdiff
path: root/routers/api
diff options
context:
space:
mode:
Diffstat (limited to 'routers/api')
-rw-r--r--routers/api/v1/admin/orgs.go12
-rw-r--r--routers/api/v1/admin/repos.go4
-rw-r--r--routers/api/v1/admin/users.go34
-rw-r--r--routers/api/v1/api.go54
-rw-r--r--routers/api/v1/convert/convert.go113
-rw-r--r--routers/api/v1/misc/markdown.go10
-rw-r--r--routers/api/v1/org/org.go24
-rw-r--r--routers/api/v1/repo/branch.go18
-rw-r--r--routers/api/v1/repo/file.go20
-rw-r--r--routers/api/v1/repo/hooks.go43
-rw-r--r--routers/api/v1/repo/issue.go165
-rw-r--r--routers/api/v1/repo/keys.go44
-rw-r--r--routers/api/v1/repo/repo.go104
-rw-r--r--routers/api/v1/user/app.go10
-rw-r--r--routers/api/v1/user/email.go20
-rw-r--r--routers/api/v1/user/followers.go38
-rw-r--r--routers/api/v1/user/keys.go40
-rw-r--r--routers/api/v1/user/user.go37
18 files changed, 512 insertions, 278 deletions
diff --git a/routers/api/v1/admin/orgs.go b/routers/api/v1/admin/orgs.go
index 5b5302ca..fcce3b93 100644
--- a/routers/api/v1/admin/orgs.go
+++ b/routers/api/v1/admin/orgs.go
@@ -8,13 +8,13 @@ import (
api "github.com/gogits/go-gogs-client"
"github.com/gogits/gogs/models"
- "github.com/gogits/gogs/modules/middleware"
+ "github.com/gogits/gogs/modules/context"
"github.com/gogits/gogs/routers/api/v1/convert"
"github.com/gogits/gogs/routers/api/v1/user"
)
// https://github.com/gogits/go-gogs-client/wiki/Administration-Organizations#create-a-new-organization
-func CreateOrg(ctx *middleware.Context, form api.CreateOrgOption) {
+func CreateOrg(ctx *context.APIContext, form api.CreateOrgOption) {
u := user.GetUserByParams(ctx)
if ctx.Written() {
return
@@ -27,18 +27,18 @@ func CreateOrg(ctx *middleware.Context, form api.CreateOrgOption) {
Website: form.Website,
Location: form.Location,
IsActive: true,
- Type: models.ORGANIZATION,
+ Type: models.USER_TYPE_ORGANIZATION,
}
if err := models.CreateOrganization(org, u); err != nil {
if models.IsErrUserAlreadyExist(err) ||
models.IsErrNameReserved(err) ||
models.IsErrNamePatternNotAllowed(err) {
- ctx.APIError(422, "CreateOrganization", err)
+ ctx.Error(422, "CreateOrganization", err)
} else {
- ctx.APIError(500, "CreateOrganization", err)
+ ctx.Error(500, "CreateOrganization", err)
}
return
}
- ctx.JSON(201, convert.ToApiOrganization(org))
+ ctx.JSON(201, convert.ToOrganization(org))
}
diff --git a/routers/api/v1/admin/repos.go b/routers/api/v1/admin/repos.go
index 7a6b2af2..0f0c3862 100644
--- a/routers/api/v1/admin/repos.go
+++ b/routers/api/v1/admin/repos.go
@@ -7,13 +7,13 @@ package admin
import (
api "github.com/gogits/go-gogs-client"
- "github.com/gogits/gogs/modules/middleware"
+ "github.com/gogits/gogs/modules/context"
"github.com/gogits/gogs/routers/api/v1/repo"
"github.com/gogits/gogs/routers/api/v1/user"
)
// https://github.com/gogits/go-gogs-client/wiki/Administration-Repositories#create-a-new-repository
-func CreateRepo(ctx *middleware.Context, form api.CreateRepoOption) {
+func CreateRepo(ctx *context.APIContext, form api.CreateRepoOption) {
owner := user.GetUserByParams(ctx)
if ctx.Written() {
return
diff --git a/routers/api/v1/admin/users.go b/routers/api/v1/admin/users.go
index 9a8c906f..ce13804f 100644
--- a/routers/api/v1/admin/users.go
+++ b/routers/api/v1/admin/users.go
@@ -8,15 +8,15 @@ import (
api "github.com/gogits/go-gogs-client"
"github.com/gogits/gogs/models"
+ "github.com/gogits/gogs/modules/context"
"github.com/gogits/gogs/modules/log"
"github.com/gogits/gogs/modules/mailer"
- "github.com/gogits/gogs/modules/middleware"
"github.com/gogits/gogs/modules/setting"
"github.com/gogits/gogs/routers/api/v1/convert"
"github.com/gogits/gogs/routers/api/v1/user"
)
-func parseLoginSource(ctx *middleware.Context, u *models.User, sourceID int64, loginName string) {
+func parseLoginSource(ctx *context.APIContext, u *models.User, sourceID int64, loginName string) {
if sourceID == 0 {
return
}
@@ -24,9 +24,9 @@ func parseLoginSource(ctx *middleware.Context, u *models.User, sourceID int64, l
source, err := models.GetLoginSourceByID(sourceID)
if err != nil {
if models.IsErrAuthenticationNotExist(err) {
- ctx.APIError(422, "", err)
+ ctx.Error(422, "", err)
} else {
- ctx.APIError(500, "GetLoginSourceByID", err)
+ ctx.Error(500, "GetLoginSourceByID", err)
}
return
}
@@ -37,7 +37,7 @@ func parseLoginSource(ctx *middleware.Context, u *models.User, sourceID int64, l
}
// https://github.com/gogits/go-gogs-client/wiki/Administration-Users#create-a-new-user
-func CreateUser(ctx *middleware.Context, form api.CreateUserOption) {
+func CreateUser(ctx *context.APIContext, form api.CreateUserOption) {
u := &models.User{
Name: form.Username,
Email: form.Email,
@@ -56,9 +56,9 @@ func CreateUser(ctx *middleware.Context, form api.CreateUserOption) {
models.IsErrEmailAlreadyUsed(err) ||
models.IsErrNameReserved(err) ||
models.IsErrNamePatternNotAllowed(err) {
- ctx.APIError(422, "", err)
+ ctx.Error(422, "", err)
} else {
- ctx.APIError(500, "CreateUser", err)
+ ctx.Error(500, "CreateUser", err)
}
return
}
@@ -66,14 +66,14 @@ func CreateUser(ctx *middleware.Context, form api.CreateUserOption) {
// Send e-mail notification.
if form.SendNotify && setting.MailService != nil {
- mailer.SendRegisterNotifyMail(ctx.Context, u)
+ mailer.SendRegisterNotifyMail(ctx.Context.Context, u)
}
- ctx.JSON(201, convert.ToApiUser(u))
+ ctx.JSON(201, convert.ToUser(u))
}
// https://github.com/gogits/go-gogs-client/wiki/Administration-Users#edit-an-existing-user
-func EditUser(ctx *middleware.Context, form api.EditUserOption) {
+func EditUser(ctx *context.APIContext, form api.EditUserOption) {
u := user.GetUserByParams(ctx)
if ctx.Written() {
return
@@ -110,19 +110,19 @@ func EditUser(ctx *middleware.Context, form api.EditUserOption) {
if err := models.UpdateUser(u); err != nil {
if models.IsErrEmailAlreadyUsed(err) {
- ctx.APIError(422, "", err)
+ ctx.Error(422, "", err)
} else {
- ctx.APIError(500, "UpdateUser", err)
+ ctx.Error(500, "UpdateUser", err)
}
return
}
log.Trace("Account profile updated by admin (%s): %s", ctx.User.Name, u.Name)
- ctx.JSON(200, convert.ToApiUser(u))
+ ctx.JSON(200, convert.ToUser(u))
}
// https://github.com/gogits/go-gogs-client/wiki/Administration-Users#delete-a-user
-func DeleteUser(ctx *middleware.Context) {
+func DeleteUser(ctx *context.APIContext) {
u := user.GetUserByParams(ctx)
if ctx.Written() {
return
@@ -131,9 +131,9 @@ func DeleteUser(ctx *middleware.Context) {
if err := models.DeleteUser(u); err != nil {
if models.IsErrUserOwnRepos(err) ||
models.IsErrUserHasOrgs(err) {
- ctx.APIError(422, "", err)
+ ctx.Error(422, "", err)
} else {
- ctx.APIError(500, "DeleteUser", err)
+ ctx.Error(500, "DeleteUser", err)
}
return
}
@@ -143,7 +143,7 @@ func DeleteUser(ctx *middleware.Context) {
}
// https://github.com/gogits/go-gogs-client/wiki/Administration-Users#create-a-public-key-for-user
-func CreatePublicKey(ctx *middleware.Context, form api.CreateKeyOption) {
+func CreatePublicKey(ctx *context.APIContext, form api.CreateKeyOption) {
u := user.GetUserByParams(ctx)
if ctx.Written() {
return
diff --git a/routers/api/v1/api.go b/routers/api/v1/api.go
index 04b392fc..59625efd 100644
--- a/routers/api/v1/api.go
+++ b/routers/api/v1/api.go
@@ -14,7 +14,7 @@ import (
"github.com/gogits/gogs/models"
"github.com/gogits/gogs/modules/auth"
- "github.com/gogits/gogs/modules/middleware"
+ "github.com/gogits/gogs/modules/context"
"github.com/gogits/gogs/routers/api/v1/admin"
"github.com/gogits/gogs/routers/api/v1/misc"
"github.com/gogits/gogs/routers/api/v1/org"
@@ -23,7 +23,7 @@ import (
)
func RepoAssignment() macaron.Handler {
- return func(ctx *middleware.Context) {
+ return func(ctx *context.APIContext) {
userName := ctx.Params(":username")
repoName := ctx.Params(":reponame")
@@ -39,9 +39,9 @@ func RepoAssignment() macaron.Handler {
owner, err = models.GetUserByName(userName)
if err != nil {
if models.IsErrUserNotExist(err) {
- ctx.Error(404)
+ ctx.Status(404)
} else {
- ctx.APIError(500, "GetUserByName", err)
+ ctx.Error(500, "GetUserByName", err)
}
return
}
@@ -52,27 +52,29 @@ func RepoAssignment() macaron.Handler {
repo, err := models.GetRepositoryByName(owner.Id, repoName)
if err != nil {
if models.IsErrRepoNotExist(err) {
- ctx.Error(404)
+ ctx.Status(404)
} else {
- ctx.APIError(500, "GetRepositoryByName", err)
+ ctx.Error(500, "GetRepositoryByName", err)
}
return
} else if err = repo.GetOwner(); err != nil {
- ctx.APIError(500, "GetOwner", err)
+ ctx.Error(500, "GetOwner", err)
return
}
- mode, err := models.AccessLevel(ctx.User, repo)
- if err != nil {
- ctx.APIError(500, "AccessLevel", err)
- return
+ if ctx.IsSigned && ctx.User.IsAdmin {
+ ctx.Repo.AccessMode = models.ACCESS_MODE_OWNER
+ } else {
+ mode, err := models.AccessLevel(ctx.User, repo)
+ if err != nil {
+ ctx.Error(500, "AccessLevel", err)
+ return
+ }
+ ctx.Repo.AccessMode = mode
}
- ctx.Repo.AccessMode = mode
-
- // Check access.
- if ctx.Repo.AccessMode == models.ACCESS_MODE_NONE {
- ctx.Error(404)
+ if !ctx.Repo.HasAccess() {
+ ctx.Status(404)
return
}
@@ -82,7 +84,7 @@ func RepoAssignment() macaron.Handler {
// Contexter middleware already checks token for user sign in process.
func ReqToken() macaron.Handler {
- return func(ctx *middleware.Context) {
+ return func(ctx *context.Context) {
if !ctx.IsSigned {
ctx.Error(401)
return
@@ -91,7 +93,7 @@ func ReqToken() macaron.Handler {
}
func ReqBasicAuth() macaron.Handler {
- return func(ctx *middleware.Context) {
+ return func(ctx *context.Context) {
if !ctx.IsBasicAuth {
ctx.Error(401)
return
@@ -100,7 +102,7 @@ func ReqBasicAuth() macaron.Handler {
}
func ReqAdmin() macaron.Handler {
- return func(ctx *middleware.Context) {
+ return func(ctx *context.Context) {
if !ctx.User.IsAdmin {
ctx.Error(403)
return
@@ -181,11 +183,11 @@ func RegisterRoutes(m *macaron.Macaron) {
m.Combo("/hooks").Get(repo.ListHooks).
Post(bind(api.CreateHookOption{}), repo.CreateHook)
m.Patch("/hooks/:id:int", bind(api.EditHookOption{}), repo.EditHook)
- m.Get("/raw/*", middleware.RepoRef(), repo.GetRawFile)
+ m.Get("/raw/*", context.RepoRef(), repo.GetRawFile)
m.Get("/archive/*", repo.GetArchive)
m.Group("/branches", func() {
- m.Get("",repo.ListBranches)
- m.Get("/:branchname",repo.GetBranch)
+ m.Get("", repo.ListBranches)
+ m.Get("/:branchname", repo.GetBranch)
})
m.Group("/keys", func() {
m.Combo("").Get(repo.ListDeployKeys).
@@ -193,6 +195,10 @@ func RegisterRoutes(m *macaron.Macaron) {
m.Combo("/:id").Get(repo.GetDeployKey).
Delete(repo.DeleteDeploykey)
})
+ m.Group("/issues", func() {
+ m.Combo("").Get(repo.ListIssues).Post(bind(api.CreateIssueOption{}), repo.CreateIssue)
+ m.Combo("/:index").Get(repo.GetIssue).Patch(bind(api.EditIssueOption{}), repo.EditIssue)
+ })
}, RepoAssignment())
}, ReqToken())
@@ -201,7 +207,7 @@ func RegisterRoutes(m *macaron.Macaron) {
m.Get("/users/:username/orgs", org.ListUserOrgs)
m.Combo("/orgs/:orgname").Get(org.Get).Patch(bind(api.EditOrgOption{}), org.Edit)
- m.Any("/*", func(ctx *middleware.Context) {
+ m.Any("/*", func(ctx *context.Context) {
ctx.Error(404)
})
@@ -218,5 +224,5 @@ func RegisterRoutes(m *macaron.Macaron) {
})
})
}, ReqAdmin())
- })
+ }, context.APIContexter())
}
diff --git a/routers/api/v1/convert/convert.go b/routers/api/v1/convert/convert.go
index 57b3d44e..7e3e380b 100644
--- a/routers/api/v1/convert/convert.go
+++ b/routers/api/v1/convert/convert.go
@@ -9,15 +9,19 @@ import (
"github.com/Unknwon/com"
- api "github.com/gogits/go-gogs-client"
"github.com/gogits/git-module"
+ api "github.com/gogits/go-gogs-client"
"github.com/gogits/gogs/models"
+ "github.com/gogits/gogs/modules/log"
"github.com/gogits/gogs/modules/setting"
)
-// ToApiUser converts user to its API format.
-func ToApiUser(u *models.User) *api.User {
+func ToUser(u *models.User) *api.User {
+ if u == nil {
+ return nil
+ }
+
return &api.User{
ID: u.Id,
UserName: u.Name,
@@ -27,7 +31,7 @@ func ToApiUser(u *models.User) *api.User {
}
}
-func ToApiEmail(email *models.EmailAddress) *api.Email {
+func ToEmail(email *models.EmailAddress) *api.Email {
return &api.Email{
Email: email.Email,
Verified: email.IsActivated,
@@ -35,12 +39,11 @@ func ToApiEmail(email *models.EmailAddress) *api.Email {
}
}
-// ToApiRepository converts repository to API format.
-func ToApiRepository(owner *models.User, repo *models.Repository, permission api.Permission) *api.Repository {
+func ToRepository(owner *models.User, repo *models.Repository, permission api.Permission) *api.Repository {
cl := repo.CloneLink()
return &api.Repository{
- Id: repo.ID,
- Owner: *ToApiUser(owner),
+ ID: repo.ID,
+ Owner: ToUser(owner),
FullName: owner.Name + "/" + repo.Name,
Private: repo.IsPrivate,
Fork: repo.IsFork,
@@ -51,30 +54,27 @@ func ToApiRepository(owner *models.User, repo *models.Repository, permission api
}
}
-// ToApiBranch converts user to its API format.
-func ToApiBranch(b *models.Branch,c *git.Commit) *api.Branch {
+func ToBranch(b *models.Branch, c *git.Commit) *api.Branch {
return &api.Branch{
- Name: b.Name,
- Commit: ToApiCommit(c),
- }
+ Name: b.Name,
+ Commit: ToCommit(c),
+ }
}
-// ToApiCommit converts user to its API format.
-func ToApiCommit(c *git.Commit) *api.PayloadCommit {
+func ToCommit(c *git.Commit) *api.PayloadCommit {
return &api.PayloadCommit{
- ID: c.ID.String(),
+ ID: c.ID.String(),
Message: c.Message(),
- URL: "Not implemented",
+ URL: "Not implemented",
Author: &api.PayloadAuthor{
- Name: c.Committer.Name,
+ Name: c.Committer.Name,
Email: c.Committer.Email,
/* UserName: c.Committer.UserName, */
},
}
}
-// ToApiPublicKey converts public key to its API format.
-func ToApiPublicKey(apiLink string, key *models.PublicKey) *api.PublicKey {
+func ToPublicKey(apiLink string, key *models.PublicKey) *api.PublicKey {
return &api.PublicKey{
ID: key.ID,
Key: key.Content,
@@ -84,8 +84,7 @@ func ToApiPublicKey(apiLink string, key *models.PublicKey) *api.PublicKey {
}
}
-// ToApiHook converts webhook to its API format.
-func ToApiHook(repoLink string, w *models.Webhook) *api.Hook {
+func ToHook(repoLink string, w *models.Webhook) *api.Hook {
config := map[string]string{
"url": w.URL,
"content_type": w.ContentType.Name(),
@@ -110,8 +109,7 @@ func ToApiHook(repoLink string, w *models.Webhook) *api.Hook {
}
}
-// ToApiDeployKey converts deploy key to its API format.
-func ToApiDeployKey(apiLink string, key *models.DeployKey) *api.DeployKey {
+func ToDeployKey(apiLink string, key *models.DeployKey) *api.DeployKey {
return &api.DeployKey{
ID: key.ID,
Key: key.Content,
@@ -122,7 +120,72 @@ func ToApiDeployKey(apiLink string, key *models.DeployKey) *api.DeployKey {
}
}
-func ToApiOrganization(org *models.User) *api.Organization {
+func ToLabel(label *models.Label) *api.Label {
+ return &api.Label{
+ Name: label.Name,
+ Color: label.Color,
+ }
+}
+
+func ToMilestone(milestone *models.Milestone) *api.Milestone {
+ if milestone == nil {
+ return nil
+ }
+
+ apiMilestone := &api.Milestone{
+ ID: milestone.ID,
+ State: milestone.State(),
+ Title: milestone.Name,
+ Description: milestone.Content,
+ OpenIssues: milestone.NumOpenIssues,
+ ClosedIssues: milestone.NumClosedIssues,
+ }
+ if milestone.IsClosed {
+ apiMilestone.Closed = &milestone.ClosedDate
+ }
+ if milestone.Deadline.Year() < 9999 {
+ apiMilestone.Deadline = &milestone.Deadline
+ }
+ return apiMilestone
+}
+
+func ToIssue(issue *models.Issue) *api.Issue {
+ apiLabels := make([]*api.Label, len(issue.Labels))
+ for i := range issue.Labels {
+ apiLabels[i] = ToLabel(issue.Labels[i])
+ }
+
+ apiIssue := &api.Issue{
+ ID: issue.ID,
+ Index: issue.Index,
+ State: issue.State(),
+ Title: issue.Name,
+ Body: issue.Content,
+ User: ToUser(issue.Poster),
+ Labels: apiLabels,
+ Assignee: ToUser(issue.Assignee),
+ Milestone: ToMilestone(issue.Milestone),
+ Comments: issue.NumComments,
+ Created: issue.Created,
+ Updated: issue.Updated,
+ }
+ if issue.IsPull {
+ if err := issue.GetPullRequest(); err != nil {
+ log.Error(4, "GetPullRequest", err)
+ } else {
+ apiIssue.PullRequest = &api.PullRequestMeta{
+ HasMerged: issue.PullRequest.HasMerged,
+ }
+ if issue.PullRequest.HasMerged {
+ apiIssue.PullRequest.Merged = &issue.PullRequest.Merged
+ }
+ }
+ }
+
+ return apiIssue
+}
+
+func ToOrganization(org *models.User) *api.Organization {
return &api.Organization{
ID: org.Id,
AvatarUrl: org.AvatarLink(),
diff --git a/routers/api/v1/misc/markdown.go b/routers/api/v1/misc/markdown.go
index b98a362c..64895db0 100644
--- a/routers/api/v1/misc/markdown.go
+++ b/routers/api/v1/misc/markdown.go
@@ -7,14 +7,14 @@ package misc
import (
api "github.com/gogits/go-gogs-client"
+ "github.com/gogits/gogs/modules/context"
"github.com/gogits/gogs/modules/markdown"
- "github.com/gogits/gogs/modules/middleware"
)
// https://github.com/gogits/go-gogs-client/wiki/Miscellaneous#render-an-arbitrary-markdown-document
-func Markdown(ctx *middleware.Context, form api.MarkdownOption) {
+func Markdown(ctx *context.APIContext, form api.MarkdownOption) {
if ctx.HasApiError() {
- ctx.APIError(422, "", ctx.GetErrMsg())
+ ctx.Error(422, "", ctx.GetErrMsg())
return
}
@@ -32,10 +32,10 @@ func Markdown(ctx *middleware.Context, form api.MarkdownOption) {
}
// https://github.com/gogits/go-gogs-client/wiki/Miscellaneous#render-a-markdown-document-in-raw-mode
-func MarkdownRaw(ctx *middleware.Context) {
+func MarkdownRaw(ctx *context.APIContext) {
body, err := ctx.Req.Body().Bytes()
if err != nil {
- ctx.APIError(422, "", err)
+ ctx.Error(422, "", err)
return
}
ctx.Write(markdown.RenderRaw(body, ""))
diff --git a/routers/api/v1/org/org.go b/routers/api/v1/org/org.go
index 2c6d6fd3..b4e52d48 100644
--- a/routers/api/v1/org/org.go
+++ b/routers/api/v1/org/org.go
@@ -8,31 +8,31 @@ import (
api "github.com/gogits/go-gogs-client"
"github.com/gogits/gogs/models"
- "github.com/gogits/gogs/modules/middleware"
+ "github.com/gogits/gogs/modules/context"
"github.com/gogits/gogs/routers/api/v1/convert"
"github.com/gogits/gogs/routers/api/v1/user"
)
-func listUserOrgs(ctx *middleware.Context, u *models.User, all bool) {
+func listUserOrgs(ctx *context.APIContext, u *models.User, all bool) {
if err := u.GetOrganizations(all); err != nil {
- ctx.APIError(500, "GetOrganizations", err)
+ ctx.Error(500, "GetOrganizations", err)
return
}
apiOrgs := make([]*api.Organization, len(u.Orgs))
for i := range u.Orgs {
- apiOrgs[i] = convert.ToApiOrganization(u.Orgs[i])
+ apiOrgs[i] = convert.ToOrganization(u.Orgs[i])
}
ctx.JSON(200, &apiOrgs)
}
// https://github.com/gogits/go-gogs-client/wiki/Organizations#list-your-organizations
-func ListMyOrgs(ctx *middleware.Context) {
+func ListMyOrgs(ctx *context.APIContext) {
listUserOrgs(ctx, ctx.User, true)
}
// https://github.com/gogits/go-gogs-client/wiki/Organizations#list-user-organizations
-func ListUserOrgs(ctx *middleware.Context) {
+func ListUserOrgs(ctx *context.APIContext) {
u := user.GetUserByParams(ctx)
if ctx.Written() {
return
@@ -41,23 +41,23 @@ func ListUserOrgs(ctx *middleware.Context) {
}
// https://github.com/gogits/go-gogs-client/wiki/Organizations#get-an-organization
-func Get(ctx *middleware.Context) {
+func Get(ctx *context.APIContext) {
org := user.GetUserByParamsName(ctx, ":orgname")
if ctx.Written() {
return
}
- ctx.JSON(200, convert.ToApiOrganization(org))
+ ctx.JSON(200, convert.ToOrganization(org))
}
// https://github.com/gogits/go-gogs-client/wiki/Organizations#edit-an-organization
-func Edit(ctx *middleware.Context, form api.EditOrgOption) {
+func Edit(ctx *context.APIContext, form api.EditOrgOption) {
org := user.GetUserByParamsName(ctx, ":orgname")
if ctx.Written() {
return
}
if !org.IsOwnedBy(ctx.User.Id) {
- ctx.Error(403)
+ ctx.Status(403)
return
}
@@ -66,9 +66,9 @@ func Edit(ctx *middleware.Context, form api.EditOrgOption) {
org.Website = form.Website
org.Location = form.Location
if err := models.UpdateUser(org); err != nil {
- ctx.APIError(500, "UpdateUser", err)
+ ctx.Error(500, "UpdateUser", err)
return
}
- ctx.JSON(200, convert.ToApiOrganization(org))
+ ctx.JSON(200, convert.ToOrganization(org))
}
diff --git a/routers/api/v1/repo/branch.go b/routers/api/v1/repo/branch.go
index e2f15ff5..a141921e 100644
--- a/routers/api/v1/repo/branch.go
+++ b/routers/api/v1/repo/branch.go
@@ -7,32 +7,32 @@ package repo
import (
api "github.com/gogits/go-gogs-client"
- "github.com/gogits/gogs/modules/middleware"
+ "github.com/gogits/gogs/modules/context"
"github.com/gogits/gogs/routers/api/v1/convert"
)
// https://github.com/gogits/go-gogs-client/wiki/Repositories#get-branch
-func GetBranch(ctx *middleware.Context) {
+func GetBranch(ctx *context.APIContext) {
branch, err := ctx.Repo.Repository.GetBranch(ctx.Params(":branchname"))
if err != nil {
- ctx.APIError(500, "GetBranch", err)
+ ctx.Error(500, "GetBranch", err)
return
}
c, err := branch.GetCommit()
if err != nil {
- ctx.APIError(500, "GetCommit", err)
+ ctx.Error(500, "GetCommit", err)
return
}
- ctx.JSON(200, convert.ToApiBranch(branch, c))
+ ctx.JSON(200, convert.ToBranch(branch, c))
}
// https://github.com/gogits/go-gogs-client/wiki/Repositories#list-branches
-func ListBranches(ctx *middleware.Context) {
+func ListBranches(ctx *context.APIContext) {
branches, err := ctx.Repo.Repository.GetBranches()
if err != nil {
- ctx.APIError(500, "GetBranches", err)
+ ctx.Error(500, "GetBranches", err)
return
}
@@ -40,10 +40,10 @@ func ListBranches(ctx *middleware.Context) {
for i := range branches {
c, err := branches[i].GetCommit()
if err != nil {
- ctx.APIError(500, "GetCommit", err)
+ ctx.Error(500, "GetCommit", err)
return
}
- apiBranches[i] = convert.ToApiBranch(branches[i], c)
+ apiBranches[i] = convert.ToBranch(branches[i], c)
}
ctx.JSON(200, &apiBranches)
diff --git a/routers/api/v1/repo/file.go b/routers/api/v1/repo/file.go
index f64e6634..745b444a 100644
--- a/routers/api/v1/repo/file.go
+++ b/routers/api/v1/repo/file.go
@@ -8,40 +8,40 @@ import (
"github.com/gogits/git-module"
"github.com/gogits/gogs/models"
- "github.com/gogits/gogs/modules/middleware"
+ "github.com/gogits/gogs/modules/context"
"github.com/gogits/gogs/routers/repo"
)
// https://github.com/gogits/go-gogs-client/wiki/Repositories-Contents#download-raw-content
-func GetRawFile(ctx *middleware.Context) {
+func GetRawFile(ctx *context.APIContext) {
if !ctx.Repo.HasAccess() {
- ctx.Error(404)
+ ctx.Status(404)
return
}
blob, err := ctx.Repo.Commit.GetBlobByPath(ctx.Repo.TreeName)
if err != nil {
if git.IsErrNotExist(err) {
- ctx.Error(404)
+ ctx.Status(404)
} else {
- ctx.APIError(500, "GetBlobByPath", err)
+ ctx.Error(500, "GetBlobByPath", err)
}
return
}
- if err = repo.ServeBlob(ctx, blob); err != nil {
- ctx.APIError(500, "ServeBlob", err)
+ if err = repo.ServeBlob(ctx.Context, blob); err != nil {
+ ctx.Error(500, "ServeBlob", err)
}
}
// https://github.com/gogits/go-gogs-client/wiki/Repositories-Contents#download-archive
-func GetArchive(ctx *middleware.Context) {
+func GetArchive(ctx *context.APIContext) {
repoPath := models.RepoPath(ctx.Params(":username"), ctx.Params(":reponame"))
gitRepo, err := git.OpenRepository(repoPath)
if err != nil {
- ctx.APIError(500, "OpenRepository", err)
+ ctx.Error(500, "OpenRepository", err)
return
}
ctx.Repo.GitRepo = gitRepo
- repo.Download(ctx)
+ repo.Download(ctx.Context)
}
diff --git a/routers/api/v1/repo/hooks.go b/routers/api/v1/repo/hooks.go
index e0893a01..0cbe6762 100644
--- a/routers/api/v1/repo/hooks.go
+++ b/routers/api/v1/repo/hooks.go
@@ -12,40 +12,39 @@ import (
api "github.com/gogits/go-gogs-client"
"github.com/gogits/gogs/models"
- "github.com/gogits/gogs/modules/middleware"
+ "github.com/gogits/gogs/modules/context"
"github.com/gogits/gogs/routers/api/v1/convert"
)
// https://github.com/gogits/go-gogs-client/wiki/Repositories#list-hooks
-func ListHooks(ctx *middleware.Context) {
+func ListHooks(ctx *context.APIContext) {
hooks, err := models.GetWebhooksByRepoID(ctx.Repo.Repository.ID)
if err != nil {
- ctx.APIError(500, "GetWebhooksByRepoID", err)
+ ctx.Error(500, "GetWebhooksByRepoID", err)
return
}
apiHooks := make([]*api.Hook, len(hooks))
for i := range hooks {
- apiHooks[i] = convert.ToApiHook(ctx.Repo.RepoLink, hooks[i])
+ apiHooks[i] = convert.ToHook(ctx.Repo.RepoLink, hooks[i])
}
-
ctx.JSON(200, &apiHooks)
}
// https://github.com/gogits/go-gogs-client/wiki/Repositories#create-a-hook
-func CreateHook(ctx *middleware.Context, form api.CreateHookOption) {
+func CreateHook(ctx *context.APIContext, form api.CreateHookOption) {
if !models.IsValidHookTaskType(form.Type) {
- ctx.APIError(422, "", "Invalid hook type")
+ ctx.Error(422, "", "Invalid hook type")
return
}
for _, name := range []string{"url", "content_type"} {
if _, ok := form.Config[name]; !ok {
- ctx.APIError(422, "", "Missing config option: "+name)
+ ctx.Error(422, "", "Missing config option: "+name)
return
}
}
if !models.IsValidHookContentType(form.Config["content_type"]) {
- ctx.APIError(422, "", "Invalid content type")
+ ctx.Error(422, "", "Invalid content type")
return
}
@@ -70,7 +69,7 @@ func CreateHook(ctx *middleware.Context, form api.CreateHookOption) {
if w.HookTaskType == models.SLACK {
channel, ok := form.Config["channel"]
if !ok {
- ctx.APIError(422, "", "Missing config option: channel")
+ ctx.Error(422, "", "Missing config option: channel")
return
}
meta, err := json.Marshal(&models.SlackMeta{
@@ -80,31 +79,31 @@ func CreateHook(ctx *middleware.Context, form api.CreateHookOption) {
Color: form.Config["color"],
})
if err != nil {
- ctx.APIError(500, "slack: JSON marshal failed", err)
+ ctx.Error(500, "slack: JSON marshal failed", err)
return
}
w.Meta = string(meta)
}
if err := w.UpdateEvent(); err != nil {
- ctx.APIError(500, "UpdateEvent", err)
+ ctx.Error(500, "UpdateEvent", err)
return
} else if err := models.CreateWebhook(w); err != nil {
- ctx.APIError(500, "CreateWebhook", err)
+ ctx.Error(500, "CreateWebhook", err)
return
}
- ctx.JSON(201, convert.ToApiHook(ctx.Repo.RepoLink, w))
+ ctx.JSON(201, convert.ToHook(ctx.Repo.RepoLink, w))
}
// https://github.com/gogits/go-gogs-client/wiki/Repositories#edit-a-hook
-func EditHook(ctx *middleware.Context, form api.EditHookOption) {
+func EditHook(ctx *context.APIContext, form api.EditHookOption) {
w, err := models.GetWebhookByID(ctx.ParamsInt64(":id"))
if err != nil {
if models.IsErrWebhookNotExist(err) {
- ctx.Error(404)
+ ctx.Status(404)
} else {
- ctx.APIError(500, "GetWebhookByID", err)
+ ctx.Error(500, "GetWebhookByID", err)
}
return
}
@@ -115,7 +114,7 @@ func EditHook(ctx *middleware.Context, form api.EditHookOption) {
}
if ct, ok := form.Config["content_type"]; ok {
if !models.IsValidHookContentType(ct) {
- ctx.APIError(422, "", "Invalid content type")
+ ctx.Error(422, "", "Invalid content type")
return
}
w.ContentType = models.ToHookContentType(ct)
@@ -130,7 +129,7 @@ func EditHook(ctx *middleware.Context, form api.EditHookOption) {
Color: form.Config["color"],
})
if err != nil {
- ctx.APIError(500, "slack: JSON marshal failed", err)
+ ctx.Error(500, "slack: JSON marshal failed", err)
return
}
w.Meta = string(meta)
@@ -148,7 +147,7 @@ func EditHook(ctx *middleware.Context, form api.EditHookOption) {
w.Create = com.IsSliceContainsStr(form.Events, string(models.HOOK_EVENT_CREATE))
w.Push = com.IsSliceContainsStr(form.Events, string(models.HOOK_EVENT_PUSH))
if err = w.UpdateEvent(); err != nil {
- ctx.APIError(500, "UpdateEvent", err)
+ ctx.Error(500, "UpdateEvent", err)
return
}
@@ -157,9 +156,9 @@ func EditHook(ctx *middleware.Context, form api.EditHookOption) {
}
if err := models.UpdateWebhook(w); err != nil {
- ctx.APIError(500, "UpdateWebhook", err)
+ ctx.Error(500, "UpdateWebhook", err)
return
}
- ctx.JSON(200, convert.ToApiHook(ctx.Repo.RepoLink, w))
+ ctx.JSON(200, convert.ToHook(ctx.Repo.RepoLink, w))
}
diff --git a/routers/api/v1/repo/issue.go b/routers/api/v1/repo/issue.go
new file mode 100644
index 00000000..bdef1297
--- /dev/null
+++ b/routers/api/v1/repo/issue.go
@@ -0,0 +1,165 @@
+// Copyright 2016 The Gogs Authors. All rights reserved.
+// Use of this source code is governed by a MIT-style
+// license that can be found in the LICENSE file.
+
+package repo
+
+import (
+ "fmt"
+ "strings"
+
+ api "github.com/gogits/go-gogs-client"
+
+ "github.com/gogits/gogs/models"
+ "github.com/gogits/gogs/modules/context"
+ "github.com/gogits/gogs/modules/setting"
+ "github.com/gogits/gogs/routers/api/v1/convert"
+ "github.com/gogits/gogs/routers/repo"
+)
+
+func ListIssues(ctx *context.APIContext) {
+ issues, err := models.Issues(&models.IssuesOptions{
+ RepoID: ctx.Repo.Repository.ID,
+ Page: ctx.QueryInt("page"),
+ })
+ if err != nil {
+ ctx.Error(500, "Issues", err)
+ return
+ }
+
+ apiIssues := make([]*api.Issue, len(issues))
+ for i := range issues {
+ apiIssues[i] = convert.ToIssue(issues[i])
+ }
+
+ ctx.SetLinkHeader(ctx.Repo.Repository.NumIssues, setting.IssuePagingNum)
+ ctx.JSON(200, &apiIssues)
+}
+
+func GetIssue(ctx *context.APIContext) {
+ issue, err := models.GetIssueByIndex(ctx.Repo.Repository.ID, ctx.ParamsInt64(":index"))
+ if err != nil {
+ if models.IsErrIssueNotExist(err) {
+ ctx.Status(404)
+ } else {
+ ctx.Error(500, "GetIssueByIndex", err)
+ }
+ return
+ }
+
+ ctx.JSON(200, convert.ToIssue(issue))
+}
+
+func CreateIssue(ctx *context.APIContext, form api.CreateIssueOption) {
+ issue := &models.Issue{
+ RepoID: ctx.Repo.Repository.ID,
+ Name: form.Title,
+ PosterID: ctx.User.Id,
+ Poster: ctx.User,
+ Content: form.Body,
+ }
+
+ if ctx.Repo.IsWriter() {
+ if len(form.Assignee) > 0 {
+ assignee, err := models.GetUserByName(form.Assignee)
+ if err != nil {
+ if models.IsErrUserNotExist(err) {
+ ctx.Error(422, "", fmt.Sprintf("Assignee does not exist: [name: %s]", form.Assignee))
+ } else {
+ ctx.Error(500, "GetUserByName", err)
+ }
+ return
+ }
+ issue.AssigneeID = assignee.Id
+ }
+ issue.MilestoneID = form.Milestone
+ } else {
+ form.Labels = nil
+ }
+
+ if err := models.NewIssue(ctx.Repo.Repository, issue, form.Labels, nil); err != nil {
+ ctx.Error(500, "NewIssue", err)
+ return
+ } else if err := repo.MailWatchersAndMentions(ctx.Context, issue); err != nil {
+ ctx.Error(500, "MailWatchersAndMentions", err)
+ return
+ }
+
+ // Refetch from database to assign some automatic values
+ var err error
+ issue, err = models.GetIssueByID(issue.ID)
+ if err != nil {
+ ctx.Error(500, "GetIssueByID", err)
+ return
+ }
+ ctx.JSON(201, convert.ToIssue(issue))
+}
+
+func EditIssue(ctx *context.APIContext, form api.EditIssueOption) {
+ issue, err := models.GetIssueByIndex(ctx.Repo.Repository.ID, ctx.ParamsInt64(":index"))
+ if err != nil {
+ if models.IsErrIssueNotExist(err) {
+ ctx.Status(404)
+ } else {
+ ctx.Error(500, "GetIssueByIndex", err)
+ }
+ return
+ }
+
+ if !issue.IsPoster(ctx.User.Id) && !ctx.Repo.IsWriter() {
+ ctx.Status(403)
+ return
+ }
+
+ if len(form.Title) > 0 {
+ issue.Name = form.Title
+ }
+ if form.Body != nil {
+ issue.Content = *form.Body
+ }
+
+ if ctx.Repo.IsWriter() && form.Assignee != nil &&
+ (issue.Assignee == nil || issue.Assignee.LowerName != strings.ToLower(*form.Assignee)) {
+ if len(*form.Assignee) == 0 {
+ issue.AssigneeID = 0
+ } else {
+ assignee, err := models.GetUserByName(*form.Assignee)
+ if err != nil {
+ if models.IsErrUserNotExist(err) {
+ ctx.Error(422, "", fmt.Sprintf("Assignee does not exist: [name: %s]", *form.Assignee))
+ } else {
+ ctx.Error(500, "GetUserByName", err)
+ }
+ return
+ }
+ issue.AssigneeID = assignee.Id
+ }
+
+ if err = models.UpdateIssueUserByAssignee(issue); err != nil {
+ ctx.Error(500, "UpdateIssueUserByAssignee", err)
+ return
+ }
+ }
+ if ctx.Repo.IsWriter() && form.Milestone != nil &&
+ issue.MilestoneID != *form.Milestone {
+ oldMid := issue.MilestoneID
+ issue.MilestoneID = *form.Milestone
+ if err = models.ChangeMilestoneAssign(oldMid, issue); err != nil {
+ ctx.Error(500, "ChangeMilestoneAssign", err)
+ return
+ }
+ }
+
+ if err = models.UpdateIssue(issue); err != nil {
+ ctx.Error(500, "UpdateIssue", err)
+ return
+ }
+
+ // Refetch from database to assign some automatic values
+ issue, err = models.GetIssueByID(issue.ID)
+ if err != nil {
+ ctx.Error(500, "GetIssueByID", err)
+ return
+ }
+ ctx.JSON(201, convert.ToIssue(issue))
+}
diff --git a/routers/api/v1/repo/keys.go b/routers/api/v1/repo/keys.go
index 2ec0b754..563dac26 100644
--- a/routers/api/v1/repo/keys.go
+++ b/routers/api/v1/repo/keys.go
@@ -10,7 +10,7 @@ import (
api "github.com/gogits/go-gogs-client"
"github.com/gogits/gogs/models"
- "github.com/gogits/gogs/modules/middleware"
+ "github.com/gogits/gogs/modules/context"
"github.com/gogits/gogs/modules/setting"
"github.com/gogits/gogs/routers/api/v1/convert"
)
@@ -20,10 +20,10 @@ func composeDeployKeysAPILink(repoPath string) string {
}
// https://github.com/gogits/go-gogs-client/wiki/Repositories-Deploy-Keys#list-deploy-keys
-func ListDeployKeys(ctx *middleware.Context) {
+func ListDeployKeys(ctx *context.APIContext) {
keys, err := models.ListDeployKeys(ctx.Repo.Repository.ID)
if err != nil {
- ctx.Handle(500, "ListDeployKeys", err)
+ ctx.Error(500, "ListDeployKeys", err)
return
}
@@ -31,57 +31,57 @@ func ListDeployKeys(ctx *middleware.Context) {
apiKeys := make([]*api.DeployKey, len(keys))
for i := range keys {
if err = keys[i].GetContent(); err != nil {
- ctx.APIError(500, "GetContent", err)
+ ctx.Error(500, "GetContent", err)
return
}
- apiKeys[i] = convert.ToApiDeployKey(apiLink, keys[i])
+ apiKeys[i] = convert.ToDeployKey(apiLink, keys[i])
}
ctx.JSON(200, &apiKeys)
}
// https://github.com/gogits/go-gogs-client/wiki/Repositories-Deploy-Keys#get-a-deploy-key
-func GetDeployKey(ctx *middleware.Context) {
+func GetDeployKey(ctx *context.APIContext) {
key, err := models.GetDeployKeyByID(ctx.ParamsInt64(":id"))
if err != nil {
if models.IsErrDeployKeyNotExist(err) {
- ctx.Error(404)
+ ctx.Status(404)
} else {
- ctx.Handle(500, "GetDeployKeyByID", err)
+ ctx.Error(500, "GetDeployKeyByID", err)
}
return
}
if err = key.GetContent(); err != nil {
- ctx.APIError(500, "GetContent", err)
+ ctx.Error(500, "GetContent", err)
return
}
apiLink := composeDeployKeysAPILink(ctx.Repo.Owner.Name + "/" + ctx.Repo.Repository.Name)
- ctx.JSON(200, convert.ToApiDeployKey(apiLink, key))
+ ctx.JSON(200, convert.ToDeployKey(apiLink, key))
}
-func HandleCheckKeyStringError(ctx *middleware.Context, err error) {
+func HandleCheckKeyStringError(ctx *context.APIContext, err error) {
if models.IsErrKeyUnableVerify(err) {
- ctx.APIError(422, "", "Unable to verify key content")
+ ctx.Error(422, "", "Unable to verify key content")
} else {
- ctx.APIError(422, "", fmt.Errorf("Invalid key content: %v", err))
+ ctx.Error(422, "", fmt.Errorf("Invalid key content: %v", err))
}
}
-func HandleAddKeyError(ctx *middleware.Context, err error) {
+func HandleAddKeyError(ctx *context.APIContext, err error) {
switch {
case models.IsErrKeyAlreadyExist(err):
- ctx.APIError(422, "", "Key content has been used as non-deploy key")
+ ctx.Error(422, "", "Key content has been used as non-deploy key")
case models.IsErrKeyNameAlreadyUsed(err):
- ctx.APIError(422, "", "Key title has been used")
+ ctx.Error(422, "", "Key title has been used")
default:
- ctx.APIError(500, "AddKey", err)
+ ctx.Error(500, "AddKey", err)
}
}
// https://github.com/gogits/go-gogs-client/wiki/Repositories-Deploy-Keys#add-a-new-deploy-key
-func CreateDeployKey(ctx *middleware.Context, form api.CreateKeyOption) {
+func CreateDeployKey(ctx *context.APIContext, form api.CreateKeyOption) {
content, err := models.CheckPublicKeyString(form.Key)
if err != nil {
HandleCheckKeyStringError(ctx, err)
@@ -96,16 +96,16 @@ func CreateDeployKey(ctx *middleware.Context, form api.CreateKeyOption) {
key.Content = content
apiLink := composeDeployKeysAPILink(ctx.Repo.Owner.Name + "/" + ctx.Repo.Repository.Name)
- ctx.JSON(201, convert.ToApiDeployKey(apiLink, key))
+ ctx.JSON(201, convert.ToDeployKey(apiLink, key))
}
// https://github.com/gogits/go-gogs-client/wiki/Repositories-Deploy-Keys#remove-a-deploy-key
-func DeleteDeploykey(ctx *middleware.Context) {
+func DeleteDeploykey(ctx *context.APIContext) {
if err := models.DeleteDeployKey(ctx.User, ctx.ParamsInt64(":id")); err != nil {
if models.IsErrKeyAccessDenied(err) {
- ctx.APIError(403, "", "You do not have access to this key")
+ ctx.Error(403, "", "You do not have access to this key")
} else {
- ctx.APIError(500, "DeleteDeployKey", err)
+ ctx.Error(500, "DeleteDeployKey", err)
}
return
}
diff --git a/routers/api/v1/repo/repo.go b/routers/api/v1/repo/repo.go
index eb00aa88..90a323c2 100644
--- a/routers/api/v1/repo/repo.go
+++ b/routers/api/v1/repo/repo.go
@@ -13,29 +13,29 @@ import (
"github.com/gogits/gogs/models"
"github.com/gogits/gogs/modules/auth"
+ "github.com/gogits/gogs/modules/context"
"github.com/gogits/gogs/modules/log"
- "github.com/gogits/gogs/modules/middleware"
"github.com/gogits/gogs/modules/setting"
"github.com/gogits/gogs/routers/api/v1/convert"
)
// https://github.com/gogits/go-gogs-client/wiki/Repositories#search-repositories
-func Search(ctx *middleware.Context) {
- opt := models.SearchOption{
- Keyword: path.Base(ctx.Query("q")),
- Uid: com.StrTo(ctx.Query("uid")).MustInt64(),
- Limit: com.StrTo(ctx.Query("limit")).MustInt(),
+func Search(ctx *context.APIContext) {
+ opts := &models.SearchRepoOptions{
+ Keyword: path.Base(ctx.Query("q")),
+ OwnerID: com.StrTo(ctx.Query("uid")).MustInt64(),
+ PageSize: com.StrTo(ctx.Query("limit")).MustInt(),
}
- if opt.Limit == 0 {
- opt.Limit = 10
+ if opts.PageSize == 0 {
+ opts.PageSize = 10
}
// Check visibility.
- if ctx.IsSigned && opt.Uid > 0 {
- if ctx.User.Id == opt.Uid {
- opt.Private = true
+ if ctx.IsSigned && opts.OwnerID > 0 {
+ if ctx.User.Id == opts.OwnerID {
+ opts.Private = true
} else {
- u, err := models.GetUserByID(opt.Uid)
+ u, err := models.GetUserByID(opts.OwnerID)
if err != nil {
ctx.JSON(500, map[string]interface{}{
"ok": false,
@@ -44,13 +44,13 @@ func Search(ctx *middleware.Context) {
return
}
if u.IsOrganization() && u.IsOwnedBy(ctx.User.Id) {
- opt.Private = true
+ opts.Private = true
}
// FIXME: how about collaborators?
}
}
- repos, err := models.SearchRepositoryByName(opt)
+ repos, _, err := models.SearchRepositoryByName(opts)
if err != nil {
ctx.JSON(500, map[string]interface{}{
"ok": false,
@@ -69,7 +69,7 @@ func Search(ctx *middleware.Context) {
return
}
results[i] = &api.Repository{
- Id: repos[i].ID,
+ ID: repos[i].ID,
FullName: path.Join(repos[i].Owner.Name, repos[i].Name),
}
}
@@ -81,28 +81,28 @@ func Search(ctx *middleware.Context) {
}
// https://github.com/gogits/go-gogs-client/wiki/Repositories#list-your-repositories
-func ListMyRepos(ctx *middleware.Context) {
+func ListMyRepos(ctx *context.APIContext) {
ownRepos, err := models.GetRepositories(ctx.User.Id, true)
if err != nil {
- ctx.APIError(500, "GetRepositories", err)
+ ctx.Error(500, "GetRepositories", err)
return
}
numOwnRepos := len(ownRepos)
accessibleRepos, err := ctx.User.GetRepositoryAccesses()
if err != nil {
- ctx.APIError(500, "GetRepositoryAccesses", err)
+ ctx.Error(500, "GetRepositoryAccesses", err)
return
}
repos := make([]*api.Repository, numOwnRepos+len(accessibleRepos))
for i := range ownRepos {
- repos[i] = convert.ToApiRepository(ctx.User, ownRepos[i], api.Permission{true, true, true})
+ repos[i] = convert.ToRepository(ctx.User, ownRepos[i], api.Permission{true, true, true})
}
i := numOwnRepos
for repo, access := range accessibleRepos {
- repos[i] = convert.ToApiRepository(repo.Owner, repo, api.Permission{
+ repos[i] = convert.ToRepository(repo.Owner, repo, api.Permission{
Admin: access >= models.ACCESS_MODE_ADMIN,
Push: access >= models.ACCESS_MODE_WRITE,
Pull: true,
@@ -113,7 +113,7 @@ func ListMyRepos(ctx *middleware.Context) {
ctx.JSON(200, &repos)
}
-func CreateUserRepo(ctx *middleware.Context, owner *models.User, opt api.CreateRepoOption) {
+func CreateUserRepo(ctx *context.APIContext, owner *models.User, opt api.CreateRepoOption) {
repo, err := models.CreateRepository(owner, models.CreateRepoOptions{
Name: opt.Name,
Description: opt.Description,
@@ -127,51 +127,51 @@ func CreateUserRepo(ctx *middleware.Context, owner *models.User, opt api.CreateR
if models.IsErrRepoAlreadyExist(err) ||
models.IsErrNameReserved(err) ||
models.IsErrNamePatternNotAllowed(err) {
- ctx.APIError(422, "", err)
+ ctx.Error(422, "", err)
} else {
if repo != nil {
if err = models.DeleteRepository(ctx.User.Id, repo.ID); err != nil {
log.Error(4, "DeleteRepository: %v", err)
}
}
- ctx.APIError(500, "CreateRepository", err)
+ ctx.Error(500, "CreateRepository", err)
}
return
}
- ctx.JSON(201, convert.ToApiRepository(owner, repo, api.Permission{true, true, true}))
+ ctx.JSON(201, convert.ToRepository(owner, repo, api.Permission{true, true, true}))
}
// https://github.com/gogits/go-gogs-client/wiki/Repositories#create
-func Create(ctx *middleware.Context, opt api.CreateRepoOption) {
+func Create(ctx *context.APIContext, opt api.CreateRepoOption) {
// Shouldn't reach this condition, but just in case.
if ctx.User.IsOrganization() {
- ctx.APIError(422, "", "not allowed creating repository for organization")
+ ctx.Error(422, "", "not allowed creating repository for organization")
return
}
CreateUserRepo(ctx, ctx.User, opt)
}
-func CreateOrgRepo(ctx *middleware.Context, opt api.CreateRepoOption) {
+func CreateOrgRepo(ctx *context.APIContext, opt api.CreateRepoOption) {
org, err := models.GetOrgByName(ctx.Params(":org"))
if err != nil {
if models.IsErrUserNotExist(err) {
- ctx.APIError(422, "", err)
+ ctx.Error(422, "", err)
} else {
- ctx.APIError(500, "GetOrgByName", err)
+ ctx.Error(500, "GetOrgByName", err)
}
return
}
if !org.IsOwnedBy(ctx.User.Id) {
- ctx.APIError(403, "", "Given user is not owner of organization.")
+ ctx.Error(403, "", "Given user is not owner of organization.")
return
}
CreateUserRepo(ctx, org, opt)
}
// https://github.com/gogits/go-gogs-client/wiki/Repositories#migrate
-func Migrate(ctx *middleware.Context, form auth.MigrateRepoForm) {
+func Migrate(ctx *context.APIContext, form auth.MigrateRepoForm) {
ctxUser := ctx.User
// Not equal means context user is an organization,
// or is another user/organization if current user is admin.
@@ -179,9 +179,9 @@ func Migrate(ctx *middleware.Context, form auth.MigrateRepoForm) {
org, err := models.GetUserByID(form.Uid)
if err != nil {
if models.IsErrUserNotExist(err) {
- ctx.APIError(422, "", err)
+ ctx.Error(422, "", err)
} else {
- ctx.APIError(500, "GetUserByID", err)
+ ctx.Error(500, "GetUserByID", err)
}
return
}
@@ -189,14 +189,14 @@ func Migrate(ctx *middleware.Context, form auth.MigrateRepoForm) {
}
if ctx.HasError() {
- ctx.APIError(422, "", ctx.GetErrMsg())
+ ctx.Error(422, "", ctx.GetErrMsg())
return
}
if ctxUser.IsOrganization() && !ctx.User.IsAdmin {
// Check ownership of organization.
if !ctxUser.IsOwnedBy(ctx.User.Id) {
- ctx.APIError(403, "", "Given user is not owner of organization.")
+ ctx.Error(403, "", "Given user is not owner of organization.")
return
}
}
@@ -207,16 +207,16 @@ func Migrate(ctx *middleware.Context, form auth.MigrateRepoForm) {
addrErr := err.(models.ErrInvalidCloneAddr)
switch {
case addrErr.IsURLError:
- ctx.APIError(422, "", err)
+ ctx.Error(422, "", err)
case addrErr.IsPermissionDenied:
- ctx.APIError(422, "", "You are not allowed to import local repositories.")
+ ctx.Error(422, "", "You are not allowed to import local repositories.")
case addrErr.IsInvalidPath:
- ctx.APIError(422, "", "Invalid local path, it does not exist or not a directory.")
+ ctx.Error(422, "", "Invalid local path, it does not exist or not a directory.")
default:
- ctx.APIError(500, "ParseRemoteAddr", "Unknown error type (ErrInvalidCloneAddr): "+err.Error())
+ ctx.Error(500, "ParseRemoteAddr", "Unknown error type (ErrInvalidCloneAddr): "+err.Error())
}
} else {
- ctx.APIError(500, "ParseRemoteAddr", err)
+ ctx.Error(500, "ParseRemoteAddr", err)
}
return
}
@@ -234,21 +234,21 @@ func Migrate(ctx *middleware.Context, form auth.MigrateRepoForm) {
log.Error(4, "DeleteRepository: %v", errDelete)
}
}
- ctx.APIError(500, "MigrateRepository", models.HandleCloneUserCredentials(err.Error(), true))
+ ctx.Error(500, "MigrateRepository", models.HandleCloneUserCredentials(err.Error(), true))
return
}
log.Trace("Repository migrated: %s/%s", ctxUser.Name, form.RepoName)
- ctx.JSON(201, convert.ToApiRepository(ctxUser, repo, api.Permission{true, true, true}))
+ ctx.JSON(201, convert.ToRepository(ctxUser, repo, api.Permission{true, true, true}))
}
-func parseOwnerAndRepo(ctx *middleware.Context) (*models.User, *models.Repository) {
+func parseOwnerAndRepo(ctx *context.APIContext) (*models.User, *models.Repository) {
owner, err := models.GetUserByName(ctx.Params(":username"))
if err != nil {
if models.IsErrUserNotExist(err) {
- ctx.APIError(422, "", err)
+ ctx.Error(422, "", err)
} else {
- ctx.APIError(500, "GetUserByName", err)
+ ctx.Error(500, "GetUserByName", err)
}
return nil, nil
}
@@ -256,9 +256,9 @@ func parseOwnerAndRepo(ctx *middleware.Context) (*models.User, *models.Repositor
repo, err := models.GetRepositoryByName(owner.Id, ctx.Params(":reponame"))
if err != nil {
if models.IsErrRepoNotExist(err) {
- ctx.Error(404)
+ ctx.Status(404)
} else {
- ctx.APIError(500, "GetRepositoryByName", err)
+ ctx.Error(500, "GetRepositoryByName", err)
}
return nil, nil
}
@@ -267,29 +267,29 @@ func parseOwnerAndRepo(ctx *middleware.Context) (*models.User, *models.Repositor
}
// https://github.com/gogits/go-gogs-client/wiki/Repositories#get
-func Get(ctx *middleware.Context) {
+func Get(ctx *context.APIContext) {
owner, repo := parseOwnerAndRepo(ctx)
if ctx.Written() {
return
}
- ctx.JSON(200, convert.ToApiRepository(owner, repo, api.Permission{true, true, true}))
+ ctx.JSON(200, convert.ToRepository(owner, repo, api.Permission{true, true, true}))
}
// https://github.com/gogits/go-gogs-client/wiki/Repositories#delete
-func Delete(ctx *middleware.Context) {
+func Delete(ctx *context.APIContext) {
owner, repo := parseOwnerAndRepo(ctx)
if ctx.Written() {
return
}
if owner.IsOrganization() && !owner.IsOwnedBy(ctx.User.Id) {
- ctx.APIError(403, "", "Given user is not owner of organization.")
+ ctx.Error(403, "", "Given user is not owner of organization.")
return
}
if err := models.DeleteRepository(owner.Id, repo.ID); err != nil {
- ctx.APIError(500, "DeleteRepository", err)
+ ctx.Error(500, "DeleteRepository", err)
return
}
diff --git a/routers/api/v1/user/app.go b/routers/api/v1/user/app.go
index 00aacbdc..da030e98 100644
--- a/routers/api/v1/user/app.go
+++ b/routers/api/v1/user/app.go
@@ -8,14 +8,14 @@ import (
api "github.com/gogits/go-gogs-client"
"github.com/gogits/gogs/models"
- "github.com/gogits/gogs/modules/middleware"
+ "github.com/gogits/gogs/modules/context"
)
// https://github.com/gogits/go-gogs-client/wiki/Users#list-access-tokens-for-a-user
-func ListAccessTokens(ctx *middleware.Context) {
+func ListAccessTokens(ctx *context.APIContext) {
tokens, err := models.ListAccessTokens(ctx.User.Id)
if err != nil {
- ctx.APIError(500, "ListAccessTokens", err)
+ ctx.Error(500, "ListAccessTokens", err)
return
}
@@ -27,13 +27,13 @@ func ListAccessTokens(ctx *middleware.Context) {
}
// https://github.com/gogits/go-gogs-client/wiki/Users#create-a-access-token
-func CreateAccessToken(ctx *middleware.Context, form api.CreateAccessTokenOption) {
+func CreateAccessToken(ctx *context.APIContext, form api.CreateAccessTokenOption) {
t := &models.AccessToken{
UID: ctx.User.Id,
Name: form.Name,
}
if err := models.NewAccessToken(t); err != nil {
- ctx.APIError(500, "NewAccessToken", err)
+ ctx.Error(500, "NewAccessToken", err)
return
}
ctx.JSON(201, &api.AccessToken{t.Name, t.Sha1})
diff --git a/routers/api/v1/user/email.go b/routers/api/v1/user/email.go
index fd9193bd..6a3d525c 100644
--- a/routers/api/v1/user/email.go
+++ b/routers/api/v1/user/email.go
@@ -8,27 +8,27 @@ import (
api "github.com/gogits/go-gogs-client"
"github.com/gogits/gogs/models"
- "github.com/gogits/gogs/modules/middleware"
+ "github.com/gogits/gogs/modules/context"
"github.com/gogits/gogs/modules/setting"
"github.com/gogits/gogs/routers/api/v1/convert"
)
// https://github.com/gogits/go-gogs-client/wiki/Users-Emails#list-email-addresses-for-a-user
-func ListEmails(ctx *middleware.Context) {
+func ListEmails(ctx *context.APIContext) {
emails, err := models.GetEmailAddresses(ctx.User.Id)
if err != nil {
- ctx.Handle(500, "GetEmailAddresses", err)
+ ctx.Error(500, "GetEmailAddresses", err)
return
}
apiEmails := make([]*api.Email, len(emails))
for i := range emails {
- apiEmails[i] = convert.ToApiEmail(emails[i])
+ apiEmails[i] = convert.ToEmail(emails[i])
}
ctx.JSON(200, &apiEmails)
}
// https://github.com/gogits/go-gogs-client/wiki/Users-Emails#add-email-addresses
-func AddEmail(ctx *middleware.Context, form api.CreateEmailOption) {
+func AddEmail(ctx *context.APIContext, form api.CreateEmailOption) {
if len(form.Emails) == 0 {
ctx.Status(422)
return
@@ -45,22 +45,22 @@ func AddEmail(ctx *middleware.Context, form api.CreateEmailOption) {
if err := models.AddEmailAddresses(emails); err != nil {
if models.IsErrEmailAlreadyUsed(err) {
- ctx.APIError(422, "", "Email address has been used: "+err.(models.ErrEmailAlreadyUsed).Email)
+ ctx.Error(422, "", "Email address has been used: "+err.(models.ErrEmailAlreadyUsed).Email)
} else {
- ctx.APIError(500, "AddEmailAddresses", err)
+ ctx.Error(500, "AddEmailAddresses", err)
}
return
}
apiEmails := make([]*api.Email, len(emails))
for i := range emails {
- apiEmails[i] = convert.ToApiEmail(emails[i])
+ apiEmails[i] = convert.ToEmail(emails[i])
}
ctx.JSON(201, &apiEmails)
}
// https://github.com/gogits/go-gogs-client/wiki/Users-Emails#delete-email-addresses
-func DeleteEmail(ctx *middleware.Context, form api.CreateEmailOption) {
+func DeleteEmail(ctx *context.APIContext, form api.CreateEmailOption) {
if len(form.Emails) == 0 {
ctx.Status(204)
return
@@ -74,7 +74,7 @@ func DeleteEmail(ctx *middleware.Context, form api.CreateEmailOption) {
}
if err := models.DeleteEmailAddresses(emails); err != nil {
- ctx.APIError(500, "DeleteEmailAddresses", err)
+ ctx.Error(500, "DeleteEmailAddresses", err)
return
}
ctx.Status(204)
diff --git a/routers/api/v1/user/followers.go b/routers/api/v1/user/followers.go
index 0a289796..00d1952d 100644
--- a/routers/api/v1/user/followers.go
+++ b/routers/api/v1/user/followers.go
@@ -8,33 +8,33 @@ import (
api "github.com/gogits/go-gogs-client"
"github.com/gogits/gogs/models"
- "github.com/gogits/gogs/modules/middleware"
+ "github.com/gogits/gogs/modules/context"
"github.com/gogits/gogs/routers/api/v1/convert"
)
-func responseApiUsers(ctx *middleware.Context, users []*models.User) {
+func responseApiUsers(ctx *context.APIContext, users []*models.User) {
apiUsers := make([]*api.User, len(users))
for i := range users {
- apiUsers[i] = convert.ToApiUser(users[i])
+ apiUsers[i] = convert.ToUser(users[i])
}
ctx.JSON(200, &apiUsers)
}
-func listUserFollowers(ctx *middleware.Context, u *models.User) {
+func listUserFollowers(ctx *context.APIContext, u *models.User) {
users, err := u.GetFollowers(ctx.QueryInt("page"))
if err != nil {
- ctx.APIError(500, "GetUserFollowers", err)
+ ctx.Error(500, "GetUserFollowers", err)
return
}
responseApiUsers(ctx, users)
}
-func ListMyFollowers(ctx *middleware.Context) {
+func ListMyFollowers(ctx *context.APIContext) {
listUserFollowers(ctx, ctx.User)
}
// https://github.com/gogits/go-gogs-client/wiki/Users-Followers#list-followers-of-a-user
-func ListFollowers(ctx *middleware.Context) {
+func ListFollowers(ctx *context.APIContext) {
u := GetUserByParams(ctx)
if ctx.Written() {
return
@@ -42,21 +42,21 @@ func ListFollowers(ctx *middleware.Context) {
listUserFollowers(ctx, u)
}
-func listUserFollowing(ctx *middleware.Context, u *models.User) {
+func listUserFollowing(ctx *context.APIContext, u *models.User) {
users, err := u.GetFollowing(ctx.QueryInt("page"))
if err != nil {
- ctx.APIError(500, "GetFollowing", err)
+ ctx.Error(500, "GetFollowing", err)
return
}
responseApiUsers(ctx, users)
}
-func ListMyFollowing(ctx *middleware.Context) {
+func ListMyFollowing(ctx *context.APIContext) {
listUserFollowing(ctx, ctx.User)
}
// https://github.com/gogits/go-gogs-client/wiki/Users-Followers#list-users-followed-by-another-user
-func ListFollowing(ctx *middleware.Context) {
+func ListFollowing(ctx *context.APIContext) {
u := GetUserByParams(ctx)
if ctx.Written() {
return
@@ -64,16 +64,16 @@ func ListFollowing(ctx *middleware.Context) {
listUserFollowing(ctx, u)
}
-func checkUserFollowing(ctx *middleware.Context, u *models.User, followID int64) {
+func checkUserFollowing(ctx *context.APIContext, u *models.User, followID int64) {
if u.IsFollowing(followID) {
ctx.Status(204)
} else {
- ctx.Error(404)
+ ctx.Status(404)
}
}
// https://github.com/gogits/go-gogs-client/wiki/Users-Followers#check-if-you-are-following-a-user
-func CheckMyFollowing(ctx *middleware.Context) {
+func CheckMyFollowing(ctx *context.APIContext) {
target := GetUserByParams(ctx)
if ctx.Written() {
return
@@ -82,7 +82,7 @@ func CheckMyFollowing(ctx *middleware.Context) {
}
// https://github.com/gogits/go-gogs-client/wiki/Users-Followers#check-if-one-user-follows-another
-func CheckFollowing(ctx *middleware.Context) {
+func CheckFollowing(ctx *context.APIContext) {
u := GetUserByParams(ctx)
if ctx.Written() {
return
@@ -95,26 +95,26 @@ func CheckFollowing(ctx *middleware.Context) {
}
// https://github.com/gogits/go-gogs-client/wiki/Users-Followers#follow-a-user
-func Follow(ctx *middleware.Context) {
+func Follow(ctx *context.APIContext) {
target := GetUserByParams(ctx)
if ctx.Written() {
return
}
if err := models.FollowUser(ctx.User.Id, target.Id); err != nil {
- ctx.APIError(500, "FollowUser", err)
+ ctx.Error(500, "FollowUser", err)
return
}
ctx.Status(204)
}
// https://github.com/gogits/go-gogs-client/wiki/Users-Followers#unfollow-a-user
-func Unfollow(ctx *middleware.Context) {
+func Unfollow(ctx *context.APIContext) {
target := GetUserByParams(ctx)
if ctx.Written() {
return
}
if err := models.UnfollowUser(ctx.User.Id, target.Id); err != nil {
- ctx.APIError(500, "UnfollowUser", err)
+ ctx.Error(500, "UnfollowUser", err)
return
}
ctx.Status(204)
diff --git a/routers/api/v1/user/keys.go b/routers/api/v1/user/keys.go
index 8ba73d99..7337112e 100644
--- a/routers/api/v1/user/keys.go
+++ b/routers/api/v1/user/keys.go
@@ -8,19 +8,19 @@ import (
api "github.com/gogits/go-gogs-client"
"github.com/gogits/gogs/models"
- "github.com/gogits/gogs/modules/middleware"
+ "github.com/gogits/gogs/modules/context"
"github.com/gogits/gogs/modules/setting"
"github.com/gogits/gogs/routers/api/v1/convert"
"github.com/gogits/gogs/routers/api/v1/repo"
)
-func GetUserByParamsName(ctx *middleware.Context, name string) *models.User {
+func GetUserByParamsName(ctx *context.APIContext, name string) *models.User {
user, err := models.GetUserByName(ctx.Params(name))
if err != nil {
if models.IsErrUserNotExist(err) {
- ctx.Error(404)
+ ctx.Status(404)
} else {
- ctx.APIError(500, "GetUserByName", err)
+ ctx.Error(500, "GetUserByName", err)
}
return nil
}
@@ -28,7 +28,7 @@ func GetUserByParamsName(ctx *middleware.Context, name string) *models.User {
}
// GetUserByParams returns user whose name is presented in URL paramenter.
-func GetUserByParams(ctx *middleware.Context) *models.User {
+func GetUserByParams(ctx *context.APIContext) *models.User {
return GetUserByParamsName(ctx, ":username")
}
@@ -36,29 +36,29 @@ func composePublicKeysAPILink() string {
return setting.AppUrl + "api/v1/user/keys/"
}
-func listPublicKeys(ctx *middleware.Context, uid int64) {
+func listPublicKeys(ctx *context.APIContext, uid int64) {
keys, err := models.ListPublicKeys(uid)
if err != nil {
- ctx.APIError(500, "ListPublicKeys", err)
+ ctx.Error(500, "ListPublicKeys", err)
return
}
apiLink := composePublicKeysAPILink()
apiKeys := make([]*api.PublicKey, len(keys))
for i := range keys {
- apiKeys[i] = convert.ToApiPublicKey(apiLink, keys[i])
+ apiKeys[i] = convert.ToPublicKey(apiLink, keys[i])
}
ctx.JSON(200, &apiKeys)
}
// https://github.com/gogits/go-gogs-client/wiki/Users-Public-Keys#list-your-public-keys
-func ListMyPublicKeys(ctx *middleware.Context) {
+func ListMyPublicKeys(ctx *context.APIContext) {
listPublicKeys(ctx, ctx.User.Id)
}
// https://github.com/gogits/go-gogs-client/wiki/Users-Public-Keys#list-public-keys-for-a-user
-func ListPublicKeys(ctx *middleware.Context) {
+func ListPublicKeys(ctx *context.APIContext) {
user := GetUserByParams(ctx)
if ctx.Written() {
return
@@ -67,23 +67,23 @@ func ListPublicKeys(ctx *middleware.Context) {
}
// https://github.com/gogits/go-gogs-client/wiki/Users-Public-Keys#get-a-single-public-key
-func GetPublicKey(ctx *middleware.Context) {
+func GetPublicKey(ctx *context.APIContext) {
key, err := models.GetPublicKeyByID(ctx.ParamsInt64(":id"))
if err != nil {
if models.IsErrKeyNotExist(err) {
- ctx.Error(404)
+ ctx.Status(404)
} else {
- ctx.Handle(500, "GetPublicKeyByID", err)
+ ctx.Error(500, "GetPublicKeyByID", err)
}
return
}
apiLink := composePublicKeysAPILink()
- ctx.JSON(200, convert.ToApiPublicKey(apiLink, key))
+ ctx.JSON(200, convert.ToPublicKey(apiLink, key))
}
// CreateUserPublicKey creates new public key to given user by ID.
-func CreateUserPublicKey(ctx *middleware.Context, form api.CreateKeyOption, uid int64) {
+func CreateUserPublicKey(ctx *context.APIContext, form api.CreateKeyOption, uid int64) {
content, err := models.CheckPublicKeyString(form.Key)
if err != nil {
repo.HandleCheckKeyStringError(ctx, err)
@@ -96,21 +96,21 @@ func CreateUserPublicKey(ctx *middleware.Context, form api.CreateKeyOption, uid
return
}
apiLink := composePublicKeysAPILink()
- ctx.JSON(201, convert.ToApiPublicKey(apiLink, key))
+ ctx.JSON(201, convert.ToPublicKey(apiLink, key))
}
// https://github.com/gogits/go-gogs-client/wiki/Users-Public-Keys#create-a-public-key
-func CreatePublicKey(ctx *middleware.Context, form api.CreateKeyOption) {
+func CreatePublicKey(ctx *context.APIContext, form api.CreateKeyOption) {
CreateUserPublicKey(ctx, form, ctx.User.Id)
}
// https://github.com/gogits/go-gogs-client/wiki/Users-Public-Keys#delete-a-public-key
-func DeletePublicKey(ctx *middleware.Context) {
+func DeletePublicKey(ctx *context.APIContext) {
if err := models.DeletePublicKey(ctx.User, ctx.ParamsInt64(":id")); err != nil {
if models.IsErrKeyAccessDenied(err) {
- ctx.APIError(403, "", "You do not have access to this key")
+ ctx.Error(403, "", "You do not have access to this key")
} else {
- ctx.APIError(500, "DeletePublicKey", err)
+ ctx.Error(500, "DeletePublicKey", err)
}
return
}
diff --git a/routers/api/v1/user/user.go b/routers/api/v1/user/user.go
index 6d4b52ff..b460d942 100644
--- a/routers/api/v1/user/user.go
+++ b/routers/api/v1/user/user.go
@@ -10,20 +10,21 @@ import (
api "github.com/gogits/go-gogs-client"
"github.com/gogits/gogs/models"
- "github.com/gogits/gogs/modules/middleware"
+ "github.com/gogits/gogs/modules/context"
)
// https://github.com/gogits/go-gogs-client/wiki/Users#search-users
-func Search(ctx *middleware.Context) {
- opt := models.SearchOption{
- Keyword: ctx.Query("q"),
- Limit: com.StrTo(ctx.Query("limit")).MustInt(),
+func Search(ctx *context.APIContext) {
+ opts := &models.SearchUserOptions{
+ Keyword: ctx.Query("q"),
+ Type: models.USER_TYPE_INDIVIDUAL,
+ PageSize: com.StrTo(ctx.Query("limit")).MustInt(),
}
- if opt.Limit == 0 {
- opt.Limit = 10
+ if opts.PageSize == 0 {
+ opts.PageSize = 10
}
- us, err := models.SearchUserByName(opt)
+ users, _, err := models.SearchUserByName(opts)
if err != nil {
ctx.JSON(500, map[string]interface{}{
"ok": false,
@@ -32,16 +33,16 @@ func Search(ctx *middleware.Context) {
return
}
- results := make([]*api.User, len(us))
- for i := range us {
+ results := make([]*api.User, len(users))
+ for i := range users {
results[i] = &api.User{
- ID: us[i].Id,
- UserName: us[i].Name,
- AvatarUrl: us[i].AvatarLink(),
- FullName: us[i].FullName,
+ ID: users[i].Id,
+ UserName: users[i].Name,
+ AvatarUrl: users[i].AvatarLink(),
+ FullName: users[i].FullName,
}
if ctx.IsSigned {
- results[i].Email = us[i].Email
+ results[i].Email = users[i].Email
}
}
@@ -52,13 +53,13 @@ func Search(ctx *middleware.Context) {
}
// https://github.com/gogits/go-gogs-client/wiki/Users#get-a-single-user
-func GetInfo(ctx *middleware.Context) {
+func GetInfo(ctx *context.APIContext) {
u, err := models.GetUserByName(ctx.Params(":username"))
if err != nil {
if models.IsErrUserNotExist(err) {
- ctx.Error(404)
+ ctx.Status(404)
} else {
- ctx.APIError(500, "GetUserByName", err)
+ ctx.Error(500, "GetUserByName", err)
}
return
}
Powered by cgit, Themed by Ted Yin.