diff options
Diffstat (limited to 'routers/api/packages/pub/pub.go')
| -rw-r--r-- | routers/api/packages/pub/pub.go | 20 |
1 files changed, 8 insertions, 12 deletions
diff --git a/routers/api/packages/pub/pub.go b/routers/api/packages/pub/pub.go index e7b07aefd0..7564e14d0e 100644 --- a/routers/api/packages/pub/pub.go +++ b/routers/api/packages/pub/pub.go @@ -15,7 +15,6 @@ import ( packages_model "code.gitea.io/gitea/models/packages" "code.gitea.io/gitea/modules/json" - "code.gitea.io/gitea/modules/log" packages_module "code.gitea.io/gitea/modules/packages" pub_module "code.gitea.io/gitea/modules/packages/pub" "code.gitea.io/gitea/modules/setting" @@ -29,9 +28,7 @@ func jsonResponse(ctx *context.Context, status int, obj any) { resp := ctx.Resp resp.Header().Set("Content-Type", "application/vnd.pub.v2+json") resp.WriteHeader(status) - if err := json.NewEncoder(resp).Encode(obj); err != nil { - log.Error("JSON encode: %v", err) - } + _ = json.NewEncoder(resp).Encode(obj) } func apiError(ctx *context.Context, status int, obj any) { @@ -43,13 +40,12 @@ func apiError(ctx *context.Context, status int, obj any) { Error Error `json:"error"` } - helper.LogAndProcessError(ctx, status, obj, func(message string) { - jsonResponse(ctx, status, ErrorWrapper{ - Error: Error{ - Code: http.StatusText(status), - Message: message, - }, - }) + message := helper.ProcessErrorForUser(ctx, status, obj) + jsonResponse(ctx, status, ErrorWrapper{ + Error: Error{ + Code: http.StatusText(status), + Message: message, + }, }) } @@ -274,7 +270,7 @@ func DownloadPackageFile(ctx *context.Context) { pf := pd.Files[0].File - s, u, _, err := packages_service.GetPackageFileStream(ctx, pf) + s, u, _, err := packages_service.OpenFileForDownload(ctx, pf, ctx.Req.Method) if err != nil { apiError(ctx, http.StatusInternalServerError, err) return |