inbox: streamline ->nntp_url

We no longer waste a precious hash slot for a per-Inbox
{nntpserver} if it's only configured globally for all inboxes.

1 files changed, 3 insertions, 6 deletions

diff --git a/lib/PublicInbox/Inbox.pm b/lib/PublicInbox/Inbox.pm
index b0bb9dcc..f234b96f 100644
--- a/lib/PublicInbox/Inbox.pm
+++ b/lib/PublicInbox/Inbox.pm
@@ -109,8 +109,6 @@ sub new {
         } else {
                 delete $opts->{feedmax};
         }
-        $opts->{nntpserver} ||= $pi_cfg->{'publicinbox.nntpserver'};
-
         # allow any combination of multi-line or comma-delimited hide entries
         my $hide = {};
         if (defined(my $h = $opts->{hide})) {
@@ -261,22 +259,21 @@ sub base_url {
 }
 
 sub nntp_url {
-        my ($self) = @_;
+        my ($self, $ctx) = @_;
         $self->{-nntp_url} ||= do {
                 # no checking for nntp_usable here, we can point entirely
                 # to non-local servers or users run by a different user
-                my $ns = $self->{nntpserver};
+                my $ns = $self->{nntpserver} //
+                       $ctx->{www}->{pi_cfg}->get_all('publicinbox.nntpserver');
                 my $group = $self->{newsgroup};
                 my @urls;
                 if ($ns && $group) {
-                        $ns = [ $ns ] if ref($ns) ne 'ARRAY';
                         @urls = map {
                                 my $u = m!\Anntps?://! ? $_ : "nntp://$_";
                                 $u .= '/' if $u !~ m!/\z!;
                                 $u.$group;
                         } @$ns;
                 }
-
                 my $mirrors = $self->{nntpmirror};
                 if ($mirrors) {
                         my @m;