fixup Plack-related requires

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

diff --git a/lib/PublicInbox/ExtMsg.pm b/lib/PublicInbox/ExtMsg.pm
index d89a7e3097b50489f0e92a5df3d8eb8e7c618f86..6356c3244ef14b414c00fe1ab7cc4e23d4ea41ce 100644 (file)
--- a/lib/PublicInbox/ExtMsg.pm
+++ b/lib/PublicInbox/ExtMsg.pm
@@ -26,6 +26,8 @@ sub ext_msg {
        my $pi_config = $ctx->{pi_config};
        my $listname = $ctx->{listname};
        my $mid = $ctx->{mid};
+       my $cgi = $ctx->{cgi};
+       my $env = $cgi->{env};
 
        eval { require PublicInbox::Search };
        my $have_xap = $@ ? 0 : 1;
@@ -43,6 +45,7 @@ sub ext_msg {
                defined $url or next;
 
                $url =~ s!/+\z!!;
+               $url = PublicInbox::Hval::prurl($env, $url);
 
                # try to find the URL with Xapian to avoid forking
                if ($have_xap) {
@@ -85,16 +88,7 @@ sub ext_msg {
 
        eval { require PublicInbox::Msgmap };
        my $have_mm = $@ ? 0 : 1;
-       my $cgi = $ctx->{cgi};
-       my $base_url;
-       my $scheme;
-       if (ref($cgi) eq 'CGI') {
-               $base_url = $cgi->url(-base) . '/';
-               $scheme = $cgi->protocol;
-       } else { # Plack::Request
-               $base_url = $cgi->base->as_string;
-               $scheme = $cgi->env->{'psgi.url_scheme'};
-       }
+       my $base_url = $cgi->base->as_string;
        if ($have_mm) {
                my $tmp_mid = $mid;
                my $url;
@@ -145,8 +139,8 @@ again:
        if (@EXT_URL && index($mid, '@') >= 0) {
                $code = 300;
                $s .= "\nPerhaps try an external site:\n\n";
-               foreach my $u (@EXT_URL) {
-                       $u = "$scheme:$u" if $u =~ m!\A//!;
+               foreach my $url (@EXT_URL) {
+                       my $u = PublicInbox::Hval::prurl($env, $url);
                        my $r = sprintf($u, $href);
                        my $t = sprintf($u, $html);
                        $s .= qq{<a\nhref="$r">$t</a>\n};
@@ -154,7 +148,7 @@ again:
        }
        $s .= '</pre></body></html>';
 
-       [300, ['Content-Type'=>'text/html; charset=UTF-8'], [$s]];
+       [$code, ['Content-Type'=>'text/html; charset=UTF-8'], [$s]];
 }
 
 # Redirect to another public-inbox which is mapped by $pi_config