update copyrights for 2018

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

diff --git a/lib/PublicInbox/NNTPD.pm b/lib/PublicInbox/NNTPD.pm
index 50d022be4ae2142ca3bcb39c378c70c8ab349f04..117c9c0379febe77b680e69cd693858760212325 100644 (file)
--- a/lib/PublicInbox/NNTPD.pm
+++ b/lib/PublicInbox/NNTPD.pm
@@ -1,4 +1,4 @@
-# Copyright (C) 2016 all contributors <meta@public-inbox.org>
+# Copyright (C) 2016-2018 all contributors <meta@public-inbox.org>
 # License: AGPL-3.0+ <https://www.gnu.org/licenses/agpl-3.0.txt>
 
 # represents an NNTPD (currently a singleton),
@@ -23,21 +23,18 @@ sub refresh_groups () {
        my $pi_config = PublicInbox::Config->new;
        my $new = {};
        my @list;
-       foreach my $k (keys %$pi_config) {
-               $k =~ /\Apublicinbox\.([^\.]+)\.mainrepo\z/ or next;
-               my $name = $1;
-               my $git_dir = $pi_config->{$k};
-               my $ngname = $pi_config->{"publicinbox.$name.newsgroup"};
-               next unless defined $ngname;
-               next if ($ngname eq ''); # disabled
-               my $ng = $pi_config->lookup_newsgroup($ngname) or next;
-
-               # Only valid if msgmap and search works
-               if ($ng->nntp_usable) {
+       $pi_config->each_inbox(sub {
+               my ($ng) = @_;
+               my $ngname = $ng->{newsgroup} or return;
+               if (ref $ngname) {
+                       warn 'multiple newsgroups not supported: '.
+                               join(', ', @$ngname). "\n";
+               } elsif ($ng->nntp_usable) {
+                       # Only valid if msgmap and search works
                        $new->{$ngname} = $ng;
                        push @list, $ng;
                }
-       }
+       });
        @list = sort { $a->{newsgroup} cmp $b->{newsgroup} } @list;
        $self->{grouplist} = \@list;
        # this will destroy old groups that got deleted