view: do not decode Message-ID

[public-inbox.git] / lib / PublicInbox / View.pm

diff --git a/lib/PublicInbox/View.pm b/lib/PublicInbox/View.pm
index 1a912a6edf6694d44860dedbc1153796c9ca5bb6..5b24706c1ecd1d7003f5d13c5601688387cd2128 100644 (file)
--- a/lib/PublicInbox/View.pm
+++ b/lib/PublicInbox/View.pm
@@ -9,6 +9,7 @@ use Encode qw/find_encoding/;
 use Encode::MIME::Header;
 use Email::MIME::ContentType qw/parse_content_type/;
 use constant MAX_INLINE_QUOTED => 5;
+use constant MAX_TRUNC_LEN => 72;
 
 my $enc_utf8 = find_encoding('utf8');
 my $enc_ascii = find_encoding('us-ascii');
@@ -95,14 +96,20 @@ sub add_text_body_short {
                if (@lines > MAX_INLINE_QUOTED) {
                        # show a short snippet of quoted text
                        $cur = join(' ', @lines);
-                       $cur =~ s/> ?//g;
+                       $cur =~ s/^>\s*//;
 
                        my @sum = split(/\s+/, $cur);
                        $cur = '';
                        do {
-                               $cur .= shift(@sum) . ' ';
-                       } while (@sum && length($cur) < 64);
-                       $cur=~ s/ \z/ .../;
+                               my $tmp = shift(@sum);
+                               my $len = length($tmp) + length($cur);
+                               if ($len > MAX_TRUNC_LEN) {
+                                       @sum = ();
+                               } else {
+                                       $cur .= $tmp . ' ';
+                               }
+                       } while (@sum && length($cur) < MAX_TRUNC_LEN);
+                       $cur =~ s/ \z/ .../;
                        "&gt; &lt;<a href=\"${full_pfx}#q${part_nr}_" . $n++ .
                                "\">$cur<\/a>&gt;\n";
                } else {
@@ -130,7 +137,6 @@ sub add_text_body_full {
 
 sub trim_message_id {
        my ($mid) = @_;
-       $mid = $enc_mime->decode($mid);
        $mid =~ s/\A\s*<//;
        $mid =~ s/>\s*\z//;
        my $html = ascii_html($mid);