Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Remove unused comment actions #9222

Merged
merged 2 commits into from
Dec 2, 2019
Merged

Remove unused comment actions #9222

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3ff9d59
Remove unused comment actions
lunny Dec 2, 2019
e151ead
improve code
lunny Dec 2, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 3 additions & 16 deletions models/issue.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -721,13 +721,9 @@ func (issue *Issue) ChangeTitle(doer *User, oldTitle string) (err error) {
OldTitle: oldTitle,
NewTitle: issue.Title,
}
comment, err := createCommentWithNoAction(sess, opts)
if err != nil {
if _, err = createCommentWithNoAction(sess, opts); 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
}
Expand All @@ -753,11 +749,7 @@ func AddDeletePRBranchComment(doer *User, repo *Repository, issueID int64, branc
Issue: issue,
CommitSHA: branchName,
}
comment, err := createCommentWithNoAction(sess, opts)
if err != nil {
return err
}
if err = sendCreateCommentAction(sess, opts, comment); err != nil {
if _, err = createCommentWithNoAction(sess, opts); err != nil {
return err
}

Expand Down Expand Up @@ -899,12 +891,7 @@ func newIssue(e *xorm.Session, doer *User, opts NewIssueOptions) (err error) {
OldMilestoneID: 0,
MilestoneID: opts.Issue.MilestoneID,
}
comment, err := createCommentWithNoAction(e, opts)
if err != nil {
return err
}

if err = sendCreateCommentAction(e, opts, comment); err != nil {
if _, err = createCommentWithNoAction(e, opts); err != nil {
return err
}
}
Expand Down
3 changes: 0 additions & 3 deletions models/issue_assignees.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
17 changes: 3 additions & 14 deletions models/issue_comment.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -699,13 +699,9 @@ func createIssueDependencyComment(e *xorm.Session, doer *User, issue *Issue, dep
Issue: issue,
DependentIssueID: dependentIssue.ID,
}
comment, err := createCommentWithNoAction(e, opts)
if err != nil {
if _, err = createCommentWithNoAction(e, opts); err != nil {
return
}
if err = sendCreateCommentAction(e, opts, comment); err != nil {
return err
}

opts = &CreateCommentOptions{
Type: cType,
Expand All @@ -714,14 +710,7 @@ func createIssueDependencyComment(e *xorm.Session, doer *User, issue *Issue, dep
Issue: dependentIssue,
DependentIssueID: issue.ID,
}
comment, err = createCommentWithNoAction(e, opts)
if err != nil {
return
}
if err = sendCreateCommentAction(e, opts, comment); err != nil {
return err
}

_, err = createCommentWithNoAction(e, opts)
return
}

Expand Down
12 changes: 2 additions & 10 deletions models/issue_label.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -414,11 +414,7 @@ func newIssueLabel(e *xorm.Session, issue *Issue, label *Label, doer *User) (err
Label: label,
Content: "1",
}
comment, err := createCommentWithNoAction(e, opts)
if err != nil {
return err
}
if err = sendCreateCommentAction(e, opts, comment); err != nil {
if _, err = createCommentWithNoAction(e, opts); err != nil {
return err
}

Expand Down Expand Up @@ -494,11 +490,7 @@ func deleteIssueLabel(e *xorm.Session, issue *Issue, label *Label, doer *User) (
Issue: issue,
Label: label,
}
comment, err := createCommentWithNoAction(e, opts)
if err != nil {
return err
}
if err = sendCreateCommentAction(e, opts, comment); err != nil {
if _, err = createCommentWithNoAction(e, opts); err != nil {
return err
}

Expand Down
7 changes: 1 addition & 6 deletions models/issue_lock.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,12 +52,7 @@ func updateIssueLock(opts *IssueLockOptions, lock bool) error {
Type: commentType,
Content: opts.Reason,
}
comment, err := createCommentWithNoAction(sess, opt)
if err != nil {
return err
}

if err = sendCreateCommentAction(sess, opt, comment); err != nil {
if _, err := createCommentWithNoAction(sess, opt); err != nil {
return err
}

Expand Down
7 changes: 1 addition & 6 deletions models/issue_milestone.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -394,12 +394,7 @@ func changeMilestoneAssign(e *xorm.Session, doer *User, issue *Issue, oldMilesto
OldMilestoneID: oldMilestoneID,
MilestoneID: issue.MilestoneID,
}
comment, err := createCommentWithNoAction(e, opts)
if err != nil {
return err
}

if err := sendCreateCommentAction(e, opts, comment); err != nil {
if _, err := createCommentWithNoAction(e, opts); err != nil {
return err
}
}
Expand Down