From 90927247fdde4e84cd18d369ae32217aa2b2a3da Mon Sep 17 00:00:00 2001 From: Aine Date: Thu, 22 Sep 2022 21:40:31 +0300 Subject: [PATCH 1/2] fix nosend description --- bot/command.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bot/command.go b/bot/command.go index c986bbe..ca7fb83 100644 --- a/bot/command.go +++ b/bot/command.go @@ -77,7 +77,7 @@ func (b *Bot) initCommands() commandList { { key: roomOptionNoSend, description: fmt.Sprintf( - "Get or set `%s` of the room (`true` - enable email sending; `false` - disable email sending)", + "Get or set `%s` of the room (`true` - disable email sending; `false` - enable email sending)", roomOptionNoSend, ), sanitizer: utils.SanitizeBoolString, From 7473ed94507a804b1527e21ed9721f72a74f8def Mon Sep 17 00:00:00 2001 From: Aine Date: Thu, 22 Sep 2022 22:23:47 +0300 Subject: [PATCH 2/2] send emails in unicode, fixes #31 --- smtp/server.go | 1 + utils/email.go | 4 ++++ 2 files changed, 5 insertions(+) diff --git a/smtp/server.go b/smtp/server.go index 864dde5..6a840f0 100644 --- a/smtp/server.go +++ b/smtp/server.go @@ -51,6 +51,7 @@ func NewServer(cfg *Config) *Server { s.WriteTimeout = 10 * time.Second s.MaxMessageBytes = cfg.MaxSize * 1024 * 1024 s.EnableREQUIRETLS = cfg.TLSRequired + s.EnableSMTPUTF8 = true if log.GetLevel() == "DEBUG" || log.GetLevel() == "TRACE" { s.Debug = os.Stdout } diff --git a/utils/email.go b/utils/email.go index 8d5a33e..62fbbe7 100644 --- a/utils/email.go +++ b/utils/email.go @@ -110,6 +110,10 @@ func (e *Email) Compose(privkey string) string { var data strings.Builder domain := strings.SplitN(e.From, "@", 2)[1] + + data.WriteString("Content-Type: text/plain; charset=\"UTF-8\"") + data.WriteString("\r\n") + data.WriteString("From: ") data.WriteString(e.From) data.WriteString("\r\n")