use warnings;
use URI::Escape qw/uri_escape_utf8/;
use Date::Parse qw/str2time/;
-use Encode::MIME::Header;
-use Plack::Util;
use PublicInbox::Hval qw/ascii_html/;
use PublicInbox::Linkify;
use PublicInbox::MID qw/mid_clean id_compress mid_mime/;
# public functions: (unstable)
sub msg_html {
- my ($ctx, $mime, $footer) = @_;
+ my ($ctx, $mime) = @_;
my $hdr = $mime->header_obj;
my $tip = _msg_html_prepare($hdr, $ctx);
PublicInbox::WwwStream->response($ctx, 200, sub {
my ($nr, undef) = @_;
if ($nr == 1) {
- $tip . multipart_text_as_html($mime, '') .
- '</pre><hr />'
+ $tip . multipart_text_as_html($mime, '') . '</pre><hr>'
} elsif ($nr == 2) {
# fake an EOF if generating the footer fails;
# we want to at least show the message if something
my $p_url =
'https://en.wikipedia.org/wiki/Posting_style#Interleaved_style';
+ my $info = '';
+ if (my $url = $ctx->{-inbox}->{infourl}) {
+ $url = PublicInbox::Hval::prurl($ctx->{env}, $url);
+ $info = qq(\n List information: <a\nhref="$url">$url</a>\n);
+ }
+
my ($arg, $link) = mailto_arg_link($hdr);
push @$arg, '/path/to/YOUR_REPLY';
$arg = join(" \\\n ", '', @$arg);
<<EOF
-<pre
-id=R>You may reply publically to <a
-href=#t>this message</a> via
-plain-text email using any one of the following methods:
+<hr><pre
+id=R><b>Reply instructions:</b>
+
+You may reply publically to <a
+href=#t>this message</a> via plain-text email
+using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: <a
Avoid top-posting and favor interleaved quoting:
<a
href="$p_url">$p_url</a>
-
+$info
* Reply to all the recipients using the <b>--to</b>, <b>--cc</b>,
and <b>--in-reply-to</b> switches of git-send-email(1):
$rv .= "From: "._hdr_names($hdr, 'From').' @ '._msg_date($hdr)." UTC";
my $upfx = $ctx->{-upfx};
my $mhref = $upfx . $mid->as_href . '/';
- $rv .= qq{ (<a\nhref="$mhref/">permalink</a> / };
- $rv .= qq{<a\nhref="$mhref/raw">raw</a>)\n};
+ $rv .= qq{ (<a\nhref="$mhref">permalink</a> / };
+ $rv .= qq{<a\nhref="${mhref}raw">raw</a>)\n};
$rv .= ' '.join('; +', @tocc) . "\n" if @tocc;
my $mapping = $ctx->{mapping};
my $mirt = PublicInbox::Hval->new_msgid($irt);
my $href = $upfx . $mirt->as_href . '/';
my $html = $mirt->as_html;
- $rv .= qq(In-Reply-To: <<a\nhref="$href/">$html</a>>\n)
+ $rv .= qq(In-Reply-To: <<a\nhref="$href">$html</a>>\n)
}
$rv .= "\n";
# add the footer
$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>";
+ " <a\nhref=\"${mhref}raw\">raw</a>" .
+ " <a\nhref=\"${mhref}#R\">reply</a>";
if (my $pct = $ctx->{pct}) { # used by SearchView.pm
- $rv .= " [relevance $pct->{$mid_raw}%]";
+ $rv .= "\t[relevance $pct->{$mid_raw}%]";
} elsif ($mapping) {
my $threaded = 'threaded';
my $flat = 'flat';
} else {
$threaded = "<b>$threaded</b>";
}
- $rv .= "
/ [<a\nhref=\"${mhref}T/#u\">$flat</a>";
+ $rv .= "
\t[<a\nhref=\"${mhref}T/#u\">$flat</a>";
$rv .= "|<a\nhref=\"${mhref}t/#u\">$threaded</a>]";
- $rv .= "
/ <a\nhref=#r$id>$ctx->{s_nr}</a>";
+ $rv .= " <a\nhref=#r$id>$ctx->{s_nr}</a>";
}
$rv .= $more ? "\n\n" : "\n";
my $this = $map->[1];
$this =~ s!\n\z!</b>\n!s;
$this =~ s!<a\nhref.*</a> !!s; # no point in duplicating subject
+ $this =~ s!<a\nhref=[^>]+>([^<]+)</a>!$1!s; # no point linking to self
$rv .= "<b>@ $this";
my $node = $map->[2];
if (my $child = $node->child) {
my $msgs = load_results($sres);
my $nr = $sres->{total};
return missing_thread($ctx) if $nr == 0;
- my $skel = '<hr
/><pre>';
+ my $skel = '<hr><pre>';
$skel .= $nr == 1 ? 'only message in thread' : 'end of thread';
- $skel .= ", back to <a\nhref=\"../../\">index</a>";
- $skel .= "\n<a\nid=t>$nr+ messages in thread:</a> (download: ";
- $skel .= "<a\nhref=\"../t.mbox.gz\">mbox.gz</a>";
+ $skel .= ", back to <a\nhref=\"../../\">index</a>\n\n";
+ $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->{dst} = \$skel;
qq(/ <a\nhref="${tpfx}t.atom">Atom feed</a>);
my $parent = in_reply_to($hdr);
+ $$dst .= "\n<b>Thread overview: </b>";
if ($nr <= 1) {
if (defined $parent) {
$$dst .= "($expand)\n ";
my $irt = in_reply_to($hdr);
if (defined $irt) {
- my $v = PublicInbox::Hval->new_msgid($irt, 1);
+ my $v = PublicInbox::Hval->new_msgid($irt);
my $html = $v->as_html;
my $href = $v->as_href;
$rv .= "In-Reply-To: <";
if ($idx && $srch) {
$idx .= "\n";
thread_skel(\$idx, $ctx, $hdr, $tpfx);
- my $p = $ctx->{parent_msg};
- my $next = $ctx->{next_msg};
- if ($p) {
- $p = PublicInbox::Hval->new_msgid($p);
- $p = $p->as_href;
- $irt = "<a\nhref=\"$upfx$p/\"\nrel=prev>parent</a> ";
- } else {
- $irt = ' ' x length('parent ');
+ my ($next, $prev);
+ my $parent = ' ';
+ $next = $prev = ' ';
+
+ if (my $n = $ctx->{next_msg}) {
+ $n = PublicInbox::Hval->new_msgid($n)->as_href;
+ $next = "<a\nhref=\"$upfx$n/\"\nrel=next>next</a>";
}
- if ($next) {
- my $n = PublicInbox::Hval->new_msgid($next)->as_href;
- $irt .= "<a\nhref=\"$upfx$n/\"\nrel=next>next</a> ";
- } else {
- $irt .= ' ' x length('next ');
+ my $u;
+ my $par = $ctx->{parent_msg};
+ if ($par) {
+ $u = PublicInbox::Hval->new_msgid($par)->as_href;
+ $u = "$upfx$u/";
}
+ if (my $p = $ctx->{prev_msg}) {
+ $prev = PublicInbox::Hval->new_msgid($p)->as_href;
+ if ($p && $par && $p eq $par) {
+ $prev = "<a\nhref=\"$upfx$prev/\"\n" .
+ 'rel=prev>prev parent</a>';
+ $parent = '';
+ } else {
+ $prev = "<a\nhref=\"$upfx$prev/\"\n" .
+ 'rel=prev>prev</a>';
+ $parent = " <a\nhref=\"$u\">parent</a>" if $u;
+ }
+ } elsif ($u) { # unlikely
+ $parent = " <a\nhref=\"$u\"\nrel=prev>parent</a>";
+ }
+ $irt = "$next $prev$parent ";
} else {
$irt = '';
}
}
sub linkify_ref_nosrch {
- my $v = PublicInbox::Hval->new_msgid($_[0], 1);
+ my $v = PublicInbox::Hval->new_msgid($_[0]);
my $html = $v->as_html;
my $href = $v->as_href;
"<<a\nhref=\"../$href/\">$html</a>>";
if ($attr ne $ctx->{prev_attr} || $ctx->{prev_level} > $level) {
$ctx->{prev_attr} = $attr;
- } else {
- $attr = '';
}
$ctx->{prev_level} = $level;
if ($cur) {
if ($cur eq $mid) {
delete $ctx->{cur};
- $$dst .= $d;
- $$dst .= "<b><a\nid=r\nhref=\"#t\">".
+ $$dst .= "<b>$d<a\nid=r\nhref=\"#t\">".
"$attr [this message]</a></b>\n";
return;
+ } else {
+ $ctx->{prev_msg} = $mid;
}
} else {
$ctx->{next_msg} ||= $mid;
}
# accumulate recent topics if search is supported
-# returns 1 if done, undef if not
-sub add_topic {
+# returns 200 if done, 404 if not
+sub acc_topic {
my ($ctx, $level, $node) = @_;
my $srch = $ctx->{srch};
my $mid = $node->messageid;
my $x = $node->message || _tryload_ghost($srch, $mid);
my ($subj, $ts);
+ my $topic;
if ($x) {
$x = $x->header_obj;
- $subj = $x->header('Subject');
+ $subj = $x->header('Subject') || '';
$subj = $srch->subject_normalized($subj);
$ts = $x->header('X-PI-TS');
- } else { # ghost message, do not bump level
- $ts = -666;
- $subj = "<$mid>";
- }
- if (++$ctx->{subjs}->{$subj} == 1) {
- push @{$ctx->{order}}, [ $level, $subj ];
- }
- my $exist = $ctx->{latest}->{$subj};
- if (!$exist || $exist->[1] < $ts) {
- $ctx->{latest}->{$subj} = [ $mid, $ts ];
+ if ($level == 0) {
+ $topic = [ $ts, 1, { $subj => $mid }, $subj ];
+ $ctx->{-cur_topic} = $topic;
+ push @{$ctx->{order}}, $topic;
+ return;
+ }
+
+ $topic = $ctx->{-cur_topic}; # should never be undef
+ $topic->[0] = $ts if $ts > $topic->[0];
+ $topic->[1]++;
+ my $seen = $topic->[2];
+ if (scalar(@$topic) == 3) { # parent was a ghost
+ push @$topic, $subj;
+ } elsif (!$seen->{$subj}) {
+ push @$topic, $level, $subj;
+ }
+ $seen->{$subj} = $mid; # latest for subject
+ } else { # ghost message
+ return if $level != 0; # ignore child ghosts
+ $topic = [ -666, 0, {} ];
+ $ctx->{-cur_topic} = $topic;
+ push @{$ctx->{order}}, $topic;
}
}
-sub emit_topics {
+sub dump_topics {
my ($ctx) = @_;
- my $order = $ctx->{order};
- my $subjs = $ctx->{subjs};
- my $latest = $ctx->{latest};
- my $fh = $ctx->{fh};
- return $fh->write("\n[No topics in range]</pre>") unless scalar @$order;
- my $pfx;
- my $prev = 0;
- my $prev_attr = '';
- my $cur;
- my @recent;
- while (defined(my $info = shift @$order)) {
- my ($level, $subj) = @$info;
- my $n = delete $subjs->{$subj};
- my ($mid, $ts) = @{delete $latest->{$subj}};
- $mid = PublicInbox::Hval->new_msgid($mid)->as_href;
- $pfx = indent_for($level);
- my $nl = $level == $prev ? "\n" : '';
- if ($nl && $cur) {
- push @recent, $cur;
- $cur = undef;
- }
- $cur ||= [ $ts, '' ];
- $cur->[0] = $ts if $ts > $cur->[0];
- $cur->[1] .= $nl . $pfx . th_pfx($level);
- if ($ts == -666) { # ghost
- $cur->[1] .= ghost_parent('', $mid) . "\n";
- next; # child will have mbox / atom link
- }
-
- $subj = PublicInbox::Hval->new($subj)->as_html;
- $cur->[1] .= "<a\nhref=\"$mid/T/#u\"><b>$subj</b></a>\n";
+ my $order = delete $ctx->{order}; # [ ts, subj1, subj2, subj3, ... ]
+ if (!@$order) {
+ $ctx->{-html_tip} = '<pre>[No topics in range]</pre>';
+ return 404;
+ }
+
+ my @out;
+
+ # sort by recency, this allows new posts to "bump" old topics...
+ foreach my $topic (sort { $b->[0] <=> $a->[0] } @$order) {
+ my ($ts, $n, $seen, $top, @ex) = @$topic;
+ @$topic = ();
+ next unless defined $top; # ghost topic
+ my $mid = delete $seen->{$top};
+ my $href = PublicInbox::Hval->new_msgid($mid)->as_href;
+ $top = PublicInbox::Hval->new($top)->as_html;
$ts = fmt_ts($ts);
- my $attr = " $ts UTC";
# $n isn't the total number of posts on the topic,
# just the number of posts in the current results window
- $n = $n == 1 ? '' : " ($n+ messages)";
-
- if ($level == 0 || $attr ne $prev_attr) {
- my $mbox = qq(<a\nhref="$mid/t.mbox.gz">mbox.gz</a>);
- my $atom = qq(<a\nhref="$mid/t.atom">Atom</a>);
- $pfx .= INDENT if $level > 0;
- $cur->[1] .= $pfx . $attr . $n . " - $mbox / $atom\n";
- $prev_attr = $attr;
+ my $anchor;
+ if ($n == 1) {
+ $n = '';
+ $anchor = '#u'; # top of only message
+ } else {
+ $n = " ($n+ messages)";
+ $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\"><b>$top</b></a>\n" .
+ " $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;
+ $href = PublicInbox::Hval->new_msgid($mid)->as_href;
+ $s .= indent_for($level) . TCHILD;
+ $s .= "<a\nhref=\"$href/T/#u\">$sub</a>\n";
+ }
+ push @out, $s;
+ }
+ $ctx->{-html_tip} = '<pre>' . join("\n", @out) . '</pre>';
+ 200;
+}
+
+sub index_nav { # callback for WwwStream
+ my (undef, $ctx) = @_;
+ delete $ctx->{qp} or return;
+ my ($next, $prev);
+ $next = $prev = ' ';
+ my $latest = '';
+
+ my $next_o = $ctx->{-next_o};
+ if ($next_o) {
+ $next = qq!<a\nhref="?o=$next_o"\nrel=next>next</a>!;
+ }
+ if (my $cur_o = $ctx->{-cur_o}) {
+ $latest = qq! <a\nhref=.>latest</a>!;
+
+ my $o = $cur_o - ($next_o - $cur_o);
+ if ($o > 0) {
+ $prev = qq!<a\nhref="?o=$o"\nrel=prev>prev</a>!;
+ } elsif ($o == 0) {
+ $prev = qq!<a\nhref=.\nrel=prev>prev</a>!;
}
}
- push @recent, $cur if $cur;
- @recent = map { $_->[1] } sort { $b->[0] <=> $a->[0] } @recent;
- $fh->write(join('', @recent) . '</pre>');
+ "<hr><pre>page: $next $prev$latest</pre>";
}
-sub emit_index_topics {
+sub index_topics {
my ($ctx) = @_;
- my ($off) = (($ctx->{cgi}->param('o') || '0') =~ /(\d+)/);
+ my ($off) = (($ctx->{qp}->{o} || '0') =~ /(\d+)/);
+ my $opts = { offset => $off, limit => 200 };
+
$ctx->{order} = [];
- $ctx->{subjs} = {};
- $ctx->{latest} = {};
- my $max = 25;
- my %opts = ( offset => $off, limit => $max * 4 );
- while (scalar @{$ctx->{order}} < $max) {
- my $sres = $ctx->{srch}->query('', \%opts);
- my $nr = scalar @{$sres->{msgs}} or last;
+ my $sres = $ctx->{srch}->query('', $opts);
+ my $nr = scalar @{$sres->{msgs}};
+ if ($nr) {
$sres = load_results($sres);
- walk_thread(thread_results($sres), $ctx, *add_topic);
- $opts{offset} += $nr;
+ walk_thread(thread_results($sres), $ctx, *acc_topic);
}
-
- emit_topics($ctx);
- $opts{offset};
+ $ctx->{-next_o} = $off+ $nr;
+ $ctx->{-cur_o} = $off;
+ PublicInbox::WwwStream->response($ctx, dump_topics($ctx), *index_nav);
}
sub thread_adj_level {