diff options
| author | Lunny Xiao <xiaolunwen@gmail.com> | 2023-05-21 20:48:28 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-05-21 20:48:28 +0800 |
| commit | 64f6a5d113da0d5d187752c9398d6e8d22d24b79 (patch) | |
| tree | f72aea0c5c32d6ee4df1c973eaf67f1058f0f1a1 /models | |
| parent | edd8ea0b0d07f7fee0f8cf506975c8f3bec690ca (diff) | |
| download | gitea-64f6a5d113da0d5d187752c9398d6e8d22d24b79.tar.gz gitea-64f6a5d113da0d5d187752c9398d6e8d22d24b79.zip | |
Use `CommentList` instead of `[]*Comment` (#24828)
As title.
Diffstat (limited to 'models')
| -rw-r--r-- | models/issues/comment.go | 2 | ||||
| -rw-r--r-- | models/issues/comment_code.go | 4 | ||||
| -rw-r--r-- | models/issues/issue.go | 4 |
3 files changed, 5 insertions, 5 deletions
diff --git a/models/issues/comment.go b/models/issues/comment.go index c7e815c8b6..bf2bbfa414 100644 --- a/models/issues/comment.go +++ b/models/issues/comment.go @@ -1048,7 +1048,7 @@ func (opts *FindCommentsOptions) ToConds() builder.Cond { } // FindComments returns all comments according options -func FindComments(ctx context.Context, opts *FindCommentsOptions) ([]*Comment, error) { +func FindComments(ctx context.Context, opts *FindCommentsOptions) (CommentList, error) { comments := make([]*Comment, 0, 10) sess := db.GetEngine(ctx).Where(opts.ToConds()) if opts.RepoID > 0 { diff --git a/models/issues/comment_code.go b/models/issues/comment_code.go index 8475da1a8c..304ac4569f 100644 --- a/models/issues/comment_code.go +++ b/models/issues/comment_code.go @@ -48,7 +48,7 @@ func fetchCodeCommentsByReview(ctx context.Context, issue *Issue, currentUser *u } func findCodeComments(ctx context.Context, opts FindCommentsOptions, issue *Issue, currentUser *user_model.User, review *Review) ([]*Comment, error) { - var comments []*Comment + var comments CommentList if review == nil { review = &Review{ID: 0} } @@ -68,7 +68,7 @@ func findCodeComments(ctx context.Context, opts FindCommentsOptions, issue *Issu return nil, err } - if err := CommentList(comments).LoadPosters(ctx); err != nil { + if err := comments.LoadPosters(ctx); err != nil { return nil, err } diff --git a/models/issues/issue.go b/models/issues/issue.go index bf41a7ec28..fc046d273c 100644 --- a/models/issues/issue.go +++ b/models/issues/issue.go @@ -124,7 +124,7 @@ type Issue struct { ClosedUnix timeutil.TimeStamp `xorm:"INDEX"` Attachments []*repo_model.Attachment `xorm:"-"` - Comments []*Comment `xorm:"-"` + Comments CommentList `xorm:"-"` Reactions ReactionList `xorm:"-"` TotalTrackedTime int64 `xorm:"-"` Assignees []*user_model.User `xorm:"-"` @@ -353,7 +353,7 @@ func (issue *Issue) LoadAttributes(ctx context.Context) (err error) { return err } - if err = CommentList(issue.Comments).loadAttributes(ctx); err != nil { + if err = issue.Comments.loadAttributes(ctx); err != nil { return err } if issue.IsTimetrackerEnabled(ctx) { |