X-Git-Url: http://www.git.stargrave.org/?a=blobdiff_plain;f=lib%2FPublicInbox%2FView.pm;h=70e38a6e567957145e530e34c7542d9e0fb8846f;hb=a5302bf56fc9ea87e35803f193f58f2d157ac75f;hp=e96f773f32bebb37d4fa68d72aa24b9ca2890859;hpb=1a8eb0a43c68e64b77fdd3c4ebd977a1ab88e71b;p=public-inbox.git
diff --git a/lib/PublicInbox/View.pm b/lib/PublicInbox/View.pm
index e96f773f..70e38a6e 100644
--- a/lib/PublicInbox/View.pm
+++ b/lib/PublicInbox/View.pm
@@ -61,7 +61,8 @@ sub msg_reply {
$info = qq(\n List information: $url\n);
}
- my ($arg, $link) = PublicInbox::Reply::mailto_arg_link($ibx, $hdr);
+ my ($arg, $link, $reply_to_all) =
+ PublicInbox::Reply::mailto_arg_link($ibx, $hdr);
# mailto: link only works if address obfuscation is disabled
if ($link) {
@@ -83,15 +84,15 @@ href=#t>this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
- and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
$p_url
$info
-* Reply to all the recipients using the --to, --cc,
- and --in-reply-to switches of git-send-email(1):
+* Reply using the --to, --cc, and --in-reply-to
+ switches of git-send-email(1):
git send-email$arg
@@ -104,9 +105,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 +187,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 = "$flat";
} else {
- $threaded = "$threaded";
+ $nested = "$nested";
}
$rv .= "\t[$flat";
- $rv .= "|$threaded]";
+ $rv .= "|$nested]";
$rv .= " $ctx->{s_nr}";
} else {
$hr = $ctx->{-hr};
@@ -368,11 +368,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 +596,9 @@ sub thread_skel {
$$dst .= "$nr+ messages in thread ($expand";
$$dst .= qq! / [top])\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 +608,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;
}
@@ -721,7 +721,7 @@ sub ghost_parent {
sub indent_for {
my ($level) = @_;
- INDENT x ($level - 1);
+ $level ? INDENT x ($level - 1) : '';
}
sub load_results {
@@ -737,9 +737,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 {
@@ -756,6 +756,25 @@ sub _msg_date {
sub fmt_ts { POSIX::strftime('%Y-%m-%d %k:%M', gmtime($_[0])) }
+sub dedupe_subject {
+ my ($prev_subj, $subj, $val) = @_;
+
+ my $omit = ''; # '"' denotes identical text omitted
+ my (@prev_pop, @curr_pop);
+ while (@$prev_subj && @$subj && $subj->[-1] eq $prev_subj->[-1]) {
+ push(@prev_pop, pop(@$prev_subj));
+ push(@curr_pop, pop(@$subj));
+ $omit ||= $val;
+ }
+ pop @$subj if @$subj && $subj->[-1] =~ /^re:\s*/i;
+ if (scalar(@curr_pop) == 1) {
+ $omit = '';
+ push @$prev_subj, @prev_pop;
+ push @$subj, @curr_pop;
+ }
+ $omit;
+}
+
sub skel_dump {
my ($ctx, $level, $node) = @_;
my $smsg = $node->{smsg} or return _skel_ghost($ctx, $level, $node);
@@ -793,20 +812,25 @@ 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 = dedupe_subject($prev_subj, \@subj, '" ');
+ my $end;
+ if (@subj) {
+ my $subj = join(' ', @subj);
+ $subj = ascii_html($subj);
obfuscate_addrs($obfs_ibx, $subj) if $obfs_ibx;
+ $end = "$subj $omit$f\n"
+ } else {
+ $end = "$f\n";
}
my $m;
my $id = '';
my $mapping = $ctx->{mapping};
- my $end = defined($subj) ? "$subj $f\n" : "$f\n";
if ($mapping) {
my $map = $mapping->{$mid};
$id = id_compress($mid, 1);
@@ -900,6 +924,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 +933,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 +956,15 @@ 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 = dedupe_subject($prev_subj, \@subj, ' "');
+ $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 .= "$subj\n";
+ $s .= "$subj$omit\n";
}
push @out, $s;
}
@@ -977,7 +1007,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;