X-Git-Url: http://www.git.stargrave.org/?a=blobdiff_plain;f=lib%2FPublicInbox%2FWwwStream.pm;h=ec9ae0cf25b167fc296bb37ada4184923ad3fa13;hb=10e38b3b0fdad7e2881f0571f9b2717df2151f7a;hp=285416d5df75b8f5c42a4cb9d79257fd71149578;hpb=bfd60ef4c2eff566481f1e40b18b7c3d1b3e43fa;p=public-inbox.git diff --git a/lib/PublicInbox/WwwStream.pm b/lib/PublicInbox/WwwStream.pm index 285416d5..ec9ae0cf 100644 --- a/lib/PublicInbox/WwwStream.pm +++ b/lib/PublicInbox/WwwStream.pm @@ -7,11 +7,15 @@ use strict; use warnings; use PublicInbox::Hval qw(ascii_html); use URI; -use constant PI_URL => 'https://public-inbox.org/'; +our $TOR_URL = 'https://www.torproject.org/'; +our $CODE_URL = 'https://public-inbox.org/'; +our $PROJECT = 'public-inbox'; + +sub close {} sub new { my ($class, $ctx, $cb) = @_; - bless { nr => 0, cb => $cb, ctx => $ctx }, $class; + bless { nr => 0, cb => $cb || *close, ctx => $ctx }, $class; } sub response { @@ -66,8 +70,10 @@ sub _html_end { chop $http; my %seen = ( $http => 1 ); my @urls = ($http); + my $need_tor; foreach my $u (@{$obj->cloneurl}) { next if $seen{$u}; + $need_tor = 1 if $u =~ m!\A[^:]+://\w+\.onion/!; $seen{$u} = 1; push @urls, $u =~ /\Ahttps?:/ ? qq($u) : $u; } @@ -77,12 +83,17 @@ sub _html_end { $urls .= "\n" . join("\n", map { "\tgit clone --mirror $_" } @urls); } - my $url = PublicInbox::Hval::prurl($ctx->{env}, PI_URL); - '
'.join("\n",
-		'- ' . $desc,
+
+	if ($need_tor) {
+		$urls .= "\n note: .onion URLs require Tor: ";
+		$urls .= qq[$TOR_URL];
+	}
+	my $url = PublicInbox::Hval::prurl($ctx->{env}, $CODE_URL);
+	'
'.join("\n\n",
+		$desc,
 		$urls,
-		'Served with public-inbox: '.
-		qq(git clone $url public-inbox),
+		'Code for this site: '.
+		qq(git clone $url $PROJECT)
 	).'
'; } @@ -99,6 +110,4 @@ sub getline { delete $self->{cb} ? _html_end($self) : undef; } -sub close {} - 1;