sub msg_html {
my ($ctx, $mime) = @_;
my $hdr = $mime->header_obj;
- my $obfs = $ctx->{-inbox}->{obfuscate};
- my $tip = _msg_html_prepare($hdr, $ctx, $obfs);
+ my $ibx = $ctx->{-inbox};
+ my $obfs_ibx = $ibx->{obfuscate} ? $ibx : undef;
+ my $tip = _msg_html_prepare($hdr, $ctx, $obfs_ibx);
PublicInbox::WwwStream->response($ctx, 200, sub {
my ($nr, undef) = @_;
if ($nr == 1) {
- $tip . multipart_text_as_html($mime, '', $obfs) .
+ $tip . multipart_text_as_html($mime, '', $obfs_ibx) .
'</pre><hr>'
} elsif ($nr == 2) {
# fake an EOF if generating the footer fails;
}
my ($arg, $link) = PublicInbox::Reply::mailto_arg_link($ibx, $hdr);
+
+ # mailto: link only works if address obfuscation is disabled
+ if ($link) {
+ $link = <<EOF;
+
+* If your mail client supports setting the <b>In-Reply-To</b> header
+ via mailto: links, try the <a
+href="$link">mailto: link</a></pre>
+EOF
+ }
push @$arg, '/path/to/YOUR_REPLY';
$arg = ascii_html(join(" \\\n ", '', @$arg));
<<EOF
<a
href="$se_url">$se_url</a>
-
-* If your mail client supports setting the <b>In-Reply-To</b> header
- via mailto: links, try the <a
-href="$link">mailto: link</a></pre>
+$link
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;
my $root_anchor = $ctx->{root_anchor} || '';
my $irt;
- my $obfs = $ctx->{-obfuscate};
+ my $obfs_ibx = $ctx->{-obfs_ibx};
my $rv = "<a\nhref=#e$id\nid=m$id>*</a> ";
$subj = '<b>'.ascii_html($subj).'</b>';
- obfuscate_addrs($subj) if $obfs;
+ obfuscate_addrs($obfs_ibx, $subj) if $obfs_ibx;
$subj = "<u\nid=u>$subj</u>" if $root_anchor eq $id_m;
$rv .= $subj . "\n";
$rv .= _th_index_lite($mid_raw, \$irt, $id, $ctx);
foreach my $f (qw(To Cc)) {
my $dst = _hdr_names_html($hdr, $f);
if ($dst ne '') {
- obfuscate_addrs($dst) if $obfs;
+ obfuscate_addrs($obfs_ibx, $dst) if $obfs_ibx;
push @tocc, "$f: $dst";
}
}
my $from = _hdr_names_html($hdr, 'From');
- obfuscate_addrs($from) if $obfs;
+ obfuscate_addrs($obfs_ibx, $from) if $obfs_ibx;
$rv .= "From: $from @ "._msg_date($hdr)." UTC";
my $upfx = $ctx->{-upfx};
my $mhref = $upfx . mid_escape($mid_raw) . '/';
$rv .= "\n";
# scan through all parts, looking for displayable text
- msg_iter($mime, sub { $rv .= add_text_body($mhref, $obfs, $_[0]) });
+ msg_iter($mime, sub { $rv .= add_text_body($mhref, $obfs_ibx, $_[0]) });
# add the footer
$rv .= "\n<a\nhref=#$id_m\nid=e$id>^</a> ".
$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};
}
return missing_thread($ctx) unless $mime;
- $ctx->{-obfuscate} = $ctx->{-inbox}->{obfuscate};
+ $ctx->{-obfs_ibx} = $inbox->{obfuscate} ? $inbox : undef;
$mime = PublicInbox::MIME->new($mime);
$ctx->{-title_html} = ascii_html($mime->header('Subject'));
$ctx->{-html_tip} = thread_index_entry($ctx, $level, $mime);
$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
- $ctx->{-obfuscate} = $ctx->{-inbox}->{obfuscate};
+ my $inbox = $ctx->{-inbox};
+ $ctx->{-obfs_ibx} = $inbox->{obfuscate} ? $inbox : undef;
walk_thread($rootset, $ctx, *pre_thread);
$skel .= '</pre>';
return stream_thread($rootset, $ctx) unless $ctx->{flat};
# flat display: lazy load the full message from smsg
- my $inbox = $ctx->{-inbox};
my $mime;
while ($mime = shift @$msgs) {
$mime = $inbox->msg_by_smsg($mime) and last;
}
sub multipart_text_as_html {
- my ($mime, $upfx, $obfs) = @_;
+ my ($mime, $upfx, $obfs_ibx) = @_;
my $rv = "";
# scan through all parts, looking for displayable text
- msg_iter($mime, sub { $rv .= add_text_body($upfx, $obfs, $_[0]) });
+ msg_iter($mime, sub { $rv .= add_text_body($upfx, $obfs_ibx, $_[0]) });
$rv;
}
}
sub add_text_body {
- my ($upfx, $obfs, $p) = @_;
+ my ($upfx, $obfs_ibx, $p) = @_;
# $p - from msg_iter: [ Email::MIME, depth, @idx ]
my ($part, $depth) = @$p; # attachment @idx is unused
my $ct = $part->content_type || 'text/plain';
if (@quot) { # ugh, top posted
flush_quote(\$s, $l, \@quot);
- obfuscate_addrs($s) if $obfs;
+ obfuscate_addrs($obfs_ibx, $s) if $obfs_ibx;
$s;
} else {
- obfuscate_addrs($s) if $obfs;
+ obfuscate_addrs($obfs_ibx, $s) if $obfs_ibx;
if ($s =~ /\n\z/s) { # common, last line ends with a newline
$s;
} else { # some editors don't do newlines...
}
sub _msg_html_prepare {
- my ($hdr, $ctx, $obfs) = @_;
+ my ($hdr, $ctx, $obfs_ibx) = @_;
my $srch = $ctx->{srch} if $ctx;
my $atom = '';
my $rv = "<pre\nid=b>"; # anchor for body start
if ($h eq 'From') {
my @n = PublicInbox::Address::names($v->raw);
$title[1] = ascii_html(join(', ', @n));
- obfuscate_addrs($title[1]) if $obfs;
+ obfuscate_addrs($obfs_ibx, $title[1]) if $obfs_ibx;
} elsif ($h eq 'Subject') {
$title[0] = $v->as_html;
if ($srch) {
}
}
$v = $v->as_html;
- obfuscate_addrs($v) if $obfs;
+ obfuscate_addrs($obfs_ibx, $v) if $obfs_ibx;
$rv .= "$h: $v\n";
}
$$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;
$sres = load_results($srch, $sres);
# reduce hash lookups in skel_dump
- $ctx->{-obfuscate} = $ctx->{-inbox}->{obfuscate};
- walk_thread(thread_results($sres), $ctx, *skel_dump);
+ my $ibx = $ctx->{-inbox};
+ $ctx->{-obfs_ibx} = $ibx->{obfuscate} ? $ibx : undef;
+ walk_thread(thread_results($sres, $srch), $ctx, *skel_dump);
$ctx->{parent_msg} = $parent;
}
}
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 {
my $mid = $smsg->{mid};
my $f = ascii_html($smsg->from_name);
- my $obfs = $ctx->{-obfuscate};
- obfuscate_addrs($f) if $obfs;
+ my $obfs_ibx = $ctx->{-obfs_ibx};
+ obfuscate_addrs($obfs_ibx, $f) if $obfs_ibx;
my $d = fmt_ts($smsg->{ts}) . ' ' . indent_for($level) . th_pfx($level);
my $attr = $f;
# 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;
+ 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 ||= '" ';
+ }
+ 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 {
- $ctx->{seen}->{$h} = 1;
- $subj = PublicInbox::Hval->new($subj);
- $subj = $subj->as_html;
- obfuscate_addrs($subj) if $obfs;
+ $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);
}
my @out;
- my $obfs = $ctx->{-inbox}->{obfuscate};
+ 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) {
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);
my $level = $ex[$i];
my $subj = $ex[$i + 1];
$mid = delete $seen->{$subj};
- $subj = ascii_html($subj);
- obfuscate_addrs($subj) if $obfs;
+ 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 ||= ' "';
+ }
+ 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;
}
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;