here to allow users to specify
@@ -625,25 +652,28 @@ sub add_text_body { # callback for each_part
}
sub _msg_page_prepare_obuf {
- my ($hdr, $ctx) = @_;
- my $over = $ctx->{-inbox}->over;
+ my ($eml, $ctx) = @_;
+ my $over = $ctx->{ibx}->over;
my $obfs_ibx = $ctx->{-obfs_ibx};
my $rv = '';
- my $mids = mids_for_index($hdr);
+ my $mids = mids_for_index($eml);
my $nr = $ctx->{nr}++;
if ($nr) { # unlikely
+ if ($ctx->{chash} eq content_hash($eml)) {
+ warn "W: BUG? @$mids not deduplicated properly\n";
+ return \$rv;
+ }
+ $rv .=
+"WARNING: multiple messages have this Message-ID\n
";
$rv .= '';
} else {
- $ctx->{first_hdr} = $hdr;
- if ($ctx->{smsg}) {
- $rv .=
-"WARNING: multiple messages have this Message-ID\n
";
- }
+ $ctx->{first_hdr} = $eml->header_obj;
+ $ctx->{chash} = content_hash($eml) if $ctx->{smsg}; # reused MID
$rv .= ""; # anchor for body start
}
$ctx->{-upfx} = '../' if $over;
my @title; # (Subject[0], From[0])
- for my $v ($hdr->header('From')) {
+ for my $v ($eml->header('From')) {
my @n = PublicInbox::Address::names($v);
$v = ascii_html($v);
$title[1] //= ascii_html(join(', ', @n));
@@ -654,14 +684,14 @@ sub _msg_page_prepare_obuf {
$rv .= "From: $v\n" if $v ne '';
}
foreach my $h (qw(To Cc)) {
- for my $v ($hdr->header($h)) {
+ 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');
+ my @subj = $eml->header('Subject');
if (@subj) {
my $v = ascii_html(shift @subj);
obfuscate_addrs($obfs_ibx, $v) if $obfs_ibx;
@@ -677,10 +707,10 @@ sub _msg_page_prepare_obuf {
$rv .= qq() if $over;
$title[0] = '(no subject)';
}
- for my $v ($hdr->header('Date')) {
+ for my $v ($eml->header('Date')) {
$v = ascii_html($v);
obfuscate_addrs($obfs_ibx, $v) if $obfs_ibx; # possible :P
- $rv .= "Date: $v\n";
+ $rv .= qq{Date: $v\t[thread overview]\n};
}
if (!$nr) { # first (and only) message, common case
$ctx->{-title_html} = join(' - ', @title);
@@ -696,12 +726,12 @@ sub _msg_page_prepare_obuf {
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));
+ $s .= "$h: $_\n" for ($eml->header_raw($h));
}
$lnk->linkify_mids('..', \$s, 1);
$rv .= $s;
}
- $rv .= _parent_headers($hdr, $over);
+ $rv .= _parent_headers($eml, $over);
$rv .= "\n";
\$rv;
}
@@ -716,7 +746,7 @@ 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 .= "\nThread overview: ";
@@ -725,7 +755,8 @@ sub thread_skel ($$$) {
$$skel .= SKEL_EXPAND."\n ";
$$skel .= ghost_parent('../', $parent) . "\n";
} else {
- $$skel .= '[no followups] '.SKEL_EXPAND."\n";
+ $$skel .= "[no followups] ".
+ SKEL_EXPAND."\n";
}
$ctx->{next_msg} = undef;
$ctx->{parent_msg} = $parent;
@@ -784,15 +815,22 @@ sub _parent_headers {
$rv;
}
-# returns a string buffer via ->getline
+# returns a string buffer
sub html_footer {
my ($ctx, $hdr) = @_;
- my $ibx = $ctx->{-inbox};
+ my $ibx = $ctx->{ibx};
my $upfx = '../';
- my $skel = " index";
+ my $skel;
my $rv = '';
if ($ibx->over) {
- $skel .= "\n";
+ my $t = ts2str($ctx->{-t_max});
+ my $t_fmt = fmt_ts($ctx->{-t_max});
+ $skel .= <~$t_fmt UTC|newest]
+EOF
+
thread_skel(\$skel, $ctx, $hdr);
my ($next, $prev);
my $parent = ' ';
@@ -823,6 +861,8 @@ sub html_footer {
$parent = " parent";
}
$rv .= "$next $prev$parent ";
+ } else { # unindexed inboxes w/o over
+ $skel = qq( latest);
}
$rv .= qq(reply);
$rv .= $skel;
@@ -837,11 +877,6 @@ sub linkify_ref_no_over {
"<$html>";
}
-sub anchor_for {
- my ($msgid) = @_;
- 'm' . id_compress($msgid, 1);
-}
-
sub ghost_parent {
my ($upfx, $mid) = @_;
@@ -860,7 +895,7 @@ sub find_mid_root {
++$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;
}
@@ -943,7 +978,7 @@ sub skel_dump { # walk_thread callback
$$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;
@@ -1038,10 +1073,10 @@ sub _skel_ghost {
}
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
@@ -1050,7 +1085,7 @@ sub acc_topic { # walk_thread callback
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;
}
@@ -1094,7 +1129,7 @@ sub dump_topics {
}
my @out;
- my $ibx = $ctx->{-inbox};
+ my $ibx = $ctx->{ibx};
my $obfs_ibx = $ibx->{obfuscate} ? $ibx : undef;
# sort by recency, this allows new posts to "bump" old topics...
@@ -1119,10 +1154,8 @@ sub dump_topics {
$anchor = '#t'; # thread skeleton
}
- my $mbox = qq(mbox.gz);
- my $atom = qq(Atom);
my $s = "$top_subj\n" .
- " $ds UTC $n - $mbox / $atom\n";
+ " $ds UTC $n\n";
for (my $i = 0; $i < scalar(@extra); $i += 2) {
my $level = $extra[$i];
my $subj = $extra[$i + 1]; # already normalized
@@ -1144,22 +1177,18 @@ sub dump_topics {
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! latest!;
+ if ($prev) { # aligned padding for: 'next (older) | '
+ $next = $next ? "$next | " : ' | ';
+ $prev .= qq[ | latest];
}
"
page: $next$prev
";
}
@@ -1176,7 +1205,7 @@ 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 $ibx = $ctx->{ibx};
my $msgs = $ibx->recent($opts, $after, $before);
my $nr = scalar @$msgs;
if ($nr < $lim && defined($after)) {
@@ -1197,15 +1226,18 @@ sub paginate_recent ($$) {
}
if (defined($oldest) && $more) {
my $s = ts2str($oldest);
- $ctx->{next_page} = qq!next!;
+ $ctx->{next_page} = qq[] .
+ 'next (older)';
}
if (defined($newest) && (defined($before) || defined($after))) {
my $s = ts2str($newest);
- $ctx->{prev_page} = qq!prev!;
+ $ctx->{prev_page} = qq[] .
+ 'prev (newer)';
}
$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
@@ -1243,7 +1275,7 @@ sub thread_adj_level {
sub ghost_index_entry {
my ($ctx, $level, $node) = @_;
my ($beg, $end) = thread_adj_level($ctx, $level);
- $beg . ''. ghost_parent($ctx->{-upfx}, $node->{mid})
+ $beg . ''. ghost_parent($ctx->{-upfx}, $node->{mid} // '?')
. '
' . $end;
}