config: each_inbox: pass user arg to callback

[public-inbox.git] / lib / PublicInbox / ExtMsg.pm

diff --git a/lib/PublicInbox/ExtMsg.pm b/lib/PublicInbox/ExtMsg.pm
index 51e7799de8640929be9538713d3f2ee7e1b1081d..0138d373cbea417d9318eaf974ade6745c983b9e 100644 (file)
--- a/lib/PublicInbox/ExtMsg.pm
+++ b/lib/PublicInbox/ExtMsg.pm
@@ -1,4 +1,4 @@
-# Copyright (C) 2015-2018 all contributors <meta@public-inbox.org>
+# Copyright (C) 2015-2019 all contributors <meta@public-inbox.org>
 # License: AGPL-3.0+ <https://www.gnu.org/licenses/agpl-3.0.txt>
 #
 # Used by the web interface to link to messages outside of the our
@@ -8,12 +8,13 @@
 package PublicInbox::ExtMsg;
 use strict;
 use warnings;
-use PublicInbox::Hval;
+use PublicInbox::Hval qw/ascii_html/;
 use PublicInbox::MID qw/mid2path/;
 use PublicInbox::WwwStream;
+our $MIN_PARTIAL_LEN = 16;
 
 # TODO: user-configurable
-our @EXT_URL = (
+our @EXT_URL = map { ascii_html($_) } (
        # leading "//" denotes protocol-relative (http:// or https://)
        '//marc.info/?i=%s',
        '//www.mail-archive.com/search?l=mid&q=%s',
@@ -30,6 +31,7 @@ sub PARTIAL_MAX () { 100 }
 
 sub search_partial ($$) {
        my ($srch, $mid) = @_;
+       return if length($mid) < $MIN_PARTIAL_LEN;
        my $opt = { limit => PARTIAL_MAX, mset => 2 };
        my @try = ("m:$mid*");
        my $chop = $mid;
@@ -58,12 +60,12 @@ sub search_partial ($$) {
        }
 
        foreach my $m (@try) {
-               my $mset = eval { $srch->query($m, $opt) };
-               if (ref($@) eq 'Search::Xapian::QueryParserError') {
-                       # If Xapian can't handle the wildcard since it
-                       # has too many results.
-                       next;
-               }
+               # If Xapian can't handle the wildcard since it
+               # has too many results.  $@ can be
+               # Search::Xapian::QueryParserError or even:
+               # "something terrible happened at ../Search/Xapian/Enquire.pm"
+               my $mset = eval { $srch->query($m, $opt) } or next;
+
                my @mids = map {
                        my $doc = $_->get_document;
                        PublicInbox::SearchMsg->load_doc($doc)->mid;
@@ -72,34 +74,39 @@ sub search_partial ($$) {
        }
 }
 
+sub ext_msg_i {
+       my ($other, $arg) = @_;
+       my ($cur, $mid, $ibxs, $found) = @$arg;
+
+       return if $other->{name} eq $cur->{name} || !$other->base_url;
+
+       my $mm = $other->mm or return;
+
+       # try to find the URL with Msgmap to avoid forking
+       my $num = $mm->num_for($mid);
+       if (defined $num) {
+               push @$found, $other;
+       } else {
+               # no point in trying the fork fallback if we
+               # know Xapian is up-to-date but missing the
+               # message in the current repo
+               push @$ibxs, $other;
+       }
+}
+
 sub ext_msg {
        my ($ctx) = @_;
        my $cur = $ctx->{-inbox};
        my $mid = $ctx->{mid};
 
        eval { require PublicInbox::Msgmap };
-       my $have_mm = $@ ? 0 : 1;
-       my (@ibx, @found);
-
-       $ctx->{www}->{pi_config}->each_inbox(sub {
-               my ($other) = @_;
-               return if $other->{name} eq $cur->{name} || !$other->base_url;
-
-               my $mm = $other->mm or return;
-
-               # try to find the URL with Msgmap to avoid forking
-               my $num = $mm->num_for($mid);
-               if (defined $num) {
-                       push @found, $other;
-               } else {
-                       # no point in trying the fork fallback if we
-                       # know Xapian is up-to-date but missing the
-                       # message in the current repo
-                       push @ibx, $other;
-               }
-       });
+       my $ibxs = [];
+       my $found = [];
+       my $arg = [ $cur, $mid, $ibxs, $found ];
+
+       $ctx->{www}->{pi_config}->each_inbox(\&ext_msg_i, $arg);
 
-       return exact($ctx, \@found, $mid) if @found;
+       return exact($ctx, $found, $mid) if @$found;
 
        # fall back to partial MID matching
        my @partial;
@@ -112,8 +119,8 @@ sub ext_msg {
        }
 
        # can't find a partial match in current inbox, try the others:
-       if (!$n_partial && length($mid) >= 16) {
-               foreach my $ibx (@ibx) {
+       if (!$n_partial && length($mid) >= $MIN_PARTIAL_LEN) {
+               foreach my $ibx (@$ibxs) {
                        $srch = $ibx->search or next;
                        $mids = search_partial($srch, $mid) or next;
                        $n_partial += scalar(@$mids);