view: s/threaded/nested/ in view

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

diff --git a/lib/PublicInbox/View.pm b/lib/PublicInbox/View.pm
index e96f773f32bebb37d4fa68d72aa24b9ca2890859..ad94977a244693c9531403780b733d9997f738f2 100644 (file)
--- a/lib/PublicInbox/View.pm
+++ b/lib/PublicInbox/View.pm
@@ -104,9 +104,8 @@ EOF
 sub in_reply_to {
        my ($hdr) = @_;
        my %mid = map { $_ => 1 } $hdr->header_raw('Message-ID');
-       my @refs = ($hdr->header_raw('References'),
-                       $hdr->header_raw('In-Reply-To'));
-       @refs = ((join(' ', @refs)) =~ /<([^>]+)>/g);
+       my @refs = (($hdr->header_raw('References') || '') =~ /<([^>]+)>/g);
+       push(@refs, (($hdr->header_raw('In-Reply-To') || '') =~ /<([^>]+)>/g));
        while (defined(my $irt = pop @refs)) {
                next if $mid{"<$irt>"};
                return $irt;
@@ -187,17 +186,17 @@ sub index_entry {
                $rv .= "\t[relevance $pct->{$mid_raw}%]";
                $hr = 1;
        } elsif ($mapping) {
-               my $threaded = 'threaded';
+               my $nested = 'nested';
                my $flat = 'flat';
                my $end = '';
                if ($ctx->{flat}) {
                        $hr = 1;
                        $flat = "<b>$flat</b>";
                } else {
-                       $threaded = "<b>$threaded</b>";
+                       $nested = "<b>$nested</b>";
                }
                $rv .= "\t[<a\nhref=\"${mhref}T/#u\">$flat</a>";
-               $rv .= "|<a\nhref=\"${mhref}t/#u\">$threaded</a>]";
+               $rv .= "|<a\nhref=\"${mhref}t/#u\">$nested</a>]";
                $rv .= " <a\nhref=#r$id>$ctx->{s_nr}</a>";
        } else {
                $hr = $ctx->{-hr};
@@ -368,11 +367,10 @@ sub thread_html {
        $ctx->{prev_attr} = '';
        $ctx->{prev_level} = 0;
        $ctx->{root_anchor} = anchor_for($mid);
-       $ctx->{seen} = {};
        $ctx->{mapping} = {};
        $ctx->{s_nr} = "$nr+ messages in thread";
 
-       my $rootset = thread_results($msgs);
+       my $rootset = thread_results($msgs, $srch);
 
        # reduce hash lookups in pre_thread->skel_dump
        my $inbox = $ctx->{-inbox};
@@ -597,8 +595,9 @@ sub thread_skel {
        $$dst .= "$nr+ messages in thread ($expand";
        $$dst .= qq! / <a\nhref="#b">[top]</a>)\n!;
 
-       my $subj = $srch->subject_path($hdr->header('Subject'));
-       $ctx->{seen} = { $subj => 1 };
+       my $subj = $hdr->header('Subject');
+       defined $subj or $subj = '';
+       $ctx->{prev_subj} = [ split(/ /, $srch->subject_normalized($subj)) ];
        $ctx->{cur} = $mid;
        $ctx->{prev_attr} = '';
        $ctx->{prev_level} = 0;
@@ -608,7 +607,7 @@ sub thread_skel {
        # reduce hash lookups in skel_dump
        my $ibx = $ctx->{-inbox};
        $ctx->{-obfs_ibx} = $ibx->{obfuscate} ? $ibx : undef;
-       walk_thread(thread_results($sres), $ctx, *skel_dump);
+       walk_thread(thread_results($sres, $srch), $ctx, *skel_dump);
 
        $ctx->{parent_msg} = $parent;
 }
@@ -737,9 +736,9 @@ sub msg_timestamp {
 }
 
 sub thread_results {
-       my ($msgs) = @_;
+       my ($msgs, $srch) = @_;
        require PublicInbox::SearchThread;
-       PublicInbox::SearchThread::thread($msgs, *sort_ts);
+       PublicInbox::SearchThread::thread($msgs, *sort_ts, $srch);
 }
 
 sub missing_thread {
@@ -793,20 +792,31 @@ sub skel_dump {
        # Subject is never undef, this mail was loaded from
        # our Xapian which would've resulted in '' if it were
        # really missing (and Filter rejects empty subjects)
-       my $subj = $smsg->subject;
-       my $h = $ctx->{srch}->subject_path($subj);
-       if ($ctx->{seen}->{$h}) {
-               $subj = undef;
-       } else {
-               $ctx->{seen}->{$h} = 1;
-               $subj = PublicInbox::Hval->new($subj);
-               $subj = $subj->as_html;
+       my @subj = split(/ /, $ctx->{srch}->subject_normalized($smsg->subject));
+
+       # remove common suffixes from the subject if it matches the previous,
+       # so we do not show redundant text at the end.
+       my $prev_subj = $ctx->{prev_subj} || [];
+       $ctx->{prev_subj} = [ @subj ];
+       my $omit = ''; # '"' denotes identical text omitted
+       while (@$prev_subj && @subj && $subj[-1] eq $prev_subj->[-1]) {
+               pop @$prev_subj;
+               pop @subj;
+               $omit ||= '&#34; ';
+       }
+       pop @subj if @subj && $subj[-1] =~ /^re:\s*/i;
+       my $end;
+       if (@subj) {
+               my $subj = join(' ', @subj);
+               $subj = ascii_html($subj);
                obfuscate_addrs($obfs_ibx, $subj) if $obfs_ibx;
+               $end = "$subj</a> $omit$f\n"
+       } else {
+               $end = "$f</a>\n";
        }
        my $m;
        my $id = '';
        my $mapping = $ctx->{mapping};
-       my $end = defined($subj) ? "$subj</a> $f\n" : "$f</a>\n";
        if ($mapping) {
                my $map = $mapping->{$mid};
                $id = id_compress($mid, 1);
@@ -900,6 +910,7 @@ sub dump_topics {
        my @out;
        my $ibx = $ctx->{-inbox};
        my $obfs_ibx = $ibx->{obfuscate} ? $ibx : undef;
+       my $srch = $ctx->{srch};
 
        # sort by recency, this allows new posts to "bump" old topics...
        foreach my $topic (sort { $b->[0] <=> $a->[0] } @$order) {
@@ -908,6 +919,7 @@ sub dump_topics {
                next unless defined $top;  # ghost topic
                my $mid = delete $seen->{$top};
                my $href = mid_escape($mid);
+               my $prev_subj = [ split(/ /, $top) ];
                $top = PublicInbox::Hval->new($top)->as_html;
                $ts = fmt_ts($ts);
 
@@ -930,11 +942,22 @@ sub dump_topics {
                        my $level = $ex[$i];
                        my $subj = $ex[$i + 1];
                        $mid = delete $seen->{$subj};
-                       $subj = ascii_html($subj);
+                       my @subj = split(/ /, $srch->subject_normalized($subj));
+                       my @next_prev = @subj; # full copy
+                       my $omit = ''; # '"' denotes identical text omitted
+                       while (@$prev_subj && @subj &&
+                                       $subj[-1] eq $prev_subj->[-1]) {
+                               pop @$prev_subj;
+                               pop @subj;
+                               $omit ||= ' &#34;';
+                       }
+                       pop @subj if @subj && $subj[-1] =~ /^re:\s*/i;
+                       $prev_subj = \@next_prev;
+                       $subj = ascii_html(join(' ', @subj));
                        obfuscate_addrs($obfs_ibx, $subj) if $obfs_ibx;
                        $href = mid_escape($mid);
                        $s .= indent_for($level) . TCHILD;
-                       $s .= "<a\nhref=\"$href/T/#u\">$subj</a>\n";
+                       $s .= "<a\nhref=\"$href/T/#u\">$subj</a>$omit\n";
                }
                push @out, $s;
        }
@@ -977,7 +1000,7 @@ sub index_topics {
        my $nr = scalar @{$sres->{msgs}};
        if ($nr) {
                $sres = load_results($srch, $sres);
-               walk_thread(thread_results($sres), $ctx, *acc_topic);
+               walk_thread(thread_results($sres, $srch), $ctx, *acc_topic);
        }
        $ctx->{-next_o} = $off+ $nr;
        $ctx->{-cur_o} = $off;