* Renamed commit.go to commit_comment.go

coder1125 · coder1125 · commit 47b369e438c2 · 2025-08-10T00:39:09.000+05:00
* Set copyright year to 2025
* Rename CreateCommitDataOptions to CreateCommitCommentOptions
* Rename FindCommitDataOptions to FindCommitCommentOptions
diff --git a/models/git/commit_comment.go b/models/git/commit_comment.go
@@ -1,4 +1,4 @@
-// Copyright 2022 The Gitea Authors. All rights reserved.
+// Copyright 2025 The Gitea Authors. All rights reserved.
 // SPDX-License-Identifier: MIT
 package git
 
@@ -45,12 +45,12 @@ type CommitComment struct {
 	ContentVersion   int                    `xorm:"NOT NULL DEFAULT 0"`
 	RefRepoID        int64                  `xorm:"index"`
 	Repo             *repo_model.Repository `xorm:"-"`
-	ReplyToCommentID int64
-	CreatedUnix      timeutil.TimeStamp `xorm:"INDEX created"`
-	UpdatedUnix      timeutil.TimeStamp `xorm:"INDEX updated"`
+	ReplyToCommentID int64                  `xorm:"index"`
+	CreatedUnix      timeutil.TimeStamp     `xorm:"INDEX created"`
+	UpdatedUnix      timeutil.TimeStamp     `xorm:"INDEX updated"`
 }
 
-type CreateCommitDataOptions struct {
+type CreateCommitCommentOptions struct {
 	Doer *user_model.User
 	Repo *repo_model.Repository
 
@@ -71,7 +71,7 @@ type AttachmentOptions struct {
 	UploaderID int64
 }
 
-type FindCommitDataOptions struct {
+type FindCommitCommentOptions struct {
 	db.ListOptions
 	RepoID    int64
 	CommitSHA string
@@ -216,7 +216,7 @@ func (commitComment *CommitComment) GetMoreUserCount(reaction string) int {
 	return len(list) - setting.UI.ReactionMaxUserNum
 }
 
-func GetCommitDataByID(ctx context.Context, repoID, ID int64) (*CommitComment, error) {
+func GetCommitCommentByID(ctx context.Context, repoID, ID int64) (*CommitComment, error) {
 	commitComment := &CommitComment{
 		RefRepoID: repoID,
 		ID:        ID,
@@ -238,7 +238,7 @@ func GetCommitDataByID(ctx context.Context, repoID, ID int64) (*CommitComment, e
 	return commitComment, err
 }
 
-func GetCommitDataBySHA(ctx context.Context, repoID int64, commitSHA string) (*CommitComment, error) {
+func GetCommitCommentBySHA(ctx context.Context, repoID int64, commitSHA string) (*CommitComment, error) {
 	commitComment := &CommitComment{
 		RefRepoID: repoID,
 		CommitSHA: commitSHA,
@@ -261,7 +261,7 @@ func GetCommitDataBySHA(ctx context.Context, repoID int64, commitSHA string) (*C
 }
 
 // CreateCommitComment creates comment with context
-func CreateCommitData(ctx context.Context, opts *CreateCommitDataOptions) (_ *CommitComment, err error) {
+func CreateCommitComment(ctx context.Context, opts *CreateCommitCommentOptions) (_ *CommitComment, err error) {
 	ctx, committer, err := db.TxContext(ctx)
 	if err != nil {
 		return nil, err
@@ -306,7 +306,7 @@ func CreateCommitData(ctx context.Context, opts *CreateCommitDataOptions) (_ *Co
 	return commit, nil
 }
 
-func UpdateCommitData(ctx context.Context, attachmentMap *AttachmentMap, commitComment *CommitComment) (err error) {
+func UpdateCommitComment(ctx context.Context, attachmentMap *AttachmentMap, commitComment *CommitComment) (err error) {
 	ctx, committer, err := db.TxContext(ctx)
 	if err != nil {
 		return err
@@ -350,7 +350,7 @@ func DeleteCommitComment(ctx context.Context, commitComment *CommitComment) erro
 	return nil
 }
 
-func FindCommitCommentsByCommit(ctx context.Context, opts *FindCommitDataOptions, commitComment *CommitComment) (CommitCommentList, error) {
+func FindCommitCommentsByCommit(ctx context.Context, opts *FindCommitCommentOptions, commitComment *CommitComment) (CommitCommentList, error) {
 	var commitCommentList CommitCommentList
 	sess := db.GetEngine(ctx).Where(opts.ToConds())
 
@@ -389,7 +389,7 @@ func FindCommitCommentsByCommit(ctx context.Context, opts *FindCommitDataOptions
 	return commitCommentList, nil
 }
 
-func FindCommitCommentsByLine(ctx context.Context, opts *FindCommitDataOptions, commitComment *CommitComment) (CommitCommentList, error) {
+func FindCommitCommentsByLine(ctx context.Context, opts *FindCommitCommentOptions, commitComment *CommitComment) (CommitCommentList, error) {
 	var commitCommentList CommitCommentList
 
 	sess := db.GetEngine(ctx)
diff --git a/routers/web/repo/commit.go b/routers/web/repo/commit.go
@@ -432,9 +432,9 @@ func Diff(ctx *context.Context) {
 		ctx.Data["MergedPRIssueNumber"] = pr.Index
 	}
 
-	commitComment, err := git_model.GetCommitDataBySHA(ctx, ctx.Repo.Repository.ID, commitID)
+	commitComment, err := git_model.GetCommitCommentBySHA(ctx, ctx.Repo.Repository.ID, commitID)
 	if err != nil {
-		ctx.ServerError("GetCommitDataBySHA", err)
+		ctx.ServerError("GetCommitCommentBySHA", err)
 		return
 	}
 
@@ -531,7 +531,7 @@ func CreateCommitComment(ctx *context.Context) {
 		attachmentsMap = ctx.Session.Get("attachmentsMaps").(git_model.AttachmentMap)
 	}
 
-	opts := git_model.CreateCommitDataOptions{
+	opts := git_model.CreateCommitCommentOptions{
 		RefRepoID:        ctx.Repo.Repository.ID,
 		Repo:             ctx.Repo.Repository,
 		Doer:             ctx.Doer,
@@ -558,13 +558,13 @@ func CreateCommitComment(ctx *context.Context) {
 			return
 		}
 	}
-	renderCommitData(ctx, commitComment, form.Origin, signedLine)
+	renderCommitComment(ctx, commitComment, form.Origin, signedLine)
 }
 
-func renderCommitData(ctx *context.Context, commitComment *git_model.CommitComment, origin string, signedLine int64) {
+func renderCommitComment(ctx *context.Context, commitComment *git_model.CommitComment, origin string, signedLine int64) {
 	ctx.Data["PageIsDiff"] = true
 
-	opts := git_model.FindCommitDataOptions{
+	opts := git_model.FindCommitCommentOptions{
 		CommitSHA: commitComment.CommitSHA,
 		Line:      signedLine,
 	}
@@ -600,7 +600,7 @@ func renderCommitData(ctx *context.Context, commitComment *git_model.CommitComme
 
 // DeleteCommitComment delete comment of commit
 func DeleteCommitComment(ctx *context.Context) {
-	commitComment, err := git_model.GetCommitDataByID(ctx, ctx.Repo.Repository.ID, ctx.PathParamInt64("id"))
+	commitComment, err := git_model.GetCommitCommentByID(ctx, ctx.Repo.Repository.ID, ctx.PathParamInt64("id"))
 	if err != nil {
 		return
 	}
@@ -610,17 +610,17 @@ func DeleteCommitComment(ctx *context.Context) {
 	}
 
 	if err = git_model.DeleteCommitComment(ctx, commitComment); err != nil {
-		ctx.ServerError("GetCommitDataByID", err)
+		ctx.ServerError("DeleteCommitComment", err)
 		return
 	}
 
 	ctx.Status(http.StatusOK)
 }
 
 func UpdateCommitComment(ctx *context.Context) {
-	commitComment, err := git_model.GetCommitDataByID(ctx, ctx.Repo.Repository.ID, ctx.PathParamInt64("id"))
+	commitComment, err := git_model.GetCommitCommentByID(ctx, ctx.Repo.Repository.ID, ctx.PathParamInt64("id"))
 	if err != nil {
-		ctx.ServerError("GetCommitDataByID", err)
+		ctx.ServerError("GetCommitCommentByID", err)
 		return
 	}
 
@@ -660,7 +660,7 @@ func UpdateCommitComment(ctx *context.Context) {
 		}
 	}
 	maps.Copy(attachmentMap, uploadedAttachments)
-	err = git_model.UpdateCommitData(ctx, &attachmentMap, commitComment)
+	err = git_model.UpdateCommitComment(ctx, &attachmentMap, commitComment)
 	if err != nil {
 		ctx.ServerError("UpdateCommitComment", err)
 		return
@@ -717,9 +717,9 @@ func CancelCommitComment(ctx *context.Context) {
 
 func ChangeCommitCommentReaction(ctx *context.Context) {
 	form := web.GetForm(ctx).(*forms.ReactionForm)
-	commitComment, err := git_model.GetCommitDataByID(ctx, ctx.Repo.Repository.ID, ctx.PathParamInt64("id"))
+	commitComment, err := git_model.GetCommitCommentByID(ctx, ctx.Repo.Repository.ID, ctx.PathParamInt64("id"))
 	if err != nil {
-		ctx.ServerError("GetCommitDataByID", err)
+		ctx.ServerError("GetCommitCommentByID", err)
 		return
 	}
 
@@ -866,7 +866,7 @@ func DeleteCommitAttachment(ctx *context.Context) {
 }
 
 func GetCommitAttachmentByUUID(ctx *context.Context) {
-	commitComment, err := git_model.GetCommitDataByID(ctx, ctx.Repo.Repository.ID, ctx.PathParamInt64("id"))
+	commitComment, err := git_model.GetCommitCommentByID(ctx, ctx.Repo.Repository.ID, ctx.PathParamInt64("id"))
 	if err != nil {
 		return
 	}
@@ -914,7 +914,7 @@ func GetCommitAttachmentByUUID(ctx *context.Context) {
 }
 
 func GetCommitAttachments(ctx *context.Context) {
-	commitComment, err := git_model.GetCommitDataByID(ctx, ctx.Repo.Repository.ID, ctx.PathParamInt64("id"))
+	commitComment, err := git_model.GetCommitCommentByID(ctx, ctx.Repo.Repository.ID, ctx.PathParamInt64("id"))
 	if err != nil {
 		return
 	}
diff --git a/services/git/commit.go b/services/git/commit.go
@@ -91,8 +91,8 @@ func ParseCommitsWithStatus(ctx context.Context, oldCommits []*asymkey_model.Sig
 	return newCommits, nil
 }
 
-func CreateCommitComment(ctx context.Context, doer *user_model.User, gitRepo *git.Repository, opts git_model.CreateCommitDataOptions) (*git_model.CommitComment, error) {
-	comment, err := git_model.CreateCommitData(ctx, &opts)
+func CreateCommitComment(ctx context.Context, doer *user_model.User, gitRepo *git.Repository, opts git_model.CreateCommitCommentOptions) (*git_model.CommitComment, error) {
+	comment, err := git_model.CreateCommitComment(ctx, &opts)
 	if err != nil {
 		return nil, err
 	}
@@ -101,7 +101,7 @@ func CreateCommitComment(ctx context.Context, doer *user_model.User, gitRepo *gi
 
 // LoadComments loads comments into each line
 func LoadCommitComments(ctx context.Context, diff *gitdiff.Diff, commitComment *git_model.CommitComment, currentUser *user_model.User) error {
-	opts := git_model.FindCommitDataOptions{
+	opts := git_model.FindCommitCommentOptions{
 		CommitSHA: commitComment.CommitSHA,
 	}
 

Original file line number	Diff line number	Diff line change
`@@ -432,9 +432,9 @@ func Diff(ctx *context.Context) {`
`432`	`432`	`ctx.Data["MergedPRIssueNumber"] = pr.Index`
`433`	`433`	`}`
`434`	`434`
`435`		`- commitComment, err := git_model.GetCommitDataBySHA(ctx, ctx.Repo.Repository.ID, commitID)`
	`435`	`+ commitComment, err := git_model.GetCommitCommentBySHA(ctx, ctx.Repo.Repository.ID, commitID)`
`436`	`436`	`if err != nil {`
`437`		`- ctx.ServerError("GetCommitDataBySHA", err)`
	`437`	`+ ctx.ServerError("GetCommitCommentBySHA", err)`
`438`	`438`	`return`
`439`	`439`	`}`
`440`	`440`
`@@ -531,7 +531,7 @@ func CreateCommitComment(ctx *context.Context) {`
`531`	`531`	`attachmentsMap = ctx.Session.Get("attachmentsMaps").(git_model.AttachmentMap)`
`532`	`532`	`}`
`533`	`533`
`534`		`- opts := git_model.CreateCommitDataOptions{`
	`534`	`+ opts := git_model.CreateCommitCommentOptions{`
`535`	`535`	`RefRepoID: ctx.Repo.Repository.ID,`
`536`	`536`	`Repo: ctx.Repo.Repository,`
`537`	`537`	`Doer: ctx.Doer,`
`@@ -558,13 +558,13 @@ func CreateCommitComment(ctx *context.Context) {`
`558`	`558`	`return`
`559`	`559`	`}`
`560`	`560`	`}`
`561`		`- renderCommitData(ctx, commitComment, form.Origin, signedLine)`
	`561`	`+ renderCommitComment(ctx, commitComment, form.Origin, signedLine)`
`562`	`562`	`}`
`563`	`563`
`564`		`-func renderCommitData(ctx context.Context, commitComment git_model.CommitComment, origin string, signedLine int64) {`
	`564`	`+func renderCommitComment(ctx context.Context, commitComment git_model.CommitComment, origin string, signedLine int64) {`
`565`	`565`	`ctx.Data["PageIsDiff"] = true`
`566`	`566`
`567`		`- opts := git_model.FindCommitDataOptions{`
	`567`	`+ opts := git_model.FindCommitCommentOptions{`
`568`	`568`	`CommitSHA: commitComment.CommitSHA,`
`569`	`569`	`Line: signedLine,`
`570`	`570`	`}`
`@@ -600,7 +600,7 @@ func renderCommitData(ctx context.Context, commitComment git_model.CommitComme`
`600`	`600`
`601`	`601`	`// DeleteCommitComment delete comment of commit`
`602`	`602`	`func DeleteCommitComment(ctx *context.Context) {`
`603`		`- commitComment, err := git_model.GetCommitDataByID(ctx, ctx.Repo.Repository.ID, ctx.PathParamInt64("id"))`
	`603`	`+ commitComment, err := git_model.GetCommitCommentByID(ctx, ctx.Repo.Repository.ID, ctx.PathParamInt64("id"))`
`604`	`604`	`if err != nil {`
`605`	`605`	`return`
`606`	`606`	`}`
`@@ -610,17 +610,17 @@ func DeleteCommitComment(ctx *context.Context) {`
`610`	`610`	`}`
`611`	`611`
`612`	`612`	`if err = git_model.DeleteCommitComment(ctx, commitComment); err != nil {`
`613`		`- ctx.ServerError("GetCommitDataByID", err)`
	`613`	`+ ctx.ServerError("DeleteCommitComment", err)`
`614`	`614`	`return`
`615`	`615`	`}`
`616`	`616`
`617`	`617`	`ctx.Status(http.StatusOK)`
`618`	`618`	`}`
`619`	`619`
`620`	`620`	`func UpdateCommitComment(ctx *context.Context) {`
`621`		`- commitComment, err := git_model.GetCommitDataByID(ctx, ctx.Repo.Repository.ID, ctx.PathParamInt64("id"))`
	`621`	`+ commitComment, err := git_model.GetCommitCommentByID(ctx, ctx.Repo.Repository.ID, ctx.PathParamInt64("id"))`
`622`	`622`	`if err != nil {`
`623`		`- ctx.ServerError("GetCommitDataByID", err)`
	`623`	`+ ctx.ServerError("GetCommitCommentByID", err)`
`624`	`624`	`return`
`625`	`625`	`}`
`626`	`626`
`@@ -660,7 +660,7 @@ func UpdateCommitComment(ctx *context.Context) {`
`660`	`660`	`}`
`661`	`661`	`}`
`662`	`662`	`maps.Copy(attachmentMap, uploadedAttachments)`
`663`		`- err = git_model.UpdateCommitData(ctx, &attachmentMap, commitComment)`
	`663`	`+ err = git_model.UpdateCommitComment(ctx, &attachmentMap, commitComment)`
`664`	`664`	`if err != nil {`
`665`	`665`	`ctx.ServerError("UpdateCommitComment", err)`
`666`	`666`	`return`
`@@ -717,9 +717,9 @@ func CancelCommitComment(ctx *context.Context) {`
`717`	`717`
`718`	`718`	`func ChangeCommitCommentReaction(ctx *context.Context) {`
`719`	`719`	`form := web.GetForm(ctx).(*forms.ReactionForm)`
`720`		`- commitComment, err := git_model.GetCommitDataByID(ctx, ctx.Repo.Repository.ID, ctx.PathParamInt64("id"))`
	`720`	`+ commitComment, err := git_model.GetCommitCommentByID(ctx, ctx.Repo.Repository.ID, ctx.PathParamInt64("id"))`
`721`	`721`	`if err != nil {`
`722`		`- ctx.ServerError("GetCommitDataByID", err)`
	`722`	`+ ctx.ServerError("GetCommitCommentByID", err)`
`723`	`723`	`return`
`724`	`724`	`}`
`725`	`725`
`@@ -866,7 +866,7 @@ func DeleteCommitAttachment(ctx *context.Context) {`
`866`	`866`	`}`
`867`	`867`
`868`	`868`	`func GetCommitAttachmentByUUID(ctx *context.Context) {`
`869`		`- commitComment, err := git_model.GetCommitDataByID(ctx, ctx.Repo.Repository.ID, ctx.PathParamInt64("id"))`
	`869`	`+ commitComment, err := git_model.GetCommitCommentByID(ctx, ctx.Repo.Repository.ID, ctx.PathParamInt64("id"))`
`870`	`870`	`if err != nil {`
`871`	`871`	`return`
`872`	`872`	`}`
`@@ -914,7 +914,7 @@ func GetCommitAttachmentByUUID(ctx *context.Context) {`
`914`	`914`	`}`
`915`	`915`
`916`	`916`	`func GetCommitAttachments(ctx *context.Context) {`
`917`		`- commitComment, err := git_model.GetCommitDataByID(ctx, ctx.Repo.Repository.ID, ctx.PathParamInt64("id"))`
	`917`	`+ commitComment, err := git_model.GetCommitCommentByID(ctx, ctx.Repo.Repository.ID, ctx.PathParamInt64("id"))`
`918`	`918`	`if err != nil {`
`919`	`919`	`return`
`920`	`920`	`}`
Original file line number	Diff line number	Diff line change
`@@ -91,8 +91,8 @@ func ParseCommitsWithStatus(ctx context.Context, oldCommits []*asymkey_model.Sig`
`91`	`91`	`return newCommits, nil`
`92`	`92`	`}`
`93`	`93`
`94`		`-func CreateCommitComment(ctx context.Context, doer user_model.User, gitRepo git.Repository, opts git_model.CreateCommitDataOptions) (*git_model.CommitComment, error) {`
`95`		`- comment, err := git_model.CreateCommitData(ctx, &opts)`
	`94`	`+func CreateCommitComment(ctx context.Context, doer user_model.User, gitRepo git.Repository, opts git_model.CreateCommitCommentOptions) (*git_model.CommitComment, error) {`
	`95`	`+ comment, err := git_model.CreateCommitComment(ctx, &opts)`
`96`	`96`	`if err != nil {`
`97`	`97`	`return nil, err`
`98`	`98`	`}`
`@@ -101,7 +101,7 @@ func CreateCommitComment(ctx context.Context, doer user_model.User, gitRepo gi`
`101`	`101`
`102`	`102`	`// LoadComments loads comments into each line`
`103`	`103`	`func LoadCommitComments(ctx context.Context, diff gitdiff.Diff, commitComment git_model.CommitComment, currentUser *user_model.User) error {`
`104`		`- opts := git_model.FindCommitDataOptions{`
	`104`	`+ opts := git_model.FindCommitCommentOptions{`
`105`	`105`	`CommitSHA: commitComment.CommitSHA,`
`106`	`106`	`}`
`107`	`107`