Merge branch 'master' into all-internal

Author: notbakaneko

app/Http/Controllers/Forum/PostsController.php

@@ -143,14 +143,14 @@ public function raw($id)
     {
         $post = Post::withTrashed()->findOrFail($id);
 
-        if ($post->trashed()) {
-            priv_check('ForumModerate', $post->forum)->ensureCan();
-        }
-
         if ($post->forum === null || $post->topic === null) {
             abort(404);
         }
 
+        if ($post->trashed() || $post->topic->trashed()) {
+            priv_check('ForumModerate', $post->forum)->ensureCan();
+        }
+
         priv_check('ForumView', $post->forum)->ensureCan();
 
         $text = $post->bodyRaw;

app/Models/Solo/Score.php

@@ -13,7 +13,6 @@
 use App\Libraries\Score\UserRank;
 use App\Libraries\Search\ScoreSearchParams;
 use App\Models\Beatmap;
-use App\Models\Beatmapset;
 use App\Models\Model;
 use App\Models\Multiplayer\ScoreLink as MultiplayerScoreLink;
 use App\Models\Score as LegacyScore;
@@ -120,10 +119,8 @@ public static function extractParams(array $rawParams, ScoreToken|MultiplayerSco
         $params['user_id'] = $scoreToken->user_id;
 
         $beatmap = $scoreToken->beatmap;
-        $params['ranked'] = $beatmap !== null && in_array($beatmap->approved, [
-            Beatmapset::STATES['approved'],
-            Beatmapset::STATES['ranked'],
-        ], true);
+        // anything that have leaderboard
+        $params['ranked'] = $beatmap !== null && $beatmap->approved > 0;
 
         $params['preserve'] = $params['passed'] ?? false;
 

app/Models/Traits/Scoreable.php

@@ -170,7 +170,7 @@ public function recalculateRank(): void
     private function shouldHaveHiddenRank(): bool
     {
         foreach ($this->enabled_mods as $mod) {
-            if ($mod === 'FL' || $mod === 'HD') {
+            if ($mod === 'FI' || $mod === 'FL' || $mod === 'HD') {
                 return true;
             }
         }

resources/js/utils/legacy-score-helper.ts

@@ -16,7 +16,7 @@ document.addEventListener('turbolinks:load', () => {
 });
 
 function shouldHaveHiddenRank(score: SoloScoreJson) {
-  return score.mods.some((mod) => mod.acronym === 'FL' || mod.acronym === 'HD');
+  return score.mods.some((mod) => mod.acronym === 'FI' || mod.acronym === 'FL' || mod.acronym === 'HD');
 }
 
 export function legacyAccuracyAndRank(score: SoloScoreJson) {