mirror of
https://codeberg.org/forgejo/forgejo.git
synced 2024-10-30 17:34:13 +01:00
2d06901a18
Sends email with information on the new user (time of creation and time of last sign-in) and a link to manage the new user from the admin panel closes: https://codeberg.org/forgejo/forgejo/issues/480 Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/1371 Co-authored-by: Aravinth Manivannan <realaravinth@batsense.net> Co-committed-by: Aravinth Manivannan <realaravinth@batsense.net> (cherry picked from commitc721aa828b
) (cherry picked from commit6487efcb9d
) Conflicts: modules/notification/base/notifier.go modules/notification/base/null.go modules/notification/notification.go https://codeberg.org/forgejo/forgejo/pulls/1422 (cherry picked from commit7ea66ee1c5
) Conflicts: services/notify/notifier.go services/notify/notify.go services/notify/null.go https://codeberg.org/forgejo/forgejo/pulls/1469 (cherry picked from commit7d2d997011
) (cherry picked from commit435a54f140
) (cherry picked from commit8ec7b3e448
) [GITEA] notifies admins on new user registration (squash) performance bottleneck Refs: https://codeberg.org/forgejo/forgejo/issues/1479 (cherry picked from commit97ac9147ff
) (cherry picked from commit19f295c16b
) (cherry picked from commit3367dcb2cf
) [GITEA] notifies admins on new user registration (squash) cosmetic changes Co-authored-by: delvh <dev.lh@web.de> (cherry picked from commit9f1670e040
) (cherry picked from commitde5bb2a224
) (cherry picked from commit8f8e52f31a
) (cherry picked from commite0d5130312
) (cherry picked from commitf1288d6d9b
) (cherry picked from commit1db4736fd7
) (cherry picked from commite8dcbb6cd6
) (cherry picked from commit09625d6476
) [GITEA] notifies admins on new user registration (squash) ctx.Locale (cherry picked from commitdab7212fad
) (cherry picked from commit9b7bbae8c4
) (cherry picked from commitf750b71d3d
) (cherry picked from commitf79af36679
) (cherry picked from commite76eee334e
) [GITEA] notifies admins on new user registration (squash) fix locale (cherry picked from commit54cd100d8d
) (cherry picked from commit053dbd3d50
) [GITEA] notifies admins on new user registration (squash) fix URL 1. Use absolute URL in the admin panel link sent on new registrations 2. Include absolute URL of the newly signed-up user's profile. New email looks like this: <details><summary>Please click to expand</summary> ``` --153937b1864f158f4fd145c4b5d4a513568681dd489021dd466a8ad7b770 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset=UTF-8 User Information: @realaravinth ( http://localhost:3000/realaravinth ) ---------------------------------------------------------------------- * Created: 2023-12-13 19:36:50 +05:30 Please click here ( http://localhost:3000/admin/users/9 ) to manage the use= r from the admin panel. --153937b1864f158f4fd145c4b5d4a513568681dd489021dd466a8ad7b770 Content-Transfer-Encoding: quoted-printable Content-Type: text/html; charset=UTF-8 <!DOCTYPE html> <html> <head> <meta http-equiv=3D"Content-Type" content=3D"text/html; charset=3Dutf-8"> <title>New user realaravinth just signed up</title> <style> blockquote { padding-left: 1em; margin: 1em 0; border-left: 1px solid gre= y; color: #777} .footer { font-size:small; color:#666;} </style> </head> <body> <ul> <h3>User Information: <a href=3D"http://localhost:3000/realaravinth">@rea= laravinth</a></h3> <li>Created: <relative-time format=3D"datetime" weekday=3D"" year=3D"nume= ric" month=3D"short" day=3D"numeric" hour=3D"numeric" minute=3D"numeric" se= cond=3D"numeric" datetime=3D"2023-12-13T19:36:50+05:30">2023-12-13 19:36:50= +05:30</relative-time></li> </ul> <p> Please <a href=3D"http://localhost:3000/admin/users/9" rel=3D"nofollow= ">click here</a> to manage the user from the admin panel. </p> </body> </html> --153937b1864f158f4fd145c4b5d4a513568681dd489021dd466a8ad7b770-- ``` </details> fixes: https://codeberg.org/forgejo/forgejo/issues/1927 Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/1940 Reviewed-by: Earl Warren <earl-warren@noreply.codeberg.org> Reviewed-by: Gusted <gusted@noreply.codeberg.org> Co-authored-by: Aravinth Manivannan <realaravinth@batsense.net> Co-committed-by: Aravinth Manivannan <realaravinth@batsense.net> (cherry picked from commitb8d764e36a
) (cherry picked from commitd48b84f623
) Conflicts: routers/web/auth/auth.go https://codeberg.org/forgejo/forgejo/pulls/2034 (cherry picked from commit02d3c125cc
) (cherry picked from commit367374ecc3
) Conflicts: models/user/user_test.go https://codeberg.org/forgejo/forgejo/pulls/2119 (cherry picked from commit4124fa5aa4
) (cherry picked from commit7f12610ff6
) [GITEA] notifies admins on new user registration (squash) DeleteByID trivial conflict because of778ad795fd
Refactor deletion (#28610) (cherry picked from commit05682614e5
) (cherry picked from commit64bd374803
) (cherry picked from commit63d086f666
) (cherry picked from commit3cd48ef4d5
) Conflicts: options/locale/locale_en-US.ini https://codeberg.org/forgejo/forgejo/pulls/2249 (cherry picked from commit6578ec4ed6
) Conflicts: routers/web/auth/auth.go https://codeberg.org/forgejo/forgejo/pulls/2300
208 lines
8.1 KiB
Go
208 lines
8.1 KiB
Go
// Copyright 2019 The Gitea Authors. All rights reserved.
|
|
// SPDX-License-Identifier: MIT
|
|
|
|
package mailer
|
|
|
|
import (
|
|
"context"
|
|
"fmt"
|
|
|
|
activities_model "code.gitea.io/gitea/models/activities"
|
|
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/log"
|
|
notify_service "code.gitea.io/gitea/services/notify"
|
|
)
|
|
|
|
type mailNotifier struct {
|
|
notify_service.NullNotifier
|
|
}
|
|
|
|
var _ notify_service.Notifier = &mailNotifier{}
|
|
|
|
// NewNotifier create a new mailNotifier notifier
|
|
func NewNotifier() notify_service.Notifier {
|
|
return &mailNotifier{}
|
|
}
|
|
|
|
func (m *mailNotifier) CreateIssueComment(ctx context.Context, doer *user_model.User, repo *repo_model.Repository,
|
|
issue *issues_model.Issue, comment *issues_model.Comment, mentions []*user_model.User,
|
|
) {
|
|
var act activities_model.ActionType
|
|
if comment.Type == issues_model.CommentTypeClose {
|
|
act = activities_model.ActionCloseIssue
|
|
} else if comment.Type == issues_model.CommentTypeReopen {
|
|
act = activities_model.ActionReopenIssue
|
|
} else if comment.Type == issues_model.CommentTypeComment {
|
|
act = activities_model.ActionCommentIssue
|
|
} else if comment.Type == issues_model.CommentTypeCode {
|
|
act = activities_model.ActionCommentIssue
|
|
} else if comment.Type == issues_model.CommentTypePullRequestPush {
|
|
act = 0
|
|
}
|
|
|
|
if err := MailParticipantsComment(ctx, comment, act, issue, mentions); err != nil {
|
|
log.Error("MailParticipantsComment: %v", err)
|
|
}
|
|
}
|
|
|
|
func (m *mailNotifier) NewIssue(ctx context.Context, issue *issues_model.Issue, mentions []*user_model.User) {
|
|
if err := MailParticipants(ctx, issue, issue.Poster, activities_model.ActionCreateIssue, mentions); err != nil {
|
|
log.Error("MailParticipants: %v", err)
|
|
}
|
|
}
|
|
|
|
func (m *mailNotifier) IssueChangeStatus(ctx context.Context, doer *user_model.User, commitID string, issue *issues_model.Issue, actionComment *issues_model.Comment, isClosed bool) {
|
|
var actionType activities_model.ActionType
|
|
if issue.IsPull {
|
|
if isClosed {
|
|
actionType = activities_model.ActionClosePullRequest
|
|
} else {
|
|
actionType = activities_model.ActionReopenPullRequest
|
|
}
|
|
} else {
|
|
if isClosed {
|
|
actionType = activities_model.ActionCloseIssue
|
|
} else {
|
|
actionType = activities_model.ActionReopenIssue
|
|
}
|
|
}
|
|
|
|
if err := MailParticipants(ctx, issue, doer, actionType, nil); err != nil {
|
|
log.Error("MailParticipants: %v", err)
|
|
}
|
|
}
|
|
|
|
func (m *mailNotifier) IssueChangeTitle(ctx context.Context, doer *user_model.User, issue *issues_model.Issue, oldTitle string) {
|
|
if err := issue.LoadPullRequest(ctx); err != nil {
|
|
log.Error("issue.LoadPullRequest: %v", err)
|
|
return
|
|
}
|
|
if issue.IsPull && issues_model.HasWorkInProgressPrefix(oldTitle) && !issue.PullRequest.IsWorkInProgress(ctx) {
|
|
if err := MailParticipants(ctx, issue, doer, activities_model.ActionPullRequestReadyForReview, nil); err != nil {
|
|
log.Error("MailParticipants: %v", err)
|
|
}
|
|
}
|
|
}
|
|
|
|
func (m *mailNotifier) NewPullRequest(ctx context.Context, pr *issues_model.PullRequest, mentions []*user_model.User) {
|
|
if err := MailParticipants(ctx, pr.Issue, pr.Issue.Poster, activities_model.ActionCreatePullRequest, mentions); err != nil {
|
|
log.Error("MailParticipants: %v", err)
|
|
}
|
|
}
|
|
|
|
func (m *mailNotifier) PullRequestReview(ctx context.Context, pr *issues_model.PullRequest, r *issues_model.Review, comment *issues_model.Comment, mentions []*user_model.User) {
|
|
var act activities_model.ActionType
|
|
if comment.Type == issues_model.CommentTypeClose {
|
|
act = activities_model.ActionCloseIssue
|
|
} else if comment.Type == issues_model.CommentTypeReopen {
|
|
act = activities_model.ActionReopenIssue
|
|
} else if comment.Type == issues_model.CommentTypeComment {
|
|
act = activities_model.ActionCommentPull
|
|
}
|
|
if err := MailParticipantsComment(ctx, comment, act, pr.Issue, mentions); err != nil {
|
|
log.Error("MailParticipantsComment: %v", err)
|
|
}
|
|
}
|
|
|
|
func (m *mailNotifier) PullRequestCodeComment(ctx context.Context, pr *issues_model.PullRequest, comment *issues_model.Comment, mentions []*user_model.User) {
|
|
if err := MailMentionsComment(ctx, pr, comment, mentions); err != nil {
|
|
log.Error("MailMentionsComment: %v", err)
|
|
}
|
|
}
|
|
|
|
func (m *mailNotifier) IssueChangeAssignee(ctx context.Context, doer *user_model.User, issue *issues_model.Issue, assignee *user_model.User, removed bool, comment *issues_model.Comment) {
|
|
// mail only sent to added assignees and not self-assignee
|
|
if !removed && doer.ID != assignee.ID && assignee.EmailNotificationsPreference != user_model.EmailNotificationsDisabled {
|
|
ct := fmt.Sprintf("Assigned #%d.", issue.Index)
|
|
if err := SendIssueAssignedMail(ctx, issue, doer, ct, comment, []*user_model.User{assignee}); err != nil {
|
|
log.Error("Error in SendIssueAssignedMail for issue[%d] to assignee[%d]: %v", issue.ID, assignee.ID, err)
|
|
}
|
|
}
|
|
}
|
|
|
|
func (m *mailNotifier) PullRequestReviewRequest(ctx context.Context, doer *user_model.User, issue *issues_model.Issue, reviewer *user_model.User, isRequest bool, comment *issues_model.Comment) {
|
|
if isRequest && doer.ID != reviewer.ID && reviewer.EmailNotificationsPreference != user_model.EmailNotificationsDisabled {
|
|
ct := fmt.Sprintf("Requested to review %s.", issue.HTMLURL())
|
|
if err := SendIssueAssignedMail(ctx, issue, doer, ct, comment, []*user_model.User{reviewer}); err != nil {
|
|
log.Error("Error in SendIssueAssignedMail for issue[%d] to reviewer[%d]: %v", issue.ID, reviewer.ID, err)
|
|
}
|
|
}
|
|
}
|
|
|
|
func (m *mailNotifier) MergePullRequest(ctx context.Context, doer *user_model.User, pr *issues_model.PullRequest) {
|
|
if err := pr.LoadIssue(ctx); err != nil {
|
|
log.Error("LoadIssue: %v", err)
|
|
return
|
|
}
|
|
if err := MailParticipants(ctx, pr.Issue, doer, activities_model.ActionMergePullRequest, nil); err != nil {
|
|
log.Error("MailParticipants: %v", err)
|
|
}
|
|
}
|
|
|
|
func (m *mailNotifier) AutoMergePullRequest(ctx context.Context, doer *user_model.User, pr *issues_model.PullRequest) {
|
|
if err := pr.LoadIssue(ctx); err != nil {
|
|
log.Error("pr.LoadIssue: %v", err)
|
|
return
|
|
}
|
|
if err := MailParticipants(ctx, pr.Issue, doer, activities_model.ActionAutoMergePullRequest, nil); err != nil {
|
|
log.Error("MailParticipants: %v", err)
|
|
}
|
|
}
|
|
|
|
func (m *mailNotifier) PullRequestPushCommits(ctx context.Context, doer *user_model.User, pr *issues_model.PullRequest, comment *issues_model.Comment) {
|
|
var err error
|
|
if err = comment.LoadIssue(ctx); err != nil {
|
|
log.Error("comment.LoadIssue: %v", err)
|
|
return
|
|
}
|
|
if err = comment.Issue.LoadRepo(ctx); err != nil {
|
|
log.Error("comment.Issue.LoadRepo: %v", err)
|
|
return
|
|
}
|
|
if err = comment.Issue.LoadPullRequest(ctx); err != nil {
|
|
log.Error("comment.Issue.LoadPullRequest: %v", err)
|
|
return
|
|
}
|
|
if err = comment.Issue.PullRequest.LoadBaseRepo(ctx); err != nil {
|
|
log.Error("comment.Issue.PullRequest.LoadBaseRepo: %v", err)
|
|
return
|
|
}
|
|
if err := comment.LoadPushCommits(ctx); err != nil {
|
|
log.Error("comment.LoadPushCommits: %v", err)
|
|
}
|
|
m.CreateIssueComment(ctx, doer, comment.Issue.Repo, comment.Issue, comment, nil)
|
|
}
|
|
|
|
func (m *mailNotifier) PullReviewDismiss(ctx context.Context, doer *user_model.User, review *issues_model.Review, comment *issues_model.Comment) {
|
|
if err := comment.Review.LoadReviewer(ctx); err != nil {
|
|
log.Error("Error in PullReviewDismiss while loading reviewer for issue[%d], review[%d] and reviewer[%d]: %v", review.Issue.ID, comment.Review.ID, comment.Review.ReviewerID, err)
|
|
}
|
|
if err := MailParticipantsComment(ctx, comment, activities_model.ActionPullReviewDismissed, review.Issue, nil); err != nil {
|
|
log.Error("MailParticipantsComment: %v", err)
|
|
}
|
|
}
|
|
|
|
func (m *mailNotifier) NewRelease(ctx context.Context, rel *repo_model.Release) {
|
|
if err := rel.LoadAttributes(ctx); err != nil {
|
|
log.Error("LoadAttributes: %v", err)
|
|
return
|
|
}
|
|
|
|
if rel.IsDraft || rel.IsPrerelease {
|
|
return
|
|
}
|
|
|
|
MailNewRelease(ctx, rel)
|
|
}
|
|
|
|
func (m *mailNotifier) RepoPendingTransfer(ctx context.Context, doer, newOwner *user_model.User, repo *repo_model.Repository) {
|
|
if err := SendRepoTransferNotifyMail(ctx, doer, newOwner, repo); err != nil {
|
|
log.Error("SendRepoTransferNotifyMail: %v", err)
|
|
}
|
|
}
|
|
|
|
func (m *mailNotifier) NewUserSignUp(ctx context.Context, newUser *user_model.User) {
|
|
MailNewUser(ctx, newUser)
|
|
}
|