forward,recall: fix charsets in part attachment

Fix charset to UTF-8 in part attachments. The forward and recall
commands fetch message parts with the go-message package which decodes
to UTF-8. Hence, we should set the charset of the part attachment to
utf-8 and not just copying over the one from the original message.

Reported-by: Bence Ferdinandy <bence@ferdinandy.com>
Signed-off-by: Koni Marti <koni.marti@gmail.com>
Acked-by: Robin Jarry <robin@jarry.cc>

1 files changed, 17 insertions, 0 deletions

diff --git a/lib/attachment.go b/lib/attachment.go
index d7cbf3f7..9246315d 100644
--- a/lib/attachment.go
+++ b/lib/attachment.go
@@ -7,7 +7,9 @@ import (
 	"net/http"
 	"os"
 	"path/filepath"
+	"strings"
 
+	"git.sr.ht/~rjarry/aerc/logging"
 	"github.com/emersion/go-message/mail"
 	"github.com/pkg/errors"
 )
@@ -134,3 +136,18 @@ func (pa *PartAttachment) WriteTo(w *mail.Writer) error {
 	}
 	return nil
 }
+
+// SetUtf8Charset sets the charset in a params map to UTF-8.
+func SetUtf8Charset(origParams map[string]string) map[string]string {
+	params := make(map[string]string)
+	for k, v := range origParams {
+		switch strings.ToLower(k) {
+		case "charset":
+			logging.Infof("substitute charset %s with utf-8", v)
+			params[k] = "utf-8"
+		default:
+			params[k] = v
+		}
+	}
+	return params
+}