X-Git-Url: http://www.git.stargrave.org/?a=blobdiff_plain;f=lib%2FPublicInbox%2FNNTPD.pm;h=33bc5fda7a9a936e0fc95c28a14d91113d3bda31;hb=24e103d37b423c1c718e7f0f6285419005a98be5;hp=6b762d8923b41ff63d973a6e8db71a37506ec9ce;hpb=2a717d13f10fcdc69921d80cf94c47a694a175d4;p=public-inbox.git

diff --git a/lib/PublicInbox/NNTPD.pm b/lib/PublicInbox/NNTPD.pm
index 6b762d89..33bc5fda 100644
--- 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",
@@ -36,11 +35,10 @@ sub new {
 sub refresh_groups {
 	my ($self, $sig) = @_;
 	my $pi_config = $sig ? PublicInbox::Config->new : $self->{pi_config};
-	my $new = {};
-	my @list;
+	my $groups = $pi_config->{-by_newsgroup}; # filled during each_inbox
 	$pi_config->each_inbox(sub {
-		my ($ng) = @_;
-		my $ngname = $ng->{newsgroup} or return;
+		my ($ibx) = @_;
+		my $ngname = $ibx->{newsgroup} or return;
 		if (ref $ngname) {
 			warn 'multiple newsgroups not supported: '.
 				join(', ', @$ngname). "\n";
@@ -50,21 +48,21 @@ sub refresh_groups {
 		# '|', '<', '>', ';', '#', '$', '&',
 		} elsif ($ngname =~ m![^A-Za-z0-9/_\.\-\~\@\+\=:]!) {
 			warn "newsgroup name invalid: `$ngname'\n";
-		} elsif ($ng->nntp_usable) {
+			delete $groups->{$ngname};
+		} elsif ($ibx->nntp_usable) {
 			# Only valid if msgmap and search works
-			$new->{$ngname} = $ng;
-			push @list, $ng;
 
 			# preload to avoid fragmentation:
-			$ng->description;
-			$ng->base_url;
+			$ibx->description;
+			$ibx->base_url;
+		} else {
+			delete $groups->{$ngname};
 		}
 	});
-	@list =	sort { $a->{newsgroup} cmp $b->{newsgroup} } @list;
-	$self->{grouplist} = \@list;
+	$self->{groupnames} = [ sort(keys %$groups) ];
 	$self->{pi_config} = $pi_config;
 	# this will destroy old groups that got deleted
-	%{$self->{groups}} = %$new;
+	$self->{groups} = $groups;
 }
 
 sub idler_start {