Merge pull request #1316 from metacpan/haarg/misc-cleanups

Miscellaneous cleanups
metacpan · Nov 7, 2024 · d215987 · d215987
2 parents 2633bba + 7d091e7
commit d215987
Show file tree

Hide file tree

Showing 5 changed files with 20 additions and 33 deletions.
diff --git a/lib/MetaCPAN/ESConfig.pm b/lib/MetaCPAN/ESConfig.pm
@@ -1,19 +1,18 @@
 use v5.20;
 use warnings;
-use experimental qw(signatures postderef);
+use experimental qw( signatures postderef );
 
 package MetaCPAN::ESConfig;
 
-use Carp                      qw(croak);
-use Const::Fast               qw(const);
-use Exporter                  qw(import);
-use MetaCPAN::Util            qw(root_dir);
-use Module::Runtime           qw(require_module $module_name_rx);
+use Carp                      qw( croak );
+use Const::Fast               qw( const );
 use Cpanel::JSON::XS          ();
-use Hash::Merge::Simple       qw(merge);
+use Exporter                  qw( import );
+use Hash::Merge::Simple       qw( merge );
 use MetaCPAN::Server::Config  ();
-use MetaCPAN::Types::TypeTiny qw(HashRef Defined);
-use Const::Fast               qw(const);
+use MetaCPAN::Types::TypeTiny qw( Defined HashRef );
+use MetaCPAN::Util            qw( root_dir );
+use Module::Runtime           qw( $module_name_rx require_module );
 
 const my %config => merge(
     {

diff --git a/lib/MetaCPAN/Query/Release.pm b/lib/MetaCPAN/Query/Release.pm
@@ -285,7 +285,7 @@ sub _activity_filters {
     if ( $new_dists and $new_dists eq 'n' ) {
         push @filters,
             (
-            +{ term  => { first  => 1 } },
+            +{ term  => { first  => true } },
             +{ terms => { status => [qw( cpan latest )] } },
             );
     }
@@ -824,29 +824,19 @@ sub recent {
     my $query;
     if ( $type eq 'n' ) {
         $query = {
-            constant_score => {
-                filter => {
-                    bool => {
-                        must => [
-                            { term  => { first  => 1 } },
-                            { terms => { status => [qw< cpan latest >] } },
-                        ]
-                    }
-                }
+            bool => {
+                must => [
+                    { term  => { first  => true } },
+                    { terms => { status => [qw< cpan latest >] } },
+                ]
             }
         };
     }
     elsif ( $type eq 'a' ) {
         $query = { match_all => {} };
     }
     else {
-        $query = {
-            constant_score => {
-                filter => {
-                    terms => { status => [qw< cpan latest >] }
-                }
-            }
-        };
+        $query = { terms => { status => [qw< cpan latest >] } };
     }
 
     my $body = {

diff --git a/lib/MetaCPAN/Util.pm b/lib/MetaCPAN/Util.pm
@@ -94,11 +94,7 @@ sub fix_version {
 
 sub author_dir {
     my $pauseid = shift;
-    my $dir     = 'id/'
-        . sprintf( "%s/%s/%s",
-        substr( $pauseid, 0, 1 ),
-        substr( $pauseid, 0, 2 ), $pauseid );
-    return $dir;
+    return sprintf( 'id/%1$.1s/%1$.2s/%1$s', $pauseid );
 }
 
 sub hit_total {

diff --git a/t/release/documentation-not-readme.t b/t/release/documentation-not-readme.t
@@ -3,12 +3,13 @@ use warnings;
 use lib 't/lib';
 
 use MetaCPAN::TestHelpers qw( test_release );
+use MetaCPAN::Util        qw( true false );
 use Test::More;
 
 test_release(
     'RWSTAUNER/Documentation-Not-Readme-0.01',
     {
-        first       => 1,
+        first       => true,
         extra_tests => \&test_modules,
         main_module => 'Documentation::Not::Readme',
     }

diff --git a/t/release/pod-examples.t b/t/release/pod-examples.t
@@ -3,12 +3,13 @@ use warnings;
 use lib 't/lib';
 
 use MetaCPAN::TestHelpers qw( test_release );
+use MetaCPAN::Util        qw( true false );
 use Test::More;
 
 test_release(
     'RWSTAUNER/Pod-Examples-99',
     {
-        first        => 1,
+        first        => true,
         extra_tests  => \&test_pod_examples,
         main_module  => 'Pod::Examples',
         changes_file => 'Changes',