view: single id="t" for multi-Subject messages

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

diff --git a/lib/PublicInbox/View.pm b/lib/PublicInbox/View.pm
index fd1bd7e2add29f423398dc6b32b6093a820537ea..45c191dbe6a942a5a0b2e3edf2574d8f482e221b 100644 (file)
--- a/lib/PublicInbox/View.pm
+++ b/lib/PublicInbox/View.pm
@@ -1,4 +1,4 @@
-# Copyright (C) 2014-2019 all contributors <meta@public-inbox.org>
+# Copyright (C) 2014-2020 all contributors <meta@public-inbox.org>
 # License: AGPL-3.0+ <https://www.gnu.org/licenses/agpl-3.0.txt>
 #
 # Used for displaying the HTML web interface.
@@ -29,8 +29,9 @@ sub msg_page_i {
        my $more = $ctx->{more};
        if ($nr == 1) {
                # $more cannot be true w/o $smsg being defined:
-               my $upfx = $more ? '../'.mid_escape($ctx->{smsg}->mid).'/' : '';
-               multipart_text_as_html(delete $ctx->{mime}, $upfx, $ctx);
+               $ctx->{mhref} = $more ? '../'.mid_escape($ctx->{smsg}->mid).'/'
+                                     : '';
+               multipart_text_as_html(delete $ctx->{mime}, $ctx);
                ${delete $ctx->{obuf}} .= '</pre><hr>';
        } elsif ($more) {
                ++$ctx->{end_nr};
@@ -83,10 +84,10 @@ sub msg_page_more {
        my $next = $ibx->over->next_by_mid($ctx->{mid}, \$id, \$prev);
        $ctx->{more} = $next ? [ $id, $prev, $next ] : undef;
        return '' unless $smsg;
-       my $upfx = '../' . mid_escape($smsg->mid) . '/';
+       $ctx->{mhref} = '../' . mid_escape($smsg->mid) . '/';
        my $mime = delete $smsg->{mime};
        _msg_page_prepare_obuf($mime->header_obj, $ctx, $nr);
-       multipart_text_as_html($mime, $upfx, $ctx);
+       multipart_text_as_html($mime, $ctx);
        ${delete $ctx->{obuf}} .= '</pre><hr>';
 }
 
@@ -486,23 +487,19 @@ sub thread_html_i { # PublicInbox::WwwStream::getline callback
 }
 
 sub multipart_text_as_html {
-       my (undef, $mhref, $ctx) = @_; # $mime = $_[0]
-       $ctx->{mhref} = $mhref;
+       # ($mime, $ctx) = @_; # msg_iter will do "$_[0] = undef"
 
        # scan through all parts, looking for displayable text
-       msg_iter($_[0], \&add_text_body, $ctx, 1);
+       msg_iter($_[0], \&add_text_body, $_[1], 1);
 }
 
 sub flush_quote {
        my ($s, $l, $quot) = @_;
 
-       # show everything in the full version with anchor from
-       # short version (see above)
-       my $rv = $l->linkify_1($$quot);
+       my $rv = $l->to_html($$quot);
 
        # we use a <span> here to allow users to specify their own
        # color for quoted text
-       $rv = $l->linkify_2(ascii_html($rv));
        $$quot = undef;
        $$s .= qq(<span\nclass="q">) . $rv . '</span>'
 }
@@ -565,7 +562,7 @@ sub add_text_body { # callback for msg_iter
                $idx[0] = $upfx . $idx[0] if $upfx ne '';
                $ctx->{-apfx} = join('/', @idx);
                $ctx->{-anchors} = {}; # attr => filename
-               $ctx->{-diff} = $diff = [];
+               $diff = 1;
                delete $ctx->{-long_path};
                my $spfx;
                if ($ibx->{-repo_objs}) {
@@ -598,18 +595,15 @@ sub add_text_body { # callback for msg_iter
                attach_link($ctx, $ct, $p, $fn, $err);
                $$rv .= "\n";
        }
-       my $l = PublicInbox::Linkify->new;
+       my $l = $ctx->{-linkify} //= PublicInbox::Linkify->new;
        foreach my $cur (@sections) {
                if ($cur =~ /\A>/) {
                        flush_quote($rv, $l, \$cur);
                } elsif ($diff) {
-                       @$diff = split(/^/m, $cur);
-                       $cur = undef;
-                       flush_diff($rv, $ctx, $l);
+                       flush_diff($rv, $ctx, \$cur);
                } else {
                        # regular lines, OK
-                       $l->linkify_1($cur);
-                       $$rv .= $l->linkify_2(ascii_html($cur));
+                       $$rv .= $l->to_html($cur);
                        $cur = undef;
                }
        }
@@ -657,16 +651,15 @@ sub _msg_page_prepare_obuf {
        }
        my @subj = $hdr->header('Subject');
        if (@subj) {
-               for my $v (@subj) {
+               my $v = ascii_html(shift @subj);
+               obfuscate_addrs($obfs_ibx, $v) if $obfs_ibx;
+               $rv .= 'Subject: ';
+               $rv .= $over ? qq(<a\nhref="#r"\nid=t>$v</a>\n) : "$v\n";
+               $title[0] = $v;
+               for $v (@subj) { # multi-Subject message :<
                        $v = ascii_html($v);
                        obfuscate_addrs($obfs_ibx, $v) if $obfs_ibx;
-                       $rv .= 'Subject: ';
-                       if ($over) {
-                               $rv .= qq(<a\nhref="#r"\nid=t>$v</a>\n);
-                       } else {
-                               $rv .= "$v\n";
-                       }
-                       $title[0] //= $v;
+                       $rv .= "Subject: $v\n";
                }
        } else { # dummy anchor for thread skeleton at bottom of page
                $rv .= qq(<a\nhref="#r"\nid=t></a>) if $over;