X-Git-Url: http://www.git.stargrave.org/?a=blobdiff_plain;f=lib%2FPublicInbox%2FView.pm;h=f0584cb7f0ee0211f538e4aca55ee9ac328273b9;hb=c3e6ffa858003c17e96ef90d13760bda194319e0;hp=e586b068fce8fdd643ba5de61505fbee7582fc1b;hpb=6f3e8ec25faa1fc71c0bc13bb2615b8fa45a44a1;p=public-inbox.git diff --git a/lib/PublicInbox/View.pm b/lib/PublicInbox/View.pm index e586b068..f0584cb7 100644 --- a/lib/PublicInbox/View.pm +++ b/lib/PublicInbox/View.pm @@ -8,9 +8,10 @@ use strict; use warnings; use bytes (); # only for bytes::length use PublicInbox::MsgTime qw(msg_datestamp); -use PublicInbox::Hval qw(ascii_html obfuscate_addrs prurl); +use PublicInbox::Hval qw(ascii_html obfuscate_addrs prurl mid_href); use PublicInbox::Linkify; -use PublicInbox::MID qw/id_compress mid_escape mids mids_for_index references/; +use PublicInbox::MID qw(id_compress mids mids_for_index references + $MID_EXTRACT); use PublicInbox::MsgIter; use PublicInbox::Address; use PublicInbox::WwwStream; @@ -18,7 +19,7 @@ use PublicInbox::Reply; use PublicInbox::ViewDiff qw(flush_diff); use POSIX qw(strftime); use Time::Local qw(timegm); -use PublicInbox::SearchMsg qw(subject_normalized); +use PublicInbox::Smsg qw(subject_normalized); use constant COLS => 72; use constant INDENT => ' '; use constant TCHILD => '` '; @@ -26,22 +27,14 @@ sub th_pfx ($) { $_[0] == 0 ? '' : TCHILD }; sub msg_page_i { my ($nr, $ctx) = @_; - my $more = $ctx->{more}; - if ($nr == 1) { - # $more cannot be true w/o $smsg being defined: - $ctx->{mhref} = $more ? '../'.mid_escape($ctx->{smsg}->mid).'/' - : ''; - multipart_text_as_html(delete $ctx->{mime}, $ctx); - ${delete $ctx->{obuf}} .= '
'.index_entry($smsg, $ctx, scalar @$msgs); $ctx->{msgs} = $msgs; PublicInbox::WwwStream->response($ctx, 200, \&thread_html_i); @@ -515,9 +504,6 @@ sub attach_link ($$$$;$) { # spotting MUA problems: $ct =~ s/;.*// unless $err; $ct = ascii_html($ct); - my $desc = $part->header('Content-Description'); - $desc = $fn unless defined $desc; - $desc = '' unless defined $desc; my $sfn; if (defined $fn && $fn =~ /\A$PublicInbox::Hval::FN\z/o) { $sfn = $fn; @@ -529,10 +515,13 @@ sub attach_link ($$$$;$) { my $rv = $ctx->{obuf}; $$rv .= qq($nl{mhref}$idx-$sfn">); if ($err) { - $$rv .= "[-- Warning: decoded text below may be mangled --]\n"; + $$rv .= <header('Content-Description') // $fn // ''; $desc = ascii_html($desc); $$rv .= ($desc eq '') ? "$ts --]" : "$desc --]\n[-- $ts --]"; $$rv .= " \n"; @@ -587,7 +576,7 @@ sub add_text_body { # callback for msg_iter $s .= "\n" unless $s =~ /\n\z/s; # split off quoted and unquoted blocks: - my @sections = split(/((?:^>[^\n]*\n)+)/sm, $s); + my @sections = PublicInbox::MsgIter::split_quotes($s); $s = ''; my $rv = $ctx->{obuf}; if (defined($fn) || $depth > 0 || $err) { @@ -631,10 +620,9 @@ sub _msg_page_prepare_obuf { } my @title; # (Subject[0], From[0]) for my $v ($hdr->header('From')) { - $v = PublicInbox::Hval->new($v); - my @n = PublicInbox::Address::names($v->raw); + my @n = PublicInbox::Address::names($v); + $v = ascii_html($v); $title[1] //= ascii_html(join(', ', @n)); - $v = $v->as_html; if ($obfs_ibx) { obfuscate_addrs($obfs_ibx, $v); obfuscate_addrs($obfs_ibx, $title[1]); @@ -672,8 +660,7 @@ sub _msg_page_prepare_obuf { } $ctx->{-title_html} = join(' - ', @title); if (scalar(@$mids) == 1) { # common case - my $mid = PublicInbox::Hval->new_msgid($mids->[0]); - my $mhtml = $mid->as_html; + my $mhtml = ascii_html($mids->[0]); $rv .= "Message-ID: <$mhtml> "; $rv .= "(raw)\n"; } else { @@ -689,7 +676,7 @@ sub _msg_page_prepare_obuf { } $rv .= _parent_headers($hdr, $over); $rv .= "\n"; - $ctx->{obuf} = \$rv; + \$rv; } sub SKEL_EXPAND () { @@ -751,9 +738,8 @@ sub _parent_headers { $refs = references($hdr); my $irt = pop @$refs; if (defined $irt) { - my $v = PublicInbox::Hval->new_msgid($irt); - my $html = $v->as_html; - my $href = $v->{href}; + my $html = ascii_html($irt); + my $href = mid_href($irt); $rv .= "In-Reply-To: <"; $rv .= "$html>\n"; } @@ -773,9 +759,8 @@ sub _parent_headers { # returns a string buffer via ->getline sub html_footer { - my ($ctx) = @_; + my ($ctx, $hdr) = @_; my $ibx = $ctx->{-inbox}; - my $hdr = delete $ctx->{hdr}; my $upfx = '../'; my $skel = " index"; my $rv = ''; @@ -787,17 +772,17 @@ sub html_footer { $next = $prev = ' '; if (my $n = $ctx->{next_msg}) { - $n = PublicInbox::Hval->new_msgid($n)->{href}; + $n = mid_href($n); $next = "next"; } my $u; my $par = $ctx->{parent_msg}; if ($par) { - $u = PublicInbox::Hval->new_msgid($par)->{href}; + $u = mid_href($par); $u = "$upfx$u/"; } if (my $p = $ctx->{prev_msg}) { - $prev = PublicInbox::Hval->new_msgid($p)->{href}; + $prev = mid_href($p); if ($p && $par && $p eq $par) { $prev = "prev parent'; @@ -819,9 +804,9 @@ sub html_footer { } sub linkify_ref_no_over { - my $v = PublicInbox::Hval->new_msgid($_[0]); - my $html = $v->as_html; - my $href = $v->{href}; + my ($mid) = @_; + my $href = mid_href($mid); + my $html = ascii_html($mid); "<$html>"; } @@ -833,9 +818,8 @@ sub anchor_for { sub ghost_parent { my ($upfx, $mid) = @_; - $mid = PublicInbox::Hval->new_msgid($mid); - my $href = $mid->{href}; - my $html = $mid->as_html; + my $href = mid_href($mid); + my $html = ascii_html($mid); qq{[parent not found: <$html>]}; } @@ -904,20 +888,20 @@ sub missing_thread { sub dedupe_subject { my ($prev_subj, $subj, $val) = @_; - my $omit = ''; # '"' denotes identical text omitted + 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; + $omit //= $val; } pop @$subj if @$subj && $subj->[-1] =~ /^re:\s*/i; if (scalar(@curr_pop) == 1) { - $omit = ''; + $omit = undef; push @$prev_subj, @prev_pop; push @$subj, @curr_pop; } - $omit; + $omit // ''; } sub skel_dump { # walk_thread callback @@ -932,7 +916,7 @@ sub skel_dump { # walk_thread callback $$skel .= delete($ctx->{sl_note}) || ''; } - my $f = ascii_html($smsg->from_name); + my $f = ascii_html($smsg->{from_name}); my $obfs_ibx = $ctx->{-obfs_ibx}; obfuscate_addrs($obfs_ibx, $f) if $obfs_ibx; @@ -971,7 +955,7 @@ sub skel_dump { # walk_thread callback # 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 = split(/ /, subject_normalized($smsg->subject)); + my @subj = split(/ /, 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} || []; @@ -996,7 +980,7 @@ sub skel_dump { # walk_thread callback $map->[0] = "$d$end"; $id = "\nid=r".$id; } else { - $m = $ctx->{-upfx}.mid_escape($mid).'/'; + $m = $ctx->{-upfx}.mid_href($mid).'/'; } $$skel .= $d . "" . $end; 1; @@ -1010,9 +994,8 @@ sub _skel_ghost { $d .= ' ' if exists $ctx->{searchview}; $d .= indent_for($level) . th_pfx($level); my $upfx = $ctx->{-upfx}; - my $m = PublicInbox::Hval->new_msgid($mid); - my $href = $upfx . $m->{href} . '/'; - my $html = $m->as_html; + my $href = $upfx . mid_href($mid) . '/'; + my $html = ascii_html($mid); my $mapping = $ctx->{mapping}; my $map = $mapping->{$mid} if $mapping; @@ -1029,8 +1012,8 @@ sub _skel_ghost { sub sort_ds { [ sort { - (eval { $a->topmost->{smsg}->ds } || 0) <=> - (eval { $b->topmost->{smsg}->ds } || 0) + (eval { $a->topmost->{smsg}->{ds} } || 0) <=> + (eval { $b->topmost->{smsg}->{ds} } || 0) } @{$_[0]} ]; } @@ -1041,7 +1024,7 @@ sub acc_topic { # walk_thread callback my $mid = $node->{id}; my $smsg = $node->{smsg} // $ctx->{-inbox}->smsg_by_mid($mid); if ($smsg) { - my $subj = subject_normalized($smsg->subject); + my $subj = subject_normalized($smsg->{subject}); $subj = '(no subject)' if $subj eq ''; my $ds = $smsg->{ds}; if ($level == 0) { # new, top-level topic @@ -1073,7 +1056,7 @@ sub acc_topic { # walk_thread callback sub dump_topics { my ($ctx) = @_; my $order = delete $ctx->{order}; # [ ds, subj1, subj2, subj3, ... ] - if (!@$order) { + unless ($order) { $ctx->{-html_tip} = '[No topics in range]'; return 404; } @@ -1088,9 +1071,9 @@ sub dump_topics { @$topic = (); next unless defined $top_subj; # ghost topic my $mid = delete $seen->{$top_subj}; - my $href = mid_escape($mid); + my $href = mid_href($mid); my $prev_subj = [ split(/ /, $top_subj) ]; - $top_subj = PublicInbox::Hval->new($top_subj)->as_html; + $top_subj = ascii_html($top_subj); $ds = fmt_ts($ds); # $n isn't the total number of posts on the topic, @@ -1118,7 +1101,7 @@ sub dump_topics { $prev_subj = \@next_prev; $subj = ascii_html($subj); obfuscate_addrs($obfs_ibx, $subj) if $obfs_ibx; - $href = mid_escape($mid); + $href = mid_href($mid); $s .= indent_for($level) . TCHILD; $s .= qq($subj$omit\n); }