Skip to content

Commit e151ead

Browse files
committed
improve code
1 parent 3ff9d59 commit e151ead

File tree

5 files changed

+8
-20
lines changed

5 files changed

+8
-20
lines changed

models/issue.go

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -721,8 +721,7 @@ func (issue *Issue) ChangeTitle(doer *User, oldTitle string) (err error) {
721721
OldTitle: oldTitle,
722722
NewTitle: issue.Title,
723723
}
724-
_, err = createCommentWithNoAction(sess, opts)
725-
if err != nil {
724+
if _, err = createCommentWithNoAction(sess, opts); err != nil {
726725
return fmt.Errorf("createComment: %v", err)
727726
}
728727
if err = issue.addCrossReferences(sess, doer, true); err != nil {
@@ -750,8 +749,7 @@ func AddDeletePRBranchComment(doer *User, repo *Repository, issueID int64, branc
750749
Issue: issue,
751750
CommitSHA: branchName,
752751
}
753-
_, err = createCommentWithNoAction(sess, opts)
754-
if err != nil {
752+
if _, err = createCommentWithNoAction(sess, opts); err != nil {
755753
return err
756754
}
757755

@@ -893,8 +891,7 @@ func newIssue(e *xorm.Session, doer *User, opts NewIssueOptions) (err error) {
893891
OldMilestoneID: 0,
894892
MilestoneID: opts.Issue.MilestoneID,
895893
}
896-
_, err = createCommentWithNoAction(e, opts)
897-
if err != nil {
894+
if _, err = createCommentWithNoAction(e, opts); err != nil {
898895
return err
899896
}
900897
}

models/issue_comment.go

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -699,8 +699,7 @@ func createIssueDependencyComment(e *xorm.Session, doer *User, issue *Issue, dep
699699
Issue: issue,
700700
DependentIssueID: dependentIssue.ID,
701701
}
702-
_, err = createCommentWithNoAction(e, opts)
703-
if err != nil {
702+
if _, err = createCommentWithNoAction(e, opts); err != nil {
704703
return
705704
}
706705

@@ -712,10 +711,6 @@ func createIssueDependencyComment(e *xorm.Session, doer *User, issue *Issue, dep
712711
DependentIssueID: issue.ID,
713712
}
714713
_, err = createCommentWithNoAction(e, opts)
715-
if err != nil {
716-
return
717-
}
718-
719714
return
720715
}
721716

models/issue_label.go

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -414,8 +414,7 @@ func newIssueLabel(e *xorm.Session, issue *Issue, label *Label, doer *User) (err
414414
Label: label,
415415
Content: "1",
416416
}
417-
_, err = createCommentWithNoAction(e, opts)
418-
if err != nil {
417+
if _, err = createCommentWithNoAction(e, opts); err != nil {
419418
return err
420419
}
421420

@@ -491,8 +490,7 @@ func deleteIssueLabel(e *xorm.Session, issue *Issue, label *Label, doer *User) (
491490
Issue: issue,
492491
Label: label,
493492
}
494-
_, err = createCommentWithNoAction(e, opts)
495-
if err != nil {
493+
if _, err = createCommentWithNoAction(e, opts); err != nil {
496494
return err
497495
}
498496

models/issue_lock.go

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -52,8 +52,7 @@ func updateIssueLock(opts *IssueLockOptions, lock bool) error {
5252
Type: commentType,
5353
Content: opts.Reason,
5454
}
55-
_, err := createCommentWithNoAction(sess, opt)
56-
if err != nil {
55+
if _, err := createCommentWithNoAction(sess, opt); err != nil {
5756
return err
5857
}
5958

models/issue_milestone.go

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -394,8 +394,7 @@ func changeMilestoneAssign(e *xorm.Session, doer *User, issue *Issue, oldMilesto
394394
OldMilestoneID: oldMilestoneID,
395395
MilestoneID: issue.MilestoneID,
396396
}
397-
_, err := createCommentWithNoAction(e, opts)
398-
if err != nil {
397+
if _, err := createCommentWithNoAction(e, opts); err != nil {
399398
return err
400399
}
401400
}

0 commit comments

Comments
 (0)