$ctx->{s_nr}";
} else {
$hr = $ctx->{-hr};
@@ -201,7 +218,10 @@ sub _th_index_lite {
my $rv = '';
my $mapping = $ctx->{mapping} or return $rv;
my $pad = ' ';
- my ($attr, $node, $idx, $level) = @{$mapping->{$mid_raw}};
+ my $mid_map = $mapping->{$mid_raw};
+ defined $mid_map or
+ return 'public-inbox BUG: '.ascii_html($mid_raw).' not mapped';
+ my ($attr, $node, $idx, $level) = @$mid_map;
my $children = $node->{children};
my $nr_c = scalar @$children;
my $nr_s = 0;
@@ -299,7 +319,8 @@ sub stream_thread ($$) {
}
return missing_thread($ctx) unless $mime;
- $mime = Email::MIME->new($mime);
+ $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);
PublicInbox::WwwStream->response($ctx, 200, sub {
@@ -311,7 +332,7 @@ sub stream_thread ($$) {
unshift @q, map { ($cl, $_) } @{$node->{children}};
my $mid = $node->{id};
if ($mime = $inbox->msg_by_smsg($node->{smsg})) {
- $mime = Email::MIME->new($mime);
+ $mime = PublicInbox::MIME->new($mime);
return thread_index_entry($ctx, $level, $mime);
} else {
return ghost_index_entry($ctx, $level, $node);
@@ -346,23 +367,26 @@ 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};
+ $ctx->{-obfs_ibx} = $inbox->{obfuscate} ? $inbox : undef;
walk_thread($rootset, $ctx, *pre_thread);
+
$skel .= '';
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;
}
return missing_thread($ctx) unless $mime;
- $mime = Email::MIME->new($mime);
+ $mime = PublicInbox::MIME->new($mime);
$ctx->{-title_html} = ascii_html($mime->header('Subject'));
$ctx->{-html_tip} = ''.index_entry($mime, $ctx, scalar @$msgs);
$mime = undef;
@@ -372,7 +396,7 @@ sub thread_html {
$mime = $inbox->msg_by_smsg($mime) and last;
}
if ($mime) {
- $mime = Email::MIME->new($mime);
+ $mime = PublicInbox::MIME->new($mime);
return index_entry($mime, $ctx, scalar @$msgs);
}
$msgs = undef;
@@ -381,14 +405,11 @@ sub thread_html {
}
sub multipart_text_as_html {
- my ($mime, $upfx) = @_;
+ my ($mime, $upfx, $obfs_ibx) = @_;
my $rv = "";
# scan through all parts, looking for displayable text
- msg_iter($mime, sub {
- my ($p) = @_;
- $rv .= add_text_body($upfx, $p);
- });
+ msg_iter($mime, sub { $rv .= add_text_body($upfx, $obfs_ibx, $_[0]) });
$rv;
}
@@ -435,12 +456,14 @@ sub attach_link ($$$$;$) {
}
$ret .= "[-- Attachment #$idx: ";
my $ts = "Type: $ct, Size: $size bytes";
+ $desc = ascii_html($desc);
$ret .= ($desc eq '') ? "$ts --]" : "$desc --]\n[-- $ts --]";
$ret .= "\n";
}
sub add_text_body {
- my ($upfx, $p) = @_; # from msg_iter: [ Email::MIME, depth, @idx ]
+ 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';
my $fn = $part->filename;
@@ -482,9 +505,8 @@ sub add_text_body {
flush_quote(\$s, $l, \@quot) if @quot;
# regular line, OK
- $cur = $l->linkify_1($cur);
- $cur = ascii_html($cur);
- $s .= $l->linkify_2($cur);
+ $l->linkify_1($cur);
+ $s .= $l->linkify_2(ascii_html($cur));
} else {
push @quot, $cur;
}
@@ -492,15 +514,20 @@ sub add_text_body {
if (@quot) { # ugh, top posted
flush_quote(\$s, $l, \@quot);
- } elsif ($s =~ /\n\z/s) { # common, last line ends with a newline
+ obfuscate_addrs($obfs_ibx, $s) if $obfs_ibx;
$s;
- } else { # some editors don't do newlines...
- $s .= "\n";
+ } else {
+ 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...
+ $s .= "\n";
+ }
}
}
sub _msg_html_prepare {
- my ($hdr, $ctx) = @_;
+ my ($hdr, $ctx, $obfs_ibx) = @_;
my $srch = $ctx->{srch} if $ctx;
my $atom = '';
my $rv = ""; # anchor for body start
@@ -519,6 +546,7 @@ sub _msg_html_prepare {
if ($h eq 'From') {
my @n = PublicInbox::Address::names($v->raw);
$title[1] = ascii_html(join(', ', @n));
+ obfuscate_addrs($obfs_ibx, $title[1]) if $obfs_ibx;
} elsif ($h eq 'Subject') {
$title[0] = $v->as_html;
if ($srch) {
@@ -528,7 +556,7 @@ sub _msg_html_prepare {
}
}
$v = $v->as_html;
- $v =~ s/(\@[^,]+,) /$1\n\t/g if ($h eq 'Cc' || $h eq 'To');
+ obfuscate_addrs($obfs_ibx, $v) if $obfs_ibx;
$rv .= "$h: $v\n";
}
@@ -567,14 +595,20 @@ 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;
$ctx->{dst} = $dst;
$sres = load_results($srch, $sres);
- walk_thread(thread_results($sres), $ctx, *skel_dump);
+
+ # reduce hash lookups in 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;
}
@@ -615,49 +649,6 @@ sub _parent_headers {
$rv;
}
-sub squote_maybe ($) {
- my ($val) = @_;
- if ($val =~ m{([^\w@\./,\%\+\-])}) {
- $val =~ s/(['!])/'\\$1'/g; # '!' for csh
- return "'$val'";
- }
- $val;
-}
-
-sub mailto_arg_link {
- my ($hdr) = @_;
- my %cc; # everyone else
- my $to; # this is the From address
-
- foreach my $h (qw(From To Cc)) {
- my $v = $hdr->header($h);
- defined($v) && ($v ne '') or next;
- my @addrs = PublicInbox::Address::emails($v);
- foreach my $address (@addrs) {
- my $dst = lc($address);
- $cc{$dst} ||= $address;
- $to ||= $dst;
- }
- }
- my @arg;
-
- my $subj = $hdr->header('Subject') || '';
- $subj = "Re: $subj" unless $subj =~ /\bRe:/i;
- my $mid = $hdr->header_raw('Message-ID');
- push @arg, '--in-reply-to='.squote_maybe(mid_clean($mid));
- my $irt = mid_escape($mid);
- delete $cc{$to};
- push @arg, "--to=$to";
- $to = uri_escape_utf8($to);
- $subj = uri_escape_utf8($subj);
- my @cc = sort values %cc;
- push(@arg, map { "--cc=$_" } @cc);
- my $cc = uri_escape_utf8(join(',', @cc));
- my $href = "mailto:$to?In-Reply-To=$irt&Cc=${cc}&Subject=$subj";
-
- (\@arg, ascii_html($href));
-}
-
sub html_footer {
my ($hdr, $standalone, $ctx, $rhref) = @_;
@@ -745,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 {
@@ -771,7 +762,11 @@ sub skel_dump {
my $dst = $ctx->{dst};
my $cur = $ctx->{cur};
my $mid = $smsg->{mid};
+
my $f = ascii_html($smsg->from_name);
+ 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;
$ctx->{first_level} ||= $level;
@@ -797,19 +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 $s = $smsg->subject;
- my $h = $ctx->{srch}->subject_path($s);
- if ($ctx->{seen}->{$h}) {
- $s = 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 $omit$f\n"
} else {
- $ctx->{seen}->{$h} = 1;
- $s = PublicInbox::Hval->new($s);
- $s = $s->as_html;
+ $end = "$f\n";
}
my $m;
my $id = '';
my $mapping = $ctx->{mapping};
- my $end = defined($s) ? "$s $f\n" : "$f\n";
if ($mapping) {
my $map = $mapping->{$mid};
$id = id_compress($mid, 1);
@@ -901,6 +908,9 @@ 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) {
@@ -909,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);
@@ -929,12 +940,24 @@ sub dump_topics {
" $ts UTC $n - $mbox / $atom\n";
for (my $i = 0; $i < scalar(@ex); $i += 2) {
my $level = $ex[$i];
- my $sub = $ex[$i + 1];
- $mid = delete $seen->{$sub};
- $sub = PublicInbox::Hval->new($sub)->as_html;
+ my $subj = $ex[$i + 1];
+ $mid = delete $seen->{$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 ||= ' "';
+ }
+ 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 .= "$sub\n";
+ $s .= "$subj$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;