X-Git-Url: http://www.git.stargrave.org/?p=public-inbox.git;a=blobdiff_plain;f=lib%2FPublicInbox%2FWwwStream.pm;h=9ed25e1d047f6fed024ba95ead017399bbc0b020;hp=29395f40909661ec2231304677a4d33a5dbbae35;hb=50c1b933afec4937ebc99e1d372cef2dc6b295c2;hpb=9a38d54754c724c5f81e8dc000bd42dbeddc39a6
diff --git a/lib/PublicInbox/WwwStream.pm b/lib/PublicInbox/WwwStream.pm
index 29395f40..9ed25e1d 100644
--- a/lib/PublicInbox/WwwStream.pm
+++ b/lib/PublicInbox/WwwStream.pm
@@ -72,10 +72,8 @@ 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;
}
@@ -86,7 +84,14 @@ sub _html_end {
join("\n", map { "\tgit clone --mirror $_" } @urls);
}
- if ($need_tor) {
+ my @nntp = map { qq($_) } @{$obj->nntp_url};
+ if (@nntp) {
+ $urls .= "\n\n";
+ $urls .= @nntp == 1 ? 'Newsgroup' : 'Newsgroups are';
+ $urls .= ' available over NNTP:';
+ $urls .= "\n\t" . join("\n\t", @nntp) . "\n";
+ }
+ if ($urls =~ m!\b[^:]+://\w+\.onion/!) {
$urls .= "\n note: .onion URLs require Tor: ";
$urls .= qq[$TOR_URL];
}