summaryrefslogtreecommitdiffstats
path: root/modules
diff options
context:
space:
mode:
authorLunny Xiao <xiaolunwen@gmail.com>2020-02-18 16:52:57 +0800
committerGitHub <noreply@github.com>2020-02-18 10:52:57 +0200
commit21e771c41b4698e29d92d849c08431ac61dc2a51 (patch)
tree36ad77ad61d95a177b3dfef8a01b5d1b9eeb7610 /modules
parentf0a43a068f1eae1c12aada77685e3c8f545aaa00 (diff)
downloadgitea-21e771c41b4698e29d92d849c08431ac61dc2a51.tar.gz
gitea-21e771c41b4698e29d92d849c08431ac61dc2a51.zip
Fix notification (#10331)
Diffstat (limited to 'modules')
-rw-r--r--modules/notification/ui/ui.go36
1 files changed, 18 insertions, 18 deletions
diff --git a/modules/notification/ui/ui.go b/modules/notification/ui/ui.go
index 4d80d43c91..525753425a 100644
--- a/modules/notification/ui/ui.go
+++ b/modules/notification/ui/ui.go
@@ -19,9 +19,9 @@ type (
}
issueNotificationOpts struct {
- issueID int64
- commentID int64
- notificationAuthorID int64
+ IssueID int64
+ CommentID int64
+ NotificationAuthorID int64
}
)
@@ -39,7 +39,7 @@ func NewNotifier() base.Notifier {
func (ns *notificationService) handle(data ...queue.Data) {
for _, datum := range data {
opts := datum.(issueNotificationOpts)
- if err := models.CreateOrUpdateIssueNotifications(opts.issueID, opts.commentID, opts.notificationAuthorID); err != nil {
+ if err := models.CreateOrUpdateIssueNotifications(opts.IssueID, opts.CommentID, opts.NotificationAuthorID); err != nil {
log.Error("Was unable to create issue notification: %v", err)
}
}
@@ -52,33 +52,33 @@ func (ns *notificationService) Run() {
func (ns *notificationService) NotifyCreateIssueComment(doer *models.User, repo *models.Repository,
issue *models.Issue, comment *models.Comment) {
var opts = issueNotificationOpts{
- issueID: issue.ID,
- notificationAuthorID: doer.ID,
+ IssueID: issue.ID,
+ NotificationAuthorID: doer.ID,
}
if comment != nil {
- opts.commentID = comment.ID
+ opts.CommentID = comment.ID
}
_ = ns.issueQueue.Push(opts)
}
func (ns *notificationService) NotifyNewIssue(issue *models.Issue) {
_ = ns.issueQueue.Push(issueNotificationOpts{
- issueID: issue.ID,
- notificationAuthorID: issue.Poster.ID,
+ IssueID: issue.ID,
+ NotificationAuthorID: issue.Poster.ID,
})
}
func (ns *notificationService) NotifyIssueChangeStatus(doer *models.User, issue *models.Issue, actionComment *models.Comment, isClosed bool) {
_ = ns.issueQueue.Push(issueNotificationOpts{
- issueID: issue.ID,
- notificationAuthorID: doer.ID,
+ IssueID: issue.ID,
+ NotificationAuthorID: doer.ID,
})
}
func (ns *notificationService) NotifyMergePullRequest(pr *models.PullRequest, doer *models.User) {
_ = ns.issueQueue.Push(issueNotificationOpts{
- issueID: pr.Issue.ID,
- notificationAuthorID: doer.ID,
+ IssueID: pr.Issue.ID,
+ NotificationAuthorID: doer.ID,
})
}
@@ -88,18 +88,18 @@ func (ns *notificationService) NotifyNewPullRequest(pr *models.PullRequest) {
return
}
_ = ns.issueQueue.Push(issueNotificationOpts{
- issueID: pr.Issue.ID,
- notificationAuthorID: pr.Issue.PosterID,
+ IssueID: pr.Issue.ID,
+ NotificationAuthorID: pr.Issue.PosterID,
})
}
func (ns *notificationService) NotifyPullRequestReview(pr *models.PullRequest, r *models.Review, c *models.Comment) {
var opts = issueNotificationOpts{
- issueID: pr.Issue.ID,
- notificationAuthorID: r.Reviewer.ID,
+ IssueID: pr.Issue.ID,
+ NotificationAuthorID: r.Reviewer.ID,
}
if c != nil {
- opts.commentID = c.ID
+ opts.CommentID = c.ID
}
_ = ns.issueQueue.Push(opts)
}