nntp: xref_by_tc: simplify slightly

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

diff --git a/lib/PublicInbox/NNTPD.pm b/lib/PublicInbox/NNTPD.pm
index 13b0f678284b284ed4c05b3cefc3beead125cd25..03c56db30727ec2dbee9e205592bd459f78ef892 100644 (file)
--- a/lib/PublicInbox/NNTPD.pm
+++ b/lib/PublicInbox/NNTPD.pm
@@ -24,7 +24,6 @@ sub new {
                groups => {},
                err => \*STDERR,
                out => \*STDOUT,
-               grouplist => [],
                pi_config => $pi_config,
                servername => $name,
                greet => \"201 $name ready - post via email\r\n",
@@ -39,31 +38,23 @@ sub refresh_groups {
        my $groups = $pi_config->{-by_newsgroup}; # filled during each_inbox
        $pi_config->each_inbox(sub {
                my ($ibx) = @_;
-               my $ngname = $ibx->{newsgroup} or return;
-               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";
-                       delete $groups->{$ngname};
-               } elsif ($ibx->nntp_usable) {
-                       # Only valid if msgmap and search works
-
+               my $ngname = $ibx->{newsgroup};
+               if (defined($ngname) && $ibx->nntp_usable) {
+                       # only valid if msgmap and over works
                        # preload to avoid fragmentation:
                        $ibx->description;
                        $ibx->base_url;
                } else {
                        delete $groups->{$ngname};
+                       delete $ibx->{newsgroup};
+                       # Note: don't be tempted to delete more for memory
+                       # savings just yet: NNTP, IMAP, and WWW may all
+                       # run in the same process someday.
                }
        });
-       $self->{grouplist} = [ map { $groups->{$_} } sort(keys %$groups) ];
-       $self->{pi_config} = $pi_config;
+       $self->{groupnames} = [ sort(keys %$groups) ];
        # this will destroy old groups that got deleted
-       $self->{groups} = $groups;
+       $self->{pi_config} = $pi_config;
 }
 
 sub idler_start {