inbox: base_url method takes PSGI env hashref instead

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

diff --git a/lib/PublicInbox/WwwStream.pm b/lib/PublicInbox/WwwStream.pm
index d9abb5ab8068756d51c3f5aaae5b9098703744ce..be6ce2e6bc9f2b8efb60314662c97714710e0362 100644 (file)
--- a/lib/PublicInbox/WwwStream.pm
+++ b/lib/PublicInbox/WwwStream.pm
@@ -7,7 +7,7 @@ use strict;
 use warnings;
 use PublicInbox::Hval qw(ascii_html);
 use URI;
-use constant PI_URL => 'https://public-inbox.org/README.html';
+use constant PI_URL => 'https://public-inbox.org/';
 
 sub new {
        my ($class, $ctx, $cb) = @_;
@@ -62,13 +62,8 @@ sub _html_end {
        my $obj = $ctx->{-inbox};
        my $desc = ascii_html($obj->description);
 
-       # FIXME: cleanup
-       my $env = $ctx->{env};
-       my $scheme = $env->{'psgi.url_scheme'};
-       my $host_port = $env->{HTTP_HOST} ||
-                       "$env->{SERVER_NAME}:$env->{SERVER_PORT}";
-       my $http = "$scheme://$host_port".($env->{SCRIPT_NAME} || '/');
-       $http = URI->new($http . $obj->{name})->canonical->as_string;
+       my $http = $obj->base_url($ctx->{env});
+       chop $http;
        my %seen = ( $http => 1 );
        my @urls = ($http);
        foreach my $u (@{$obj->cloneurl}) {
@@ -86,8 +81,8 @@ sub _html_end {
        '<pre>'.join("\n",
                '- ' . $desc,
                $urls,
-               'served with software from public-inbox: '
-                       ."<a\nhref=\"$url\">$url</a>",
+               'Archived served using code from public-inbox:',
+               qq(\tgit clone <a\nhref="$url">$url</a> public-inbox),
        ).'</pre></body></html>';
 }