www: support publicinbox.imapserver

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

diff --git a/lib/PublicInbox/Inbox.pm b/lib/PublicInbox/Inbox.pm
index df140cacbec177191839a7ffd310b132e11c566e..6cd20ec0b0418a088785e8ac0e70a94f0419688e 100644 (file)
--- 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})) {
@@ -250,7 +248,8 @@ sub base_url {
        }
        # called from a non-PSGI environment (e.g. NNTP/POP3):
        $self->{-base_url} ||= do {
-               my $url = $self->{url}->[0] or return undef;
+               my $url = $self->{url} // return undef;
+               $url = $url->[0] // return undef;
                # expand protocol-relative URLs to HTTPS if we're
                # not inside a web server
                $url = "https:$url" if $url =~ m!\A//!;
@@ -259,51 +258,52 @@ sub base_url {
        };
 }
 
-sub nntp_url {
-       my ($self) = @_;
-       $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 $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;
-                       foreach (@$mirrors) {
-                               my $u = m!\Anntps?://! ? $_ : "nntp://$_";
-                               if ($u =~ m!\Anntps?://[^/]+/?\z!) {
-                                       if ($group) {
-                                               $u .= '/' if $u !~ m!/\z!;
-                                               $u .= $group;
-                                       } else {
-                                               warn
-"publicinbox.$self->{name}.nntpmirror=$_ missing newsgroup name\n";
-                                       }
+sub _x_url ($$$) {
+       my ($self, $x, $ctx) = @_; # $x is "nntp" or "imap"
+       # no checking for nntp_usable here, we can point entirely
+       # to non-local servers or users run by a different user
+       my $ns = $self->{"${x}server"} //
+              $ctx->{www}->{pi_cfg}->get_all("publicinbox.${x}server");
+       my $group = $self->{newsgroup};
+       my @urls;
+       if ($ns && $group) {
+               @urls = map {
+                       my $u = m!\A${x}s?://! ? $_ : "$x://$_";
+                       $u .= '/' if $u !~ m!/\z!;
+                       $u.$group;
+               } @$ns;
+       }
+       if (my $mirrors = $self->{"${x}mirror"}) {
+               my @m;
+               for (@$mirrors) {
+                       my $u = m!\A${x}s?://! ? $_ : "$x://$_";
+                       if ($u =~ m!\A${x}s?://[^/]+/?\z!) {
+                               if ($group) {
+                                       $u .= '/' if $u !~ m!/\z!;
+                                       $u .= $group;
+                               } else { # n.b. IMAP uses "newsgroup"
+                                       warn <<EOM;
+publicinbox.$self->{name}.${x}mirror=$_ missing newsgroup name
+EOM
                                }
-                               # else: allow full URLs like:
-                               # nntp://news.example.com/alt.example
-                               push @m, $u;
                        }
-
-                       # List::Util::uniq requires Perl 5.26+, maybe we
-                       # can use it by 2030 or so
-                       my %seen;
-                       @urls = grep { !$seen{$_}++ } (@urls, @m);
+                       # else: allow full URLs like:
+                       # nntp://news.example.com/alt.example
+                       push @m, $u;
                }
-               \@urls;
-       };
+
+               # List::Util::uniq requires Perl 5.26+, maybe we
+               # can use it by 2030 or so
+               my %seen;
+               @urls = grep { !$seen{$_}++ } (@urls, @m);
+       }
+       \@urls;
 }
 
+# my ($self, $ctx) = @_;
+sub nntp_url { $_[0]->{-nntp_url} //= _x_url($_[0], 'nntp', $_[1]) }
+sub imap_url { $_[0]->{-imap_url} //= _x_url($_[0], 'imap', $_[1]) }
+
 sub nntp_usable {
        my ($self) = @_;
        my $ret = mm($self) && over($self);