Merge pull request #12076 from nanaya/ranking-global

Combine performance and score ranking pages (+ cleanup)

Author: notbakaneko

app/Http/Controllers/RankingController.php

@@ -277,8 +277,12 @@ public function scopeFromCountry($query, $countryAcronym)
 
     public function scopeFriendsOf($query, $user)
     {
-        $userIds = $user->friends()->allRelatedIds();
-        $userIds[] = $user->getKey();
+        if ($user === null) {
+            $userIds = [];
+        } else {
+            $userIds = $user->friends()->allRelatedIds();
+            $userIds[] = $user->getKey();
+        }
 
         return $query->whereIn('user_id', $userIds);
     }

app/Models/Score/Best/Model.php

@@ -198,8 +198,12 @@ public function isRanked()
 
     public function scopeFriendsOf($query, $user)
     {
-        $userIds = $user->friends()->allRelatedIds();
-        $userIds[] = $user->getKey();
+        if ($user === null) {
+            $userIds = [];
+        } else {
+            $userIds = $user->friends()->allRelatedIds();
+            $userIds[] = $user->getKey();
+        }
 
         return $query->whereIn('user_id', $userIds);
     }

app/Models/UserStatistics/Model.php

@@ -1180,7 +1180,7 @@ function nav_links()
         'page_title.main.beatmap_packs_controller._' => route('packs.index'),
     ];
     foreach (RankingController::TYPES as $rankingType) {
-        $links['rankings']["rankings.type.{$rankingType}"] = RankingController::url($rankingType, $defaultMode);
+        $links['rankings']["rankings.type.{$rankingType}"] = RankingController::url(['type' => $rankingType]);
     }
     $links['community'] = [
         'page_title.forum._' => route('forum.forums.index'),

app/helpers.php

@@ -44,7 +44,7 @@
 @nav2-height: 90px;
 @nav2-height--pinned: 50px;
 @nav2-header-height: 360px;
-@nav2-header-image-height: 340px;
+@nav2-header-image-height: 310px;
 
 // mobile nav
 // TODO: un-bootstrap names

resources/css/variables.less

@@ -37,10 +37,9 @@
         'charts' => 'spotlights (old)',
         'country' => 'country',
         'daily_challenge' => 'daily challenge',
+        'global' => 'global',
         'kudosu' => 'kudosu',
         'multiplayer' => 'multiplayer',
-        'performance' => 'performance',
-        'score' => 'score',
         'seasons' => 'seasons',
         'team' => 'team',
     ],

resources/lang/en/rankings.php

@@ -10,9 +10,8 @@
 @extends('rankings.index', [
     'hasFilter' => false,
     'hasMode' => false,
-    'hasPager' => true,
+    'params' => ['type' => 'multiplayer'],
     'titlePrepend' => osu_trans('rankings.type.multiplayer').': '.$room->name,
-    'type' => 'multiplayer',
 ])
 
 @section('ranking-header')

resources/views/multiplayer/rooms/show.blade.php

@@ -3,7 +3,11 @@
     See the LICENCE file in the repository root for full licence text.
 --}}
 @php
+    use App\Models\Country;
     use App\Transformers\SelectOptionTransformer;
+
+    $transformer = new SelectOptionTransformer();
+    $country = $countryStats?->country;
 @endphp
 
 <div class="js-react--ranking-country-filter u-contents">
@@ -21,7 +25,10 @@
 
 <script id="json-country-filter" type="application/json">
     {!! json_encode([
-        'current' => $country === null ? null : json_item($country, new SelectOptionTransformer()),
-        'items' => $countries,
+        'current' => $country === null ? null : json_item($country, $transformer),
+        'items' => json_collection(
+            Country::whereHasRuleset($params['mode'])->get(),
+            $transformer,
+        ),
     ]) !!}
 </script>

resources/views/rankings/_country_filter.blade.php

@@ -3,18 +3,18 @@
     See the LICENCE file in the repository root for full licence text.
 --}}
 @php
-    $filter ??= null;
-    $mode ??= default_mode();
-    $sort ??= null;
-    $type ??= 'performance';
-    $variant ??= null;
+    $params['filter'] ??= null;
+    $params['mode'] ??= default_mode();
+    $params['sort'] ??= null;
+    $params['type'] ??= 'global';
+    $params['variant'] ??= null;
 @endphp
 @if ($object instanceof App\Models\Country)
     <a
         class="ranking-page-table-main"
         href="{{ route('rankings', [
-            'mode' => $mode,
-            'type' => 'performance',
+            'mode' => $params['mode'],
+            'type' => 'global',
             'country' => $object->acronym,
         ]) }}"
     >
@@ -31,8 +31,8 @@ class="ranking-page-table-main"
     <a
         class="ranking-page-table-main"
         href="{{ route('teams.leaderboard', [
-            'ruleset' => $mode,
-            'sort' => $sort,
+            'ruleset' => $params['mode'],
+            'sort' => $params['sort'],
             'team' => $object,
         ]) }}"
     >
@@ -49,13 +49,13 @@ class="ranking-page-table-main"
             <a
                 class="u-contents"
                 href="{{ route('rankings', [
-                    'mode' => $mode,
-                    'sort' => $sort,
-                    'type' => $type,
+                    'mode' => $params['mode'],
+                    'sort' => $params['sort'],
+                    'type' => $params['type'],
 
                     'country' => $object->country->acronym,
-                    'filter' => $filter,
-                    'variant' => $variant,
+                    'filter' => $params['filter'],
+                    'variant' => $params['variant'],
                 ]) }}"
             >
                 @include('objects._flag_country', [
@@ -76,7 +76,7 @@ class="u-contents"
             class="ranking-page-table-main__link js-usercard"
             data-tooltip-position="right center"
             data-user-id="{{ $object->getKey() }}"
-            href="{{ route('users.show', ['user' => $object->getKey(), 'mode' => $mode]) }}"
+            href="{{ route('users.show', ['user' => $object->getKey(), 'mode' => $params['mode']]) }}"
         >
             @if ($showAvatar ?? false)
                 <span class="ranking-page-table-main__flag">

resources/views/rankings/_main_column.blade.php

@@ -19,7 +19,7 @@
 
     <script id="json-user-filter" type="application/json">
         {!! json_encode([
-            'current' => $filter,
+            'current' => $params['filter'],
         ]) !!}
     </script>
 @endif