about summary refs log tree commit homepage
path: root/lib/PublicInbox/SearchThread.pm
diff options
context:
space:
mode:
authorEric Wong (Contractor, The Linux Foundation) <e@80x24.org>2018-03-29 09:57:52 +0000
committerEric Wong (Contractor, The Linux Foundation) <e@80x24.org>2018-03-29 10:00:04 +0000
commit11707dae97d1f4638157cfee298464b2f2deeed4 (patch)
treea25db85d1ab0e5e4daeb099140d31f1c07fd0c5c /lib/PublicInbox/SearchThread.pm
parent821ed7c40b7b50ceb1c942af5e14d168995d514e (diff)
downloadpublic-inbox-11707dae97d1f4638157cfee298464b2f2deeed4.tar.gz
Too many similar functions doing the same basic thing was
redundant and misleading, especially since Message-ID is
no longer treated as a truly unique identifier.

For displaying threads in the HTML, this makes it clear
that we favor the primary Message-ID mapped to an NNTP
article number if a message cannot be found.
Diffstat (limited to 'lib/PublicInbox/SearchThread.pm')
-rw-r--r--lib/PublicInbox/SearchThread.pm14
1 files changed, 7 insertions, 7 deletions
diff --git a/lib/PublicInbox/SearchThread.pm b/lib/PublicInbox/SearchThread.pm
index 6fbce15c..1d250b46 100644
--- a/lib/PublicInbox/SearchThread.pm
+++ b/lib/PublicInbox/SearchThread.pm
@@ -22,15 +22,15 @@ use strict;
 use warnings;
 
 sub thread {
-        my ($messages, $ordersub, $srch) = @_;
+        my ($messages, $ordersub, $ibx) = @_;
         my $id_table = {};
         _add_message($id_table, $_) foreach @$messages;
         my $rootset = [ grep {
-                        !delete($_->{parent}) && $_->visible($srch)
+                        !delete($_->{parent}) && $_->visible($ibx)
                 } values %$id_table ];
         $id_table = undef;
         $rootset = $ordersub->($rootset);
-        $_->order_children($ordersub, $srch) for @$rootset;
+        $_->order_children($ordersub, $ibx) for @$rootset;
         $rootset;
 }
 
@@ -131,20 +131,20 @@ sub has_descendent {
 # a ghost Message-ID is the result of a long header line
 # being folded/mangled by a MUA, and not a missing message.
 sub visible ($$) {
-        my ($self, $srch) = @_;
-        ($self->{smsg} ||= eval { $srch->lookup_mail($self->{id}) }) ||
+        my ($self, $ibx) = @_;
+        ($self->{smsg} ||= eval { $ibx->smsg_by_mid($self->{id}) }) ||
          (scalar values %{$self->{children}});
 }
 
 sub order_children {
-        my ($cur, $ordersub, $srch) = @_;
+        my ($cur, $ordersub, $ibx) = @_;
 
         my %seen = ($cur => 1); # self-referential loop prevention
         my @q = ($cur);
         while (defined($cur = shift @q)) {
                 my $c = $cur->{children}; # The hashref here...
 
-                $c = [ grep { !$seen{$_}++ && visible($_, $srch) } values %$c ];
+                $c = [ grep { !$seen{$_}++ && visible($_, $ibx) } values %$c ];
                 $c = $ordersub->($c) if scalar @$c > 1;
                 $cur->{children} = $c; # ...becomes an arrayref
                 push @q, @$c;