inbox: simplify filtering for duplicate NNTP URLs

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

diff --git a/lib/PublicInbox/Inbox.pm b/lib/PublicInbox/Inbox.pm
index 5feb2154f562fda7ce69271d11f3f40e9ba44b88..07e8b5b754071de5c8264d9e95034469e45b1128 100644 (file)
--- a/lib/PublicInbox/Inbox.pm
+++ b/lib/PublicInbox/Inbox.pm
@@ -50,9 +50,9 @@ sub cleanup_task () {
 }
 
 sub cleanup_possible () {
-       # no need to require EvCleanup, here, if it were enabled another
+       # no need to require DS, here, if it were enabled another
        # module would've require'd it, already
-       eval { PublicInbox::EvCleanup::enabled() } or return 0;
+       eval { PublicInbox::DS::in_loop() } or return 0;
 
        eval {
                require Devel::Peek; # needs separate package in Fedora
@@ -65,7 +65,7 @@ sub _cleanup_later ($) {
        my ($self) = @_;
        $cleanup_avail = cleanup_possible() if $cleanup_avail < 0;
        return if $cleanup_avail != 1;
-       $cleanup_timer ||= PublicInbox::EvCleanup::later(*cleanup_task);
+       $cleanup_timer ||= PublicInbox::DS::later(*cleanup_task);
        $CLEANUP->{"$self"} = $self;
 }
 
@@ -240,26 +240,22 @@ sub cloneurl {
 }
 
 sub base_url {
-       my ($self, $env) = @_;
-       my $scheme;
-       if ($env && ($scheme = $env->{'psgi.url_scheme'})) { # PSGI env
-               my $host_port = $env->{HTTP_HOST} ||
-                       "$env->{SERVER_NAME}:$env->{SERVER_PORT}";
-               my $url = "$scheme://$host_port". ($env->{SCRIPT_NAME} || '/');
+       my ($self, $env) = @_; # env - PSGI env
+       if ($env) {
+               my $url = PublicInbox::Git::host_prefix_url($env, '');
                # for mount in Plack::Builder
                $url .= '/' if $url !~ m!/\z!;
-               $url .= $self->{name} . '/';
-       } else {
-               # either called from a non-PSGI environment (e.g. NNTP/POP3)
-               $self->{-base_url} ||= do {
-                       my $url = $self->{url} or return undef;
-                       # expand protocol-relative URLs to HTTPS if we're
-                       # not inside a web server
-                       $url = "https:$url" if $url =~ m!\A//!;
-                       $url .= '/' if $url !~ m!/\z!;
-                       $url;
-               };
+               return $url .= $self->{name} . '/';
        }
+       # called from a non-PSGI environment (e.g. NNTP/POP3):
+       $self->{-base_url} ||= do {
+               my $url = $self->{url}->[0] or return undef;
+               # expand protocol-relative URLs to HTTPS if we're
+               # not inside a web server
+               $url = "https:$url" if $url =~ m!\A//!;
+               $url .= '/' if $url !~ m!/\z!;
+               $url;
+       };
 }
 
 sub nntp_url {
@@ -297,12 +293,11 @@ sub nntp_url {
                                # nntp://news.example.com/alt.example
                                push @m, $u;
                        }
-                       my %seen = map { $_ => 1 } @urls;
-                       foreach my $u (@m) {
-                               next if $seen{$u};
-                               $seen{$u} = 1;
-                               push @urls, $u;
-                       }
+
+                       # List::Util::uniq requires Perl 5.26+, maybe we
+                       # can use it by 2030 or so
+                       my %seen;
+                       @urls = grep { !$seen{$_}++ } (@urls, @m);
                }
                \@urls;
        };