diff options
Diffstat (limited to 'services/issue')
| -rw-r--r-- | services/issue/assignee.go | 8 | ||||
| -rw-r--r-- | services/issue/comments.go | 8 | ||||
| -rw-r--r-- | services/issue/content.go | 4 | ||||
| -rw-r--r-- | services/issue/issue.go | 14 | ||||
| -rw-r--r-- | services/issue/label.go | 12 | ||||
| -rw-r--r-- | services/issue/milestone.go | 4 | ||||
| -rw-r--r-- | services/issue/status.go | 4 |
7 files changed, 27 insertions, 27 deletions
diff --git a/services/issue/assignee.go b/services/issue/assignee.go index 9b0445d29f..27fc695533 100644 --- a/services/issue/assignee.go +++ b/services/issue/assignee.go @@ -13,7 +13,7 @@ import ( "code.gitea.io/gitea/models/unit" user_model "code.gitea.io/gitea/models/user" "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/notification" + notify_service "code.gitea.io/gitea/services/notify" ) // DeleteNotPassedAssignee deletes all assignees who aren't passed via the "assignees" array @@ -54,7 +54,7 @@ func ToggleAssigneeWithNotify(ctx context.Context, issue *issues_model.Issue, do return false, nil, err } - notification.NotifyIssueChangeAssignee(ctx, doer, issue, assignee, removed, comment) + notify_service.IssueChangeAssignee(ctx, doer, issue, assignee, removed, comment) return removed, comment, err } @@ -72,7 +72,7 @@ func ReviewRequest(ctx context.Context, issue *issues_model.Issue, doer, reviewe } if comment != nil { - notification.NotifyPullRequestReviewRequest(ctx, doer, issue, reviewer, isAdd, comment) + notify_service.PullRequestReviewRequest(ctx, doer, issue, reviewer, isAdd, comment) } return comment, err @@ -259,7 +259,7 @@ func TeamReviewRequest(ctx context.Context, issue *issues_model.Issue, doer *use continue } comment.AssigneeID = member.ID - notification.NotifyPullRequestReviewRequest(ctx, doer, issue, member, isAdd, comment) + notify_service.PullRequestReviewRequest(ctx, doer, issue, member, isAdd, comment) } return comment, err diff --git a/services/issue/comments.go b/services/issue/comments.go index 2c5ef0f5dc..4a8574edd5 100644 --- a/services/issue/comments.go +++ b/services/issue/comments.go @@ -11,8 +11,8 @@ import ( issues_model "code.gitea.io/gitea/models/issues" repo_model "code.gitea.io/gitea/models/repo" user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/notification" "code.gitea.io/gitea/modules/timeutil" + notify_service "code.gitea.io/gitea/services/notify" ) // CreateRefComment creates a commit reference comment to issue. @@ -63,7 +63,7 @@ func CreateIssueComment(ctx context.Context, doer *user_model.User, repo *repo_m return nil, err } - notification.NotifyCreateIssueComment(ctx, doer, repo, issue, comment, mentions) + notify_service.CreateIssueComment(ctx, doer, repo, issue, comment, mentions) return comment, nil } @@ -95,7 +95,7 @@ func UpdateComment(ctx context.Context, c *issues_model.Comment, doer *user_mode } } - notification.NotifyUpdateComment(ctx, doer, c, oldContent) + notify_service.UpdateComment(ctx, doer, c, oldContent) return nil } @@ -109,7 +109,7 @@ func DeleteComment(ctx context.Context, doer *user_model.User, comment *issues_m return err } - notification.NotifyDeleteComment(ctx, doer, comment) + notify_service.DeleteComment(ctx, doer, comment) return nil } diff --git a/services/issue/content.go b/services/issue/content.go index 819ac3f20f..cda11dbb18 100644 --- a/services/issue/content.go +++ b/services/issue/content.go @@ -7,7 +7,7 @@ import ( "code.gitea.io/gitea/models/db" issues_model "code.gitea.io/gitea/models/issues" user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/notification" + notify_service "code.gitea.io/gitea/services/notify" ) // ChangeContent changes issue content, as the given user. @@ -18,7 +18,7 @@ func ChangeContent(issue *issues_model.Issue, doer *user_model.User, content str return err } - notification.NotifyIssueChangeContent(db.DefaultContext, doer, issue, oldContent) + notify_service.IssueChangeContent(db.DefaultContext, doer, issue, oldContent) return nil } diff --git a/services/issue/issue.go b/services/issue/issue.go index 35409589ef..828599be6b 100644 --- a/services/issue/issue.go +++ b/services/issue/issue.go @@ -16,8 +16,8 @@ import ( system_model "code.gitea.io/gitea/models/system" user_model "code.gitea.io/gitea/models/user" "code.gitea.io/gitea/modules/git" - "code.gitea.io/gitea/modules/notification" "code.gitea.io/gitea/modules/storage" + notify_service "code.gitea.io/gitea/services/notify" ) // NewIssue creates new issue with labels for repository. @@ -37,12 +37,12 @@ func NewIssue(ctx context.Context, repo *repo_model.Repository, issue *issues_mo return err } - notification.NotifyNewIssue(ctx, issue, mentions) + notify_service.NewIssue(ctx, issue, mentions) if len(issue.Labels) > 0 { - notification.NotifyIssueChangeLabels(ctx, issue.Poster, issue, issue.Labels, nil) + notify_service.IssueChangeLabels(ctx, issue.Poster, issue, issue.Labels, nil) } if issue.Milestone != nil { - notification.NotifyIssueChangeMilestone(ctx, issue.Poster, issue, 0) + notify_service.IssueChangeMilestone(ctx, issue.Poster, issue, 0) } return nil @@ -63,7 +63,7 @@ func ChangeTitle(ctx context.Context, issue *issues_model.Issue, doer *user_mode } } - notification.NotifyIssueChangeTitle(ctx, doer, issue, oldTitle) + notify_service.IssueChangeTitle(ctx, doer, issue, oldTitle) return nil } @@ -77,7 +77,7 @@ func ChangeIssueRef(ctx context.Context, issue *issues_model.Issue, doer *user_m return err } - notification.NotifyIssueChangeRef(ctx, doer, issue, oldRef) + notify_service.IssueChangeRef(ctx, doer, issue, oldRef) return nil } @@ -166,7 +166,7 @@ func DeleteIssue(ctx context.Context, doer *user_model.User, gitRepo *git.Reposi } } - notification.NotifyDeleteIssue(ctx, doer, issue) + notify_service.DeleteIssue(ctx, doer, issue) return nil } diff --git a/services/issue/label.go b/services/issue/label.go index ee821a49c9..f830aab0e7 100644 --- a/services/issue/label.go +++ b/services/issue/label.go @@ -8,7 +8,7 @@ import ( issues_model "code.gitea.io/gitea/models/issues" access_model "code.gitea.io/gitea/models/perm/access" user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/notification" + notify_service "code.gitea.io/gitea/services/notify" ) // ClearLabels clears all of an issue's labels @@ -17,7 +17,7 @@ func ClearLabels(issue *issues_model.Issue, doer *user_model.User) error { return err } - notification.NotifyIssueClearLabels(db.DefaultContext, doer, issue) + notify_service.IssueClearLabels(db.DefaultContext, doer, issue) return nil } @@ -28,7 +28,7 @@ func AddLabel(issue *issues_model.Issue, doer *user_model.User, label *issues_mo return err } - notification.NotifyIssueChangeLabels(db.DefaultContext, doer, issue, []*issues_model.Label{label}, nil) + notify_service.IssueChangeLabels(db.DefaultContext, doer, issue, []*issues_model.Label{label}, nil) return nil } @@ -38,7 +38,7 @@ func AddLabels(issue *issues_model.Issue, doer *user_model.User, labels []*issue return err } - notification.NotifyIssueChangeLabels(db.DefaultContext, doer, issue, labels, nil) + notify_service.IssueChangeLabels(db.DefaultContext, doer, issue, labels, nil) return nil } @@ -73,7 +73,7 @@ func RemoveLabel(issue *issues_model.Issue, doer *user_model.User, label *issues return err } - notification.NotifyIssueChangeLabels(db.DefaultContext, doer, issue, nil, []*issues_model.Label{label}) + notify_service.IssueChangeLabels(db.DefaultContext, doer, issue, nil, []*issues_model.Label{label}) return nil } @@ -88,6 +88,6 @@ func ReplaceLabels(issue *issues_model.Issue, doer *user_model.User, labels []*i return err } - notification.NotifyIssueChangeLabels(db.DefaultContext, doer, issue, labels, old) + notify_service.IssueChangeLabels(db.DefaultContext, doer, issue, labels, old) return nil } diff --git a/services/issue/milestone.go b/services/issue/milestone.go index a9be8bd887..5a07cfd2e5 100644 --- a/services/issue/milestone.go +++ b/services/issue/milestone.go @@ -10,7 +10,7 @@ import ( "code.gitea.io/gitea/models/db" issues_model "code.gitea.io/gitea/models/issues" user_model "code.gitea.io/gitea/models/user" - "code.gitea.io/gitea/modules/notification" + notify_service "code.gitea.io/gitea/services/notify" ) func changeMilestoneAssign(ctx context.Context, doer *user_model.User, issue *issues_model.Issue, oldMilestoneID int64) error { @@ -78,7 +78,7 @@ func ChangeMilestoneAssign(issue *issues_model.Issue, doer *user_model.User, old return fmt.Errorf("Commit: %w", err) } - notification.NotifyIssueChangeMilestone(db.DefaultContext, doer, issue, oldMilestoneID) + notify_service.IssueChangeMilestone(db.DefaultContext, doer, issue, oldMilestoneID) return nil } diff --git a/services/issue/status.go b/services/issue/status.go index 3718a5048f..9b6c683f4f 100644 --- a/services/issue/status.go +++ b/services/issue/status.go @@ -9,7 +9,7 @@ import ( issues_model "code.gitea.io/gitea/models/issues" user_model "code.gitea.io/gitea/models/user" "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/notification" + notify_service "code.gitea.io/gitea/services/notify" ) // ChangeStatus changes issue status to open or closed. @@ -30,7 +30,7 @@ func ChangeStatus(ctx context.Context, issue *issues_model.Issue, doer *user_mod } } - notification.NotifyIssueChangeStatus(ctx, doer, commitID, issue, comment, closed) + notify_service.IssueChangeStatus(ctx, doer, commitID, issue, comment, closed) return nil } |