routes/api/v1: codemod

5 files changed, 30 insertions, 36 deletions

diff --git a/routes/api/v1/admin/org.go b/routes/api/v1/admin/org.go
index 88468426..d01de993 100644
--- a/routes/api/v1/admin/org.go
+++ b/routes/api/v1/admin/org.go
@@ -12,7 +12,6 @@ import (
 	"github.com/gogs/gogs/routes/api/v1/user"
 )
 
-// https://github.com/gogs/go-gogs-client/wiki/Administration-Organizations#create-a-new-organization
 func CreateOrg(c *context.APIContext, form api.CreateOrgOption) {
 	org.CreateOrgForUser(c, form, user.GetUserByParams(c))
 }
diff --git a/routes/api/v1/admin/org_repo.go b/routes/api/v1/admin/org_repo.go
index a2064921..b99a144f 100644
--- a/routes/api/v1/admin/org_repo.go
+++ b/routes/api/v1/admin/org_repo.go
@@ -13,11 +13,7 @@ import (
 func GetRepositoryByParams(c *context.APIContext) *models.Repository {
 	repo, err := models.GetRepositoryByName(c.Org.Team.OrgID, c.Params(":reponame"))
 	if err != nil {
-		if errors.IsRepoNotExist(err) {
-			c.Status(404)
-		} else {
-			c.Error(500, "GetRepositoryByName", err)
-		}
+		c.NotFoundOrServerError("GetRepositoryByName", errors.IsRepoNotExist, err)
 		return nil
 	}
 	return repo
@@ -29,11 +25,11 @@ func AddTeamRepository(c *context.APIContext) {
 		return
 	}
 	if err := c.Org.Team.AddRepository(repo); err != nil {
-		c.Error(500, "AddRepository", err)
+		c.ServerError("AddRepository", err)
 		return
 	}
 
-	c.Status(204)
+	c.NoContent()
 }
 
 func RemoveTeamRepository(c *context.APIContext) {
@@ -42,9 +38,9 @@ func RemoveTeamRepository(c *context.APIContext) {
 		return
 	}
 	if err := c.Org.Team.RemoveRepository(repo.ID); err != nil {
-		c.Error(500, "RemoveRepository", err)
+		c.ServerError("RemoveRepository", err)
 		return
 	}
 
-	c.Status(204)
+	c.NoContent()
 }
diff --git a/routes/api/v1/admin/org_team.go b/routes/api/v1/admin/org_team.go
index 5ddf6ae1..7083c4ae 100644
--- a/routes/api/v1/admin/org_team.go
+++ b/routes/api/v1/admin/org_team.go
@@ -5,6 +5,8 @@
 package admin
 
 import (
+	"net/http"
+
 	api "github.com/gogs/go-gogs-client"
 
 	"github.com/gogs/gogs/models"
@@ -22,14 +24,14 @@ func CreateTeam(c *context.APIContext, form api.CreateTeamOption) {
 	}
 	if err := models.NewTeam(team); err != nil {
 		if models.IsErrTeamAlreadyExist(err) {
-			c.Error(422, "", err)
+			c.Error(http.StatusUnprocessableEntity, "", err)
 		} else {
-			c.Error(500, "NewTeam", err)
+			c.ServerError("NewTeam", err)
 		}
 		return
 	}
 
-	c.JSON(201, convert.ToTeam(team))
+	c.JSON(http.StatusCreated, convert.ToTeam(team))
 }
 
 func AddTeamMember(c *context.APIContext) {
@@ -38,11 +40,11 @@ func AddTeamMember(c *context.APIContext) {
 		return
 	}
 	if err := c.Org.Team.AddMember(u.ID); err != nil {
-		c.Error(500, "AddMember", err)
+		c.ServerError("AddMember", err)
 		return
 	}
 
-	c.Status(204)
+	c.NoContent()
 }
 
 func RemoveTeamMember(c *context.APIContext) {
@@ -52,9 +54,9 @@ func RemoveTeamMember(c *context.APIContext) {
 	}
 
 	if err := c.Org.Team.RemoveMember(u.ID); err != nil {
-		c.Error(500, "RemoveMember", err)
+		c.ServerError("RemoveMember", err)
 		return
 	}
 
-	c.Status(204)
+	c.NoContent()
 }
diff --git a/routes/api/v1/admin/repo.go b/routes/api/v1/admin/repo.go
index cec04b49..7e0507bc 100644
--- a/routes/api/v1/admin/repo.go
+++ b/routes/api/v1/admin/repo.go
@@ -12,7 +12,6 @@ import (
 	"github.com/gogs/gogs/routes/api/v1/user"
 )
 
-// https://github.com/gogs/go-gogs-client/wiki/Administration-Repositories#create-a-new-repository
 func CreateRepo(c *context.APIContext, form api.CreateRepoOption) {
 	owner := user.GetUserByParams(c)
 	if c.Written() {
diff --git a/routes/api/v1/admin/user.go b/routes/api/v1/admin/user.go
index b35e3096..8e7c630e 100644
--- a/routes/api/v1/admin/user.go
+++ b/routes/api/v1/admin/user.go
@@ -5,6 +5,8 @@
 package admin
 
 import (
+	"net/http"
+
 	log "gopkg.in/clog.v1"
 
 	api "github.com/gogs/go-gogs-client"
@@ -25,9 +27,9 @@ func parseLoginSource(c *context.APIContext, u *models.User, sourceID int64, log
 	source, err := models.GetLoginSourceByID(sourceID)
 	if err != nil {
 		if errors.IsLoginSourceNotExist(err) {
-			c.Error(422, "", err)
+			c.Error(http.StatusUnprocessableEntity, "", err)
 		} else {
-			c.Error(500, "GetLoginSourceByID", err)
+			c.ServerError("GetLoginSourceByID", err)
 		}
 		return
 	}
@@ -37,7 +39,6 @@ func parseLoginSource(c *context.APIContext, u *models.User, sourceID int64, log
 	u.LoginName = loginName
 }
 
-// https://github.com/gogs/go-gogs-client/wiki/Administration-Users#create-a-new-user
 func CreateUser(c *context.APIContext, form api.CreateUserOption) {
 	u := &models.User{
 		Name:      form.Username,
@@ -58,23 +59,22 @@ func CreateUser(c *context.APIContext, form api.CreateUserOption) {
 			models.IsErrEmailAlreadyUsed(err) ||
 			models.IsErrNameReserved(err) ||
 			models.IsErrNamePatternNotAllowed(err) {
-			c.Error(422, "", err)
+			c.Error(http.StatusUnprocessableEntity, "", err)
 		} else {
-			c.Error(500, "CreateUser", err)
+			c.ServerError("CreateUser", err)
 		}
 		return
 	}
-	log.Trace("Account created by admin (%s): %s", c.User.Name, u.Name)
+	log.Trace("Account created by admin %q: %s", c.User.Name, u.Name)
 
 	// Send email notification.
 	if form.SendNotify && setting.MailService != nil {
 		mailer.SendRegisterNotifyMail(c.Context.Context, models.NewMailerUser(u))
 	}
 
-	c.JSON(201, u.APIFormat())
+	c.JSON(http.StatusCreated, u.APIFormat())
 }
 
-// https://github.com/gogs/go-gogs-client/wiki/Administration-Users#edit-an-existing-user
 func EditUser(c *context.APIContext, form api.EditUserOption) {
 	u := user.GetUserByParams(c)
 	if c.Written() {
@@ -90,7 +90,7 @@ func EditUser(c *context.APIContext, form api.EditUserOption) {
 		u.Passwd = form.Password
 		var err error
 		if u.Salt, err = models.GetUserSalt(); err != nil {
-			c.Error(500, "UpdateUser", err)
+			c.ServerError("GetUserSalt", err)
 			return
 		}
 		u.EncodePasswd()
@@ -119,18 +119,17 @@ func EditUser(c *context.APIContext, form api.EditUserOption) {
 
 	if err := models.UpdateUser(u); err != nil {
 		if models.IsErrEmailAlreadyUsed(err) {
-			c.Error(422, "", err)
+			c.Error(http.StatusUnprocessableEntity, "", err)
 		} else {
-			c.Error(500, "UpdateUser", err)
+			c.ServerError("UpdateUser", err)
 		}
 		return
 	}
-	log.Trace("Account profile updated by admin (%s): %s", c.User.Name, u.Name)
+	log.Trace("Account profile updated by admin %q: %s", c.User.Name, u.Name)
 
-	c.JSON(200, u.APIFormat())
+	c.JSONSuccess(u.APIFormat())
 }
 
-// https://github.com/gogs/go-gogs-client/wiki/Administration-Users#delete-a-user
 func DeleteUser(c *context.APIContext) {
 	u := user.GetUserByParams(c)
 	if c.Written() {
@@ -140,18 +139,17 @@ func DeleteUser(c *context.APIContext) {
 	if err := models.DeleteUser(u); err != nil {
 		if models.IsErrUserOwnRepos(err) ||
 			models.IsErrUserHasOrgs(err) {
-			c.Error(422, "", err)
+			c.Error(http.StatusUnprocessableEntity, "", err)
 		} else {
-			c.Error(500, "DeleteUser", err)
+			c.ServerError("DeleteUser", err)
 		}
 		return
 	}
 	log.Trace("Account deleted by admin(%s): %s", c.User.Name, u.Name)
 
-	c.Status(204)
+	c.NoContent()
 }
 
-// https://github.com/gogs/go-gogs-client/wiki/Administration-Users#create-a-public-key-for-user
 func CreatePublicKey(c *context.APIContext, form api.CreateKeyOption) {
 	u := user.GetUserByParams(c)
 	if c.Written() {