aboutsummaryrefslogtreecommitdiffstats
path: root/routers/api
diff options
context:
space:
mode:
authorkolaente <konrad@kola-entertainments.de>2019-06-12 21:41:28 +0200
committertechknowlogick <techknowlogick@gitea.io>2019-06-12 15:41:28 -0400
commitf9ec2f89f2265bc1371a6c62359de9816534fa6b (patch)
treef48b138a457e5ac6cf843bbb38400926704370f7 /routers/api
parent5832f8d90df2d72cb38698c3e9050f2b29717dc7 (diff)
downloadgitea-f9ec2f89f2265bc1371a6c62359de9816534fa6b.tar.gz
gitea-f9ec2f89f2265bc1371a6c62359de9816534fa6b.zip
Add golangci (#6418)
Diffstat (limited to 'routers/api')
-rw-r--r--routers/api/v1/misc/markdown.go27
-rw-r--r--routers/api/v1/repo/pull.go12
-rw-r--r--routers/api/v1/repo/repo.go9
-rw-r--r--routers/api/v1/user/gpg_key.go5
4 files changed, 32 insertions, 21 deletions
diff --git a/routers/api/v1/misc/markdown.go b/routers/api/v1/misc/markdown.go
index 06e344a15b..b00b00c499 100644
--- a/routers/api/v1/misc/markdown.go
+++ b/routers/api/v1/misc/markdown.go
@@ -5,6 +5,7 @@
package misc
import (
+ "net/http"
"strings"
api "code.gitea.io/gitea/modules/structs"
@@ -42,7 +43,7 @@ func Markdown(ctx *context.APIContext, form api.MarkdownOption) {
}
if len(form.Text) == 0 {
- ctx.Write([]byte(""))
+ _, _ = ctx.Write([]byte(""))
return
}
@@ -63,12 +64,24 @@ func Markdown(ctx *context.APIContext, form api.MarkdownOption) {
meta = ctx.Repo.Repository.ComposeMetas()
}
if form.Wiki {
- ctx.Write([]byte(markdown.RenderWiki(md, urlPrefix, meta)))
+ _, err := ctx.Write([]byte(markdown.RenderWiki(md, urlPrefix, meta)))
+ if err != nil {
+ ctx.Error(http.StatusInternalServerError, "", err)
+ return
+ }
} else {
- ctx.Write(markdown.Render(md, urlPrefix, meta))
+ _, err := ctx.Write(markdown.Render(md, urlPrefix, meta))
+ if err != nil {
+ ctx.Error(http.StatusInternalServerError, "", err)
+ return
+ }
}
default:
- ctx.Write(markdown.RenderRaw([]byte(form.Text), "", false))
+ _, err := ctx.Write(markdown.RenderRaw([]byte(form.Text), "", false))
+ if err != nil {
+ ctx.Error(http.StatusInternalServerError, "", err)
+ return
+ }
}
}
@@ -98,5 +111,9 @@ func MarkdownRaw(ctx *context.APIContext) {
ctx.Error(422, "", err)
return
}
- ctx.Write(markdown.RenderRaw(body, "", false))
+ _, err = ctx.Write(markdown.RenderRaw(body, "", false))
+ if err != nil {
+ ctx.Error(http.StatusInternalServerError, "", err)
+ return
+ }
}
diff --git a/routers/api/v1/repo/pull.go b/routers/api/v1/repo/pull.go
index 0e1db144b1..b14b0b02b8 100644
--- a/routers/api/v1/repo/pull.go
+++ b/routers/api/v1/repo/pull.go
@@ -353,7 +353,11 @@ func EditPullRequest(ctx *context.APIContext, form api.EditPullRequestOption) {
return
}
- pr.LoadIssue()
+ err = pr.LoadIssue()
+ if err != nil {
+ ctx.Error(http.StatusInternalServerError, "LoadIssue", err)
+ return
+ }
issue := pr.Issue
issue.Repo = ctx.Repo.Repository
@@ -547,7 +551,11 @@ func MergePullRequest(ctx *context.APIContext, form auth.MergePullRequestForm) {
return
}
- pr.LoadIssue()
+ err = pr.LoadIssue()
+ if err != nil {
+ ctx.Error(http.StatusInternalServerError, "LoadIssue", err)
+ return
+ }
pr.Issue.Repo = ctx.Repo.Repository
if ctx.IsSigned {
diff --git a/routers/api/v1/repo/repo.go b/routers/api/v1/repo/repo.go
index f8df3e9fa1..26cfff51ce 100644
--- a/routers/api/v1/repo/repo.go
+++ b/routers/api/v1/repo/repo.go
@@ -631,15 +631,6 @@ func updateBasicProperties(ctx *context.APIContext, opts api.EditRepoOption) err
return nil
}
-func unitTypeInTypes(unitType models.UnitType, unitTypes []models.UnitType) bool {
- for _, tp := range unitTypes {
- if unitType == tp {
- return true
- }
- }
- return false
-}
-
// updateRepoUnits updates repo units: Issue settings, Wiki settings, PR settings
func updateRepoUnits(ctx *context.APIContext, opts api.EditRepoOption) error {
owner := ctx.Repo.Owner
diff --git a/routers/api/v1/user/gpg_key.go b/routers/api/v1/user/gpg_key.go
index c2c55e9b92..7bf43c5822 100644
--- a/routers/api/v1/user/gpg_key.go
+++ b/routers/api/v1/user/gpg_key.go
@@ -9,14 +9,9 @@ import (
"code.gitea.io/gitea/models"
"code.gitea.io/gitea/modules/context"
- "code.gitea.io/gitea/modules/setting"
"code.gitea.io/gitea/routers/api/v1/convert"
)
-func composePublicGPGKeysAPILink() string {
- return setting.AppURL + "api/v1/user/gpg_keys/"
-}
-
func listGPGKeys(ctx *context.APIContext, uid int64) {
keys, err := models.ListGPGKeys(uid)
if err != nil {