Apparently URLs can be configured relatively for HTTP(S) setups,
attempt to support them when linking to cross-posted messages.
This also fixes the top-row (mirror/help/color/Atom feed) links
in /$INBOX_URL/$EXTMSG_MSGID/T/ (and /t/) URLs.
Reported-by: Konstantin Ryabitsev <konstantin@linuxfoundation.org>
Link: https://public-inbox.org/meta/20210902191239.cmbxlmjqcsmdzmqp@meerkat.local/
$k =~ s/:[0-9]+:$x->{blob}\z// or next;
next if $k eq $cur_key;
my $ibx = $by_eidx_key->{$k} // next;
$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}++;
}
}
push(@{$ctx->{found}}, $ibx) unless $seen{$k}++;
}
}
finalize_partial($ctx);
}
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};
sub partial_response ($) {
my ($ctx) = @_;
my $mid = $ctx->{mid};
my $html = ascii_html($mid);
my $title = "<$html> not found";
my $s = "<pre>Message-ID <$html>\nnot found\n";
my $html = ascii_html($mid);
my $title = "<$html> not found";
my $s = "<pre>Message-ID <$html>\nnot found\n";
+ $ctx->{-upfx} //= '../';
if (my $n_partial = $ctx->{n_partial}) {
$code = 300;
my $es = $n_partial == 1 ? '' : 'es';
if (my $n_partial = $ctx->{n_partial}) {
$code = 300;
my $es = $n_partial == 1 ? '' : 'es';
my $cur_name = $ctx->{ibx}->{name};
foreach my $pair (@{$ctx->{partial}}) {
my ($ibx, $res) = @$pair;
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);
foreach my $m (@$res) {
my $href = mid_href($m);
my $html = ascii_html($m);
}
$ctx->{-html_tip} = $s .= '</pre>';
$ctx->{-title_html} = $title;
}
$ctx->{-html_tip} = $s .= '</pre>';
$ctx->{-title_html} = $title;
html_oneshot($ctx, $code);
}
html_oneshot($ctx, $code);
}
my $title = "<$html> found in ";
my $end = @$found == 1 ? 'another inbox' : 'other inboxes';
$ctx->{-title_html} = $title . $end;
my $title = "<$html> found in ";
my $end = @$found == 1 ? 'another inbox' : 'other inboxes';
$ctx->{-title_html} = $title . $end;
+ $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: <$html>\nfound in $end:\n\n",
(map {
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: <$html>\nfound in $end:\n\n",
(map {
+ my $u = _url_pfx($ctx, $_->base_url);
qq(<a\nhref="$u$href/">$u$html/</a>\n)
} @$found),
$ext_urls, '</pre>');
qq(<a\nhref="$u$href/">$u$html/</a>\n)
} @$found),
$ext_urls, '</pre>');
# /$INBOX/$MSGID/t/ and /$INBOX/$MSGID/T/
sub thread_html {
my ($ctx) = @_;
# /$INBOX/$MSGID/t/ and /$INBOX/$MSGID/T/
sub thread_html {
my ($ctx) = @_;
+ $ctx->{-upfx} = '../../';
my $mid = $ctx->{mid};
my $ibx = $ctx->{ibx};
my ($nr, $msgs) = $ibx->over->get_thread($mid);
my $mid = $ctx->{mid};
my $ibx = $ctx->{ibx};
my ($nr, $msgs) = $ibx->over->get_thread($mid);
$skel .= " (download: <a\nhref=\"../t.mbox.gz\">mbox.gz</a>";
$skel .= " / follow: <a\nhref=\"../t.atom\">Atom feed</a>)\n";
$skel .= "-- links below jump to the message on this page --\n";
$skel .= " (download: <a\nhref=\"../t.mbox.gz\">mbox.gz</a>";
$skel .= " / follow: <a\nhref=\"../t.atom\">Atom feed</a>)\n";
$skel .= "-- links below jump to the message on this page --\n";
- $ctx->{-upfx} = '../../';
$ctx->{cur_level} = 0;
$ctx->{skel} = \$skel;
$ctx->{prev_attr} = '';
$ctx->{cur_level} = 0;
$ctx->{skel} = \$skel;
$ctx->{prev_attr} = '';