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

refactor: don't reconstruct mimeBody

Browse Source
This commit is contained in:
James Houlahan
2020-08-06 10:27:08 +02:00
parent 7e1af9ff4e
commit 0e7e13211b
39 changed files with 311 additions and 533 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
internal/smtp/user.go
View File

@ -20,6 +20,7 @@
package smtp
import (
"bytes"
"encoding/base64"
"io"
"mime"
@ -182,7 +183,15 @@ func (su *smtpUser) Send(from string, to []string, messageReader io.Reader) (err
attachedPublicKeyName = "publickey - " + kr.GetIdentities()[0].Name
}
message, mimeBody, plainBody, attReaders, err := message.Parse(messageReader, attachedPublicKey, attachedPublicKeyName)
buf := new(bytes.Buffer)
if _, err = buf.ReadFrom(messageReader); err != nil {
return
}
mimeBody := buf.String()
message, plainBody, attReaders, err := message.Parse(buf.Bytes(), attachedPublicKey, attachedPublicKeyName)
if err != nil {
return
}