diff options
Diffstat (limited to 'routers/repo')
| -rw-r--r-- | routers/repo/issue.go | 5 | ||||
| -rw-r--r-- | routers/repo/webhook.go | 3 |
2 files changed, 5 insertions, 3 deletions
diff --git a/routers/repo/issue.go b/routers/repo/issue.go index 8aef322090..bc65e73f11 100644 --- a/routers/repo/issue.go +++ b/routers/repo/issue.go @@ -19,6 +19,7 @@ import ( "code.gitea.io/gitea/modules/auth" "code.gitea.io/gitea/modules/base" "code.gitea.io/gitea/modules/context" + "code.gitea.io/gitea/modules/convert" "code.gitea.io/gitea/modules/git" issue_indexer "code.gitea.io/gitea/modules/indexer/issues" "code.gitea.io/gitea/modules/log" @@ -2453,7 +2454,7 @@ func GetIssueAttachments(ctx *context.Context) { issue := GetActionIssue(ctx) var attachments = make([]*api.Attachment, len(issue.Attachments)) for i := 0; i < len(issue.Attachments); i++ { - attachments[i] = issue.Attachments[i].APIFormat() + attachments[i] = convert.ToReleaseAttachment(issue.Attachments[i]) } ctx.JSON(200, attachments) } @@ -2472,7 +2473,7 @@ func GetCommentAttachments(ctx *context.Context) { return } for i := 0; i < len(comment.Attachments); i++ { - attachments = append(attachments, comment.Attachments[i].APIFormat()) + attachments = append(attachments, convert.ToReleaseAttachment(comment.Attachments[i])) } } ctx.JSON(200, attachments) diff --git a/routers/repo/webhook.go b/routers/repo/webhook.go index bec401021c..13b95c8076 100644 --- a/routers/repo/webhook.go +++ b/routers/repo/webhook.go @@ -16,6 +16,7 @@ import ( "code.gitea.io/gitea/modules/auth" "code.gitea.io/gitea/modules/base" "code.gitea.io/gitea/modules/context" + "code.gitea.io/gitea/modules/convert" "code.gitea.io/gitea/modules/git" "code.gitea.io/gitea/modules/setting" api "code.gitea.io/gitea/modules/structs" @@ -1052,7 +1053,7 @@ func TestWebhook(ctx *context.Context) { } } - apiUser := ctx.User.APIFormat() + apiUser := convert.ToUser(ctx.User, true, true) p := &api.PushPayload{ Ref: git.BranchPrefix + ctx.Repo.Repository.DefaultBranch, Before: commit.ID.String(), |