peter/go-gitea
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Factor out creation of reference comments

Browse Source
This commit is contained in:
Keith Rutkowski 2018-04-02 10:10:13 -04:00
parent faf860e707
commit 8c7a08fccf
2 changed files with 32 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
models/action.go
View File

@ -502,7 +502,7 @@ func UpdateIssuesCommit(doer *User, repo *Repository, commits []*PushCommit, com
if (mask & KeywordsFoundReference) == KeywordsFoundReference { if (mask & KeywordsFoundReference) == KeywordsFoundReference {
message := fmt.Sprintf(`<a href="%s/commit/%s">%s</a>`, repo.Link(), c.Sha1, c.Message) message := fmt.Sprintf(`<a href="%s/commit/%s">%s</a>`, repo.Link(), c.Sha1, c.Message)
if err = CreateRefComment(doer, repo, issue, message, c.Sha1); err != nil { if err = CreateCommitRefComment(doer, repo, issue, message, c.Sha1); err != nil {
return err return err
} }
} }

41
models/issue_comment.go
View File

@ -107,7 +107,8 @@ type Comment struct {
CreatedUnix util.TimeStamp `xorm:"INDEX created"` CreatedUnix util.TimeStamp `xorm:"INDEX created"`
UpdatedUnix util.TimeStamp `xorm:"INDEX updated"` UpdatedUnix util.TimeStamp `xorm:"INDEX updated"`
// Reference issue in commit message // Reference issue in commit message, comments, issues, or pull requests
// the commit SHA for commit refs otherwise a SHA of a unique reference identifier
CommitSHA string `xorm:"VARCHAR(40)"` CommitSHA string `xorm:"VARCHAR(40)"`
Attachments []*Attachment `xorm:"-"` Attachments []*Attachment `xorm:"-"`
@ -622,17 +623,17 @@ func CreateIssueComment(doer *User, repo *Repository, issue *Issue, content stri
return comment, nil return comment, nil
} }
// CreateRefComment creates a commit reference comment to issue. // createRefComment creates a commit, comment, issue, or pull request reference comment to issue.
func CreateRefComment(doer *User, repo *Repository, issue *Issue, content, commitSHA string) error { func createRefComment(doer *User, repo *Repository, issue *Issue, content, refSHA string, commentType CommentType) error {
if len(commitSHA) == 0 { if len(refSHA) == 0 {
return fmt.Errorf("cannot create reference with empty commit SHA") return fmt.Errorf("cannot create reference with empty SHA")
} }
// Check if same reference from same commit has already existed. // Check if same reference from same issue and comment has already existed.
has, err := x.Get(&Comment{ has, err := x.Get(&Comment{
Type: CommentTypeCommitRef, Type: commentType,
IssueID: issue.ID, IssueID: issue.ID,
CommitSHA: commitSHA, CommitSHA: refSHA,
}) })
if err != nil { if err != nil {
return fmt.Errorf("check reference comment: %v", err) return fmt.Errorf("check reference comment: %v", err)
@ -641,16 +642,36 @@ func CreateRefComment(doer *User, repo *Repository, issue *Issue, content, commi
} }
_, err = CreateComment(&CreateCommentOptions{ _, err = CreateComment(&CreateCommentOptions{
Type: CommentTypeCommitRef, Type: commentType,
Doer: doer, Doer: doer,
Repo: repo, Repo: repo,
Issue: issue, Issue: issue,
CommitSHA: commitSHA, CommitSHA: refSHA,
Content: content, Content: content,
}) })
return err return err
} }
// CreateCommitRefComment creates a commit reference comment to issue.
func CreateCommitRefComment(doer *User, repo *Repository, issue *Issue, content, commitSHA string) error {
return createRefComment(doer, repo, issue, content, commitSHA, CommentTypeCommitRef)
}
// CreateCommentRefComment creates a comment reference comment to issue.
func CreateCommentRefComment(doer *User, repo *Repository, issue *Issue, content, refSHA string) error {
return createRefComment(doer, repo, issue, content, refSHA, CommentTypeCommentRef)
}
// CreateIssueRefComment creates a comment reference comment to issue.
func CreateIssueRefComment(doer *User, repo *Repository, issue *Issue, content, refSHA string) error {
return createRefComment(doer, repo, issue, content, refSHA, CommentTypeIssueRef)
}
// CreatePullRefComment creates a comment reference comment to issue.
func CreatePullRefComment(doer *User, repo *Repository, issue *Issue, content, refSHA string) error {
return createRefComment(doer, repo, issue, content, refSHA, CommentTypePullRef)
}
// GetCommentByID returns the comment by given ID. // GetCommentByID returns the comment by given ID.
func GetCommentByID(id int64) (*Comment, error) { func GetCommentByID(id int64) (*Comment, error) {
c := new(Comment) c := new(Comment)