Merge branch 'master' into fastimage-log

Author: notbakaneko

Diff for: app/Http/Controllers/RankingController.php

@@ -259,18 +259,16 @@ public function kudosu()
             )];
         }
 
-        $scores->loadMissing('country');
-
         return ext_view('rankings.kudosu', compact('scores'));
     }
 
     public function spotlight($mode)
     {
-        $chartId = $this->params['spotlight'] ?? null;
+        $chartId = get_int($this->params['spotlight'] ?? null);
 
         $spotlights = Spotlight::orderBy('chart_id', 'desc')->get();
         if ($chartId === null) {
-            $spotlight = $spotlights->first();
+            $spotlight = $spotlights->first() ?? abort(404);
         } else {
             $spotlight = Spotlight::findOrFail($chartId);
         }

Diff for: app/Http/Controllers/UsersController.php

@@ -1003,12 +1003,13 @@ private function storeUser(array $rawParams)
 
             $user = $registration->user();
 
-            if ($country === null) {
+            // report unknown country code but ignore non-country from cloudflare
+            if ($countryCode !== null && $country === null && $countryCode !== 'T1') {
                 app('sentry')->getClient()->captureMessage(
-                    'User registered from unknown country: '.$countryCode,
+                    'User registered from unknown country',
                     null,
                     (new Scope())
-                        ->setExtra('country', $countryCode)
+                        ->setTag('country', $countryCode)
                         ->setExtra('ip', $ip)
                         ->setExtra('user_id', $user->getKey())
                 );

Diff for: app/helpers.php

@@ -1133,11 +1133,11 @@ function nav_links()
     ];
     $links['rankings'] = [
         'rankings.type.performance' => route('rankings', ['mode' => $defaultMode, 'type' => 'performance']),
-        'rankings.type.charts' => route('rankings', ['mode' => $defaultMode, 'type' => 'charts']),
         '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'),
     ];
     $links['community'] = [

Diff for: resources/lang/en/rankings.php

@@ -24,7 +24,7 @@
     ],
 
     'type' => [
-        'charts' => 'spotlights',
+        'charts' => 'spotlights (old)',
         'country' => 'country',
         'kudosu' => 'kudosu',
         'multiplayer' => 'multiplayer',

Diff for: resources/views/rankings/index.blade.php

@@ -24,7 +24,7 @@
     ];
 
     $links = [];
-    foreach (['performance', 'charts', 'score', 'country', 'multiplayer', 'seasons', 'kudosu'] as $tab) {
+    foreach (['performance', 'score', 'country', 'multiplayer', 'seasons', 'charts', 'kudosu'] as $tab) {
         $links[] = [
             'active' => $tab === $type,
             'title' => osu_trans("rankings.type.{$tab}"),

Diff for: resources/views/rankings/kudosu.blade.php

@@ -38,10 +38,10 @@
                     <td class="ranking-page-table__column">
                         <div class="ranking-page-table__user-link">
                             @include('objects._flag_country', [
-                                'countryCode' => $user->country->acronym,
+                                'countryCode' => $user->country_acronym,
                                 'modifiers' => 'medium',
                             ])
-                            {!!  link_to_user($user, null, '', ['ranking-page-table__user-link-text']) !!}
+                            {!! link_to_user($user, null, '', ['ranking-page-table__user-link-text']) !!}
                         </div>
                     </td>
                     <td class="ranking-page-table__column ranking-page-table__column--focused">