From b7b15c91a466c084a5a859106b0580f0c595ee38 Mon Sep 17 00:00:00 2001
From: nanaya <me@nanaya.net>
Date: Mon, 7 Oct 2024 21:39:30 +0900
Subject: [PATCH 1/9] Add separator before each forum main categories

In post search and topic move dropdown.
---
 resources/views/forum/topics/_moderate_move.blade.php   | 8 +++++++-
 resources/views/objects/search/_forum_options.blade.php | 8 +++++++-
 2 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/resources/views/forum/topics/_moderate_move.blade.php b/resources/views/forum/topics/_moderate_move.blade.php
index 624a24d06b5..bcc1d2577da 100644
--- a/resources/views/forum/topics/_moderate_move.blade.php
+++ b/resources/views/forum/topics/_moderate_move.blade.php
@@ -35,11 +35,17 @@ class="btn-circle btn-circle--topic-nav btn-circle--yellow"
                             <label class="form-select">
                                 <select name="destination_forum_id" class="form-select__input">
                                     @foreach (App\Models\Forum\Forum::displayList()->get() as $dstForum)
+                                        @php
+                                            $currentDepth = $dstForum->currentDepth();
+                                        @endphp
+                                        @if (!$loop->first && $currentDepth === 0)
+                                            <hr>
+                                        @endif
                                         <option value="{{ $dstForum->getKey() }}"
                                             {{ $dstForum->isOpen() ? '' : 'disabled' }}
                                             {{ $dstForum->getKey() === $topic->forum_id ? 'selected' : '' }}
                                         >
-                                            {{ str_repeat('–', $dstForum->currentDepth()) }}
+                                            {{ str_repeat('–', $currentDepth) }}
                                             {{ $dstForum->forum_name }}
                                         </option>
                                     @endforeach
diff --git a/resources/views/objects/search/_forum_options.blade.php b/resources/views/objects/search/_forum_options.blade.php
index b7dca9fe59e..05dbb93c2d2 100644
--- a/resources/views/objects/search/_forum_options.blade.php
+++ b/resources/views/objects/search/_forum_options.blade.php
@@ -73,11 +73,17 @@ class="form-select__input"
 
                     @foreach (App\Models\Forum\Forum::searchable()->displayList()->get() as $forum)
                         @if (priv_check('ForumView', $forum)->can())
+                            @php
+                                $currentDepth = $forum->currentDepth();
+                            @endphp
+                            @if ($currentDepth === 0)
+                                <hr>
+                            @endif
                             <option
                                 value="{{ $forum->getKey() }}"
                                 {{ $forum->getKey() === get_int($params[$fields['forumId']] ?? null) ? 'selected' : '' }}
                             >
-                                {{ str_repeat('–', $forum->currentDepth()) }}
+                                {{ str_repeat('–', $currentDepth) }}
                                 {{ $forum->forum_name }}
                             </option>
                         @endif

From b62d0403aad045d3bc8f8374a49f534daee0ccf9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Tue, 8 Oct 2024 09:43:33 +0200
Subject: [PATCH 2/9] Fix incorrect grade cutoffs when displaying lazer scores
 and stable scores in lazer mode

As reported on discord: https://discord.com/channels/188630481301012481/1097318920991559880/1293089915394985985

a
---
 resources/js/scores-show/dial.tsx  | 39 +------------------
 resources/js/scores-show/info.tsx  |  4 +-
 resources/js/utils/score-helper.ts | 61 ++++++++++++++++++++++++++++++
 3 files changed, 65 insertions(+), 39 deletions(-)

diff --git a/resources/js/scores-show/dial.tsx b/resources/js/scores-show/dial.tsx
index d99dd709578..a03f06a7618 100644
--- a/resources/js/scores-show/dial.tsx
+++ b/resources/js/scores-show/dial.tsx
@@ -10,6 +10,7 @@ interface Props {
   accuracy: number;
   mode: Ruleset;
   rank: Rank;
+  rank_cutoffs: number[];
 }
 
 const displayRank: Record<Rank, string> = {
@@ -24,46 +25,10 @@ const displayRank: Record<Rank, string> = {
   XH: 'SS',
 };
 
-const refDataMap: Record<Ruleset, number[]> = {
-  // <rank>: minimum acc => (higher rank acc - current acc)
-  // for SS, use minimum accuracy of 0.99 (any less and it's too small)
-  // actual array is reversed as it's rendered from D to SS clockwise
-
-  // SS: 0.99 => 0.01
-  // S: 0.9801 => 0.0099
-  // A: 0.9401 => 0.04
-  // B: 0.9001 => 0.04
-  // C: 0.8501 => 0.05
-  // D: 0 => 0.8501
-  fruits: [0.8501, 0.05, 0.04, 0.04, 0.0099, 0.01],
-  // SS: 0.99 => 0.01
-  // S: 0.95 => 0.04
-  // A: 0.9 => 0.05
-  // B: 0.8 => 0.1
-  // C: 0.7 => 0.1
-  // D: 0 => 0.7
-  mania: [0.7, 0.1, 0.1, 0.05, 0.04, 0.01],
-  // SS: 0.99 => 0.01
-  // S: (0.9 * 300 + 0.1 * 100) / 300 = 0.933 => 0.057
-  // A: (0.8 * 300 + 0.2 * 100) / 300 = 0.867 => 0.066
-  // B: (0.7 * 300 + 0.3 * 100) / 300 = 0.8 => 0.067
-  // C: 0.6 => 0.2
-  // D: 0 => 0.6
-  osu: [0.6, 0.2, 0.067, 0.066, 0.057, 0.01],
-  // SS: 0.99 => 0.01
-  // S: (0.9 * 300 + 0.1 * 50) / 300 = 0.917 => 0.073
-  // A: (0.8 * 300 + 0.2 * 50) / 300 = 0.833 => 0.084
-  // B: (0.7 * 300 + 0.3 * 50) / 300 = 0.75 => 0.083
-  // C: 0.6 => 0.15
-  // D: 0 => 0.6
-  taiko: [0.6, 0.15, 0.083, 0.084, 0.073, 0.01],
-};
-
 export default function Dial(props: Props) {
   const arc = d3.arc();
   const pie = d3.pie().sortValues(null);
   const valueData = [props.accuracy, 1 - props.accuracy];
-  const refData = refDataMap[props.mode];
 
   return (
     <div className='score-dial'>
@@ -76,7 +41,7 @@ export default function Dial(props: Props) {
             </linearGradient>
           </defs>
           <g transform='translate(100, 100)'>
-            {pie(refData).map((d) => (
+            {pie(props.rank_cutoffs).map((d) => (
               <path
                 key={d.index}
                 className={`score-dial__inner score-dial__inner--${d.index}`}
diff --git a/resources/js/scores-show/info.tsx b/resources/js/scores-show/info.tsx
index e598a775c44..c83426d26bd 100644
--- a/resources/js/scores-show/info.tsx
+++ b/resources/js/scores-show/info.tsx
@@ -5,7 +5,7 @@ import BeatmapsetCover from 'components/beatmapset-cover';
 import { SoloScoreJsonForShow } from 'interfaces/solo-score-json';
 import * as React from 'react';
 import { rulesetName } from 'utils/beatmap-helper';
-import { accuracy, rank } from 'utils/score-helper';
+import { accuracy, rank, rankCutoffs } from 'utils/score-helper';
 import Buttons from './buttons';
 import Dial from './dial';
 import Player from './player';
@@ -27,7 +27,7 @@ export default function Info({ score }: Props) {
       </div>
 
       <div className='score-info__item score-info__item--dial'>
-        <Dial accuracy={accuracy(score)} mode={rulesetName(score.ruleset_id)} rank={rank(score)} />
+        <Dial accuracy={accuracy(score)} mode={rulesetName(score.ruleset_id)} rank={rank(score)} rank_cutoffs={rankCutoffs(score)} />
       </div>
 
       <div className='score-info__item score-info__item--player'>
diff --git a/resources/js/utils/score-helper.ts b/resources/js/utils/score-helper.ts
index 7cb82f4ba32..750236a9308 100644
--- a/resources/js/utils/score-helper.ts
+++ b/resources/js/utils/score-helper.ts
@@ -105,6 +105,67 @@ export function rank(score: SoloScoreJson) {
     : score.rank;
 }
 
+export function rankCutoffs(score: SoloScoreJson): number[] {
+  // <rank>: minimum acc => (higher rank acc - current acc)
+  // for SS, use minimum accuracy of 0.99 (any less and it's too small)
+  // actual array is reversed as it's rendered from D to SS clockwise
+
+  if (shouldReturnLegacyValue(score)) {
+    return {
+      // SS: 0.99 => 0.01
+      // S: 0.9801 => 0.0099
+      // A: 0.9401 => 0.04
+      // B: 0.9001 => 0.04
+      // C: 0.8501 => 0.05
+      // D: 0 => 0.8501
+      fruits: [0.8501, 0.05, 0.04, 0.04, 0.0099, 0.01],
+      // SS: 0.99 => 0.01
+      // S: 0.95 => 0.04
+      // A: 0.9 => 0.05
+      // B: 0.8 => 0.1
+      // C: 0.7 => 0.1
+      // D: 0 => 0.7
+      mania: [0.7, 0.1, 0.1, 0.05, 0.04, 0.01],
+      // SS: 0.99 => 0.01
+      // S: (0.9 * 300 + 0.1 * 100) / 300 = 0.933 => 0.057
+      // A: (0.8 * 300 + 0.2 * 100) / 300 = 0.867 => 0.066
+      // B: (0.7 * 300 + 0.3 * 100) / 300 = 0.8 => 0.067
+      // C: 0.6 => 0.2
+      // D: 0 => 0.6
+      osu: [0.6, 0.2, 0.067, 0.066, 0.057, 0.01],
+      // SS: 0.99 => 0.01
+      // S: (0.9 * 300 + 0.1 * 50) / 300 = 0.917 => 0.073
+      // A: (0.8 * 300 + 0.2 * 50) / 300 = 0.833 => 0.084
+      // B: (0.7 * 300 + 0.3 * 50) / 300 = 0.75 => 0.083
+      // C: 0.6 => 0.15
+      // D: 0 => 0.6
+      taiko: [0.6, 0.15, 0.083, 0.084, 0.073, 0.01],
+    }[rulesetName(score.ruleset_id)];
+  }
+
+  return {
+    // SS: 0.99 => 0.01
+    // S: 0.98 => 0.01
+    // A: 0.94 => 0.04
+    // B: 0.9 => 0.04
+    // C: 0.85 => 0.05
+    // D: 0 => 0.85
+    // cross-reference: https://github.com/ppy/osu/blob/b658d9a681a04101900d5ce6c5b84d56320e08e7/osu.Game.Rulesets.Catch/Scoring/CatchScoreProcessor.cs#L108-L135
+    fruits: [0.85, 0.05, 0.04, 0.04, 0.01, 0.01],
+    // remaining rulesets use the same cutoffs
+    // SS: 0.99 => 0.01
+    // S: 0.95 => 0.04
+    // A: 0.9 => 0.05
+    // B: 0.8 => 0.1
+    // C: 0.7 => 0.1
+    // D: 0 => 0.7
+    // cross-reference: https://github.com/ppy/osu/blob/b658d9a681a04101900d5ce6c5b84d56320e08e7/osu.Game/Rulesets/Scoring/ScoreProcessor.cs#L541-L572
+    mania: [0.7, 0.1, 0.1, 0.05, 0.04, 0.01],
+    osu: [0.7, 0.1, 0.1, 0.05, 0.04, 0.01],
+    taiko: [0.7, 0.1, 0.1, 0.05, 0.04, 0.01],
+  }[rulesetName(score.ruleset_id)];
+}
+
 export function scoreDownloadUrl(score: SoloScoreJson) {
   if (score.type === 'solo_score') {
     return route('scores.download', { score: score.id });

From ea78b9a98f84adb068c24bbfa5996ccfa79c8959 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Tue, 8 Oct 2024 09:44:22 +0200
Subject: [PATCH 3/9] Match grade colours with client

---
 resources/css/colors.less | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/resources/css/colors.less b/resources/css/colors.less
index 957b4a686cc..fd9cc072ad8 100644
--- a/resources/css/colors.less
+++ b/resources/css/colors.less
@@ -203,9 +203,10 @@ body {
 
 @group-colour-default: #0087ca;
 
-@colour-rank-d: #ff5858;
-@colour-rank-c: #ea7948;
-@colour-rank-b: #d99d03;
-@colour-rank-a: #72c904;
-@colour-rank-s: #0096a2;
-@colour-rank-ss: #be0089;
+// cross-reference: https://github.com/ppy/osu/blob/b658d9a681a04101900d5ce6c5b84d56320e08e7/osu.Game/Graphics/OsuColour.cs#L42-L73
+@colour-rank-d: #ff5a5a;
+@colour-rank-c: #ff8e5d;
+@colour-rank-b: #e3b130;
+@colour-rank-a: #88da20;
+@colour-rank-s: #02b5c3;
+@colour-rank-ss: #de31ae;

From fe63a2a3a733765b9d97cc87e3ef53ac50f573d0 Mon Sep 17 00:00:00 2001
From: nanaya <me@nanaya.net>
Date: Thu, 10 Oct 2024 18:17:18 +0900
Subject: [PATCH 4/9] Remove extra padding on comment editor footer

---
 resources/css/bem/comment-editor.less | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/resources/css/bem/comment-editor.less b/resources/css/bem/comment-editor.less
index 1007123e57b..6fb3d805d07 100644
--- a/resources/css/bem/comment-editor.less
+++ b/resources/css/bem/comment-editor.less
@@ -8,11 +8,11 @@
   @_spacing: 10px;
   @_border-radius: @border-radius-large;
 
+  --bg: hsl(var(--hsl-b3));
   border-radius: @_border-radius;
   display: flex;
   flex-direction: column;
-  background-color: @osu-colour-b3;
-  border: 2px solid @osu-colour-b3;
+  background: var(--bg);
   position: relative;
 
   &--fancy {
@@ -62,8 +62,10 @@
     padding: @_spacing;
     font-size: @font-size--phone-input;
     border-radius: @_border-radius @_border-radius 0 0;
-    resize: none;
+    border: 2px solid var(--bg);
+    border-bottom: none;
     background-color: @osu-colour-b5;
+    resize: none;
 
     @media @desktop {
       font-size: inherit;

From 13322890cd890bcc5069241fb7afbf7c9ebacace Mon Sep 17 00:00:00 2001
From: nanaya <me@nanaya.net>
Date: Thu, 10 Oct 2024 18:17:43 +0900
Subject: [PATCH 5/9] Remove redundant text colour styling

---
 resources/css/bem/comment-editor.less | 1 -
 1 file changed, 1 deletion(-)

diff --git a/resources/css/bem/comment-editor.less b/resources/css/bem/comment-editor.less
index 6fb3d805d07..3003461c998 100644
--- a/resources/css/bem/comment-editor.less
+++ b/resources/css/bem/comment-editor.less
@@ -71,7 +71,6 @@
       font-size: inherit;
     }
 
-    color: white;
     &::placeholder {
       color: @osu-colour-f1;
     }

From 5ba9fe354b57c577da1b3b79e6d8d51ef1f0f8f7 Mon Sep 17 00:00:00 2001
From: nanaya <me@nanaya.net>
Date: Thu, 10 Oct 2024 21:04:52 +0900
Subject: [PATCH 6/9] Remove usage of old score es index

---
 .env.example                                  |   1 -
 .../Commands/UserBestScoresCheckCommand.php   |  30 -----
 .../Controllers/LegacyInterOpController.php   |  12 --
 app/Jobs/RemoveBeatmapsetBestScores.php       |   8 --
 app/Libraries/UserBestScoresCheck.php         | 116 ------------------
 config/elasticsearch.php                      |   3 -
 docker-compose.yml                            |   1 -
 routes/web.php                                |   1 -
 8 files changed, 172 deletions(-)
 delete mode 100644 app/Console/Commands/UserBestScoresCheckCommand.php
 delete mode 100644 app/Libraries/UserBestScoresCheck.php

diff --git a/.env.example b/.env.example
index 7c5b8beb274..38932f88b36 100644
--- a/.env.example
+++ b/.env.example
@@ -183,7 +183,6 @@ CLIENT_CHECK_VERSION=false
 # BAN_PERSIST_DAYS=28
 
 # ES_HOST=localhost:9200
-# ES_SCORES_HOST=localhost:9200
 # ES_SOLO_SCORES_HOST=localhost:9200
 # ES_INDEX_PREFIX=
 # ES_CLIENT_TIMEOUT=5
diff --git a/app/Console/Commands/UserBestScoresCheckCommand.php b/app/Console/Commands/UserBestScoresCheckCommand.php
deleted file mode 100644
index 0b62c7cdc3e..00000000000
--- a/app/Console/Commands/UserBestScoresCheckCommand.php
+++ /dev/null
@@ -1,30 +0,0 @@
-<?php
-
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the GNU Affero General Public License v3.0.
-// See the LICENCE file in the repository root for full licence text.
-
-namespace App\Console\Commands;
-
-use App\Libraries\UserBestScoresCheck;
-use App\Models\User;
-use Illuminate\Console\Command;
-
-class UserBestScoresCheckCommand extends Command
-{
-    protected $signature = 'user:check-best-scores {userId} {mode}';
-
-    protected $description = 'Removes the best scores for a given user from elasticsearch if it no longer exists in the database.';
-
-    public function handle()
-    {
-        $mode = $this->argument('mode');
-        $user = User::findOrFail($this->argument('userId'));
-
-        $checker = new UserBestScoresCheck($user);
-        $response = $checker->run($mode);
-
-        $this->line("Found {$checker->esIdsFound} in index, {$checker->dbIdsFound} valid.");
-        $this->line('Delete query response from elasticsearch:');
-        $this->line(json_encode($response, JSON_PRETTY_PRINT));
-    }
-}
diff --git a/app/Http/Controllers/LegacyInterOpController.php b/app/Http/Controllers/LegacyInterOpController.php
index dc97375c975..72693f84b94 100644
--- a/app/Http/Controllers/LegacyInterOpController.php
+++ b/app/Http/Controllers/LegacyInterOpController.php
@@ -10,7 +10,6 @@
 use App\Jobs\Notifications\ForumTopicReply;
 use App\Jobs\RegenerateBeatmapsetCover;
 use App\Libraries\Chat;
-use App\Libraries\UserBestScoresCheck;
 use App\Models\Beatmap;
 use App\Models\Beatmapset;
 use App\Models\Chat\Channel;
@@ -297,17 +296,6 @@ public function userBatchSendMessage()
         return response()->json($results);
     }
 
-    public function userBestScoresCheck($id)
-    {
-        $user = User::findOrFail($id);
-
-        foreach (Beatmap::MODES as $mode => $_v) {
-            (new UserBestScoresCheck($user))->run($mode);
-        }
-
-        return ['success' => true];
-    }
-
     public function userIndex($id)
     {
         $user = User::findOrFail($id);
diff --git a/app/Jobs/RemoveBeatmapsetBestScores.php b/app/Jobs/RemoveBeatmapsetBestScores.php
index 568bea841c6..c72c47e9d75 100644
--- a/app/Jobs/RemoveBeatmapsetBestScores.php
+++ b/app/Jobs/RemoveBeatmapsetBestScores.php
@@ -6,7 +6,6 @@
 namespace App\Jobs;
 
 use App\Libraries\Elasticsearch\BoolQuery;
-use App\Libraries\Elasticsearch\Es;
 use App\Models\Beatmap;
 use App\Models\Beatmapset;
 use App\Models\Score\Best\Model;
@@ -57,13 +56,6 @@ public function handle()
             $query->filter(['terms' => ['beatmap_id' => $beatmapIds]]);
             $query->filter(['range' => ['score_id' => ['lte' => $this->maxScoreIds[$mode]]]]);
 
-            // TODO: do something with response?
-            Es::getClient('scores')->deleteByQuery([
-                'index' => $GLOBALS['cfg']['osu']['elasticsearch']['prefix']."high_scores_{$mode}",
-                'body' => ['query' => $query->toArray()],
-                'client' => ['ignore' => 404],
-            ]);
-
             $class = Model::getClass($mode);
             // Just delete until no more matching rows.
             $query = $class
diff --git a/app/Libraries/UserBestScoresCheck.php b/app/Libraries/UserBestScoresCheck.php
deleted file mode 100644
index 6f7c4b41db1..00000000000
--- a/app/Libraries/UserBestScoresCheck.php
+++ /dev/null
@@ -1,116 +0,0 @@
-<?php
-
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the GNU Affero General Public License v3.0.
-// See the LICENCE file in the repository root for full licence text.
-
-namespace App\Libraries;
-
-use App\Libraries\Elasticsearch\BoolQuery;
-use App\Libraries\Elasticsearch\Es;
-use App\Libraries\Elasticsearch\Search;
-use App\Libraries\Elasticsearch\Sort;
-use App\Libraries\Search\BasicSearch;
-use App\Models\Score\Best;
-use App\Models\User;
-
-/**
- * Used to check the best scores for a user if it exists in elasticsearch but not longer
- * exists in the database. A mismatch tends to break the current pager, so this can be run to
- * fix it by deleting the invalid score from elasticsearch.
- *
- * e.g.
- * (new UserBestScoresCheck(User::find($user_id)))->run($mode).
- */
-class UserBestScoresCheck
-{
-    /** @var int */
-    public $dbIdsFound;
-    /** @var int */
-    public $esIdsFound;
-
-    /** @var User */
-    private $user;
-
-    /**
-     * @param User $user The User to check the scores for.
-     */
-    public function __construct(User $user)
-    {
-        $this->user = $user;
-    }
-
-    /**
-     * Checks for extraneous scores in Elasticsearch.
-     *
-     * @param string $mode The game mode.
-     * @return array List of score_ids that exist in Elasticsearch but not the database.
-     */
-    public function check(string $mode)
-    {
-        $this->dbIdsFound = 0;
-        $this->esIdsFound = 0;
-
-        $clazz = Best\Model::getClass($mode);
-
-        $search = $this->newSearch($mode);
-        $cursor = [0];
-
-        $missingIds = [];
-
-        while ($cursor !== null) {
-            $esIds = $search->searchAfter(array_values($cursor))->response()->ids();
-            $this->esIdsFound += count($esIds);
-
-            $dbIds = $clazz::default()->whereIn('score_id', $esIds)->pluck('score_id')->all();
-            $this->dbIdsFound += count($dbIds);
-
-            $missingIds = array_merge(
-                $missingIds,
-                array_values(array_diff($esIds, $dbIds))
-            );
-
-            $cursor = $search->getSortCursor();
-        }
-
-        return $missingIds;
-    }
-
-    /**
-     * Removes extraneous scores from Elasticsearch.
-     *
-     * @param string $mode The game mode.
-     * @param array $ids List of score_ids to remove.
-     * @return array The raw response from Elasticsearch.
-     */
-    public function removeFromEs(string $mode, array $ids)
-    {
-        return Es::getClient('scores')->deleteByQuery([
-            'index' => $GLOBALS['cfg']['osu']['elasticsearch']['prefix']."high_scores_{$mode}",
-            'body' => ['query' => ['terms' => ['score_id' => $ids]]],
-        ]);
-    }
-
-    /**
-     * Checks for extraneous scores in Elasticsearch and removes them.
-     *
-     * @param string $mode The game mode.
-     * @return array The raw response from Elasticsearch.
-     */
-    public function run(string $mode)
-    {
-        return $this->removeFromEs($mode, $this->check($mode));
-    }
-
-    private function newSearch(string $mode): Search
-    {
-        $index = $GLOBALS['cfg']['osu']['elasticsearch']['prefix']."high_scores_{$mode}";
-
-        $search = new BasicSearch($index, "user_best_scores_check_{$mode}");
-        $search->connectionName = 'scores';
-
-        return $search
-            ->sort(new Sort('score_id', 'asc'))
-            ->size(Es::CHUNK_SIZE)
-            ->query((new BoolQuery())->filter(['term' => ['user_id' => $this->user->getKey()]]));
-    }
-}
diff --git a/config/elasticsearch.php b/config/elasticsearch.php
index 0ce6f8eba79..203283c7207 100644
--- a/config/elasticsearch.php
+++ b/config/elasticsearch.php
@@ -20,9 +20,6 @@
         'default' => array_merge($defaults, [
             'hosts' => $parseHosts('ES_HOST'),
         ]),
-        'scores' => array_merge($defaults, [
-            'hosts' => $parseHosts('ES_SCORES_HOST'),
-        ]),
         'solo_scores' => array_merge($defaults, [
             'hosts' => $parseHosts('ES_SOLO_SCORES_HOST'),
         ]),
diff --git a/docker-compose.yml b/docker-compose.yml
index 6d9ce7103d9..68636414721 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -5,7 +5,6 @@ x-env: &x-env
   DB_CONNECTION_STRING: Server=db;Database=osu;Uid=osuweb;
   DB_HOST: db
   ES_HOST: http://elasticsearch:9200
-  ES_SCORES_HOST: http://elasticsearch:9200
   ES_SOLO_SCORES_HOST: http://elasticsearch:9200
   GITHUB_TOKEN: "${GITHUB_TOKEN}"
   NOTIFICATION_REDIS_HOST: redis
diff --git a/routes/web.php b/routes/web.php
index 9d1f9cb1712..54ed56d460d 100644
--- a/routes/web.php
+++ b/routes/web.php
@@ -563,7 +563,6 @@
     Route::post('generate-notification', 'LegacyInterOpController@generateNotification');
     Route::post('index-beatmapset/{beatmapset}', 'LegacyInterOpController@indexBeatmapset');
     Route::post('/refresh-beatmapset-cache/{beatmapset}', 'LegacyInterOpController@refreshBeatmapsetCache');
-    Route::post('/user-best-scores-check/{user}', 'LegacyInterOpController@userBestScoresCheck');
     Route::post('user-send-message', 'LegacyInterOpController@userSendMessage');
     Route::post('user-batch-mark-channel-as-read', 'LegacyInterOpController@userBatchMarkChannelAsRead');
     Route::post('user-batch-send-message', 'LegacyInterOpController@userBatchSendMessage');

From a685477a1f42fea87aedab4c1b2065ba759b88ae Mon Sep 17 00:00:00 2001
From: nanaya <me@nanaya.net>
Date: Thu, 10 Oct 2024 21:52:45 +0900
Subject: [PATCH 7/9] Show video icon on beatmap page

---
 resources/js/beatmapsets-show/header.tsx | 23 +++++++++++++++--------
 1 file changed, 15 insertions(+), 8 deletions(-)

diff --git a/resources/js/beatmapsets-show/header.tsx b/resources/js/beatmapsets-show/header.tsx
index d22d61d9e61..2bf1ff64c37 100644
--- a/resources/js/beatmapsets-show/header.tsx
+++ b/resources/js/beatmapsets-show/header.tsx
@@ -25,6 +25,19 @@ import Stats from './stats';
 
 const favouritesToShow = 50;
 
+function statusIcon(type: 'storyboard' | 'video') {
+  const iconClass = type === 'video' ? 'fas fa-film' : 'fas fa-image';
+
+  return (
+    <div
+      className='beatmapset-status beatmapset-status--show-icon'
+      title={trans(`beatmapsets.show.info.${type}`)}
+    >
+      <span className={iconClass} />
+    </div>
+  );
+}
+
 interface DownloadButtonOptions {
   bottomTextKey?: string;
   href: string;
@@ -352,14 +365,8 @@ export default class Header extends React.Component<Props> {
   private renderStatusBar() {
     return (
       <div className='beatmapset-header__status'>
-        {this.controller.beatmapset.storyboard &&
-          <div
-            className='beatmapset-status beatmapset-status--show-icon'
-            title={trans('beatmapsets.show.info.storyboard')}
-          >
-            <span className='fas fa-image' />
-          </div>
-        }
+        {this.controller.beatmapset.video && statusIcon('video')}
+        {this.controller.beatmapset.storyboard && statusIcon('storyboard')}
         <a className='beatmapset-status beatmapset-status--show' href={this.statusToWikiLink(this.controller.currentBeatmap.status)}>
           {trans(`beatmapsets.show.status.${this.controller.currentBeatmap.status}`)}
         </a>

From 251c493497fb6b80b6d486dd4cc90965b2ea089b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Fri, 11 Oct 2024 09:13:37 +0200
Subject: [PATCH 8/9] Clean up props

---
 resources/js/scores-show/dial.tsx | 6 ++----
 resources/js/scores-show/info.tsx | 3 +--
 2 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/resources/js/scores-show/dial.tsx b/resources/js/scores-show/dial.tsx
index a03f06a7618..fa37e6dcbb1 100644
--- a/resources/js/scores-show/dial.tsx
+++ b/resources/js/scores-show/dial.tsx
@@ -3,14 +3,12 @@
 
 import * as d3 from 'd3';
 import Rank from 'interfaces/rank';
-import Ruleset from 'interfaces/ruleset';
 import * as React from 'react';
 
 interface Props {
   accuracy: number;
-  mode: Ruleset;
   rank: Rank;
-  rank_cutoffs: number[];
+  rankCutoffs: number[];
 }
 
 const displayRank: Record<Rank, string> = {
@@ -41,7 +39,7 @@ export default function Dial(props: Props) {
             </linearGradient>
           </defs>
           <g transform='translate(100, 100)'>
-            {pie(props.rank_cutoffs).map((d) => (
+            {pie(props.rankCutoffs).map((d) => (
               <path
                 key={d.index}
                 className={`score-dial__inner score-dial__inner--${d.index}`}
diff --git a/resources/js/scores-show/info.tsx b/resources/js/scores-show/info.tsx
index c83426d26bd..d25f2b2e1e0 100644
--- a/resources/js/scores-show/info.tsx
+++ b/resources/js/scores-show/info.tsx
@@ -4,7 +4,6 @@
 import BeatmapsetCover from 'components/beatmapset-cover';
 import { SoloScoreJsonForShow } from 'interfaces/solo-score-json';
 import * as React from 'react';
-import { rulesetName } from 'utils/beatmap-helper';
 import { accuracy, rank, rankCutoffs } from 'utils/score-helper';
 import Buttons from './buttons';
 import Dial from './dial';
@@ -27,7 +26,7 @@ export default function Info({ score }: Props) {
       </div>
 
       <div className='score-info__item score-info__item--dial'>
-        <Dial accuracy={accuracy(score)} mode={rulesetName(score.ruleset_id)} rank={rank(score)} rank_cutoffs={rankCutoffs(score)} />
+        <Dial accuracy={accuracy(score)} rank={rank(score)} rankCutoffs={rankCutoffs(score)} />
       </div>
 
       <div className='score-info__item score-info__item--player'>

From a86ce4138c86fa0a834860f180321a0587703228 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Fri, 11 Oct 2024 09:28:23 +0200
Subject: [PATCH 9/9] Refactor helper methods for grade circles

---
 resources/js/utils/score-helper.ts | 103 ++++++++++++++---------------
 1 file changed, 51 insertions(+), 52 deletions(-)

diff --git a/resources/js/utils/score-helper.ts b/resources/js/utils/score-helper.ts
index 750236a9308..b4ea926961f 100644
--- a/resources/js/utils/score-helper.ts
+++ b/resources/js/utils/score-helper.ts
@@ -106,64 +106,63 @@ export function rank(score: SoloScoreJson) {
 }
 
 export function rankCutoffs(score: SoloScoreJson): number[] {
-  // <rank>: minimum acc => (higher rank acc - current acc)
   // for SS, use minimum accuracy of 0.99 (any less and it's too small)
   // actual array is reversed as it's rendered from D to SS clockwise
 
+  let absoluteCutoffs: number[] = [];
+  const ruleset = rulesetName(score.ruleset_id);
+
   if (shouldReturnLegacyValue(score)) {
-    return {
-      // SS: 0.99 => 0.01
-      // S: 0.9801 => 0.0099
-      // A: 0.9401 => 0.04
-      // B: 0.9001 => 0.04
-      // C: 0.8501 => 0.05
-      // D: 0 => 0.8501
-      fruits: [0.8501, 0.05, 0.04, 0.04, 0.0099, 0.01],
-      // SS: 0.99 => 0.01
-      // S: 0.95 => 0.04
-      // A: 0.9 => 0.05
-      // B: 0.8 => 0.1
-      // C: 0.7 => 0.1
-      // D: 0 => 0.7
-      mania: [0.7, 0.1, 0.1, 0.05, 0.04, 0.01],
-      // SS: 0.99 => 0.01
-      // S: (0.9 * 300 + 0.1 * 100) / 300 = 0.933 => 0.057
-      // A: (0.8 * 300 + 0.2 * 100) / 300 = 0.867 => 0.066
-      // B: (0.7 * 300 + 0.3 * 100) / 300 = 0.8 => 0.067
-      // C: 0.6 => 0.2
-      // D: 0 => 0.6
-      osu: [0.6, 0.2, 0.067, 0.066, 0.057, 0.01],
-      // SS: 0.99 => 0.01
-      // S: (0.9 * 300 + 0.1 * 50) / 300 = 0.917 => 0.073
-      // A: (0.8 * 300 + 0.2 * 50) / 300 = 0.833 => 0.084
-      // B: (0.7 * 300 + 0.3 * 50) / 300 = 0.75 => 0.083
-      // C: 0.6 => 0.15
-      // D: 0 => 0.6
-      taiko: [0.6, 0.15, 0.083, 0.084, 0.073, 0.01],
-    }[rulesetName(score.ruleset_id)];
+    switch (ruleset) {
+      case 'fruits':
+        absoluteCutoffs = [0, 0.8501, 0.9001, 0.9401, 0.9801, 0.99, 1];
+        break;
+
+      case 'mania':
+        absoluteCutoffs = [0, 0.7, 0.8, 0.9, 0.95, 0.99, 1];
+        break;
+
+      case 'osu':
+        // S: (0.9 * 300 + 0.1 * 100) / 300 = 0.933
+        // A: (0.8 * 300 + 0.2 * 100) / 300 = 0.867
+        // B: (0.7 * 300 + 0.3 * 100) / 300 = 0.8
+        absoluteCutoffs = [0, 0.6, 0.8, 0.867, 0.933, 0.99, 1];
+        break;
+
+      case 'taiko':
+        // S: (0.9 * 300 + 0.1 * 50) / 300 = 0.917
+        // A: (0.8 * 300 + 0.2 * 50) / 300 = 0.833
+        // B: (0.7 * 300 + 0.3 * 50) / 300 = 0.75
+        absoluteCutoffs = [0, 0.6, 0.75, 0.833, 0.917, 0.99, 1];
+        break;
+    }
+  } else {
+    switch (ruleset) {
+      case 'fruits':
+        // cross-reference: https://github.com/ppy/osu/blob/b658d9a681a04101900d5ce6c5b84d56320e08e7/osu.Game.Rulesets.Catch/Scoring/CatchScoreProcessor.cs#L108-L135
+        absoluteCutoffs = [0, 0.85, 0.9, 0.94, 0.98, 0.99, 1];
+        break;
+
+      case 'mania':
+      case 'osu':
+      case 'taiko':
+        // cross-reference: https://github.com/ppy/osu/blob/b658d9a681a04101900d5ce6c5b84d56320e08e7/osu.Game/Rulesets/Scoring/ScoreProcessor.cs#L541-L572
+        absoluteCutoffs = [0, 0.7, 0.8, 0.9, 0.95, 0.99, 1];
+        break;
+    }
+  }
+
+  return differenceBetweenConsecutiveElements(absoluteCutoffs);
+}
+
+function differenceBetweenConsecutiveElements(arr: number[]): number[] {
+  const result = [];
+
+  for (let i = 1; i < arr.length; ++i) {
+    result.push(arr[i] - arr[i - 1]);
   }
 
-  return {
-    // SS: 0.99 => 0.01
-    // S: 0.98 => 0.01
-    // A: 0.94 => 0.04
-    // B: 0.9 => 0.04
-    // C: 0.85 => 0.05
-    // D: 0 => 0.85
-    // cross-reference: https://github.com/ppy/osu/blob/b658d9a681a04101900d5ce6c5b84d56320e08e7/osu.Game.Rulesets.Catch/Scoring/CatchScoreProcessor.cs#L108-L135
-    fruits: [0.85, 0.05, 0.04, 0.04, 0.01, 0.01],
-    // remaining rulesets use the same cutoffs
-    // SS: 0.99 => 0.01
-    // S: 0.95 => 0.04
-    // A: 0.9 => 0.05
-    // B: 0.8 => 0.1
-    // C: 0.7 => 0.1
-    // D: 0 => 0.7
-    // cross-reference: https://github.com/ppy/osu/blob/b658d9a681a04101900d5ce6c5b84d56320e08e7/osu.Game/Rulesets/Scoring/ScoreProcessor.cs#L541-L572
-    mania: [0.7, 0.1, 0.1, 0.05, 0.04, 0.01],
-    osu: [0.7, 0.1, 0.1, 0.05, 0.04, 0.01],
-    taiko: [0.7, 0.1, 0.1, 0.05, 0.04, 0.01],
-  }[rulesetName(score.ruleset_id)];
+  return result;
 }
 
 export function scoreDownloadUrl(score: SoloScoreJson) {