mirror of
https://github.com/go-gitea/gitea.git
synced 2026-10-26 06:16:56 +09:00
13ddad6e07
Users with "Only Email on Mention" can now still receive email for the events they picked in a custom repository watch, covering issues, pull requests and releases. The setting is renamed to "Only Email on Mention and Custom Watches" to make this explicit, matching GitHub's "Participating, @mentions and custom". "All activity" watches don't bypass the setting, because they are also created automatically by `AUTO_WATCH_NEW_REPOS` for repository creators and team members. To keep picking every event distinct from "All activity", the custom watch dialog now stores a new `WatchModeCustom`. Existing custom watches keep working without a migration. ## Screenshots ### Before <img width="1650" height="675" alt="grafik" src="https://github.com/user-attachments/assets/ecc56e20-cd05-41e9-a840-607b352c50a8" /> ### After <img width="1657" height="671" alt="grafik" src="https://github.com/user-attachments/assets/a406db94-3ac4-4587-b840-0cd472b135c5" /> Addresses https://github.com/openSUSE/openSUSE-git/issues/183 Ref: https://github.com/go-gitea/gitea/issues/35492 --------- Co-authored-by: bircni <bircni@icloud.com> Co-authored-by: Giteabot <teabot@gitea.io>
62 lines
1.7 KiB
Go
62 lines
1.7 KiB
Go
// Copyright 2019 The Gitea Authors. All rights reserved.
|
|
// SPDX-License-Identifier: MIT
|
|
|
|
package mailer
|
|
|
|
import (
|
|
"context"
|
|
|
|
activities_model "gitea.dev/models/activities"
|
|
issues_model "gitea.dev/models/issues"
|
|
user_model "gitea.dev/models/user"
|
|
"gitea.dev/modules/container"
|
|
"gitea.dev/modules/log"
|
|
"gitea.dev/modules/setting"
|
|
)
|
|
|
|
// MailParticipantsComment sends new comment emails to repository watchers and mentioned people.
|
|
func MailParticipantsComment(ctx context.Context, c *issues_model.Comment, opType activities_model.ActionType, issue *issues_model.Issue, mentions []*user_model.User) error {
|
|
if setting.MailService == nil {
|
|
// No mail service configured
|
|
return nil
|
|
}
|
|
|
|
content := c.Content
|
|
if c.Type == issues_model.CommentTypePullRequestPush {
|
|
content = ""
|
|
}
|
|
if err := mailIssueCommentToParticipants(ctx,
|
|
&mailComment{
|
|
Issue: issue,
|
|
Doer: c.Poster,
|
|
ActionType: opType,
|
|
Content: content,
|
|
Comment: c,
|
|
}, mentions); err != nil {
|
|
log.Error("mailIssueCommentToParticipants: %v", err)
|
|
}
|
|
return nil
|
|
}
|
|
|
|
// MailMentionsComment sends email to users mentioned in a code comment
|
|
func MailMentionsComment(ctx context.Context, pr *issues_model.PullRequest, c *issues_model.Comment, mentions []*user_model.User) (err error) {
|
|
if setting.MailService == nil {
|
|
// No mail service configured
|
|
return nil
|
|
}
|
|
|
|
visited := make(container.Set[int64], len(mentions)+1)
|
|
visited.Add(c.Poster.ID)
|
|
if err = mailIssueCommentBatch(ctx,
|
|
&mailComment{
|
|
Issue: pr.Issue,
|
|
Doer: c.Poster,
|
|
ActionType: activities_model.ActionCommentPull,
|
|
Content: c.Content,
|
|
Comment: c,
|
|
}, mentions, visited, true, nil); err != nil {
|
|
log.Error("mailIssueCommentBatch: %v", err)
|
|
}
|
|
return nil
|
|
}
|