No ext_urls

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

diff --git a/lib/PublicInbox/ExtMsg.pm b/lib/PublicInbox/ExtMsg.pm
index 5c8bf5611bff1900747cd3c90c366682ad37985b..be29974900792f2023b7b7b97b5144b61ee6538c 100644 (file)
--- a/lib/PublicInbox/ExtMsg.pm
+++ b/lib/PublicInbox/ExtMsg.pm
@@ -1,4 +1,4 @@
-# Copyright (C) 2015-2021 all contributors <meta@public-inbox.org>
+# Copyright (C) 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
@@ -11,7 +11,7 @@ use warnings;
 use PublicInbox::Hval qw(ascii_html prurl mid_href);
 use PublicInbox::WwwStream qw(html_oneshot);
 use PublicInbox::Smsg;
-our $MIN_PARTIAL_LEN = 16;
+our $MIN_PARTIAL_LEN = 14; # for 'XXXXXXXXXX.fsf' msgids gnus generates
 
 # TODO: user-configurable
 our @EXT_URL = map { ascii_html($_) } (
@@ -32,7 +32,7 @@ sub PARTIAL_MAX () { 100 }
 sub search_partial ($$) {
        my ($ibx, $mid) = @_;
        return if length($mid) < $MIN_PARTIAL_LEN;
-       my $srch = $ibx->search or return; # NOT ->isrch, we already try ->ALL
+       my $srch = $ibx->isrch or return;
        my $opt = { limit => PARTIAL_MAX, relevance => -1 };
        my @try = ("m:$mid*");
        my $chop = $mid;
@@ -117,7 +117,7 @@ sub ext_msg_ALL ($) {
                        $k =~ s/:[0-9]+:$x->{blob}\z// or next;
                        next if $k eq $cur_key;
                        my $ibx = $by_eidx_key->{$k} // next;
-                       my $url = $ibx->base_url or next;
+                       $ibx->base_url or next;
                        push(@{$ctx->{found}}, $ibx) unless $seen{$k}++;
                }
        }
@@ -150,7 +150,7 @@ sub ext_msg {
        };
 }
 
-# called via PublicInbox::DS->EventLoop
+# called via PublicInbox::DS::event_loop
 sub event_step {
        my ($ctx, $sync) = @_;
        # can't find a partial match in current inbox, try the others:
@@ -188,6 +188,12 @@ sub finalize_exact {
        finalize_partial($ctx);
 }
 
+sub _url_pfx ($$) {
+       my ($ctx, $u) = @_;
+       (index($u, '://') < 0 && index($u, '/') != 0) ?
+               "$ctx->{-upfx}../$u" : $u;
+}
+
 sub partial_response ($) {
        my ($ctx) = @_;
        my $mid = $ctx->{mid};
@@ -196,6 +202,7 @@ sub partial_response ($) {
        my $html = ascii_html($mid);
        my $title = "&lt;$html&gt; not found";
        my $s = "<pre>Message-ID &lt;$html&gt;\nnot found\n";
+       $ctx->{-upfx} //= '../';
        if (my $n_partial = $ctx->{n_partial}) {
                $code = 300;
                my $es = $n_partial == 1 ? '' : 'es';
@@ -204,8 +211,8 @@ sub partial_response ($) {
                my $cur_name = $ctx->{ibx}->{name};
                foreach my $pair (@{$ctx->{partial}}) {
                        my ($ibx, $res) = @$pair;
-                       my $env = $ctx->{env} if $ibx->{name} eq $cur_name;
-                       my $u = $ibx->base_url($env) or next;
+                       my $e = $ibx->{name} eq $cur_name ? $ctx->{env} : undef;
+                       my $u = _url_pfx($ctx, $ibx->base_url($e) // next);
                        foreach my $m (@$res) {
                                my $href = mid_href($m);
                                my $html = ascii_html($m);
@@ -220,13 +227,13 @@ sub partial_response ($) {
        }
        $ctx->{-html_tip} = $s .= '</pre>';
        $ctx->{-title_html} = $title;
-       $ctx->{-upfx} = '../';
        html_oneshot($ctx, $code);
 }
 
 sub finalize_partial ($) { $_[0]->{-wcb}->(partial_response($_[0])) }
 
 sub ext_urls {
+       return "";
        my ($ctx, $mid, $href, $html) = @_;
 
        # Fall back to external repos if configured
@@ -253,13 +260,13 @@ sub exact {
        my $title = "&lt;$html&gt; found in ";
        my $end = @$found == 1 ? 'another inbox' : 'other inboxes';
        $ctx->{-title_html} = $title . $end;
-       $ctx->{-upfx} = '../';
+       $ctx->{-upfx} //= '../';
        my $ext_urls = ext_urls($ctx, $mid, $href, $html);
        my $code = (@$found == 1 && $ext_urls eq '') ? 200 : 300;
        $ctx->{-html_tip} = join('',
                        "<pre>Message-ID: &lt;$html&gt;\nfound in $end:\n\n",
                                (map {
-                                       my $u = $_->base_url;
+                                       my $u = _url_pfx($ctx, $_->base_url);
                                        qq(<a\nhref="$u$href/">$u$html/</a>\n)
                                } @$found),
                        $ext_urls, '</pre>');