wwwstream: show init + index instructions for -V1, too

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

diff --git a/lib/PublicInbox/NNTPD.pm b/lib/PublicInbox/NNTPD.pm
index 7a917169c70fd8841a3a3fd830b8c6f0e98beb5e..6b762d8923b41ff63d973a6e8db71a37506ec9ce 100644 (file)
--- a/lib/PublicInbox/NNTPD.pm
+++ b/lib/PublicInbox/NNTPD.pm
@@ -8,6 +8,7 @@ use strict;
 use warnings;
 use Sys::Hostname;
 use PublicInbox::Config;
+use PublicInbox::InboxIdle;
 
 sub new {
        my ($class) = @_;
@@ -24,15 +25,17 @@ sub new {
                err => \*STDERR,
                out => \*STDOUT,
                grouplist => [],
+               pi_config => $pi_config,
                servername => $name,
                greet => \"201 $name ready - post via email\r\n",
                # accept_tls => { SSL_server => 1, ..., SSL_reuse_ctx => ... }
+               # idler => PublicInbox::InboxIdle
        }, $class;
 }
 
-sub refresh_groups () {
-       my ($self) = @_;
-       my $pi_config = PublicInbox::Config->new;
+sub refresh_groups {
+       my ($self, $sig) = @_;
+       my $pi_config = $sig ? PublicInbox::Config->new : $self->{pi_config};
        my $new = {};
        my @list;
        $pi_config->each_inbox(sub {
@@ -41,16 +44,31 @@ sub refresh_groups () {
                if (ref $ngname) {
                        warn 'multiple newsgroups not supported: '.
                                join(', ', @$ngname). "\n";
+               # Newsgroup name needs to be compatible with RFC 3977
+               # wildmat-exact and RFC 3501 (IMAP) ATOM-CHAR.
+               # Leave out a few chars likely to cause problems or conflicts:
+               # '|', '<', '>', ';', '#', '$', '&',
+               } elsif ($ngname =~ m![^A-Za-z0-9/_\.\-\~\@\+\=:]!) {
+                       warn "newsgroup name invalid: `$ngname'\n";
                } elsif ($ng->nntp_usable) {
                        # Only valid if msgmap and search works
                        $new->{$ngname} = $ng;
                        push @list, $ng;
+
+                       # preload to avoid fragmentation:
+                       $ng->description;
+                       $ng->base_url;
                }
        });
        @list = sort { $a->{newsgroup} cmp $b->{newsgroup} } @list;
        $self->{grouplist} = \@list;
+       $self->{pi_config} = $pi_config;
        # this will destroy old groups that got deleted
        %{$self->{groups}} = %$new;
 }
 
+sub idler_start {
+       $_[0]->{idler} //= PublicInbox::InboxIdle->new($_[0]->{pi_config});
+}
+
 1;