Silverfish/proton-bridge
1
0
Fork 1
mirror of https://github.com/ProtonMail/proton-bridge.git synced 2026-02-08 01:58:34 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

feat: set mime type

Browse Source
This commit is contained in:
James Houlahan
2020-07-02 16:31:12 +02:00
parent 2b36d3ab7b
commit 8bd74c5edc
3 changed files with 19 additions and 79 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
pkg/message/parser.go
View File

@ -47,10 +47,18 @@ func Parse(r io.Reader, key, keyName string) (m *pmapi.Message, mime, plain stri
return
}
if m.Body, plain, err = collectBodyParts(p); err != nil {
var isHTML bool
if m.Body, plain, isHTML, err = collectBodyParts(p); err != nil {
return
}
if isHTML {
m.MIMEType = "text/html"
} else {
m.MIMEType = "text/plain"
}
if key != "" {
attachPublicKey(p.Root(), key, keyName)
}
@ -84,7 +92,7 @@ func collectAttachments(p *parser.Parser) (atts []*pmapi.Attachment, data []io.R
return
}
func collectBodyParts(p *parser.Parser) (body, plain string, err error) {
func collectBodyParts(p *parser.Parser) (body, plain string, isHTML bool, err error) {
var parts, plainParts []string
w := p.
@ -96,6 +104,7 @@ func collectBodyParts(p *parser.Parser) (body, plain string, err error) {
}).
WithContentTypeHandler("text/html", func(p *parser.Part) (err error) {
parts = append(parts, string(p.Body))
isHTML = true
text, err := html2text.FromString(string(p.Body))
if err != nil {
@ -110,7 +119,7 @@ func collectBodyParts(p *parser.Parser) (body, plain string, err error) {
return
}
return strings.Join(parts, "\r\n"), strings.Join(plainParts, "\r\n"), nil
return strings.Join(parts, "\r\n"), strings.Join(plainParts, "\r\n"), isHTML, nil
}
func writeMIMEMessage(p *parser.Parser) (mime string, err error) {