extmsg: use updated mail-archive.com URL

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

diff --git a/lib/PublicInbox/ExtMsg.pm b/lib/PublicInbox/ExtMsg.pm
index 019d50a457aa98a609e4bbca0da0c43213d7c0ce..6cfc6c322295d2f6f3515de38db75e48e0dfff25 100644 (file)
--- a/lib/PublicInbox/ExtMsg.pm
+++ b/lib/PublicInbox/ExtMsg.pm
@@ -14,25 +14,28 @@ use PublicInbox::WwwStream;
 
 # TODO: user-configurable
 our @EXT_URL = (
-       'http://mid.gmane.org/%s',
-       'https://lists.debian.org/msgid-search/%s',
        # leading "//" denotes protocol-relative (http:// or https://)
-       '//mid.mail-archive.com/%s',
        '//marc.info/?i=%s',
+       '//www.mail-archive.com/search?l=mid&q=%s',
+       'http://mid.gmane.org/%s',
+       'https://lists.debian.org/msgid-search/%s',
+       '//docs.FreeBSD.org/cgi/mid.cgi?db=mid&id=%s',
+       'https://www.w3.org/mid/%s',
+       'http://www.postgresql.org/message-id/%s',
+       'https://lists.debconf.org/cgi-lurker/keyword.cgi?'.
+               'doc-url=/lurker&format=en.html&query=id:%s'
 );
 
 sub ext_msg {
        my ($ctx) = @_;
-       my $pi_config = $ctx->{pi_config};
        my $cur = $ctx->{-inbox};
        my $mid = $ctx->{mid};
-       my $env = $ctx->{env};
 
        eval { require PublicInbox::Search };
        my $have_xap = $@ ? 0 : 1;
        my (@nox, @ibx, @found);
 
-       $pi_config->each_inbox(sub {
+       $ctx->{www}->{pi_config}->each_inbox(sub {
                my ($other) = @_;
                return if $other->{name} eq $cur->{name} || !$other->base_url;
 
@@ -102,7 +105,7 @@ again:
 
        my $code = 404;
        my $h = PublicInbox::Hval->new_msgid($mid);
-       my $href = $h->as_href;
+       my $href = $h->{href};
        my $html = $h->as_html;
        my $title = "<$html> not found";
        my $s = "<pre>Message-ID &lt;$html&gt;\nnot found\n";
@@ -110,12 +113,14 @@ again:
                $code = 300;
                my $es = $n_partial == 1 ? '' : 'es';
                $s .= "\n$n_partial partial match$es found:\n\n";
+               my $cur_name = $cur->{name};
                foreach my $pair (@partial) {
                        my ($ibx, $res) = @$pair;
-                       my $u = $ibx->base_url or next;
+                       my $env = $ctx->{env} if $ibx->{name} eq $cur_name;
+                       my $u = $ibx->base_url($env) or next;
                        foreach my $m (@$res) {
                                my $p = PublicInbox::Hval->new_msgid($m);
-                               my $r = $p->as_href;
+                               my $r = $p->{href};
                                my $t = $p->as_html;
                                $s .= qq{<a\nhref="$u$r/">$u$t/</a>\n};
                        }
@@ -153,7 +158,7 @@ sub ext_urls {
 sub exact {
        my ($ctx, $found, $mid) = @_;
        my $h = PublicInbox::Hval->new_msgid($mid);
-       my $href = $h->as_href;
+       my $href = $h->{href};
        my $html = $h->as_html;
        my $title = "&lt;$html&gt; found in ";
        my $end = @$found == 1 ? 'another inbox' : 'other inboxes';