-# Copyright (C) 2014-2020 all contributors <meta@public-inbox.org>
+# Copyright (C) all contributors <meta@public-inbox.org>
# License: AGPL-3.0+ <https://www.gnu.org/licenses/agpl-3.0.txt>
#
# Used for displaying the HTML web interface.
# See Documentation/design_www.txt for this.
package PublicInbox::View;
use strict;
-use warnings;
-use bytes (); # only for bytes::length
+use v5.10.1;
+use List::Util qw(max);
+use Text::Wrap qw(wrap); # stdlib, we need Perl 5.6+ for $huge
use PublicInbox::MsgTime qw(msg_datestamp);
-use PublicInbox::Hval qw(ascii_html obfuscate_addrs prurl mid_href);
+use PublicInbox::Hval qw(ascii_html obfuscate_addrs prurl mid_href
+ ts2str fmt_ts);
use PublicInbox::Linkify;
use PublicInbox::MID qw(id_compress mids mids_for_index references
$MID_EXTRACT);
use PublicInbox::MsgIter;
use PublicInbox::Address;
-use PublicInbox::WwwStream;
+use PublicInbox::WwwStream qw(html_oneshot);
use PublicInbox::Reply;
use PublicInbox::ViewDiff qw(flush_diff);
use PublicInbox::Eml;
use POSIX qw(strftime);
use Time::Local qw(timegm);
use PublicInbox::Smsg qw(subject_normalized);
+use PublicInbox::ContentHash qw(content_hash);
use constant COLS => 72;
use constant INDENT => ' ';
use constant TCHILD => '` ';
my ($ctx, $eml) = @_;
if ($eml) { # called by WwwStream::async_eml or getline
my $smsg = $ctx->{smsg};
- $ctx->{smsg} = $ctx->{over}->next_by_mid(@{$ctx->{next_arg}});
+ my $over = $ctx->{ibx}->over;
+ $ctx->{smsg} = $over ? $over->next_by_mid(@{$ctx->{next_arg}})
+ : $ctx->gone('over');
$ctx->{mhref} = ($ctx->{nr} || $ctx->{smsg}) ?
"../${\mid_href($smsg->{mid})}/" : '';
- my $hdr = $eml->header_obj;
- my $obuf = $ctx->{obuf} = _msg_page_prepare_obuf($hdr, $ctx);
- multipart_text_as_html($eml, $ctx);
- delete $ctx->{obuf};
- $$obuf .= '</pre><hr>';
- $$obuf .= html_footer($ctx, $ctx->{first_hdr}) if !$ctx->{smsg};
- $$obuf;
+ if (_msg_page_prepare($eml, $ctx)) {
+ $eml->each_part(\&add_text_body, $ctx, 1);
+ print { $ctx->{zfh} } '</pre><hr>';
+ }
+ html_footer($ctx, $ctx->{first_hdr}) if !$ctx->{smsg};
+ ''; # XXX TODO cleanup
} else { # called by WwwStream::async_next or getline
$ctx->{smsg}; # may be undef
}
}
-# /$INBOX/$MESSAGE_ID/ for unindexed v1 inboxes
-sub no_over_i {
- my ($ctx) = @_;
- my $eml = delete $ctx->{eml} or return;
- my $hdr = $eml->header_obj;
- $ctx->{mhref} = '';
- my $obuf = $ctx->{obuf} = _msg_page_prepare_obuf($hdr, $ctx);
- multipart_text_as_html($eml, $ctx);
- delete $ctx->{obuf};
- $$obuf .= '</pre><hr>';
- eval { $$obuf .= html_footer($ctx, $hdr) };
- $$obuf
-}
-
+# /$INBOX/$MSGID/ for unindexed v1 inboxes
sub no_over_html ($) {
my ($ctx) = @_;
- my $bref = $ctx->{-inbox}->msg_by_mid($ctx->{mid}) or return; # 404
- $ctx->{eml} = PublicInbox::Eml->new($bref);
- PublicInbox::WwwStream::response($ctx, 200, \&no_over_i);
+ my $bref = $ctx->{ibx}->msg_by_mid($ctx->{mid}) or return; # 404
+ my $eml = PublicInbox::Eml->new($bref);
+ $ctx->{mhref} = '';
+ PublicInbox::WwwStream::init($ctx);
+ if (_msg_page_prepare($eml, $ctx)) { # sets {-title_html}
+ $eml->each_part(\&add_text_body, $ctx, 1);
+ print { $ctx->{zfh} } '</pre><hr>';
+ }
+ html_footer($ctx, $eml);
+ $ctx->html_done;
}
# public functions: (unstable)
sub msg_page {
my ($ctx) = @_;
- my $ibx = $ctx->{-inbox};
+ my $ibx = $ctx->{ibx};
$ctx->{-obfs_ibx} = $ibx->{obfuscate} ? $ibx : undef;
- my $over = $ctx->{over} = $ibx->over or return no_over_html($ctx);
+ my $over = $ibx->over or return no_over_html($ctx);
my ($id, $prev);
my $next_arg = $ctx->{next_arg} = [ $ctx->{mid}, \$id, \$prev ];
- $ctx->{smsg} = $over->next_by_mid(@$next_arg) or return; # undef == 404
- PublicInbox::WwwStream::aresponse($ctx, 200, \&msg_page_i);
+
+ my $smsg = $ctx->{smsg} = $over->next_by_mid(@$next_arg) or
+ return; # undef == 404
+
+ # allow user to easily browse the range around this message if
+ # they have ->over
+ $ctx->{-t_max} = $smsg->{ts};
+ $ctx->{-spfx} = '../' if $ibx->{coderepo};
+ PublicInbox::WwwStream::aresponse($ctx, \&msg_page_i);
}
# /$INBOX/$MESSAGE_ID/#R
sub msg_reply ($$) {
+ return "";
my ($ctx, $hdr) = @_;
my $se_url =
'https://kernel.org/pub/software/scm/git/docs/git-send-email.html';
'https://en.wikipedia.org/wiki/Posting_style#Interleaved_style';
my $info = '';
- my $ibx = $ctx->{-inbox};
+ my $ibx = $ctx->{ibx};
if (my $url = $ibx->{infourl}) {
$url = prurl($ctx->{env}, $url);
$info = qq(\n List information: <a\nhref="$url">$url</a>\n);
<a
href="$se_url">$se_url</a>
$link</pre>
+
+ Be sure your reply has a <b>Subject:</b> header at the top and a blank line
+ before the message body.
EOF
}
$nr == 1 ? "$nr $singular" : "$nr $plural";
}
-# human-friendly format
-sub fmt_ts ($) { strftime('%Y-%m-%d %k:%M', gmtime($_[0])) }
-
# Displays the text of of the message for /$INBOX/$MSGID/[Tt]/ endpoint
# this is already inside a <pre>
sub eml_entry {
- my ($ctx, $eml, $more) = @_;
+ my ($ctx, $eml) = @_;
my $smsg = delete $ctx->{smsg};
my $subj = delete $smsg->{subject};
my $mid_raw = $smsg->{mid};
# Deleting these fields saves about 400K as we iterate across 1K msgs
delete @$smsg{qw(ts blob)};
- my $hdr = $eml->header_obj;
- my $from = _hdr_names_html($hdr, 'From');
+ my $from = _hdr_names_html($eml, 'From');
obfuscate_addrs($obfs_ibx, $from) if $obfs_ibx;
$rv .= "From: $from @ ".fmt_ts($ds)." UTC";
my $upfx = $ctx->{-upfx};
my $mhref = $upfx . mid_href($mid_raw) . '/';
$rv .= qq{ (<a\nhref="$mhref">permalink</a> / };
$rv .= qq{<a\nhref="${mhref}raw">raw</a>)\n};
- my $to = fold_addresses(_hdr_names_html($hdr, 'To'));
- my $cc = fold_addresses(_hdr_names_html($hdr, 'Cc'));
+ my $to = fold_addresses(_hdr_names_html($eml, 'To'));
+ my $cc = fold_addresses(_hdr_names_html($eml, 'Cc'));
my ($tlen, $clen) = (length($to), length($cc));
my $to_cc = '';
if (($tlen + $clen) > COLS) {
$rv .= $to_cc;
my $mapping = $ctx->{mapping};
- if (!$mapping && (defined($irt) || defined($irt = in_reply_to($hdr)))) {
+ if (!$mapping && (defined($irt) || defined($irt = in_reply_to($eml)))) {
my $href = $upfx . mid_href($irt) . '/';
my $html = ascii_html($irt);
$rv .= qq(In-Reply-To: <<a\nhref="$href">$html</a>>\n)
}
- $rv .= "\n";
+ say { $ctx->zfh } $rv;
# scan through all parts, looking for displayable text
$ctx->{mhref} = $mhref;
- $ctx->{obuf} = \$rv;
- $eml->each_part(\&add_text_body, $ctx, 1);
- delete $ctx->{obuf};
+ $ctx->{changed_href} = "#e$id"; # for diffstat "files? changed,"
+ $eml->each_part(\&add_text_body, $ctx, 1); # expensive
# add the footer
- $rv
.= "\n<a\nhref=#$id_m\nid=e$id>^</a> ".
+ $rv = "\n<a\nhref=#$id_m\nid=e$id>^</a> ".
"<a\nhref=\"$mhref\">permalink</a>" .
" <a\nhref=\"${mhref}raw\">raw</a>" .
" <a\nhref=\"${mhref}#R\">reply</a>";
+ delete($ctx->{-qry}) and
+ $rv .= qq[ <a\nhref="${mhref}#related">related</a>];
+
my $hr;
if (defined(my $pct = $smsg->{pct})) { # used by SearchView.pm
$rv .= "\t[relevance $pct%]";
} elsif ($mapping) {
my $nested = 'nested';
my $flat = 'flat';
- my $end = '';
if ($ctx->{flat}) {
$hr = 1;
$flat = "<b>$flat</b>";
$hr = $ctx->{-hr};
}
- $rv .= $more ? '</pre><hr><pre>' : '</pre>' if $hr;
+ # do we have more messages? start a new <pre> if so
+ $rv .= scalar(@{$ctx->{msgs}}) ? '</pre><hr><pre>' : '</pre>' if $hr;
$rv;
}
sub pad_link ($$;$) {
my ($mid, $level, $s) = @_;
$s ||= '...';
- my $id = id_compress($mid, 1);
- (' 'x19).indent_for($level).th_pfx($level)."<a\nhref=#r$id>($s)</a>\n";
+ my $href = defined($mid) ?
+ ("<a\nhref=#r".id_compress($mid, 1).">($s)</a>\n") :
+ "($s)\n";
+ (' 'x19).indent_for($level).th_pfx($level).$href;
+}
+
+sub _skel_hdr {
+ # my ($mapping, $mid) = @_;
+ ($_[0]->{$_[1] // \'bogus'} // [ "(?)\n" ])->[0];
}
sub _th_index_lite {
my $rv = '';
my $mapping = $ctx->{mapping} or return $rv;
my $pad = ' ';
- my $mid_map = $mapping->{$mid_raw};
- defined $mid_map or
+ my $mid_map = $mapping->{$mid_raw} //
return 'public-inbox BUG: '.ascii_html($mid_raw).' not mapped';
my ($attr, $node, $idx, $level) = @$mid_map;
my $children = $node->{children};
my $s = ($idx - 1). ' preceding siblings ...';
$rv .= pad_link($pmid, $level, $s);
} elsif ($idx == 2) {
- my $ppmid = $siblings->[0]->{mid};
- $rv .= $pad . $mapping->{$ppmid}->[0];
+ $rv .= $pad . _skel_hdr($mapping,
+ $siblings->[0] ?
+ $siblings->[0]->{mid} : undef);
}
- $rv .= $pad . $mapping->{$pmid}->[0];
+ $rv .= $pad . _skel_hdr($mapping, $pmid);
}
}
my $s_s = nr_to_s($nr_s, 'sibling', 'siblings');
my $s_c = nr_to_s($nr_c, 'reply', 'replies');
- $attr =~ s!\n\z!</b>\n!s;
+ chop $attr; # remove "\n"
$attr =~ s!<a\nhref.*</a> (?:" )?!!s; # no point in dup subject
$attr =~ s!<a\nhref=[^>]+>([^<]+)</a>!$1!s; # no point linking to self
- $rv .= "<b>@ $attr";
+ $rv .= "<b>@ $attr</b>\n";
if ($nr_c) {
- my $cmid = $children->[0]->{mid};
- $rv .= $pad . $mapping->{$cmid}->[0];
+ my $cmid = $children->[0] ? $children->[0]->{mid} : undef;
+ $rv .= $pad . _skel_hdr($mapping, $cmid);
if ($nr_c > 2) {
my $s = ($nr_c - 1). ' more replies';
$rv .= pad_link($cmid, $level + 1, $s);
} elsif (my $cn = $children->[1]) {
- $rv .= $pad . $mapping->{$cn->{mid}}->[0];
+ $rv .= $pad . _skel_hdr($mapping, $cn->{mid});
}
}
my $next = $siblings->[$idx+1] if $siblings && $idx >= 0;
if ($next) {
my $nmid = $next->{mid};
- $rv .= $pad . $mapping->{$nmid}->[0];
+ $rv .= $pad . _skel_hdr($mapping, $nmid);
my $nnext = $nr_s - $idx;
if ($nnext > 2) {
my $s = ($nnext - 1).' subsequent siblings';
$rv .= pad_link($nmid, $level, $s);
} elsif (my $nn = $siblings->[$idx + 2]) {
- $rv .= $pad . $mapping->{$nn->{mid}}->[0];
+ $rv .= $pad . _skel_hdr($mapping, $nn->{mid});
}
}
$rv .= $pad ."<a\nhref=#r$id>$s_s, $s_c; $ctx->{s_nr}</a>\n";
sub thread_eml_entry {
my ($ctx, $eml) = @_;
my ($beg, $end) = thread_adj_level($ctx, $ctx->{level});
- $beg . '<pre>' . eml_entry($ctx, $eml, 0) . '</pre>' . $end;
+ print { $ctx->zfh } $beg, '<pre>';
+ print { $ctx->{zfh} } eml_entry($ctx, $eml), '</pre>';
+ $end;
}
sub next_in_queue ($$) {
sub stream_thread_i { # PublicInbox::WwwStream::getline callback
my ($ctx, $eml) = @_;
- goto &thread_eml_entry if $eml; # tail recursion
+ return thread_eml_entry($ctx, $eml) if $eml;
return unless exists($ctx->{skel});
my $ghost_ok = $ctx->{nr}++;
while (1) {
if (!$ghost_ok) { # first non-ghost
$ctx->{-title_html} =
ascii_html($smsg->{subject});
- $ctx->zmore($ctx->html_top);
+ print { $ctx->zfh } $ctx->html_top;
}
return $smsg;
}
# buffer the ghost entry and loop
- $ctx->zmore(ghost_index_entry($ctx, $lvl, $smsg));
+ print { $ctx->zfh } ghost_index_entry($ctx, $lvl, $smsg)
} else { # all done
- $ctx->zmore(join('', thread_adj_level($ctx, 0)));
- $ctx->zmore(${delete($ctx->{skel})});
+ print { $ctx->zfh } thread_adj_level($ctx, 0),
+ ${delete($ctx->{skel})};
return;
}
}
sub stream_thread ($$) {
my ($rootset, $ctx) = @_;
- $ctx->{-queue} = [ map { (0, $_) } @$rootset ];
- PublicInbox::WwwStream::aresponse($ctx, 200, \&stream_thread_i);
+ @{$ctx->{-queue}} = map { (0, $_) } @$rootset;
+ PublicInbox::WwwStream::aresponse($ctx, \&stream_thread_i);
}
-# /$INBOX/$MESSAGE_ID/t/
+# /$INBOX/$MSGID/t/ and /$INBOX/$MSGID/T/
sub thread_html {
my ($ctx) = @_;
+ $ctx->{-upfx} = '../../';
my $mid = $ctx->{mid};
- my $ibx = $ctx->{-inbox};
+ my $ibx = $ctx->{ibx};
my ($nr, $msgs) = $ibx->over->get_thread($mid);
return missing_thread($ctx) if $nr == 0;
+ $ctx->{-spfx} = '../../' if $ibx->{coderepo};
+
+ # link $INBOX_DIR/description text to "index_topics" view around
+ # the newest message in this thread
+ my $t = ts2str($ctx->{-t_max} = max(map { delete $_->{ts} } @$msgs));
+ my $t_fmt = fmt_ts($ctx->{-t_max});
+
my $skel = '<hr><pre>';
$skel .= $nr == 1 ? 'only message in thread' : 'end of thread';
- $skel .= ", back to <a\nhref=\"../../\">index</a>\n\n";
+ $skel .= <<EOF;
+, other threads:[<a
+href="../../?t=$t">~$t_fmt UTC</a> | <a
+href="../../">newest</a>]
+
+EOF
$skel .= "<b\nid=t>Thread overview:</b> ";
$skel .= $nr == 1 ? '(only message)' : "$nr+ messages";
$skel .= " (download: <a\nhref=\"../t.mbox.gz\">mbox.gz</a>";
$skel .= " / follow: <a\nhref=\"../t.atom\">Atom feed</a>)\n";
$skel .= "-- links below jump to the message on this page --\n";
- $ctx->{-upfx} = '../../';
$ctx->{cur_level} = 0;
$ctx->{skel} = \$skel;
$ctx->{prev_attr} = '';
$ctx->{prev_level} = 0;
- $ctx->{root_anchor} = anchor_for($mid);
- $ctx->{mapping} = {};
+ $ctx->{root_anchor} = 'm' . id_compress($mid, 1);
+ $ctx->{mapping} = {}; # mid -> [ header_summary, node, idx, level ]
$ctx->{s_nr} = ($nr > 1 ? "$nr+ messages" : 'only message')
.' in thread';
# flat display: lazy load the full message from smsg
$ctx->{msgs} = $msgs;
$ctx->{-html_tip} = '<pre>';
- PublicInbox::WwwStream::aresponse($ctx, 200, \&thread_html_i);
+ PublicInbox::WwwStream::aresponse($ctx, \&thread_html_i);
}
sub thread_html_i { # PublicInbox::WwwStream::getline callback
my $smsg = $ctx->{smsg};
if (exists $ctx->{-html_tip}) {
$ctx->{-title_html} = ascii_html($smsg->{subject});
- $ctx->zmore($ctx->html_top);
+ print { $ctx->zfh } $ctx->html_top;
}
- return eml_entry($ctx, $eml, scalar @{$ctx->{msgs}});
+ return eml_entry($ctx, $eml);
} else {
while (my $smsg = shift @{$ctx->{msgs}}) {
return $smsg if exists($smsg->{blob});
}
my $skel = delete($ctx->{skel}) or return; # all done
- $ctx->zmore($$skel);
+ print { $ctx->zfh } $$skel;
undef;
}
}
-sub multipart_text_as_html {
- # ($mime, $ctx) = @_; # each_part may do "$_[0] = undef"
-
- # scan through all parts, looking for displayable text
- $_[0]->each_part(\&add_text_body, $_[1], 1);
-}
-
sub submsg_hdr ($$) {
my ($ctx, $eml) = @_;
- my $obfs_ibx = $ctx->{-obfs_ibx};
- my $rv = $ctx->{obuf};
- $$rv .= "\n";
+ my $s = "\n";
for my $h (qw(From To Cc Subject Date Message-ID X-Alt-Message-ID)) {
- my @v = $eml->header($h);
- for my $v (@v) {
- obfuscate_addrs($obfs_ibx, $v) if $obfs_ibx;
- $v = ascii_html($v);
- $$rv .= "$h: $v\n";
- }
+ $s .= "$h: $_\n" for $eml->header($h);
}
+ obfuscate_addrs($ctx->{-obfs_ibx}, $s) if $ctx->{-obfs_ibx};
+ ascii_html($s);
}
sub attach_link ($$$$;$) {
# downloads for 0-byte multipart attachments
return unless $part->{bdy};
- my $nl = $idx eq '1' ? '' : "\n"; # like join("\n", ...)
- my $size = bytes::length($part->body);
+ my $size = length($part->body);
+ delete $part->{bdy}; # save memory
# hide attributes normally, unless we want to aid users in
# spotting MUA problems:
} else {
$sfn = 'a.bin';
}
- my $rv = $ctx->{obuf};
- $$rv .= qq($nl<a\nhref="$ctx->{mhref}$idx-$sfn">);
- if ($err) {
- $$rv .= <<EOF;
+ my $rv = $idx eq '1' ? '' : "\n"; # like join("\n", ...)
+ $rv .= qq(<a\nhref="$ctx->{mhref}$idx-$sfn">);
+ $rv .= <<EOF if $err;
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
EOF
- }
- $$rv .= "[-- Attachment #$idx: ";
- my $ts = "Type: $ct, Size: $size bytes";
+ $rv .= "[-- Attachment #$idx: ";
my $desc = $part->header('Content-Description') // $fn // '';
- $desc = ascii_html($desc);
- $$rv .= ($desc eq '') ? "$ts --]" : "$desc --]\n[-- $ts --]";
- $$rv .= "</a>\n";
-
- submsg_hdr($ctx, $part) if $part->{is_submsg};
-
- undef;
+ $rv .= ascii_html($desc)." --]\n[-- " if $desc ne '';
+ $rv .= "Type: $ct, Size: $size bytes --]</a>\n";
+ $rv .= submsg_hdr($ctx, $part) if $part->{is_submsg};
+ $rv;
}
sub add_text_body { # callback for each_part
my ($p, $ctx) = @_;
my $upfx = $ctx->{mhref};
- my $ibx = $ctx->{-inbox};
+ my $ibx = $ctx->{ibx};
my $l = $ctx->{-linkify} //= PublicInbox::Linkify->new;
# $p - from each_part: [ Email::MIME-like, depth, $idx ]
my ($part, $depth, $idx) = @$p;
my $ct = $part->content_type || 'text/plain';
my $fn = $part->filename;
my ($s, $err) = msg_part_text($part, $ct);
- return attach_link($ctx, $ct, $p, $fn) unless defined $s;
-
- my $rv = $ctx->{obuf};
- if ($part->{is_submsg}) {
- submsg_hdr($ctx, $part);
- $$rv .= "\n";
- }
+ my $zfh = $ctx->zfh;
+ $s // return print $zfh (attach_link($ctx, $ct, $p, $fn) // '');
+ say $zfh submsg_hdr($ctx, $part) if $part->{is_submsg};
# makes no difference to browsers, and don't screw up filename
# link generation in diffs with the extra '%0D'
- $s =~ s/\r\n/\n/sg;
+ $s =~ s/\r+\n/\n/sg;
# will be escaped to `•' in HTML
obfuscate_addrs($ibx, $s, "\x{2022}") if $ibx->{obfuscate};
$ctx->{-anchors} = {} if $s =~ /^diff --git /sm;
$diff = 1;
delete $ctx->{-long_path};
- my $spfx;
- if ($ibx->{-repo_objs}) {
- if (index($upfx, '//') >= 0) { # absolute URL (Atom feeds)
- $spfx = $upfx;
- $spfx =~ s!/([^/]*)/\z!/!;
- } else {
- my $n_slash = $upfx =~ tr!/!/!;
- if ($n_slash == 0) {
- $spfx = '../';
- } elsif ($n_slash == 1) {
- $spfx = '';
- } else { # nslash == 2
- $spfx = '../../';
- }
- }
- }
- $ctx->{-spfx} = $spfx;
};
- # some editors don't put trailing newlines at the end:
- $s .= "\n" unless $s =~ /\n\z/s;
-
# split off quoted and unquoted blocks:
my @sections = PublicInbox::MsgIter::split_quotes($s);
undef $s; # free memory
if (defined($fn) || ($depth > 0 && !$part->{is_submsg}) || $err) {
# badly-encoded message with $err? tell the world about it!
- attach_link($ctx, $ct, $p, $fn, $err);
- $$rv .= "\n";
+ say $zfh attach_link($ctx, $ct, $p, $fn, $err);
}
- foreach my $cur (@sections) {
+ delete $part->{bdy}; # save memory
+ for my $cur (@sections) { # $cur may be huge
if ($cur =~ /\A>/) {
# we use a <span> here to allow users to specify
# their own color for quoted text
- $$rv .= qq(<span\nclass="q">);
- $$rv .= $l->to_html($cur);
- $$rv .= '</span>';
+ print $zfh qq(<span\nclass="q">),
+ $l->to_html($cur), '</span>';
} elsif ($diff) {
flush_diff($ctx, \$cur);
- } else {
- # regular lines, OK
- $$rv .= $l->to_html($cur);
+ } else { # regular lines, OK
+ print $zfh $l->to_html($cur);
}
undef $cur; # free memory
}
}
-sub _msg_page_prepare_obuf {
- my ($hdr, $ctx) = @_;
- my $over = $ctx->{-inbox}->over;
- my $obfs_ibx = $ctx->{-obfs_ibx};
- my $rv = '';
- my $mids = mids_for_index($hdr);
+sub _msg_page_prepare {
+ my ($eml, $ctx) = @_;
+ my $have_over = !!$ctx->{ibx}->over;
+ my $mids = mids_for_index($eml);
my $nr = $ctx->{nr}++;
if ($nr) { # unlikely
- $rv .= '<pre>';
- } else {
- $ctx->{first_hdr} = $hdr;
- if ($ctx->{smsg}) {
- $rv .=
-"<pre>WARNING: multiple messages have this Message-ID\n</pre>";
+ if ($ctx->{chash} eq content_hash($eml)) {
+ warn "W: BUG? @$mids not deduplicated properly\n";
+ return;
}
- $rv .= "<pre\nid=b>"; # anchor for body start
+ $ctx->{-html_tip} =
+qq[<pre>WARNING: multiple messages have this Message-ID (<a
+href="d/">diff</a>)</pre><pre>];
+ } else {
+ $ctx->{first_hdr} = $eml->header_obj;
+ $ctx->{chash} = content_hash($eml) if $ctx->{smsg}; # reused MID
+ $ctx->{-html_tip} = "<pre\nid=b>"; # anchor for body start
}
- $ctx->{-upfx} = '../' if $over;
+ $ctx->{-upfx} = '../';
my @title; # (Subject[0], From[0])
- for my $v ($hdr->header('From')) {
+ my $hbuf = '';
+ for my $v ($eml->header('From')) {
my @n = PublicInbox::Address::names($v);
- $v = ascii_html($v);
- $title[1] //= ascii_html(join(', ', @n));
- if ($obfs_ibx) {
- obfuscate_addrs($obfs_ibx, $v);
- obfuscate_addrs($obfs_ibx, $title[1]);
- }
- $rv .= "From: $v\n" if $v ne '';
+ $title[1] //= join(', ', @n);
+ $hbuf .= "From: $v\n" if $v ne '';
}
- foreach my $h (qw(To Cc)) {
- for my $v ($hdr->header($h)) {
+ for my $h (qw(To Cc)) {
+ for my $v ($eml->header($h)) {
fold_addresses($v);
- $v = ascii_html($v);
- obfuscate_addrs($obfs_ibx, $v) if $obfs_ibx;
- $rv .= "$h: $v\n" if $v ne '';
- }
- }
- my @subj = $hdr->header('Subject');
- if (@subj) {
- my $v = ascii_html(shift @subj);
- obfuscate_addrs($obfs_ibx, $v) if $obfs_ibx;
- $rv .= 'Subject: ';
- $rv .= $over ? qq(<a\nhref="#r"\nid=t>$v</a>\n) : "$v\n";
- $title[0] = $v;
- for $v (@subj) { # multi-Subject message :<
- $v = ascii_html($v);
- obfuscate_addrs($obfs_ibx, $v) if $obfs_ibx;
- $rv .= "Subject: $v\n";
+ $hbuf .= "$h: $v\n" if $v ne '';
}
- } else { # dummy anchor for thread skeleton at bottom of page
- $rv .= qq(<a\nhref="#r"\nid=t></a>) if $over;
- $title[0] = '(no subject)';
}
- for my $v ($hdr->header('Date')) {
- $v = ascii_html($v);
- obfuscate_addrs($obfs_ibx, $v) if $obfs_ibx; # possible :P
- $rv .= "Date: $v\n";
+ my @subj = $eml->header('Subject');
+ $hbuf .= "Subject: $_\n" for @subj;
+ $title[0] = $subj[0] // '(no subject)';
+ $hbuf .= "Date: $_\n" for $eml->header('Date');
+ $hbuf = ascii_html($hbuf);
+ $ctx->{-title_html} = ascii_html(join(' - ', @title));
+ if (my $obfs_ibx = $ctx->{-obfs_ibx}) {
+ obfuscate_addrs($obfs_ibx, $hbuf);
+ obfuscate_addrs($obfs_ibx, $ctx->{-title_html});
}
- if (!$nr) { # first (and only) message, common case
- $ctx->{-title_html} = join(' - ', @title);
- $rv = $ctx->html_top . $rv;
+
+ # [thread overview] link is typically added after Date,
+ # but added after Subject, or even nothing.
+ if ($have_over) {
+ chop $hbuf; # drop "\n", or noop if $rv eq ''
+ $hbuf .= qq{\t<a\nhref="#r">[thread overview]</a>\n};
+ $hbuf =~ s!^Subject:\x20(.*?)(\n[A-Z]|\z)
+ !Subject: <a\nhref="#r"\nid=t>$1</a>$2!msx or
+ $hbuf .= qq(<a\nhref="#r\nid=t></a>);
}
if (scalar(@$mids) == 1) { # common case
- my $mhtml = ascii_html($mids->[0]);
- $rv .= "Message-ID: <$mhtml> ";
- $rv .= "(<a\nhref=\"raw\">raw</a>)\n";
+ my $x = ascii_html($mids->[0]);
+ $hbuf .= qq[Message-ID: <$x> (<a href="raw">raw</a>)\n];
+ }
+ if (!$nr) { # first (and only) message, common case
+ print { $ctx->zfh } $ctx->html_top, $hbuf;
} else {
+ delete $ctx->{-title_html};
+ print { $ctx->zfh } $ctx->{-html_tip}, $hbuf;
+ }
+ $ctx->{-linkify} //= PublicInbox::Linkify->new;
+ $hbuf = '';
+ if (scalar(@$mids) != 1) { # unlikely, but it happens :<
# X-Alt-Message-ID can happen if a message is injected from
# public-inbox-nntpd because of multiple Message-ID headers.
- my $lnk = PublicInbox::Linkify->new;
- my $s = '';
for my $h (qw(Message-ID X-Alt-Message-ID)) {
- $s .= "$h: $_\n" for ($hdr->header_raw($h));
+ $hbuf .= "$h: $_\n" for ($eml->header_raw($h));
}
- $lnk->linkify_mids('..', \$s, 1);
- $rv .= $s;
+ $ctx->{-linkify}->linkify_mids('..', \$hbuf, 1); # escapes HTML
+ print { $ctx->{zfh} } $hbuf;
+ $hbuf = '';
}
- $rv .= _parent_headers($hdr, $over);
- $rv .= "\n";
- \$rv;
+ my @irt = $eml->header_raw('In-Reply-To');
+ my $refs;
+ if (!@irt) {
+ $refs = references($eml);
+ $irt[0] = pop(@$refs) if scalar @$refs;
+ }
+ $hbuf .= "In-Reply-To: $_\n" for @irt;
+
+ # do not display References: if search is present,
+ # we show the thread skeleton at the bottom, instead.
+ if (!$have_over) {
+ $refs //= references($eml);
+ $hbuf .= 'References: <'.join(">\n\t<", @$refs).">\n" if @$refs;
+ }
+ $ctx->{-linkify}->linkify_mids('..', \$hbuf); # escapes HTML
+ say { $ctx->{zfh} } $hbuf;
+ 1;
}
sub SKEL_EXPAND () {
sub thread_skel ($$$) {
my ($skel, $ctx, $hdr) = @_;
my $mid = mids($hdr)->[0];
- my $ibx = $ctx->{-inbox};
+ my $ibx = $ctx->{ibx};
my ($nr, $msgs) = $ibx->over->get_thread($mid);
my $parent = in_reply_to($hdr);
$$skel .= "\n<b>Thread overview: </b>";
$$skel .= SKEL_EXPAND."\n ";
$$skel .= ghost_parent('../', $parent) . "\n";
} else {
- $$skel .= '[no followups] '.SKEL_EXPAND."\n";
+ $$skel .= "<a\nid=r>[no followups]</a> ".
+ SKEL_EXPAND."\n";
}
$ctx->{next_msg} = undef;
$ctx->{parent_msg} = $parent;
# when multiple Subject: headers are present, so we follow suit:
my $subj = $hdr->header('Subject') // '';
$subj = '(no subject)' if $subj eq '';
- $ctx->{prev_subj} = [ split(/ /, subject_normalized($subj)) ];
$ctx->{cur} = $mid;
$ctx->{prev_attr} = '';
$ctx->{prev_level} = 0;
$ctx->{parent_msg} = $parent;
}
-sub _parent_headers {
- my ($hdr, $over) = @_;
- my $rv = '';
- my @irt = $hdr->header_raw('In-Reply-To');
- my $refs;
- if (@irt) {
- my $lnk = PublicInbox::Linkify->new;
- $rv .= "In-Reply-To: $_\n" for @irt;
- $lnk->linkify_mids('..', \$rv);
- } else {
- $refs = references($hdr);
- my $irt = pop @$refs;
- if (defined $irt) {
- my $html = ascii_html($irt);
- my $href = mid_href($irt);
- $rv .= "In-Reply-To: <";
- $rv .= "<a\nhref=\"../$href/\">$html</a>>\n";
- }
- }
-
- # do not display References: if search is present,
- # we show the thread skeleton at the bottom, instead.
- return $rv if $over;
-
- $refs //= references($hdr);
- if (@$refs) {
- @$refs = map { linkify_ref_no_over($_) } @$refs;
- $rv .= 'References: '. join("\n\t", @$refs) . "\n";
- }
- $rv;
-}
-
-# returns a string buffer via ->getline
+# writes to zbuf
sub html_footer {
my ($ctx, $hdr) = @_;
- my $ibx = $ctx->{-inbox};
my $upfx = '../';
- my $skel = " <a\nhref=\"$upfx\">index</a>";
- my $rv = '<pre>';
- if ($ibx->over) {
- $skel .= "\n";
+ my (@related, $skel);
+ my $foot = '<pre>';
+ my $qry = delete $ctx->{-qry};
+ if ($qry && $ctx->{ibx}->isrch) {
+ my $q = ''; # search for either ancestor or descendent patches
+ for (@{$qry->{dfpre}}, @{$qry->{dfpost}}) {
+ chop if length > 7; # include 1 abbrev "older" patches
+ $q .= "dfblob:$_ ";
+ }
+ chop $q; # omit trailing SP
+ local $Text::Wrap::columns = COLS;
+ local $Text::Wrap::huge = 'overflow';
+ $q = wrap('', '', $q);
+ my $rows = ($q =~ tr/\n/\n/) + 1;
+ $q = ascii_html($q);
+ $related[0] = <<EOM;
+<form id=related
+action=$upfx
+><pre>find likely ancestor, descendant, or conflicting patches for <a
+href=#t>this message</a>:
+<textarea name=q cols=${\COLS} rows=$rows>$q</textarea>
+<input type=submit value=search
+/>\t(<a href=${upfx}_/text/help/#search>help</a>)</pre></form>
+EOM
+ }
+ if ($ctx->{ibx}->over) {
+ my $t = ts2str($ctx->{-t_max});
+ my $t_fmt = fmt_ts($ctx->{-t_max});
+ my $fallback = @related ? "\t" : "<a id=related>\t</a>";
+ $skel = <<EOF;
+${fallback}other threads:[<a
+href="$upfx?t=$t">~$t_fmt UTC</a>|<a
+href="$upfx">newest</a>]
+EOF
thread_skel(\$skel, $ctx, $hdr);
my ($next, $prev);
my $parent = ' ';
if (my $n = $ctx->{next_msg}) {
$n = mid_href($n);
- $next = "<a\nhref=\"$upfx$n/\"\nrel=next>next</a>";
+ $next = qq(<a\nhref="$upfx$n/"\nrel=next>next</a>);
}
- my $u;
my $par = $ctx->{parent_msg};
- if ($par) {
- $u = mid_href($par);
- $u = "$upfx$u/";
- }
+ my $u = $par ? $upfx.mid_href($par).'/' : undef;
if (my $p = $ctx->{prev_msg}) {
$prev = mid_href($p);
if ($p && $par && $p eq $par) {
- $prev = "<a\nhref=\"$upfx$prev/\"\n" .
+ $prev = qq(<a\nhref="$upfx$prev/"\n) .
'rel=prev>prev parent</a>';
$parent = '';
} else {
- $prev = "<a\nhref=\"$upfx$prev/\"\n" .
+ $prev = qq(<a\nhref="$upfx$prev/"\n) .
'rel=prev>prev</a>';
- $parent = " <a\nhref=\"$u\">parent</a>" if $u;
+ $parent = qq( <a\nhref="$u">parent</a>) if $u;
}
} elsif ($u) { # unlikely
- $parent = " <a\nhref=\"$u\"\nrel=prev>parent</a>";
+ $parent = qq( <a\nhref="$u"\nrel=prev>parent</a>);
}
- $rv .= "$next $prev$parent ";
+ $foot .= "$next $prev$parent ";
+ } else { # unindexed inboxes w/o over
+ $skel = qq( <a\nhref="$upfx">latest</a>);
}
- $rv .= qq(<a\nhref="#R">reply</a>);
- $rv .= $skel;
- $rv .= '</pre>';
- $rv .= msg_reply($ctx, $hdr);
-}
-
-sub linkify_ref_no_over {
- my ($mid) = @_;
- my $href = mid_href($mid);
- my $html = ascii_html($mid);
- "<<a\nhref=\"../$href/\">$html</a>>";
-}
-
-sub anchor_for {
- my ($msgid) = @_;
- 'm' . id_compress($msgid, 1);
+ # $skel may be big for big threads, don't append it to $foot
+ print { $ctx->zfh } $foot, qq(<a\nhref="#R">reply</a>),
+ $skel, '</pre>', @related,
+ msg_reply($ctx, $hdr);
}
sub ghost_parent {
++$ctx->{root_idx} if $level == 0;
if ($node->{mid} eq $ctx->{mid}) {
$ctx->{found_mid_at} = $ctx->{root_idx};
- return 0;
+ return 0; # stop iterating
}
1;
}
$$skel .= delete($ctx->{sl_note}) || '';
}
- my $f = ascii_html($smsg->{from_name});
+ my $f = ascii_html(delete $smsg->{from_name});
my $obfs_ibx = $ctx->{-obfs_ibx};
obfuscate_addrs($obfs_ibx, $f) if $obfs_ibx;
1;
}
+# note: we favor Date: here because git-send-email increments it
+# to preserve [PATCH $N/$M] ordering in series (it can't control Received:)
sub sort_ds {
- [ sort {
+ @{$_[0]} = sort {
(eval { $a->topmost->{ds} } || 0) <=>
(eval { $b->topmost->{ds} } || 0)
- } @{$_[0]} ];
+ } @{$_[0]};
}
# accumulate recent topics if search is supported
my ($ctx, $level, $smsg) = @_;
my $mid = $smsg->{mid};
my $has_blob = $smsg->{blob} // do {
- if (my $by_mid = $ctx->{-inbox}->smsg_by_mid($mid)) {
+ if (my $by_mid = $ctx->{ibx}->smsg_by_mid($mid)) {
%$smsg = (%$smsg, %$by_mid);
1;
}
if ($has_blob) {
my $subj = subject_normalized($smsg->{subject});
$subj = '(no subject)' if $subj eq '';
+ my $ts = $smsg->{ts};
my $ds = $smsg->{ds};
if ($level == 0) { # new, top-level topic
- my $topic = [ $ds, 1, { $subj => $mid }, $subj ];
+ my $topic = [ $ts, $ds, 1, { $subj => $mid }, $subj ];
$ctx->{-cur_topic} = $topic;
push @{$ctx->{order}}, $topic;
return 1;
# continue existing topic
my $topic = $ctx->{-cur_topic}; # should never be undef
- $topic->[0] = $ds if $ds > $topic->[0];
- $topic->[1]++; # bump N+ message counter
- my $seen = $topic->[2];
- if (scalar(@$topic) == 3) { # parent was a ghost
+ $topic->[0] = $ts if $ts > $topic->[0];
+ $topic->[1] = $ds if $ds > $topic->[1];
+ $topic->[2]++; # bump N+ message counter
+ my $seen = $topic->[3];
+ if (scalar(@$topic) == 4) { # parent was a ghost
push @$topic, $subj;
} elsif (!defined($seen->{$subj})) {
push @$topic, $level, $subj; # @extra messages
$seen->{$subj} = $mid; # latest for subject
} else { # ghost message
return 1 if $level != 0; # ignore child ghosts
- my $topic = $ctx->{-cur_topic} = [ -666, 0, {} ];
+ my $topic = $ctx->{-cur_topic} = [ -666, -666, 0, {} ];
push @{$ctx->{order}}, $topic;
}
1;
}
my @out;
- my $ibx = $ctx->{-inbox};
- my $obfs_ibx = $ibx->{obfuscate} ? $ibx : undef;
-
+ my $obfs_ibx = $ctx->{ibx}->{obfuscate} ? $ctx->{ibx} : undef;
+ if (my $note = delete $ctx->{t_note}) {
+ push @out, $note; # "messages from ... to ..."
+ }
# sort by recency, this allows new posts to "bump" old topics...
foreach my $topic (sort { $b->[0] <=> $a->[0] } @$order) {
- my ($ds, $n, $seen, $top_subj, @extra) = @$topic;
+ my ($ts, $ds, $n, $seen, $top_subj, @extra) = @$topic;
@$topic = ();
next unless defined $top_subj; # ghost topic
my $mid = delete $seen->{$top_subj};
$anchor = '#t'; # thread skeleton
}
- my $mbox = qq(<a\nhref="$href/t.mbox.gz">mbox.gz</a>);
- my $atom = qq(<a\nhref="$href/t.atom">Atom</a>);
my $s = "<a\nhref=\"$href/T/$anchor\">$top_subj</a>\n" .
- " $ds UTC $n - $mbox / $atom\n";
- for (my $i = 0; $i < scalar(@extra); $i += 2) {
- my $level = $extra[$i];
- my $subj = $extra[$i + 1]; # already normalized
+ " $ds UTC $n\n";
+ while (@extra) {
+ my $level = shift @extra;
+ my $subj = shift @extra; # already normalized
$mid = delete $seen->{$subj};
my @subj = split(/ /, $subj);
my @next_prev = @subj; # full copy
200;
}
-# only for the t= query parameter passed to overview DB
-sub ts2str ($) { strftime('%Y%m%d%H%M%S', gmtime($_[0])) };
-
sub str2ts ($) {
my ($yyyy, $mon, $dd, $hh, $mm, $ss) = unpack('A4A2A2A2A2A2', $_[0]);
- timegm($ss, $mm, $hh, $dd, $mon - 1, $yyyy);
+ timegm($ss || 0, $mm || 0, $hh || 0, $dd, $mon - 1, $yyyy);
}
sub pagination_footer ($$) {
my ($ctx, $latest) = @_;
- delete $ctx->{qp} or return;
my $next = $ctx->{next_page} || '';
my $prev = $ctx->{prev_page} || '';
- if ($prev) {
- $next = $next ? "$next " : ' ';
- $prev .= qq! <a\nhref='$latest'>latest</a>!;
+ if ($prev) { # aligned padding for: 'next (older) | '
+ $next = $next ? "$next | " : ' | ';
+ $prev .= qq[ | <a\nhref="$latest">latest</a>];
}
- "<hr><pre>page: $next$prev</pre>";
-}
-
-sub index_nav { # callback for WwwStream::getline
- my ($ctx) = @_;
- return $ctx->html_top if exists $ctx->{-html_tip};
- pagination_footer($ctx, '.')
+ ($next || $prev) ? "<hr><pre id=nav>page: $next$prev</pre>" : '';
}
sub paginate_recent ($$) {
$t =~ s/\A([0-9]{8,14})-// and $after = str2ts($1);
$t =~ /\A([0-9]{8,14})\z/ and $before = str2ts($1);
- my $ibx = $ctx->{-inbox};
- my $msgs = $ibx->recent($opts, $after, $before);
- my $nr = scalar @$msgs;
- if ($nr < $lim && defined($after)) {
+ my $msgs = $ctx->{ibx}->over->recent($opts, $after, $before);
+ if (defined($after) && scalar(@$msgs) < $lim) {
$after = $before = undef;
- $msgs = $ibx->recent($opts);
- $nr = scalar @$msgs;
+ $msgs = $ctx->{ibx}->over->recent($opts);
}
- my $more = $nr == $lim;
+ my $more = scalar(@$msgs) == $lim;
my ($newest, $oldest);
- if ($nr) {
+ if (@$msgs) {
$newest = $msgs->[0]->{ts};
$oldest = $msgs->[-1]->{ts};
# if we only had $after, our SQL query in ->recent ordered
if ($newest < $oldest) {
($oldest, $newest) = ($newest, $oldest);
- $more = 0 if defined($after) && $after < $oldest;
+ $more = undef if defined($after) && $after < $oldest;
+ }
+ if (defined($after // $before)) {
+ my $n = strftime('%Y-%m-%d %H:%M:%S', gmtime($newest));
+ my $o = strftime('%Y-%m-%d %H:%M:%S', gmtime($oldest));
+ $ctx->{t_note} = <<EOM;
+ messages from $o to $n UTC [<a href="#nav">more...</a>]
+EOM
+ my $s = ts2str($newest);
+ $ctx->{prev_page} = qq[<a\nhref="?t=$s-"\nrel=prev>] .
+ 'prev (newer)</a>';
}
}
if (defined($oldest) && $more) {
my $s = ts2str($oldest);
- $ctx->{next_page} = qq!<a\nhref="?t=$s"\nrel=next>next</a>!;
- }
- if (defined($newest) && (defined($before) || defined($after))) {
- my $s = ts2str($newest);
- $ctx->{prev_page} = qq!<a\nhref="?t=$s-"\nrel=prev>prev</a>!;
+ $ctx->{next_page} = qq[<a\nhref="?t=$s"\nrel=next>] .
+ 'next (older)</a>';
}
$msgs;
}
+# GET /$INBOX - top-level inbox view for indexed inboxes
sub index_topics {
my ($ctx) = @_;
my $msgs = paginate_recent($ctx, 200); # 200 is our window
- if (@$msgs) {
- walk_thread(thread_results($ctx, $msgs), $ctx, \&acc_topic);
- }
- PublicInbox::WwwStream::response($ctx, dump_topics($ctx), \&index_nav);
+ walk_thread(thread_results($ctx, $msgs), $ctx, \&acc_topic) if @$msgs;
+ html_oneshot($ctx, dump_topics($ctx), pagination_footer($ctx, '.'));
}
sub thread_adj_level {
sub ghost_index_entry {
my ($ctx, $level, $node) = @_;
my ($beg, $end) = thread_adj_level($ctx, $level);
- $beg . '<pre>'. ghost_parent($ctx->{-upfx}, $node->{mid})
+ $beg . '<pre>'. ghost_parent($ctx->{-upfx}, $node->{mid} // '?')
. '</pre>' . $end;
}
+# /$INBOX/$MSGID/d/ endpoint
+sub diff_msg {
+ my ($ctx) = @_;
+ require PublicInbox::MailDiff;
+ my $ibx = $ctx->{ibx};
+ my $over = $ibx->over or return no_over_html($ctx);
+ my ($id, $prev);
+ my $md = bless { ctx => $ctx }, 'PublicInbox::MailDiff';
+ my $next_arg = $md->{next_arg} = [ $ctx->{mid}, \$id, \$prev ];
+ my $smsg = $md->{smsg} = $over->next_by_mid(@$next_arg) or
+ return; # undef == 404
+ $ctx->{-t_max} = $smsg->{ts};
+ $ctx->{-upfx} = '../../';
+ $ctx->{-apfx} = '//'; # fail on to_attr()
+ $ctx->{-linkify} = PublicInbox::Linkify->new;
+ my $mid = ascii_html($smsg->{mid});
+ $ctx->{-title_html} = "diff for duplicates of <$mid>";
+ PublicInbox::WwwStream::html_init($ctx);
+ print { $ctx->{zfh} } '<pre>diff for duplicates of <<a href="../">',
+ $mid, "</a>>\n\n";
+ sub {
+ $ctx->attach($_[0]->([200, delete $ctx->{-res_hdr}]));
+ $md->begin_mail_diff;
+ };
+}
+
1;