GithubProxy/coai
1
0
Fork 0
mirror of https://github.com/coaidev/coai.git synced 2025-05-21 05:50:14 +09:00
Code Issues Actions Packages Projects Releases Wiki Activity

chore: Compatible with pre-modified SMTP sending method (#174)

Browse Source
This commit is contained in:
Deng Junhai 2024-06-23 19:25:40 +08:00
parent 6f3cdad1e7
commit 16aba18926
2 changed files with 13 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
app/src/routes/admin/System.tsx
View File

@ -289,9 +289,7 @@ function Mail({ data, dispatch, onChange }: CompProps<MailState>) {
data.port < 65535 &&
data.username.length > 0 &&
data.password.length > 0 &&
data.from.length > 0 &&
data.username.includes("@") &&
!/\w+@/.test(data.from)
data.from.length > 0
);
}, [data]);
@ -391,7 +389,6 @@ function Mail({ data, dispatch, onChange }: CompProps<MailState>) {
}
className={cn(
"transition-all duration-300",
!data.username.includes("@") && `border-red-700`,
)}
placeholder={t("admin.system.mailUser")}
/>
@ -426,9 +423,6 @@ function Mail({ data, dispatch, onChange }: CompProps<MailState>) {
placeholder={`${data.username}@${location.hostname}`}
className={cn(
"transition-all duration-300",
data.from.length > 0 &&
!/\w+@/.test(data.from) &&
`border-red-700`,
)}
/>
</ParagraphItem>

15
utils/smtp.go
View File

@ -38,10 +38,19 @@ func (s *SmtpPoster) SendMail(to string, subject string, body string) error {
return fmt.Errorf("smtp not configured properly")
}
dialer := mail.NewDialer(s.Host, s.Port, s.Username, s.Password)
message := mail.NewMessage()
var dialer *mail.Dialer
var from string
message.SetHeader("From", s.From)
if strings.Contains(s.Username, "@") {
dialer = mail.NewDialer(s.Host, s.Port, s.Username, s.Password)
from = s.From
} else {
dialer = mail.NewDialer(s.Host, s.Port, s.From, s.Password)
from = fmt.Sprintf("%s <%s>", s.Username, s.From)
}
message := mail.NewMessage()
message.SetHeader("From", from)
message.SetHeader("To", to)
message.SetHeader("Subject", subject)
message.SetBody("text/html", body)