sub in_reply_to {
my ($hdr) = @_;
my %mid = map { $_ => 1 } $hdr->header_raw('Message-ID');
- my @refs = ($hdr->header_raw('References'),
- $hdr->header_raw('In-Reply-To'));
- @refs = ((join(' ', @refs)) =~ /<([^>]+)>/g);
+ my @refs = (($hdr->header_raw('References') || '') =~ /<([^>]+)>/g);
+ push(@refs, (($hdr->header_raw('In-Reply-To') || '') =~ /<([^>]+)>/g));
while (defined(my $irt = pop @refs)) {
next if $mid{"<$irt>"};
return $irt;
$rv .= "\t[relevance $pct->{$mid_raw}%]";
$hr = 1;
} elsif ($mapping) {
- my $threaded = 'threaded';
+ my $nested = 'nested';
my $flat = 'flat';
my $end = '';
if ($ctx->{flat}) {
$hr = 1;
$flat = "<b>$flat</b>";
} else {
- $threaded = "<b>$threaded</b>";
+ $nested = "<b>$nested</b>";
}
$rv .= "\t[<a\nhref=\"${mhref}T/#u\">$flat</a>";
- $rv .= "|<a\nhref=\"${mhref}t/#u\">$threaded</a>]";
+ $rv .= "|<a\nhref=\"${mhref}t/#u\">$nested</a>]";
$rv .= " <a\nhref=#r$id>$ctx->{s_nr}</a>";
} else {
$hr = $ctx->{-hr};
$ctx->{mapping} = {};
$ctx->{s_nr} = "$nr+ messages in thread";
- my $rootset = thread_results($msgs);
+ my $rootset = thread_results($msgs, $srch);
# reduce hash lookups in pre_thread->skel_dump
my $inbox = $ctx->{-inbox};
# reduce hash lookups in skel_dump
my $ibx = $ctx->{-inbox};
$ctx->{-obfs_ibx} = $ibx->{obfuscate} ? $ibx : undef;
- walk_thread(thread_results($sres), $ctx, *skel_dump);
+ walk_thread(thread_results($sres, $srch), $ctx, *skel_dump);
$ctx->{parent_msg} = $parent;
}
}
sub thread_results {
- my ($msgs) = @_;
+ my ($msgs, $srch) = @_;
require PublicInbox::SearchThread;
- PublicInbox::SearchThread::thread($msgs, *sort_ts);
+ PublicInbox::SearchThread::thread($msgs, *sort_ts, $srch);
}
sub missing_thread {
my $nr = scalar @{$sres->{msgs}};
if ($nr) {
$sres = load_results($srch, $sres);
- walk_thread(thread_results($sres), $ctx, *acc_topic);
+ walk_thread(thread_results($sres, $srch), $ctx, *acc_topic);
}
$ctx->{-next_o} = $off+ $nr;
$ctx->{-cur_o} = $off;