Skip to content

Commit 2b79d3f

Browse files
GiteaBotlunny
GiteaBot
and
lunny
authored
For API attachments, use API URL (#25639) (#25814)
Backport #25639 by @lunny Fix #25257 Co-authored-by: Lunny Xiao <xiaolunwen@gmail.com>
1 parent b4460cf commit 2b79d3f

19 files changed

+108
-67
lines changed

‎models/repo/attachment.go

-7
Original file line numberDiff line numberDiff line change
@@ -65,13 +65,6 @@ func (a *Attachment) DownloadURL() string {
6565
return setting.AppURL + "attachments/" + url.PathEscape(a.UUID)
6666
}
6767

68-
// _____ __ __ .__ __
69-
// / _ \_/ |__/ |______ ____ | |__ _____ ____ _____/ |_
70-
// / /_\ \ __\ __\__ \ _/ ___\| | \ / \_/ __ \ / \ __\
71-
// / | \ | | | / __ \\ \___| Y \ Y Y \ ___/| | \ |
72-
// \____|__ /__| |__| (____ /\___ >___| /__|_| /\___ >___| /__|
73-
// \/ \/ \/ \/ \/ \/ \/
74-
7568
// ErrAttachmentNotExist represents a "AttachmentNotExist" kind of error.
7669
type ErrAttachmentNotExist struct {
7770
ID int64

‎routers/api/v1/api.go

+3-3
Original file line numberDiff line numberDiff line change
@@ -1035,7 +1035,7 @@ func Routes(ctx gocontext.Context) *web.Route {
10351035
m.Group("/assets", func() {
10361036
m.Combo("").Get(repo.ListReleaseAttachments).
10371037
Post(reqToken(), reqRepoWriter(unit.TypeReleases), repo.CreateReleaseAttachment)
1038-
m.Combo("/{asset}").Get(repo.GetReleaseAttachment).
1038+
m.Combo("/{attachment_id}").Get(repo.GetReleaseAttachment).
10391039
Patch(reqToken(), reqRepoWriter(unit.TypeReleases), bind(api.EditAttachmentOptions{}), repo.EditReleaseAttachment).
10401040
Delete(reqToken(), reqRepoWriter(unit.TypeReleases), repo.DeleteReleaseAttachment)
10411041
})
@@ -1176,7 +1176,7 @@ func Routes(ctx gocontext.Context) *web.Route {
11761176
m.Combo("").
11771177
Get(repo.ListIssueCommentAttachments).
11781178
Post(reqToken(), mustNotBeArchived, repo.CreateIssueCommentAttachment)
1179-
m.Combo("/{asset}").
1179+
m.Combo("/{attachment_id}").
11801180
Get(repo.GetIssueCommentAttachment).
11811181
Patch(reqToken(), mustNotBeArchived, bind(api.EditAttachmentOptions{}), repo.EditIssueCommentAttachment).
11821182
Delete(reqToken(), mustNotBeArchived, repo.DeleteIssueCommentAttachment)
@@ -1228,7 +1228,7 @@ func Routes(ctx gocontext.Context) *web.Route {
12281228
m.Combo("").
12291229
Get(repo.ListIssueAttachments).
12301230
Post(reqToken(), mustNotBeArchived, repo.CreateIssueAttachment)
1231-
m.Combo("/{asset}").
1231+
m.Combo("/{attachment_id}").
12321232
Get(repo.GetIssueAttachment).
12331233
Patch(reqToken(), mustNotBeArchived, bind(api.EditAttachmentOptions{}), repo.EditIssueAttachment).
12341234
Delete(reqToken(), mustNotBeArchived, repo.DeleteIssueAttachment)

‎routers/api/v1/repo/issue_attachment.go

+4-4
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ func GetIssueAttachment(ctx *context.APIContext) {
6464
return
6565
}
6666

67-
ctx.JSON(http.StatusOK, convert.ToAttachment(attach))
67+
ctx.JSON(http.StatusOK, convert.ToAPIAttachment(ctx.Repo.Repository, attach))
6868
}
6969

7070
// ListIssueAttachments lists all attachments of the issue
@@ -194,7 +194,7 @@ func CreateIssueAttachment(ctx *context.APIContext) {
194194
return
195195
}
196196

197-
ctx.JSON(http.StatusCreated, convert.ToAttachment(attachment))
197+
ctx.JSON(http.StatusCreated, convert.ToAPIAttachment(ctx.Repo.Repository, attachment))
198198
}
199199

200200
// EditIssueAttachment updates the given attachment
@@ -254,7 +254,7 @@ func EditIssueAttachment(ctx *context.APIContext) {
254254
ctx.Error(http.StatusInternalServerError, "UpdateAttachment", err)
255255
}
256256

257-
ctx.JSON(http.StatusCreated, convert.ToAttachment(attachment))
257+
ctx.JSON(http.StatusCreated, convert.ToAPIAttachment(ctx.Repo.Repository, attachment))
258258
}
259259

260260
// DeleteIssueAttachment delete a given attachment
@@ -332,7 +332,7 @@ func getIssueAttachmentSafeWrite(ctx *context.APIContext) *repo_model.Attachment
332332
}
333333

334334
func getIssueAttachmentSafeRead(ctx *context.APIContext, issue *issues_model.Issue) *repo_model.Attachment {
335-
attachment, err := repo_model.GetAttachmentByID(ctx, ctx.ParamsInt64("asset"))
335+
attachment, err := repo_model.GetAttachmentByID(ctx, ctx.ParamsInt64("attachment_id"))
336336
if err != nil {
337337
ctx.NotFoundOrServerError("GetAttachmentByID", repo_model.IsErrAttachmentNotExist, err)
338338
return nil

‎routers/api/v1/repo/issue_comment.go

+6-6
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,7 @@ func ListIssueComments(ctx *context.APIContext) {
103103
apiComments := make([]*api.Comment, len(comments))
104104
for i, comment := range comments {
105105
comment.Issue = issue
106-
apiComments[i] = convert.ToComment(ctx, comments[i])
106+
apiComments[i] = convert.ToAPIComment(ctx, ctx.Repo.Repository, comments[i])
107107
}
108108

109109
ctx.SetTotalCountHeader(totalCount)
@@ -191,7 +191,7 @@ func ListIssueCommentsAndTimeline(ctx *context.APIContext) {
191191
for _, comment := range comments {
192192
if comment.Type != issues_model.CommentTypeCode && isXRefCommentAccessible(ctx, ctx.Doer, comment, issue.RepoID) {
193193
comment.Issue = issue
194-
apiComments = append(apiComments, convert.ToTimelineComment(ctx, comment, ctx.Doer))
194+
apiComments = append(apiComments, convert.ToTimelineComment(ctx, issue.Repo, comment, ctx.Doer))
195195
}
196196
}
197197

@@ -308,7 +308,7 @@ func ListRepoIssueComments(ctx *context.APIContext) {
308308
return
309309
}
310310
for i := range comments {
311-
apiComments[i] = convert.ToComment(ctx, comments[i])
311+
apiComments[i] = convert.ToAPIComment(ctx, ctx.Repo.Repository, comments[i])
312312
}
313313

314314
ctx.SetTotalCountHeader(totalCount)
@@ -368,7 +368,7 @@ func CreateIssueComment(ctx *context.APIContext) {
368368
return
369369
}
370370

371-
ctx.JSON(http.StatusCreated, convert.ToComment(ctx, comment))
371+
ctx.JSON(http.StatusCreated, convert.ToAPIComment(ctx, ctx.Repo.Repository, comment))
372372
}
373373

374374
// GetIssueComment Get a comment by ID
@@ -436,7 +436,7 @@ func GetIssueComment(ctx *context.APIContext) {
436436
return
437437
}
438438

439-
ctx.JSON(http.StatusOK, convert.ToComment(ctx, comment))
439+
ctx.JSON(http.StatusOK, convert.ToAPIComment(ctx, ctx.Repo.Repository, comment))
440440
}
441441

442442
// EditIssueComment modify a comment of an issue
@@ -561,7 +561,7 @@ func editIssueComment(ctx *context.APIContext, form api.EditIssueCommentOption)
561561
return
562562
}
563563

564-
ctx.JSON(http.StatusOK, convert.ToComment(ctx, comment))
564+
ctx.JSON(http.StatusOK, convert.ToAPIComment(ctx, ctx.Repo.Repository, comment))
565565
}
566566

567567
// DeleteIssueComment delete a comment from an issue

‎routers/api/v1/repo/issue_comment_attachment.go

+5-5
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ func GetIssueCommentAttachment(ctx *context.APIContext) {
6868
return
6969
}
7070

71-
ctx.JSON(http.StatusOK, convert.ToAttachment(attachment))
71+
ctx.JSON(http.StatusOK, convert.ToAPIAttachment(ctx.Repo.Repository, attachment))
7272
}
7373

7474
// ListIssueCommentAttachments lists all attachments of the comment
@@ -110,7 +110,7 @@ func ListIssueCommentAttachments(ctx *context.APIContext) {
110110
return
111111
}
112112

113-
ctx.JSON(http.StatusOK, convert.ToAttachments(comment.Attachments))
113+
ctx.JSON(http.StatusOK, convert.ToAPIAttachments(ctx.Repo.Repository, comment.Attachments))
114114
}
115115

116116
// CreateIssueCommentAttachment creates an attachment and saves the given file
@@ -201,7 +201,7 @@ func CreateIssueCommentAttachment(ctx *context.APIContext) {
201201
return
202202
}
203203

204-
ctx.JSON(http.StatusCreated, convert.ToAttachment(attachment))
204+
ctx.JSON(http.StatusCreated, convert.ToAPIAttachment(ctx.Repo.Repository, attachment))
205205
}
206206

207207
// EditIssueCommentAttachment updates the given attachment
@@ -259,7 +259,7 @@ func EditIssueCommentAttachment(ctx *context.APIContext) {
259259
if err := repo_model.UpdateAttachment(ctx, attach); err != nil {
260260
ctx.Error(http.StatusInternalServerError, "UpdateAttachment", attach)
261261
}
262-
ctx.JSON(http.StatusCreated, convert.ToAttachment(attach))
262+
ctx.JSON(http.StatusCreated, convert.ToAPIAttachment(ctx.Repo.Repository, attach))
263263
}
264264

265265
// DeleteIssueCommentAttachment delete a given attachment
@@ -352,7 +352,7 @@ func canUserWriteIssueCommentAttachment(ctx *context.APIContext, comment *issues
352352
}
353353

354354
func getIssueCommentAttachmentSafeRead(ctx *context.APIContext, comment *issues_model.Comment) *repo_model.Attachment {
355-
attachment, err := repo_model.GetAttachmentByID(ctx, ctx.ParamsInt64("asset"))
355+
attachment, err := repo_model.GetAttachmentByID(ctx, ctx.ParamsInt64("attachment_id"))
356356
if err != nil {
357357
ctx.NotFoundOrServerError("GetAttachmentByID", repo_model.IsErrAttachmentNotExist, err)
358358
return nil

‎routers/api/v1/repo/release.go

+5-5
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ func GetRelease(ctx *context.APIContext) {
6464
ctx.Error(http.StatusInternalServerError, "LoadAttributes", err)
6565
return
6666
}
67-
ctx.JSON(http.StatusOK, convert.ToRelease(ctx, release))
67+
ctx.JSON(http.StatusOK, convert.ToAPIRelease(ctx, ctx.Repo.Repository, release))
6868
}
6969

7070
// GetLatestRelease gets the most recent non-prerelease, non-draft release of a repository, sorted by created_at
@@ -105,7 +105,7 @@ func GetLatestRelease(ctx *context.APIContext) {
105105
ctx.Error(http.StatusInternalServerError, "LoadAttributes", err)
106106
return
107107
}
108-
ctx.JSON(http.StatusOK, convert.ToRelease(ctx, release))
108+
ctx.JSON(http.StatusOK, convert.ToAPIRelease(ctx, ctx.Repo.Repository, release))
109109
}
110110

111111
// ListReleases list a repository's releases
@@ -174,7 +174,7 @@ func ListReleases(ctx *context.APIContext) {
174174
ctx.Error(http.StatusInternalServerError, "LoadAttributes", err)
175175
return
176176
}
177-
rels[i] = convert.ToRelease(ctx, release)
177+
rels[i] = convert.ToAPIRelease(ctx, ctx.Repo.Repository, release)
178178
}
179179

180180
filteredCount, err := repo_model.CountReleasesByRepoID(ctx.Repo.Repository.ID, opts)
@@ -272,7 +272,7 @@ func CreateRelease(ctx *context.APIContext) {
272272
return
273273
}
274274
}
275-
ctx.JSON(http.StatusCreated, convert.ToRelease(ctx, rel))
275+
ctx.JSON(http.StatusCreated, convert.ToAPIRelease(ctx, ctx.Repo.Repository, rel))
276276
}
277277

278278
// EditRelease edit a release
@@ -357,7 +357,7 @@ func EditRelease(ctx *context.APIContext) {
357357
ctx.Error(http.StatusInternalServerError, "LoadAttributes", err)
358358
return
359359
}
360-
ctx.JSON(http.StatusOK, convert.ToRelease(ctx, rel))
360+
ctx.JSON(http.StatusOK, convert.ToAPIRelease(ctx, ctx.Repo.Repository, rel))
361361
}
362362

363363
// DeleteRelease delete a release from a repository

‎routers/api/v1/repo/release_attachment.go

+7-7
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ func GetReleaseAttachment(ctx *context.APIContext) {
5252
// "$ref": "#/responses/Attachment"
5353

5454
releaseID := ctx.ParamsInt64(":id")
55-
attachID := ctx.ParamsInt64(":asset")
55+
attachID := ctx.ParamsInt64(":attachment_id")
5656
attach, err := repo_model.GetAttachmentByID(ctx, attachID)
5757
if err != nil {
5858
if repo_model.IsErrAttachmentNotExist(err) {
@@ -68,7 +68,7 @@ func GetReleaseAttachment(ctx *context.APIContext) {
6868
return
6969
}
7070
// FIXME Should prove the existence of the given repo, but results in unnecessary database requests
71-
ctx.JSON(http.StatusOK, convert.ToAttachment(attach))
71+
ctx.JSON(http.StatusOK, convert.ToAPIAttachment(ctx.Repo.Repository, attach))
7272
}
7373

7474
// ListReleaseAttachments lists all attachments of the release
@@ -117,7 +117,7 @@ func ListReleaseAttachments(ctx *context.APIContext) {
117117
ctx.Error(http.StatusInternalServerError, "LoadAttributes", err)
118118
return
119119
}
120-
ctx.JSON(http.StatusOK, convert.ToRelease(ctx, release).Attachments)
120+
ctx.JSON(http.StatusOK, convert.ToAPIRelease(ctx, ctx.Repo.Repository, release).Attachments)
121121
}
122122

123123
// CreateReleaseAttachment creates an attachment and saves the given file
@@ -209,7 +209,7 @@ func CreateReleaseAttachment(ctx *context.APIContext) {
209209
return
210210
}
211211

212-
ctx.JSON(http.StatusCreated, convert.ToAttachment(attach))
212+
ctx.JSON(http.StatusCreated, convert.ToAPIAttachment(ctx.Repo.Repository, attach))
213213
}
214214

215215
// EditReleaseAttachment updates the given attachment
@@ -256,7 +256,7 @@ func EditReleaseAttachment(ctx *context.APIContext) {
256256

257257
// Check if release exists an load release
258258
releaseID := ctx.ParamsInt64(":id")
259-
attachID := ctx.ParamsInt64(":asset")
259+
attachID := ctx.ParamsInt64(":attachment_id")
260260
attach, err := repo_model.GetAttachmentByID(ctx, attachID)
261261
if err != nil {
262262
if repo_model.IsErrAttachmentNotExist(err) {
@@ -279,7 +279,7 @@ func EditReleaseAttachment(ctx *context.APIContext) {
279279
if err := repo_model.UpdateAttachment(ctx, attach); err != nil {
280280
ctx.Error(http.StatusInternalServerError, "UpdateAttachment", attach)
281281
}
282-
ctx.JSON(http.StatusCreated, convert.ToAttachment(attach))
282+
ctx.JSON(http.StatusCreated, convert.ToAPIAttachment(ctx.Repo.Repository, attach))
283283
}
284284

285285
// DeleteReleaseAttachment delete a given attachment
@@ -318,7 +318,7 @@ func DeleteReleaseAttachment(ctx *context.APIContext) {
318318

319319
// Check if release exists an load release
320320
releaseID := ctx.ParamsInt64(":id")
321-
attachID := ctx.ParamsInt64(":asset")
321+
attachID := ctx.ParamsInt64(":attachment_id")
322322
attach, err := repo_model.GetAttachmentByID(ctx, attachID)
323323
if err != nil {
324324
if repo_model.IsErrAttachmentNotExist(err) {

‎routers/api/v1/repo/release_tags.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ func GetReleaseByTag(ctx *context.APIContext) {
6363
ctx.Error(http.StatusInternalServerError, "LoadAttributes", err)
6464
return
6565
}
66-
ctx.JSON(http.StatusOK, convert.ToRelease(ctx, release))
66+
ctx.JSON(http.StatusOK, convert.ToAPIRelease(ctx, ctx.Repo.Repository, release))
6767
}
6868

6969
// DeleteReleaseByTag delete a release from a repository by tag name

‎routers/web/repo/issue.go

+5-5
Original file line numberDiff line numberDiff line change
@@ -2036,7 +2036,7 @@ func GetIssueInfo(ctx *context.Context) {
20362036
}
20372037
}
20382038

2039-
ctx.JSON(http.StatusOK, convert.ToAPIIssue(ctx, issue))
2039+
ctx.JSON(http.StatusOK, convert.ToIssue(ctx, issue))
20402040
}
20412041

20422042
// UpdateIssueTitle change issue's title
@@ -2541,7 +2541,7 @@ func SearchIssues(ctx *context.Context) {
25412541
}
25422542

25432543
ctx.SetTotalCountHeader(filteredCount)
2544-
ctx.JSON(http.StatusOK, convert.ToAPIIssueList(ctx, issues))
2544+
ctx.JSON(http.StatusOK, convert.ToIssueList(ctx, issues))
25452545
}
25462546

25472547
func getUserIDForFilter(ctx *context.Context, queryName string) int64 {
@@ -2702,7 +2702,7 @@ func ListIssues(ctx *context.Context) {
27022702
}
27032703

27042704
ctx.SetTotalCountHeader(filteredCount)
2705-
ctx.JSON(http.StatusOK, convert.ToAPIIssueList(ctx, issues))
2705+
ctx.JSON(http.StatusOK, convert.ToIssueList(ctx, issues))
27062706
}
27072707

27082708
// UpdateIssueStatus change issue's status
@@ -3263,7 +3263,7 @@ func GetIssueAttachments(ctx *context.Context) {
32633263
}
32643264
attachments := make([]*api.Attachment, len(issue.Attachments))
32653265
for i := 0; i < len(issue.Attachments); i++ {
3266-
attachments[i] = convert.ToAttachment(issue.Attachments[i])
3266+
attachments[i] = convert.ToAttachment(ctx.Repo.Repository, issue.Attachments[i])
32673267
}
32683268
ctx.JSON(http.StatusOK, attachments)
32693269
}
@@ -3287,7 +3287,7 @@ func GetCommentAttachments(ctx *context.Context) {
32873287
return
32883288
}
32893289
for i := 0; i < len(comment.Attachments); i++ {
3290-
attachments = append(attachments, convert.ToAttachment(comment.Attachments[i]))
3290+
attachments = append(attachments, convert.ToAttachment(ctx.Repo.Repository, comment.Attachments[i]))
32913291
}
32923292
ctx.JSON(http.StatusOK, attachments)
32933293
}

‎services/actions/notifier.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -171,7 +171,7 @@ func (n *actionsNotifier) NotifyCreateIssueComment(ctx context.Context, doer *us
171171
WithPayload(&api.IssueCommentPayload{
172172
Action: api.HookIssueCommentCreated,
173173
Issue: convert.ToAPIIssue(ctx, issue),
174-
Comment: convert.ToComment(ctx, comment),
174+
Comment: convert.ToAPIComment(ctx, repo, comment),
175175
Repository: convert.ToRepo(ctx, repo, permission),
176176
Sender: convert.ToUser(ctx, doer, nil),
177177
IsPull: true,
@@ -185,7 +185,7 @@ func (n *actionsNotifier) NotifyCreateIssueComment(ctx context.Context, doer *us
185185
WithPayload(&api.IssueCommentPayload{
186186
Action: api.HookIssueCommentCreated,
187187
Issue: convert.ToAPIIssue(ctx, issue),
188-
Comment: convert.ToComment(ctx, comment),
188+
Comment: convert.ToAPIComment(ctx, repo, comment),
189189
Repository: convert.ToRepo(ctx, repo, permission),
190190
Sender: convert.ToUser(ctx, doer, nil),
191191
IsPull: false,

‎services/actions/notifier_helper.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -228,7 +228,7 @@ func notifyRelease(ctx context.Context, doer *user_model.User, rel *repo_model.R
228228
WithRef(git.RefNameFromTag(rel.TagName).String()).
229229
WithPayload(&api.ReleasePayload{
230230
Action: action,
231-
Release: convert.ToRelease(ctx, rel),
231+
Release: convert.ToAPIRelease(ctx, rel.Repo, rel),
232232
Repository: convert.ToRepo(ctx, rel.Repo, permission),
233233
Sender: convert.ToUser(ctx, doer, nil),
234234
}).

‎services/convert/activity.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ func ToActivity(ctx context.Context, ac *activities_model.Action, doer *user_mod
3737

3838
if ac.Comment != nil {
3939
result.CommentID = ac.CommentID
40-
result.Comment = ToComment(ctx, ac.Comment)
40+
result.Comment = ToAPIComment(ctx, ac.Repo, ac.Comment)
4141
}
4242

4343
return result

0 commit comments

Comments
 (0)