user/dev discussion of public-inbox itself
 help / color / mirror / code / Atom feed
From: Eric Wong <e@80x24.org>
To: meta@public-inbox.org
Subject: [PATCH 1/2] www: a note .onion URLs require the usage of Tor
Date: Thu, 21 Jul 2016 02:02:21 +0000	[thread overview]
Message-ID: <20160721020222.15358-2-e@80x24.org> (raw)
In-Reply-To: <20160721020222.15358-1-e@80x24.org>

Not everybody knows what .onion URLs are, so refer them to Tor.
---
 lib/PublicInbox/WwwStream.pm | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

diff --git a/lib/PublicInbox/WwwStream.pm b/lib/PublicInbox/WwwStream.pm
index bdc8048..de457b4 100644
--- a/lib/PublicInbox/WwwStream.pm
+++ b/lib/PublicInbox/WwwStream.pm
@@ -8,6 +8,7 @@ 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/';
 
 sub close {}
 
@@ -68,8 +69,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(<a\nhref="$u">$u</a>) : $u;
 	}
@@ -79,12 +82,17 @@ sub _html_end {
 		$urls .= "\n" .
 			join("\n", map { "\tgit clone --mirror $_" } @urls);
 	}
+
+	if ($need_tor) {
+		$urls .= "\n note: .onion URLs require Tor: ";
+		$urls .= qq[<a\nhref="$TOR_URL">$TOR_URL</a>];
+	}
 	my $url = PublicInbox::Hval::prurl($ctx->{env}, PI_URL);
-	'<hr><pre>'.join("\n",
-		'- ' . $desc,
+	'<hr><pre>'.join("\n\n",
+		$desc,
 		$urls,
 		'Served with public-inbox: '.
-		qq(git clone <a\nhref="$url">$url</a> public-inbox),
+		qq(git clone <a\nhref="$url">$url</a> public-inbox)
 	).'</pre></body></html>';
 }
 
-- 
EW


  reply	other threads:[~2016-07-21  2:02 UTC|newest]

Thread overview: 3+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2016-07-21  2:02 [PATCH 0/2] www: footer tweaks Eric Wong
2016-07-21  2:02 ` Eric Wong [this message]
2016-07-21  2:02 ` [PATCH 2/2] www: redefinable project name and URL Eric Wong

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

  List information: https://public-inbox.org/README

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20160721020222.15358-2-e@80x24.org \
    --to=e@80x24.org \
    --cc=meta@public-inbox.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
Code repositories for project(s) associated with this public inbox

	https://80x24.org/public-inbox.git

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).