nntpd: share {groups} hash with {-by_newsgroup} in Config

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

diff --git a/lib/PublicInbox/Config.pm b/lib/PublicInbox/Config.pm
index d425cc9b162d0d4ab7b3dcd76b7fa3f3a03c863c..e7aea99b7ae80f8c8f515583b963d51bbfb59da7 100644 (file)
--- a/lib/PublicInbox/Config.pm
+++ b/lib/PublicInbox/Config.pm
@@ -91,9 +91,12 @@ sub lookup_name ($$) {
 
 sub lookup_ei {
        my ($self, $name) = @_;
-       $self->{-ei_by_name}->{$name} //= _fill_ei($self, "eindex.$name");
+       $self->{-ei_by_name}->{$name} //= _fill_ei($self, "extindex.$name");
 }
 
+# special case for [extindex "all"]
+sub ALL { lookup_ei($_[0], 'all') }
+
 sub each_inbox {
        my ($self, $cb, @arg) = @_;
        # may auto-vivify if config file is non-existent:
@@ -435,7 +438,9 @@ EOF
                }
        }
        if (my $ng = $ibx->{newsgroup}) {
-               $self->{-by_newsgroup}->{$ng} = $ibx;
+               # PublicInbox::NNTPD does stricter (and more expensive checks),
+               # keep this lean for startup speed
+               $self->{-by_newsgroup}->{$ng} = $ibx unless ref($ng);
        }
        $self->{-by_name}->{$name} = $ibx;
        if ($ibx->{obfuscate}) {
@@ -488,4 +493,16 @@ sub urlmatch {
        }
 }
 
+sub json {
+       state $json;
+       $json //= do {
+               for my $mod (qw(Cpanel::JSON::XS JSON::MaybeXS JSON JSON::PP)) {
+                       eval "require $mod" or next;
+                       # ->ascii encodes non-ASCII to "\uXXXX"
+                       $json = $mod->new->ascii(1) and last;
+               }
+               $json;
+       };
+}
+
 1;