Merge branch 'master' into kudosu-rankings-country

Author: notbakaneko

app/Exceptions/Handler.php

@@ -6,7 +6,6 @@
 namespace App\Exceptions;
 
 use App\Libraries\SessionVerification;
-use Auth;
 use Illuminate\Auth\Access\AuthorizationException as LaravelAuthorizationException;
 use Illuminate\Auth\AuthenticationException;
 use Illuminate\Database\Eloquent\ModelNotFoundException;
@@ -34,6 +33,7 @@ class Handler extends ExceptionHandler
         ModelNotFoundException::class,
         TokenMismatchException::class,
         \Illuminate\Validation\ValidationException::class,
+        \Laravel\Octane\Exceptions\DdException::class,
         \Symfony\Component\HttpKernel\Exception\HttpException::class,
 
         // local
@@ -90,6 +90,15 @@ private static function isOAuthSessionException(Throwable $e): bool
             && $e->getMessage() === 'Authorization request was not present in the session.';
     }
 
+    private static function reportWithSentry(Throwable $e): void
+    {
+        $ref = log_error_sentry($e, ['http_code' => (string) static::statusCode($e)]);
+
+        if ($ref !== null) {
+            \Request::instance()->attributes->set('ref', $ref);
+        }
+    }
+
     private static function unwrapViewException(Throwable $e): Throwable
     {
         if ($e instanceof ViewException) {
@@ -121,10 +130,7 @@ public function report(Throwable $e)
             return;
         }
 
-        // Fallback in case error happening before config is initialised
-        if ($GLOBALS['cfg']['sentry']['dsn'] ?? false) {
-            $this->reportWithSentry($e);
-        }
+        static::reportWithSentry($e);
 
         parent::report($e);
     }
@@ -196,25 +202,4 @@ protected function unauthenticated($request, AuthenticationException $exception)
 
         return ext_view('users.login', null, null, 401);
     }
-
-    private function reportWithSentry($e)
-    {
-        if (Auth::check()) {
-            $userContext = [
-                'id' => Auth::user()->user_id,
-                'username' => Auth::user()->username_clean,
-            ];
-        } else {
-            $userContext = [
-                'id' => null,
-            ];
-        }
-
-        app('sentry')->configureScope(function ($scope) use ($e, $userContext) {
-            $scope->setUser($userContext);
-            $scope->setTag('http_code', (string) static::statusCode($e));
-        });
-
-        request()->attributes->set('ref', app('sentry')->captureException($e));
-    }
 }

app/Http/Controllers/RankingController.php

@@ -264,11 +264,11 @@ public function kudosu()
 
     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);
         }

app/helpers.php

@@ -468,13 +468,35 @@ function json_time(?DateTime $time): ?string
     return $time === null ? null : $time->format(DateTime::ATOM);
 }
 
-function log_error($exception)
+function log_error($exception, ?array $sentryTags = null): void
 {
     Log::error($exception);
+    log_error_sentry($exception, $sentryTags);
+}
 
-    if ($GLOBALS['cfg']['sentry']['dsn']) {
-        Sentry::captureException($exception);
+function log_error_sentry(Throwable $exception, ?array $tags = null): ?string
+{
+    // Fallback in case error happening before config is initialised
+    if (!($GLOBALS['cfg']['sentry']['dsn'] ?? false)) {
+        return null;
     }
+
+    return Sentry\withScope(function ($scope) use ($exception, $tags) {
+        $currentUser = Auth::user();
+        $userContext = $currentUser === null
+            ? ['id' => null]
+            : [
+                'id' => $currentUser->getKey(),
+                'username' => $currentUser->username,
+            ];
+
+        $scope->setUser($userContext);
+        foreach ($tags ?? [] as $key => $value) {
+            $scope->setTag($key, $value);
+        }
+
+        return Sentry\captureException($exception);
+    });
 }
 
 function logout()
@@ -1110,11 +1132,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'] = [

resources/lang/en/rankings.php

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

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}"),