From 1b28cc7f00a866cb2b60a6569002db1f605019d5 Mon Sep 17 00:00:00 2001 From: Eric Wong Date: Thu, 18 Aug 2016 01:10:35 +0000 Subject: view: try assuming UTF-8 for bogus charsets MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit For some reason, Alpine will set X-UNKNOWN for valid UTF-8. Since we favor UTF-8 HTML anyways, try forcing Email::MIME to handle text/plain as UTF-8 which might show up better. At least this change renders properly by showing "•" (•) instead of "â ¢" (•) Reported-by: Thomas Ferris Nicolaisen --- lib/PublicInbox/View.pm | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/lib/PublicInbox/View.pm b/lib/PublicInbox/View.pm index 3f0e1226..6997c1c5 100644 --- a/lib/PublicInbox/View.pm +++ b/lib/PublicInbox/View.pm @@ -457,8 +457,14 @@ sub add_text_body { my $err = $@; if ($err) { if ($ct =~ m!\btext/plain\b!i) { + # Try to assume UTF-8 because Alpine seems to + # do wacky things and set charset=X-UNKNOWN + $part->charset_set('UTF-8'); + $s = eval { $part->body_str }; + + # If forcing charset=UTF-8 failed, # attach_link will warn further down... - $s = $part->body; + $s = $part->body if $@; } else { return attach_link($upfx, $ct, $p, $fn); } -- cgit v1.2.3-24-ge0c7