mirror of
https://codeberg.org/forgejo/forgejo.git
synced 2024-11-10 20:59:31 +01:00
Fix notification (#10331)
This commit is contained in:
parent
f0a43a068f
commit
21e771c41b
1 changed files with 18 additions and 18 deletions
|
@ -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)
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue