Silverfish/proton-bridge
1
0
Fork 1
mirror of https://github.com/ProtonMail/proton-bridge.git synced 2025-12-16 23:26:44 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix: unequal number of rich/plain parts

Browse Source
This commit is contained in:
James Houlahan
2020-08-24 10:04:08 +02:00
parent 4ab8f7d6b5
commit 1f17628399
1 changed files with 6 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
pkg/message/parser.go
View File

@ -19,7 +19,6 @@ package message
import ( import (
"bytes" "bytes"
"errors"
"fmt" "fmt"
"io" "io"
"mime" "mime"
@ -161,15 +160,14 @@ func buildBodies(p *parser.Parser) (richBody, plainBody string, err error) {
return return
} }
if len(richParts) != len(plainParts) {
return "", "", errors.New("unequal number of rich and plain parts")
}
richBuilder, plainBuilder := strings.Builder{}, strings.Builder{} richBuilder, plainBuilder := strings.Builder{}, strings.Builder{}
for i := 0; i < len(richParts); i++ { for _, richPart := range richParts {
_, _ = richBuilder.Write(richParts[i].Body) _, _ = richBuilder.Write(richPart.Body)
_, _ = plainBuilder.Write(getPlainBody(plainParts[i])) }
for _, plainPart := range plainParts {
_, _ = plainBuilder.Write(getPlainBody(plainPart))
} }
return richBuilder.String(), plainBuilder.String(), nil return richBuilder.String(), plainBuilder.String(), nil