X-Git-Url: http://www.git.stargrave.org/?a=blobdiff_plain;f=lib%2FPublicInbox%2FView.pm;h=ac7657ae5c6390fe5b8c1c191fdec9ef811ebbc9;hb=38c481a5438593cff686709493a70b8a6b3033d1;hp=0d85581dfd966eed4a0e4e0db2f2817c2f0e1713;hpb=92afb41e15dfdcda291b432173bd49ddfc49614a;p=public-inbox.git diff --git a/lib/PublicInbox/View.pm b/lib/PublicInbox/View.pm index 0d85581d..ac7657ae 100644 --- a/lib/PublicInbox/View.pm +++ b/lib/PublicInbox/View.pm @@ -7,7 +7,7 @@ package PublicInbox::View; use strict; use warnings; use Date::Parse qw/str2time/; -use PublicInbox::Hval qw/ascii_html/; +use PublicInbox::Hval qw/ascii_html obfuscate_addrs/; use PublicInbox::Linkify; use PublicInbox::MID qw/mid_clean id_compress mid_mime mid_escape/; use PublicInbox::MsgIter; @@ -24,11 +24,14 @@ sub th_pfx ($) { $_[0] == 0 ? '' : TCHILD }; sub msg_html { my ($ctx, $mime) = @_; my $hdr = $mime->header_obj; - my $tip = _msg_html_prepare($hdr, $ctx); + 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, '') . '
' + $tip . multipart_text_as_html($mime, '', $obfs_ibx) . + '
' } elsif ($nr == 2) { # fake an EOF if generating the footer fails; # we want to at least show the message if something @@ -52,12 +55,23 @@ sub msg_reply { 'https://en.wikipedia.org/wiki/Posting_style#Interleaved_style'; my $info = ''; - if (my $url = $ctx->{-inbox}->{infourl}) { + my $ibx = $ctx->{-inbox}; + if (my $url = $ibx->{infourl}) { $url = PublicInbox::Hval::prurl($ctx->{env}, $url); $info = qq(\n List information: $url\n); } - my ($arg, $link) = PublicInbox::Reply::mailto_arg_link($hdr); + my ($arg, $link) = PublicInbox::Reply::mailto_arg_link($ibx, $hdr); + + # mailto: link only works if address obfuscation is disabled + if ($link) { + $link = <In-Reply-To header + via mailto: links, try the mailto: link +EOF + } push @$arg, '/path/to/YOUR_REPLY'; $arg = ascii_html(join(" \\\n ", '', @$arg)); <$se_url - -* If your mail client supports setting the In-Reply-To header - via mailto: links, try the mailto: link +$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; @@ -103,7 +113,7 @@ sub in_reply_to { undef; } -sub _hdr_names ($$) { +sub _hdr_names_html ($$) { my ($hdr, $field) = @_; my $val = $hdr->header($field) or return ''; ascii_html(join(', ', PublicInbox::Address::names($val))); @@ -128,18 +138,25 @@ sub index_entry { my $root_anchor = $ctx->{root_anchor} || ''; my $irt; + my $obfs_ibx = $ctx->{-obfs_ibx}; my $rv = "* "; $subj = ''.ascii_html($subj).''; + obfuscate_addrs($obfs_ibx, $subj) if $obfs_ibx; $subj = "$subj" if $root_anchor eq $id_m; $rv .= $subj . "\n"; $rv .= _th_index_lite($mid_raw, \$irt, $id, $ctx); my @tocc; foreach my $f (qw(To Cc)) { - my $dst = _hdr_names($hdr, $f); - push @tocc, "$f: $dst" if $dst ne ''; + my $dst = _hdr_names_html($hdr, $f); + if ($dst ne '') { + obfuscate_addrs($obfs_ibx, $dst) if $obfs_ibx; + push @tocc, "$f: $dst"; + } } - $rv .= "From: "._hdr_names($hdr, 'From').' @ '._msg_date($hdr)." UTC"; + my $from = _hdr_names_html($hdr, 'From'); + 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 .= qq{ (permalink / }; @@ -156,7 +173,7 @@ sub index_entry { $rv .= "\n"; # scan through all parts, looking for displayable text - msg_iter($mime, sub { $rv .= add_text_body($mhref, $_[0]) }); + msg_iter($mime, sub { $rv .= add_text_body($mhref, $obfs_ibx, $_[0]) }); # add the footer $rv .= "\n^ ". @@ -302,6 +319,7 @@ sub stream_thread ($$) { } return missing_thread($ctx) unless $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); @@ -349,17 +367,20 @@ 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; @@ -384,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; } @@ -444,7 +462,8 @@ sub attach_link ($$$$;$) { } 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; @@ -495,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 @@ -522,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) { @@ -531,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"; } @@ -570,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; } @@ -705,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 { @@ -731,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; @@ -757,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); @@ -861,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) { @@ -869,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); @@ -889,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; } @@ -937,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;