No ext_urls

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

diff --git a/lib/PublicInbox/Inbox.pm b/lib/PublicInbox/Inbox.pm
index 0ad68810942b42094e76da2de56fb013bfdec21c..cb98d2ad5e29cbc017ddf65df293e9bbe1546d9f 100644 (file)
--- a/lib/PublicInbox/Inbox.pm
+++ b/lib/PublicInbox/Inbox.pm
@@ -181,33 +181,18 @@ sub over {
        } // ($req ? croak("E: $@") : undef);
 }
 
-sub try_cat {
-       my ($path) = @_;
-       open(my $fh, '<', $path) or return '';
-       local $/;
-       <$fh> // '';
-}
-
-sub cat_desc ($) {
-       my $desc = try_cat($_[0]);
-       local $/ = "\n";
-       chomp $desc;
-       utf8::decode($desc);
-       $desc =~ s/\s+/ /smg;
-       $desc eq '' ? undef : $desc;
-}
-
 sub description {
        my ($self) = @_;
-       ($self->{description} //= cat_desc("$self->{inboxdir}/description")) //
+       ($self->{description} //=
+               PublicInbox::Git::cat_desc("$self->{inboxdir}/description")) //
                '($INBOX_DIR/description missing)';
 }
 
 sub cloneurl {
        my ($self) = @_;
        $self->{cloneurl} // do {
-               my $s = try_cat("$self->{inboxdir}/cloneurl");
-               my @urls = split(/\s+/s, $s);
+               my @urls = split(/\s+/s,
+                 PublicInbox::Git::try_cat("$self->{inboxdir}/cloneurl"));
                scalar(@urls) ? ($self->{cloneurl} = \@urls) : undef;
        } // [];
 }
@@ -220,7 +205,8 @@ sub base_url {
                $url .= '/' if $url !~ m!/\z!;
                return $url .= $self->{name} . '/';
        }
-       # called from a non-PSGI environment (e.g. NNTP/POP3):
+       # called from a non-PSGI environment or cross-inbox environment
+       # where multiple inboxes can have different domains
        my $url = $self->{url} // return undef;
        $url = $url->[0] // return undef;
        # expand protocol-relative URLs to HTTPS if we're
@@ -285,9 +271,9 @@ sub pop3_url {
                my $group = $self->{newsgroup};
                my @urls;
                ($ps && $group) and
-                       @urls = map { m!\Apops?://! ? $_ : "pop://$_" } @$ps;
+                       @urls = map { m!\Apop3?s?://! ? $_ : "pop3://$_" } @$ps;
                if (my $mi = $self->{'pop3mirror'}) {
-                       my @m = map { m!\Apops?://! ? $_ : "pop://$_" } @$mi;
+                       my @m = map { m!\Apop3?s?://! ? $_ : "pop3://$_" } @$mi;
                        my %seen; # List::Util::uniq requires Perl 5.26+
                        @urls = grep { !$seen{$_}++ } (@urls, @m);
                }
@@ -351,11 +337,6 @@ sub msg_by_mid ($$) {
        $smsg ? msg_by_smsg($self, $smsg) : msg_by_path($self, mid2path($mid));
 }
 
-sub recent {
-       my ($self, $opts, $after, $before) = @_;
-       $self->over->recent($opts, $after, $before);
-}
-
 sub modified {
        my ($self) = @_;
        if (my $over = $self->over) {
@@ -409,6 +390,16 @@ sub uidvalidity { $_[0]->{uidvalidity} //= eval { $_[0]->mm->created_at } }
 
 sub eidx_key { $_[0]->{newsgroup} // $_[0]->{inboxdir} }
 
+# only used by NNTP, so we need ->mm anyways
+sub art_min { $_[0]->{-art_min} //= eval { $_[0]->mm(1)->min } }
+
+# used by IMAP, too, which tries to avoid ->mm (but ->{mm} is likely
+# faster since it's smaller iff available)
+sub art_max {
+       $_[0]->{-art_max} //= eval { $_[0]->{mm}->max } //
+                               eval { $_[0]->over(1)->max };
+}
+
 sub mailboxid { # rfc 8474, 8620, 8621
        my ($self, $imap_slice) = @_;
        my $pfx = defined($imap_slice) ? $self->{newsgroup} : $self->{name};
@@ -421,4 +412,6 @@ sub mailboxid { # rfc 8474, 8620, 8621
                sprintf('-%x', uidvalidity($self) // 0)
 }
 
+sub thing_type { 'public inbox' }
+
 1;