about summary refs log tree commit homepage
path: root/lib/PublicInbox/SearchThread.pm
diff options
context:
space:
mode:
authorEric Wong <e@80x24.org>2019-12-19 05:18:00 +0000
committerEric Wong <e@80x24.org>2019-12-20 03:09:26 +0000
commit3082849c654fdee12ad97396b4e39be3c4888c1d (patch)
tree429a5b1dd08b4bb101e5a32d615cccd140dcb8b0 /lib/PublicInbox/SearchThread.pm
parent8d29cf132caf3de81986179b10746f31123c96b9 (diff)
downloadpublic-inbox-3082849c654fdee12ad97396b4e39be3c4888c1d.tar.gz
Instead of only passing an Inbox object, we'll pass the $ctx
reference as PublicInbox::SearchView::mset_thread did.

So although mset_thread was wrong, we now make it's usage
of SearchThread::thread correct and update other callers to
favor the new style of passing the entire $ctx (with ->{-inbox})
instead of just the Inbox object.

This makes the thread skeleton at the bottom of the search
page to show subjects of messages, but unfortunately links to
non-existent #anchors.  The next commit will fix that.

While we're at it, favor "\&foo" over "*foo" since the former
makes the code reference (aka "function pointer) obvious so it
won't be confused for other things named "foo" in that
scope (e.g. $foo/@foo/%foo).
Diffstat (limited to 'lib/PublicInbox/SearchThread.pm')
-rw-r--r--lib/PublicInbox/SearchThread.pm8
1 files changed, 5 insertions, 3 deletions
diff --git a/lib/PublicInbox/SearchThread.pm b/lib/PublicInbox/SearchThread.pm
index 931bd579..ab2f1a84 100644
--- a/lib/PublicInbox/SearchThread.pm
+++ b/lib/PublicInbox/SearchThread.pm
@@ -22,7 +22,7 @@ use strict;
 use warnings;
 
 sub thread {
-        my ($msgs, $ordersub, $ibx) = @_;
+        my ($msgs, $ordersub, $ctx) = @_;
         my $id_table = {};
 
         # Sadly, we sort here anyways since the fill-in-the-blanks References:
@@ -32,12 +32,13 @@ sub thread {
         # We'll trust the client Date: header here instead of the Received:
         # time since this is for display (and not retrieval)
         _add_message($id_table, $_) for sort { $a->{ds} <=> $b->{ds} } @$msgs;
+        my $ibx = $ctx->{-inbox};
         my $rootset = [ grep {
                         !delete($_->{parent}) && $_->visible($ibx)
                 } values %$id_table ];
         $id_table = undef;
         $rootset = $ordersub->($rootset);
-        $_->order_children($ordersub, $ibx) for @$rootset;
+        $_->order_children($ordersub, $ctx) for @$rootset;
         $rootset;
 }
 
@@ -151,10 +152,11 @@ sub visible ($$) {
 }
 
 sub order_children {
-        my ($cur, $ordersub, $ibx) = @_;
+        my ($cur, $ordersub, $ctx) = @_;
 
         my %seen = ($cur => 1); # self-referential loop prevention
         my @q = ($cur);
+        my $ibx = $ctx->{-inbox};
         while (defined($cur = shift @q)) {
                 my $c = $cur->{children}; # The hashref here...