From 3082849c654fdee12ad97396b4e39be3c4888c1d Mon Sep 17 00:00:00 2001
From: Eric Wong <e@80x24.org>
Date: Thu, 19 Dec 2019 05:18:00 +0000
Subject: [PATCH] searchthread: fix usage of user-supplied parameter

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).
---
 lib/PublicInbox/SearchThread.pm | 8 +++++---
 lib/PublicInbox/SearchView.pm   | 2 +-
 lib/PublicInbox/View.pm         | 3 +--
 3 files changed, 7 insertions(+), 6 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...
 
diff --git a/lib/PublicInbox/SearchView.pm b/lib/PublicInbox/SearchView.pm
index 78f2bd8b..566808e1 100644
--- a/lib/PublicInbox/SearchView.pm
+++ b/lib/PublicInbox/SearchView.pm
@@ -276,7 +276,7 @@ sub mset_thread {
 	} ($mset->items) ]});
 	my $r = $q->{r};
 	my $rootset = PublicInbox::SearchThread::thread($msgs,
-		$r ? sort_relevance(\%pct) : *PublicInbox::View::sort_ds,
+		$r ? sort_relevance(\%pct) : \&PublicInbox::View::sort_ds,
 		$ctx);
 	my $skel = search_nav_bot($mset, $q). "<pre>";
 	$ctx->{-upfx} = '';
diff --git a/lib/PublicInbox/View.pm b/lib/PublicInbox/View.pm
index 39b04174..33f71990 100644
--- a/lib/PublicInbox/View.pm
+++ b/lib/PublicInbox/View.pm
@@ -881,8 +881,7 @@ sub strict_loose_note ($) {
 sub thread_results {
 	my ($ctx, $msgs) = @_;
 	require PublicInbox::SearchThread;
-	my $ibx = $ctx->{-inbox};
-	my $rootset = PublicInbox::SearchThread::thread($msgs, *sort_ds, $ibx);
+	my $rootset = PublicInbox::SearchThread::thread($msgs, \&sort_ds, $ctx);
 
 	# FIXME: `tid' is broken on --reindex, so that needs to be fixed
 	# and preserved in the future.  This bug is hidden by `sid' matches
-- 
2.44.0