heimoshuiyu/postmoogle
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

do not convert plaintext as html

Browse Source
This commit is contained in:
Aine
2022-08-23 18:11:38 +03:00
parent 24686ef501
commit 0178c3cff3
3 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
smtp/session.go
View File

@@ -66,17 +66,13 @@ func (s *session) Data(r io.Reader) error {
if err != nil {
return err
}
text := eml.Text
if eml.HTML != "" {
text = eml.HTML
}
attachments := s.parseAttachments(eml.Attachments)
inlines := s.parseAttachments(eml.Inlines)
files := make([]*utils.File, 0, len(attachments)+len(inlines))
files = append(files, attachments...)
files = append(files, inlines...)
return s.client.Send(s.ctx, s.from, s.to, eml.GetHeader("Subject"), text, files)
return s.client.Send(s.ctx, s.from, s.to, eml.GetHeader("Subject"), eml.Text, eml.HTML, files)
}
func (s *session) Reset() {}

2
smtp/smtp.go
View File

@@ -10,5 +10,5 @@ import (
// Client interface to send emails
type Client interface {
GetMapping(context.Context, string) (id.RoomID, bool)
Send(ctx context.Context, from, mailbox, subject, body string, files []*utils.File) error
Send(ctx context.Context, from, mailbox, subject, text, html string, files []*utils.File) error
}