about summary refs log tree commit homepage
path: root/lib/PublicInbox/Inbox.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/Inbox.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/Inbox.pm')
-rw-r--r--lib/PublicInbox/Inbox.pm22
1 files changed, 11 insertions, 11 deletions
diff --git a/lib/PublicInbox/Inbox.pm b/lib/PublicInbox/Inbox.pm
index 4c7305f9..01aa500c 100644
--- a/lib/PublicInbox/Inbox.pm
+++ b/lib/PublicInbox/Inbox.pm
@@ -293,20 +293,20 @@ sub path_check {
         git($self)->check('HEAD:'.$path);
 }
 
+sub smsg_by_mid ($$) {
+        my ($self, $mid) = @_;
+        my $srch = search($self) or return;
+        # favor the Message-ID we used for the NNTP article number:
+        my $mm = mm($self) or return;
+        my $num = $mm->num_for($mid);
+        $srch->lookup_article($num);
+}
+
 sub msg_by_mid ($$;$) {
         my ($self, $mid, $ref) = @_;
         my $srch = search($self) or
-                        return msg_by_path($self, mid2path($mid), $ref);
-        my $smsg;
-        # favor the Message-ID we used for the NNTP article number:
-        if (my $mm = mm($self)) {
-                my $num = $mm->num_for($mid);
-                $smsg = $srch->lookup_article($num);
-        } else {
-                $smsg = $srch->retry_reopen(sub {
-                        $srch->lookup_skeleton($mid) and $smsg->load_expand;
-                });
-        }
+                return msg_by_path($self, mid2path($mid), $ref);
+        my $smsg = smsg_by_mid($self, $mid);
         $smsg ? msg_by_smsg($self, $smsg, $ref) : undef;
 }