From 3ff9d59ef61fe4360af5baa3f1d25eb995315378 Mon Sep 17 00:00:00 2001 From: Lunny Xiao Date: Mon, 2 Dec 2019 17:10:11 +0800 Subject: [PATCH 1/2] Remove unused comment actions --- models/issue.go | 16 +++------------- models/issue_assignees.go | 3 --- models/issue_comment.go | 12 +++--------- models/issue_label.go | 10 ++-------- models/issue_lock.go | 6 +----- models/issue_milestone.go | 6 +----- 6 files changed, 10 insertions(+), 43 deletions(-) diff --git a/models/issue.go b/models/issue.go index a3597f1585bf..3fb09603c543 100644 --- a/models/issue.go +++ b/models/issue.go @@ -721,13 +721,10 @@ func (issue *Issue) ChangeTitle(doer *User, oldTitle string) (err error) { OldTitle: oldTitle, NewTitle: issue.Title, } - comment, err := createCommentWithNoAction(sess, opts) + _, err = createCommentWithNoAction(sess, opts) if err != nil { return fmt.Errorf("createComment: %v", err) } - if err = sendCreateCommentAction(sess, opts, comment); err != nil { - return err - } if err = issue.addCrossReferences(sess, doer, true); err != nil { return err } @@ -753,13 +750,10 @@ func AddDeletePRBranchComment(doer *User, repo *Repository, issueID int64, branc Issue: issue, CommitSHA: branchName, } - comment, err := createCommentWithNoAction(sess, opts) + _, err = createCommentWithNoAction(sess, opts) if err != nil { return err } - if err = sendCreateCommentAction(sess, opts, comment); err != nil { - return err - } return sess.Commit() } @@ -899,14 +893,10 @@ func newIssue(e *xorm.Session, doer *User, opts NewIssueOptions) (err error) { OldMilestoneID: 0, MilestoneID: opts.Issue.MilestoneID, } - comment, err := createCommentWithNoAction(e, opts) + _, err = createCommentWithNoAction(e, opts) if err != nil { return err } - - if err = sendCreateCommentAction(e, opts, comment); err != nil { - return err - } } if opts.IsPull { diff --git a/models/issue_assignees.go b/models/issue_assignees.go index c78132db5de7..1eee9d776903 100644 --- a/models/issue_assignees.go +++ b/models/issue_assignees.go @@ -144,9 +144,6 @@ func (issue *Issue) toggleAssignee(sess *xorm.Session, doer *User, assigneeID in if err != nil { return false, nil, fmt.Errorf("createComment: %v", err) } - if err = sendCreateCommentAction(sess, opts, comment); err != nil { - return false, nil, err - } // if pull request is in the middle of creation - don't call webhook if isCreate { diff --git a/models/issue_comment.go b/models/issue_comment.go index 1fad141d9273..82db69503f55 100644 --- a/models/issue_comment.go +++ b/models/issue_comment.go @@ -678,7 +678,7 @@ func createDeadlineComment(e *xorm.Session, doer *User, issue *Issue, newDeadlin if err != nil { return nil, err } - return comment, sendCreateCommentAction(e, opts, comment) + return comment, nil } // Creates issue dependency comment @@ -699,13 +699,10 @@ func createIssueDependencyComment(e *xorm.Session, doer *User, issue *Issue, dep Issue: issue, DependentIssueID: dependentIssue.ID, } - comment, err := createCommentWithNoAction(e, opts) + _, err = createCommentWithNoAction(e, opts) if err != nil { return } - if err = sendCreateCommentAction(e, opts, comment); err != nil { - return err - } opts = &CreateCommentOptions{ Type: cType, @@ -714,13 +711,10 @@ func createIssueDependencyComment(e *xorm.Session, doer *User, issue *Issue, dep Issue: dependentIssue, DependentIssueID: issue.ID, } - comment, err = createCommentWithNoAction(e, opts) + _, err = createCommentWithNoAction(e, opts) if err != nil { return } - if err = sendCreateCommentAction(e, opts, comment); err != nil { - return err - } return } diff --git a/models/issue_label.go b/models/issue_label.go index b2dd106176f4..16572975bf8e 100644 --- a/models/issue_label.go +++ b/models/issue_label.go @@ -414,13 +414,10 @@ func newIssueLabel(e *xorm.Session, issue *Issue, label *Label, doer *User) (err Label: label, Content: "1", } - comment, err := createCommentWithNoAction(e, opts) + _, err = createCommentWithNoAction(e, opts) if err != nil { return err } - if err = sendCreateCommentAction(e, opts, comment); err != nil { - return err - } return updateLabel(e, label) } @@ -494,13 +491,10 @@ func deleteIssueLabel(e *xorm.Session, issue *Issue, label *Label, doer *User) ( Issue: issue, Label: label, } - comment, err := createCommentWithNoAction(e, opts) + _, err = createCommentWithNoAction(e, opts) if err != nil { return err } - if err = sendCreateCommentAction(e, opts, comment); err != nil { - return err - } return updateLabel(e, label) } diff --git a/models/issue_lock.go b/models/issue_lock.go index 05eca27ad6c1..115654406148 100644 --- a/models/issue_lock.go +++ b/models/issue_lock.go @@ -52,14 +52,10 @@ func updateIssueLock(opts *IssueLockOptions, lock bool) error { Type: commentType, Content: opts.Reason, } - comment, err := createCommentWithNoAction(sess, opt) + _, err := createCommentWithNoAction(sess, opt) if err != nil { return err } - if err = sendCreateCommentAction(sess, opt, comment); err != nil { - return err - } - return sess.Commit() } diff --git a/models/issue_milestone.go b/models/issue_milestone.go index e3cbb9062406..b179fcf542d1 100644 --- a/models/issue_milestone.go +++ b/models/issue_milestone.go @@ -394,14 +394,10 @@ func changeMilestoneAssign(e *xorm.Session, doer *User, issue *Issue, oldMilesto OldMilestoneID: oldMilestoneID, MilestoneID: issue.MilestoneID, } - comment, err := createCommentWithNoAction(e, opts) + _, err := createCommentWithNoAction(e, opts) if err != nil { return err } - - if err := sendCreateCommentAction(e, opts, comment); err != nil { - return err - } } return nil From e151ead80057d4a2b90b7187fd698ce347c788b2 Mon Sep 17 00:00:00 2001 From: Lunny Xiao Date: Mon, 2 Dec 2019 17:39:30 +0800 Subject: [PATCH 2/2] improve code --- models/issue.go | 9 +++------ models/issue_comment.go | 7 +------ models/issue_label.go | 6 ++---- models/issue_lock.go | 3 +-- models/issue_milestone.go | 3 +-- 5 files changed, 8 insertions(+), 20 deletions(-) diff --git a/models/issue.go b/models/issue.go index 3fb09603c543..0a08a97fdd35 100644 --- a/models/issue.go +++ b/models/issue.go @@ -721,8 +721,7 @@ func (issue *Issue) ChangeTitle(doer *User, oldTitle string) (err error) { OldTitle: oldTitle, NewTitle: issue.Title, } - _, err = createCommentWithNoAction(sess, opts) - if err != nil { + if _, err = createCommentWithNoAction(sess, opts); err != nil { return fmt.Errorf("createComment: %v", err) } if err = issue.addCrossReferences(sess, doer, true); err != nil { @@ -750,8 +749,7 @@ func AddDeletePRBranchComment(doer *User, repo *Repository, issueID int64, branc Issue: issue, CommitSHA: branchName, } - _, err = createCommentWithNoAction(sess, opts) - if err != nil { + if _, err = createCommentWithNoAction(sess, opts); err != nil { return err } @@ -893,8 +891,7 @@ func newIssue(e *xorm.Session, doer *User, opts NewIssueOptions) (err error) { OldMilestoneID: 0, MilestoneID: opts.Issue.MilestoneID, } - _, err = createCommentWithNoAction(e, opts) - if err != nil { + if _, err = createCommentWithNoAction(e, opts); err != nil { return err } } diff --git a/models/issue_comment.go b/models/issue_comment.go index 82db69503f55..5843689f1bbb 100644 --- a/models/issue_comment.go +++ b/models/issue_comment.go @@ -699,8 +699,7 @@ func createIssueDependencyComment(e *xorm.Session, doer *User, issue *Issue, dep Issue: issue, DependentIssueID: dependentIssue.ID, } - _, err = createCommentWithNoAction(e, opts) - if err != nil { + if _, err = createCommentWithNoAction(e, opts); err != nil { return } @@ -712,10 +711,6 @@ func createIssueDependencyComment(e *xorm.Session, doer *User, issue *Issue, dep DependentIssueID: issue.ID, } _, err = createCommentWithNoAction(e, opts) - if err != nil { - return - } - return } diff --git a/models/issue_label.go b/models/issue_label.go index 16572975bf8e..4318406af71e 100644 --- a/models/issue_label.go +++ b/models/issue_label.go @@ -414,8 +414,7 @@ func newIssueLabel(e *xorm.Session, issue *Issue, label *Label, doer *User) (err Label: label, Content: "1", } - _, err = createCommentWithNoAction(e, opts) - if err != nil { + if _, err = createCommentWithNoAction(e, opts); err != nil { return err } @@ -491,8 +490,7 @@ func deleteIssueLabel(e *xorm.Session, issue *Issue, label *Label, doer *User) ( Issue: issue, Label: label, } - _, err = createCommentWithNoAction(e, opts) - if err != nil { + if _, err = createCommentWithNoAction(e, opts); err != nil { return err } diff --git a/models/issue_lock.go b/models/issue_lock.go index 115654406148..4a2055ce324e 100644 --- a/models/issue_lock.go +++ b/models/issue_lock.go @@ -52,8 +52,7 @@ func updateIssueLock(opts *IssueLockOptions, lock bool) error { Type: commentType, Content: opts.Reason, } - _, err := createCommentWithNoAction(sess, opt) - if err != nil { + if _, err := createCommentWithNoAction(sess, opt); err != nil { return err } diff --git a/models/issue_milestone.go b/models/issue_milestone.go index b179fcf542d1..0b854a8671d4 100644 --- a/models/issue_milestone.go +++ b/models/issue_milestone.go @@ -394,8 +394,7 @@ func changeMilestoneAssign(e *xorm.Session, doer *User, issue *Issue, oldMilesto OldMilestoneID: oldMilestoneID, MilestoneID: issue.MilestoneID, } - _, err := createCommentWithNoAction(e, opts) - if err != nil { + if _, err := createCommentWithNoAction(e, opts); err != nil { return err } }