X-Git-Url: http://www.git.stargrave.org/?a=blobdiff_plain;f=lib%2FPublicInbox%2FWwwStream.pm;h=c89e6de41822a7571c06864074ff984bcf6a7151;hb=adecbd43d2eed046fe6e88a459d03567461fd84b;hp=d2bf318bed49a6027e68f7a696a91de1ff29de61;hpb=5422a844b7384c32b3532d128e15e0b50d24435b;p=public-inbox.git diff --git a/lib/PublicInbox/WwwStream.pm b/lib/PublicInbox/WwwStream.pm index d2bf318b..c89e6de4 100644 --- a/lib/PublicInbox/WwwStream.pm +++ b/lib/PublicInbox/WwwStream.pm @@ -7,11 +7,21 @@ use strict; use warnings; use PublicInbox::Hval qw(ascii_html); use URI; -use constant PI_URL => 'https://public-inbox.org/README.html'; +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 { + my ($class, $ctx, $code, $cb) = @_; + [ $code, [ 'Content-Type', 'text/html; charset=UTF-8' ], + $class->new($ctx, $cb) ] } sub _html_top ($) { @@ -21,25 +31,30 @@ sub _html_top ($) { my $desc = ascii_html($obj->description); my $title = $ctx->{-title_html} || $desc; my $upfx = $ctx->{-upfx} || ''; + my $help = $upfx.'_/text/help'; my $atom = $ctx->{-atom} || $upfx.'new.atom'; my $tip = $ctx->{-html_tip} || ''; - my $top = "$desc (Atom feed)"; + my $top = "$desc"; + my $links = "help / ". + "Atom feed"; if ($obj->search) { my $q_val = $ctx->{-q_value_html}; if (defined $q_val && $q_val ne '') { - $q_val = qq(\nvalue="$q_val" ); + $q_val = qq(\nvalue="$q_val"); } else { $q_val = ''; } # XXX gross, for SearchView.pm my $extra = $ctx->{-extra_form_html} || ''; - $top = qq{
} } else { - $top = '' . $top . ''; + $top = '
' . $top . "\n" . $links . ''; } "
'.join("\n", - '- ' . $desc, + + 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]; + } + my $url = PublicInbox::Hval::prurl($ctx->{env}, $CODE_URL); + ''.join("\n\n", + $desc, $urls, - 'served with software from public-inbox: ' - ."$url", + 'Code for this site: '. + qq(git clone $url $PROJECT) ).''; } @@ -97,6 +119,4 @@ sub getline { delete $self->{cb} ? _html_end($self) : undef; } -sub close {} - 1;