treewide: update to v3 Tor onions

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

diff --git a/lib/PublicInbox/WwwStream.pm b/lib/PublicInbox/WwwStream.pm
index 66e34a12e885c12c95454933cb42f5082545c53e..2f8212d4a917d651802f2e78e0df36e430e90396 100644 (file)
--- a/lib/PublicInbox/WwwStream.pm
+++ b/lib/PublicInbox/WwwStream.pm
@@ -1,4 +1,4 @@
-# Copyright (C) 2016-2020 all contributors <meta@public-inbox.org>
+# Copyright (C) 2016-2021 all contributors <meta@public-inbox.org>
 # License: AGPL-3.0+ <https://www.gnu.org/licenses/agpl-3.0.txt>
 #
 # HTML body stream for which yields getline+close methods for
@@ -12,7 +12,8 @@ our @EXPORT_OK = qw(html_oneshot);
 use bytes (); # length
 use PublicInbox::Hval qw(ascii_html prurl ts2str);
 our $TOR_URL = 'https://www.torproject.org/';
-our $CODE_URL = 'https://public-inbox.org/public-inbox.git';
+our $CODE_URL = [ qw(http://7fh6tueqddpjyxjmgtdiueylzoqt6pt7hec3pukyptlmohoowvhde4yd.onion/public-inbox.git
+       https://public-inbox.org/public-inbox.git) ];
 
 sub base_url ($) {
        my $ctx = shift;
@@ -39,8 +40,8 @@ sub html_top ($) {
        my $desc = ascii_html($ibx->description);
        my $title = delete($ctx->{-title_html}) // $desc;
        my $upfx = $ctx->{-upfx} || '';
-       my $help = $upfx.'_/text/help';
-       my $color = $upfx.'_/text/color';
+       my $help = $upfx.'_/text/help/';
+       my $color = $upfx.'_/text/color/';
        my $atom = $ctx->{-atom} || $upfx.'new.atom';
        my $top = "<b>$desc</b>";
        if (my $t_max = $ctx->{-t_max}) {
@@ -50,9 +51,10 @@ sub html_top ($) {
        } elsif ($ctx->{qp}->{t}) {
                $top = qq(<a\nhref="./">$top</a>);
        }
+       my $code = $ibx->{coderepo} ? qq( / <a\nhref=#code>code</a>) : '';
        my $links = qq(<a\nhref="$help">help</a> / ).
                        qq(<a\nhref="$color">color</a> / ).
-                       qq(<a\nhref=#mirror>mirror</a> / ).
+                       qq(<a\nhref=#mirror>mirror</a>$code / ).
                        qq(<a\nhref="$atom">Atom feed</a>);
        if ($ibx->isrch) {
                my $q_val = delete($ctx->{-q_value_html}) // '';
@@ -78,22 +80,28 @@ sub html_top ($) {
 
 sub coderepos ($) {
        my ($ctx) = @_;
-       my $ibx = $ctx->{ibx};
+       my $cr = $ctx->{ibx}->{coderepo} // return ();
+       my $cfg = $ctx->{www}->{pi_cfg};
+       my $upfx = ($ctx->{-upfx} // ''). '../';
        my @ret;
-       if (defined(my $cr = $ibx->{coderepo})) {
-               my $cfg = $ctx->{www}->{pi_cfg};
-               my $env = $ctx->{env};
-               for my $cr_name (@$cr) {
-                       my $urls = $cfg->{"coderepo.$cr_name.cgiturl"};
-                       if ($urls) {
-                               $ret[0] //= <<EOF;
-code repositories for the project(s) associated with this inbox:
+       for my $cr_name (@$cr) {
+               $ret[0] //= <<EOF;
+<a id=code>code repositories for project(s) associated with this inbox:
 EOF
-                               $ret[0] .= "\n\t".prurl($env, $_) for @$urls;
+               my $urls = $cfg->get_all("coderepo.$cr_name.cgiturl");
+               if ($urls) {
+                       for (@$urls) {
+                               # relative or absolute URL?, prefix relative
+                               # "foo.git" with appropriate number of "../"
+                               my $u = m!\A(?:[a-z\+]+:)?//! ? $_ : $upfx.$_;
+                               $u = ascii_html(prurl($ctx->{env}, $u));
+                               $ret[0] .= qq(\n\t<a\nhref="$u">$u</a>);
                        }
+               } else {
+                       $ret[0] .= qq[\n\t$cr_name.git (no URL configured)];
                }
        }
-       @ret; # may be empty
+       @ret; # may be empty, this sub is called as an arg for join()
 }
 
 sub code_footer ($) {