ac889d4290
## Changes: 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 commit b8d764e36a0cd8e60627805f87b84bb04152e9c1)
81 lines
2 KiB
Go
81 lines
2 KiB
Go
// Copyright 2023 The Forgejo Authors. All rights reserved.
|
|
// SPDX-License-Identifier: MIT
|
|
package mailer
|
|
|
|
import (
|
|
"bytes"
|
|
"context"
|
|
"strconv"
|
|
|
|
user_model "code.gitea.io/gitea/models/user"
|
|
"code.gitea.io/gitea/modules/base"
|
|
"code.gitea.io/gitea/modules/log"
|
|
"code.gitea.io/gitea/modules/setting"
|
|
"code.gitea.io/gitea/modules/templates"
|
|
"code.gitea.io/gitea/modules/translation"
|
|
)
|
|
|
|
const (
|
|
tplNewUserMail base.TplName = "notify/admin_new_user"
|
|
)
|
|
|
|
var sa = SendAsync
|
|
|
|
// MailNewUser sends notification emails on new user registrations to all admins
|
|
func MailNewUser(ctx context.Context, u *user_model.User) {
|
|
if !setting.Admin.SendNotificationEmailOnNewUser {
|
|
return
|
|
}
|
|
|
|
if setting.MailService == nil {
|
|
// No mail service configured
|
|
return
|
|
}
|
|
|
|
recipients, err := user_model.GetAllAdmins(ctx)
|
|
if err != nil {
|
|
log.Error("user_model.GetAllAdmins: %v", err)
|
|
return
|
|
}
|
|
|
|
langMap := make(map[string][]string)
|
|
for _, r := range recipients {
|
|
langMap[r.Language] = append(langMap[r.Language], r.Email)
|
|
}
|
|
|
|
for lang, tos := range langMap {
|
|
mailNewUser(ctx, u, lang, tos)
|
|
}
|
|
}
|
|
|
|
func mailNewUser(ctx context.Context, u *user_model.User, lang string, tos []string) {
|
|
locale := translation.NewLocale(lang)
|
|
|
|
manageUserURL := setting.AppURL + "admin/users/" + strconv.FormatInt(u.ID, 10)
|
|
subject := locale.Tr("mail.admin.new_user.subject", u.Name)
|
|
body := locale.Tr("mail.admin.new_user.text", manageUserURL)
|
|
mailMeta := map[string]any{
|
|
"NewUser": u,
|
|
"NewUserUrl": u.HTMLURL(),
|
|
"Subject": subject,
|
|
"Body": body,
|
|
"Language": locale.Language(),
|
|
"Locale": locale,
|
|
"Str2html": templates.Str2html,
|
|
}
|
|
|
|
var mailBody bytes.Buffer
|
|
|
|
if err := bodyTemplates.ExecuteTemplate(&mailBody, string(tplNewUserMail), mailMeta); err != nil {
|
|
log.Error("ExecuteTemplate [%s]: %v", string(tplNewUserMail)+"/body", err)
|
|
return
|
|
}
|
|
|
|
msgs := make([]*Message, 0, len(tos))
|
|
for _, to := range tos {
|
|
msg := NewMessage(to, subject, mailBody.String())
|
|
msg.Info = subject
|
|
msgs = append(msgs, msg)
|
|
}
|
|
sa(msgs...)
|
|
}
|