X-Git-Url: http://www.git.stargrave.org/?a=blobdiff_plain;f=lib%2FPublicInbox%2FIMAPD.pm;h=7425409d3594ebbd1b985c3ca1c323e534a8857a;hb=af0b0fb7a454470a32c452119d0392e0dedb3fe1;hp=366b69221cbbf1cbcb2e051cf91862e574dd47ca;hpb=ac43c3b17f452b02edf1cce3632a433e998de5ca;p=public-inbox.git

diff --git a/lib/PublicInbox/IMAPD.pm b/lib/PublicInbox/IMAPD.pm
index 366b6922..7425409d 100644
--- a/lib/PublicInbox/IMAPD.pm
+++ b/lib/PublicInbox/IMAPD.pm
@@ -1,4 +1,4 @@
-# Copyright (C) 2020 all contributors <meta@public-inbox.org>
+# Copyright (C) 2020-2021 all contributors <meta@public-inbox.org>
 # License: AGPL-3.0+ <https://www.gnu.org/licenses/agpl-3.0.txt>
 
 # represents an IMAPD (currently a singleton),
@@ -19,20 +19,21 @@ sub new {
 		err => \*STDERR,
 		out => \*STDOUT,
 		# accept_tls => { SSL_server => 1, ..., SSL_reuse_ctx => ... }
-		# pi_config => PublicInbox::Config
+		# pi_cfg => PublicInbox::Config
 		# idler => PublicInbox::InboxIdle
 	}, $class;
 }
 
-sub imapd_refresh_ibx { # pi_config->each_inbox cb
+sub imapd_refresh_ibx { # pi_cfg->each_inbox cb
 	my ($ibx, $imapd) = @_;
 	my $ngname = $ibx->{newsgroup} or return;
-	if (ref $ngname) {
-		warn 'multiple newsgroups not supported: '.
-			join(', ', @$ngname). "\n";
-		return;
-	} elsif ($ngname =~ m![^a-z0-9/_\.\-\~\@\+\=:]! ||
-		 $ngname =~ /\.[0-9]+\z/) {
+
+	# We require lower-case since IMAP mailbox names are
+	# case-insensitive (but -nntpd matches INN in being
+	# case-sensitive
+	if ($ngname =~ m![^a-z0-9/_\.\-\~\@\+\=:]! ||
+			# don't confuse with 50K slices
+			$ngname =~ /\.[0-9]+\z/) {
 		warn "mailbox name invalid: newsgroup=`$ngname'\n";
 		return;
 	}
@@ -59,7 +60,7 @@ sub imapd_refresh_ibx { # pi_config->each_inbox cb
 }
 
 sub imapd_refresh_finalize {
-	my ($imapd, $pi_config) = @_;
+	my ($imapd, $pi_cfg) = @_;
 	my $mailboxes;
 	if (my $next = delete $imapd->{imapd_next}) {
 		$imapd->{mailboxes} = delete $next->{mailboxes};
@@ -77,40 +78,40 @@ sub imapd_refresh_finalize {
 			qq[* LIST (\\Has${no}Children) "." $u\r\n]
 		} keys %$mailboxes
 	];
-	$imapd->{pi_config} = $pi_config;
+	$imapd->{pi_cfg} = $pi_cfg;
 	if (my $idler = $imapd->{idler}) {
-		$idler->refresh($pi_config);
+		$idler->refresh($pi_cfg);
 	}
 }
 
-sub imapd_refresh_step { # pi_config->iterate_start cb
-	my ($pi_config, $section, $imapd) = @_;
+sub imapd_refresh_step { # pi_cfg->iterate_start cb
+	my ($pi_cfg, $section, $imapd) = @_;
 	if (defined($section)) {
 		return if $section !~ m!\Apublicinbox\.([^/]+)\z!;
-		my $ibx = $pi_config->lookup_name($1) or return;
+		my $ibx = $pi_cfg->lookup_name($1) or return;
 		imapd_refresh_ibx($ibx, $imapd->{imapd_next});
 	} else { # undef == "EOF"
-		imapd_refresh_finalize($imapd, $pi_config);
+		imapd_refresh_finalize($imapd, $pi_cfg);
 	}
 }
 
 sub refresh_groups {
 	my ($self, $sig) = @_;
-	my $pi_config = PublicInbox::Config->new;
+	my $pi_cfg = PublicInbox::Config->new;
 	if ($sig) { # SIGHUP is handled through the event loop
 		$self->{imapd_next} = { dummies => {}, mailboxes => {} };
-		my $iter = PublicInbox::ConfigIter->new($pi_config,
+		my $iter = PublicInbox::ConfigIter->new($pi_cfg,
 						\&imapd_refresh_step, $self);
 		$iter->event_step;
 	} else { # initial start is synchronous
 		$self->{dummies} = {};
-		$pi_config->each_inbox(\&imapd_refresh_ibx, $self);
-		imapd_refresh_finalize($self, $pi_config);
+		$pi_cfg->each_inbox(\&imapd_refresh_ibx, $self);
+		imapd_refresh_finalize($self, $pi_cfg);
 	}
 }
 
 sub idler_start {
-	$_[0]->{idler} //= PublicInbox::InboxIdle->new($_[0]->{pi_config});
+	$_[0]->{idler} //= PublicInbox::InboxIdle->new($_[0]->{pi_cfg});
 }
 
 1;