Merge pull request ppy#11073 from nanaya/rankings-route

Combine ranking url generation and order constant

Author: notbakaneko

app/Http/Controllers/RankingController.php

@@ -27,10 +27,12 @@ class RankingController extends Controller
     private $params;
     private $friendsOnly;
 
-    const PAGE_SIZE = 50;
     const MAX_RESULTS = 10000;
+    const PAGE_SIZE = 50;
     const RANKING_TYPES = ['performance', 'charts', 'score', 'country'];
     const SPOTLIGHT_TYPES = ['charts'];
+    // in display order
+    const TYPES = ['performance', 'score', 'country', 'multiplayer', 'seasons', 'charts', 'kudosu'];
 
     public function __construct()
     {
@@ -103,6 +105,26 @@ public function __construct()
         }, ['except' => ['kudosu']]);
     }
 
+    public static function url(
+        string $type,
+        string $rulesetName,
+        ?Country $country = null,
+        ?Spotlight $spotlight = null,
+    ): string {
+        return match ($type) {
+            'country' => route('rankings', ['mode' => $rulesetName, 'type' => $type]),
+            'kudosu' => route('rankings.kudosu'),
+            'multiplayer' => route('multiplayer.rooms.show', ['room' => 'latest']),
+            'seasons' => route('seasons.show', ['season' => 'latest']),
+            default => route('rankings', [
+                'country' => $country !== null && $type === 'performance' ? $country->getKey() : null,
+                'mode' => $rulesetName,
+                'spotlight' => $spotlight !== null && $type === 'charts' ? $spotlight->getKey() : null,
+                'type' => $type,
+            ]),
+        };
+    }
+
     /**
      * Get Ranking
      *

app/helpers.php

@@ -4,6 +4,7 @@
 // See the LICENCE file in the repository root for full licence text.
 
 use App\Exceptions\FastImagesizeFetchException;
+use App\Http\Controllers\RankingController;
 use App\Libraries\Base64Url;
 use App\Libraries\LocaleMeta;
 use App\Models\LoginAttempt;
@@ -1131,15 +1132,9 @@ function nav_links()
         'page_title.main.artists_controller._' => route('artists.index'),
         'page_title.main.beatmap_packs_controller._' => route('packs.index'),
     ];
-    $links['rankings'] = [
-        'rankings.type.performance' => route('rankings', ['mode' => $defaultMode, 'type' => 'performance']),
-        'rankings.type.score' => route('rankings', ['mode' => $defaultMode, 'type' => 'score']),
-        'rankings.type.country' => route('rankings', ['mode' => $defaultMode, 'type' => 'country']),
-        'rankings.type.multiplayer' => route('multiplayer.rooms.show', ['room' => 'latest']),
-        'rankings.type.seasons' => route('seasons.show', ['season' => 'latest']),
-        'rankings.type.charts' => route('rankings', ['mode' => $defaultMode, 'type' => 'charts']),
-        'layout.menu.rankings.kudosu' => route('rankings.kudosu'),
-    ];
+    foreach (RankingController::TYPES as $rankingType) {
+        $links['rankings']["rankings.type.{$rankingType}"] = RankingController::url($rankingType, $defaultMode);
+    }
     $links['community'] = [
         'page_title.forum._' => route('forum.forums.index'),
         'page_title.main.chat_controller._' => route('chat.index'),

resources/lang/en/layout.php

@@ -86,7 +86,6 @@
         ],
         'rankings' => [
             '_' => 'rankings',
-            'kudosu' => 'kudosu',
         ],
         'store' => [
             '_' => 'store',

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

@@ -8,11 +8,9 @@
     $selectOptionTransformer = new SelectOptionTransformer();
 @endphp
 @extends('rankings.index', [
-    'country' => null,
     'hasFilter' => false,
     'hasMode' => false,
     'hasPager' => true,
-    'spotlight' => null,
     'titlePrepend' => osu_trans('rankings.type.multiplayer').': '.$room->name,
     'type' => 'multiplayer',
 ])

resources/views/rankings/_mode_selector.blade.php

@@ -8,7 +8,7 @@
         <li>
             <a
                 class="{{ class_with_modifiers('game-mode-link', ['active' => $mode === $tab ]) }}"
-                href="{{ $route($tab, $type) }}"
+                href="{{ $rankingUrl($type, $tab) }}"
             >
                 <span
                     class="fal fa-extra-mode-{{ $tab }}"

resources/views/rankings/index.blade.php

@@ -3,37 +3,25 @@
     See the LICENCE file in the repository root for full licence text.
 --}}
 @php
+    use App\Http\Controllers\RankingController;
+
     $mode ??= default_mode();
-    $selectorParams = [
-        'type' => $type,
-        'mode' => $mode,
-        'route' => fn ($routeMode, $routeType) => (
-            match ($routeType) {
-                'country' => route('rankings', ['mode' => $routeMode, 'type' => $routeType]),
-                'multiplayer' => route('multiplayer.rooms.show', ['room' => 'latest']),
-                'seasons' => route('seasons.show', ['season' => 'latest']),
-                'kudosu' => route('rankings.kudosu'),
-                default => trim(route('rankings', [
-                    'mode' => $routeMode,
-                    'type' => $routeType,
-                    'spotlight' => $routeType === 'charts' ? $spotlight ?? null : null,
-                    'country' => $routeType === 'performance' ? ($country['acronym'] ?? null) : null,
-                ]), '?')
-            }
-        )
-    ];
+    $country ??= null;
+    $spotlight ??= null;
+    $rankingUrl = fn (string $type, string $rulesetName) =>
+        RankingController::url($type, $rulesetName, $country, $spotlight);
 
     $links = [];
-    foreach (['performance', 'score', 'country', 'multiplayer', 'seasons', 'charts', 'kudosu'] as $tab) {
+    foreach (RankingController::TYPES as $tab) {
         $links[] = [
             'active' => $tab === $type,
             'title' => osu_trans("rankings.type.{$tab}"),
-            'url' => $selectorParams['route']($mode, $tab),
+            'url' => $rankingUrl($tab, $mode),
         ];
     }
 
-    $hasMode = $hasMode ?? true;
-    $hasScores = $hasScores ?? true;
+    $hasMode ??= true;
+    $hasScores ??= true;
 @endphp
 
 @extends('master', ['titlePrepend' => $titlePrepend ?? osu_trans("rankings.type.{$type}")])
@@ -45,7 +33,7 @@
     ]])
         @slot('linksAppend')
             @if($hasMode)
-                @include('rankings._mode_selector', $selectorParams)
+                @include('rankings._mode_selector')
             @endif
 
             @yield('additionalHeaderLinks')