yesBad/proton-bridge
1
0
Fork 0
forked from Silverfish/proton-bridge
Code Actions Activity

Convert to UTF-8 any message part which specifies charset

Browse Source
This commit is contained in:
Michal Horejsek
2020-09-24 13:56:42 +02:00
parent d956b04062
commit a89a3f6612
1 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
pkg/message/parser.go
View File

@ -102,11 +102,12 @@ func convertForeignEncodings(p *parser.Parser) error {
RegisterContentTypeHandler("text/.*", func(p *parser.Part) error { RegisterContentTypeHandler("text/.*", func(p *parser.Part) error {
return p.ConvertToUTF8() return p.ConvertToUTF8()
}). }).
RegisterContentTypeHandler("multipart/alternative", func(p *parser.Part) error {
return p.ConvertToUTF8()
}).
RegisterDefaultHandler(func(p *parser.Part) error { RegisterDefaultHandler(func(p *parser.Part) error {
t, _, _ := p.Header.ContentType() t, params, _ := p.Header.ContentType()
// multipart/alternative, for example, can contain extra charset.
if params != nil && params["charset"] != "" {
return p.ConvertToUTF8()
}
logrus.WithField("type", t).Trace("Not converting part to utf-8") logrus.WithField("type", t).Trace("Not converting part to utf-8")
return nil return nil
}). }).