here to allow users to specify
@@ -639,19 +653,22 @@ sub add_text_body { # callback for each_part
sub _msg_page_prepare_obuf {
my ($eml, $ctx) = @_;
- my $over = $ctx->{-inbox}->over;
+ my $over = $ctx->{ibx}->over;
my $obfs_ibx = $ctx->{-obfs_ibx};
my $rv = '';
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} = $eml->header_obj;
- if ($ctx->{smsg}) {
- $rv .=
-"WARNING: multiple messages have this Message-ID\n
";
- }
+ $ctx->{chash} = content_hash($eml) if $ctx->{smsg}; # reused MID
$rv .= ""; # anchor for body start
}
$ctx->{-upfx} = '../' if $over;
@@ -693,7 +710,7 @@ sub _msg_page_prepare_obuf {
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);
@@ -729,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: ";
@@ -738,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;
@@ -800,7 +818,7 @@ sub _parent_headers {
# returns a string buffer
sub html_footer {
my ($ctx, $hdr) = @_;
- my $ibx = $ctx->{-inbox};
+ my $ibx = $ctx->{ibx};
my $upfx = '../';
my $skel;
my $rv = '';
@@ -859,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) = @_;
@@ -965,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;
@@ -1060,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
@@ -1072,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;
}
@@ -1116,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...
@@ -1141,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
@@ -1194,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)) {
@@ -1264,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;
}