lib/PublicInbox/ExtMsg.pm | 28 ++++++++++------------------ diff --git a/lib/PublicInbox/ExtMsg.pm b/lib/PublicInbox/ExtMsg.pm index 4925a592430ef608b44e8c91568d02084ca2379e..019d50a457aa98a609e4bbca0da0c43213d7c0ce 100644 --- a/lib/PublicInbox/ExtMsg.pm +++ b/lib/PublicInbox/ExtMsg.pm @@ -104,14 +104,12 @@ my $code = 404; my $h = PublicInbox::Hval->new_msgid($mid); my $href = $h->as_href; my $html = $h->as_html; - my $title = "Message-ID <$html> not found"; - my $s = "
$title\n";
-
+ my $title = "<$html> not found";
+ my $s = "Message-ID <$html>\nnot found\n";
if ($n_partial) {
$code = 300;
my $es = $n_partial == 1 ? '' : 'es';
- $s.= "\n$n_partial partial match$es found:\n\n";
+ $s .= "\n$n_partial partial match$es found:\n\n";
foreach my $pair (@partial) {
my ($ibx, $res) = @$pair;
my $u = $ibx->base_url or next;
@@ -123,21 +121,15 @@ $s .= qq{$u$t/\n};
}
}
}
-
- # Fall back to external repos if configured
- if (@EXT_URL && index($mid, '@') >= 0) {
+ my $ext = ext_urls($ctx, $mid, $href, $html);
+ if ($ext ne '') {
+ $s .= $ext;
$code = 300;
- $s .= "\nPerhaps try an external site:\n\n";
- foreach my $url (@EXT_URL) {
- my $u = PublicInbox::Hval::prurl($env, $url);
- my $r = sprintf($u, $href);
- my $t = sprintf($u, $html);
- $s .= qq{$t\n};
- }
}
- $s .= '';
-
- [$code, ['Content-Type'=>'text/html; charset=UTF-8'], [$s]];
+ $ctx->{-html_tip} = $s .= '';
+ $ctx->{-title_html} = $title;
+ $ctx->{-upfx} = '../';
+ PublicInbox::WwwStream->response($ctx, $code);
}
sub ext_urls {