Merge branch 'master' into gha-node

Author: notbakaneko

app/Http/Controllers/Multiplayer/Rooms/Playlist/ScoresController.php

@@ -104,7 +104,7 @@ public function index($roomId, $playlistId)
      *
      * ### Response Format
      *
-     * Returns [MultiplayerScore](#multiplayerscore) object.
+     * Returns [Score](#score) object.
      *
      * @urlParam room integer required Id of the room.
      * @urlParam playlist integer required Id of the playlist item.
@@ -136,7 +136,7 @@ public function show($roomId, $playlistId, $id)
      *
      * ### Response Format
      *
-     * Returns [MultiplayerScore](#multiplayerscore) object.
+     * Returns [Score](#score) object.
      *
      * @urlParam room integer required Id of the room.
      * @urlParam playlist integer required Id of the playlist item.

app/Jobs/RemoveBeatmapsetSoloScores.php

@@ -11,7 +11,6 @@
 use App\Models\Beatmap;
 use App\Models\Beatmapset;
 use App\Models\Solo\Score;
-use DB;
 use Illuminate\Bus\Queueable;
 use Illuminate\Contracts\Queue\ShouldQueue;
 use Illuminate\Database\Eloquent\Collection;
@@ -59,15 +58,7 @@ private function deleteScores(Collection $scores): void
     {
         $ids = $scores->pluck('id')->all();
 
-        $scoresQuery = Score::whereKey($ids);
-        // Queue delete ahead of time in case process is stopped right after
-        // db delete is committed. It's fine queuing deleted score ahead of
-        // time as best score check doesn't use index.
-        // Set the flag first so indexer will correctly delete it.
-        $scoresQuery->update(['preserve' => false]);
+        Score::whereKey($ids)->update(['ranked' => false]);
         $this->scoreSearch->queueForIndex($this->schemas, $ids);
-        DB::transaction(function () use ($ids, $scoresQuery): void {
-            $scoresQuery->delete();
-        });
     }
 }

app/Models/Multiplayer/PlaylistItemUserHighScore.php

@@ -18,7 +18,6 @@
  * @property \Carbon\Carbon $created_at
  * @property int $id
  * @property int $playlist_item_id
- * @property float|null $pp
  * @property int $score_id
  * @property ScoreLink $scoreLink
  * @property int $total_score
@@ -51,7 +50,6 @@ public static function lookupOrDefault(int $userId, int $playlistItemId): static
             'user_id' => $userId,
         ], [
             'accuracy' => 0,
-            'pp' => 0,
             'total_score' => 0,
         ]);
     }
@@ -122,7 +120,6 @@ public function updateWithScoreLink(ScoreLink $scoreLink): bool
 
         return $this->fill([
             'accuracy' => $score->accuracy,
-            'pp' => $score->pp,
             'score_id' => $score->getKey(),
             'total_score' => $score->total_score,
         ])->save();

app/Models/Multiplayer/UserScoreAggregate.php

@@ -20,7 +20,6 @@
  * @property int $id
  * @property int|null $last_score_id
  * @property bool $in_room
- * @property float|null $pp
  * @property int $room_id
  * @property int $total_score
  * @property \Carbon\Carbon $updated_at
@@ -53,7 +52,6 @@ public static function lookupOrDefault(User $user, Room $room): static
             'accuracy' => 0,
             'attempts' => 0,
             'completed' => 0,
-            'pp' => 0,
             'total_score' => 0,
         ]);
     }
@@ -91,11 +89,6 @@ public function averageAccuracy()
         return $this->completed > 0 ? $this->accuracy / $this->completed : 0;
     }
 
-    public function averagePp()
-    {
-        return $this->completed > 0 ? $this->pp / $this->completed : 0;
-    }
-
     public function playlistItemAttempts(): array
     {
         $playlistItemAggs = PlaylistItemUserHighScore
@@ -159,7 +152,6 @@ public function removeRunningTotals()
             'attempts',
             'completed',
             'last_score_id',
-            'pp',
             'total_score',
         ];
 

app/Models/Solo/Score.php

@@ -164,6 +164,7 @@ public function scopeIndexable(Builder $query): Builder
     {
         return $query
             ->where('preserve', true)
+            ->where('ranked', true)
             ->whereHas('user', fn (Builder $q): Builder => $q->default());
     }
 
@@ -427,6 +428,10 @@ public function url(): string
 
     public function userRank(?array $params = null): int
     {
+        if (!$this->ranked || !$this->preserve) {
+            return 0;
+        }
+
         // Non-legacy score always has its rank checked against all score types.
         if (!$this->isLegacy()) {
             $params['is_legacy'] = null;

app/Transformers/Multiplayer/UserScoreAggregateTransformer.php

@@ -23,7 +23,7 @@ public function transform(UserScoreAggregate $score)
             'accuracy' => $score->averageAccuracy(),
             'attempts' => $score->attempts,
             'completed' => $score->completed,
-            'pp' => $score->averagePp(),
+            'pp' => 0,
             'room_id' => $score->room_id,
             'total_score' => $score->total_score,
             'user_id' => $score->user_id,

resources/js/scores-show/player.tsx

@@ -17,7 +17,7 @@ export default function Player(props: Props) {
   let title: string;
   let content: React.ReactNode;
 
-  if (props.score.rank_global == null || props.score.ranked === false || props.score.preserve === false) {
+  if (props.score.rank_global == null || props.score.rank_global === 0 || props.score.ranked === false || props.score.preserve === false) {
     title = trans('scores.status.no_rank');
     content = '-';
   } else {

resources/views/docs/_structures/multiplayer_score.md

@@ -2,10 +2,10 @@
 
 An object which contains scores and related data for fetching next page of the result.
 
-Field           | Type                                    | Description
---------------- | --------------------------------------- | -------------------------------------------------------------
-cursor_string   | [CursorString](#cursorstring)           | To be used to fetch the next page.
-params          | object                                  | Parameters used for score listing.
-scores          | [MultiplayerScore](#multiplayerscore)[] | |
-total           | integer?                                | Index only. Total scores of the specified playlist item.
-user_score      | [MultiplayerScore](#multiplayerscore)?  | Index only. Score of the accessing user if exists.
+Field         | Type                          | Description
+------------- | ----------------------------- | -----------
+cursor_string | [CursorString](#cursorstring) | To be used to fetch the next page.
+params        | object                        | Parameters used for score listing.
+scores        | [Score](#score)[]             | |
+total         | integer?                      | Index only. Total scores of the specified playlist item.
+user_score    | [Score](#score)?              | Index only. Score of the accessing user if exists.

resources/views/docs/_structures/multiplayer_scores.md

@@ -1,5 +1,39 @@
 ## Score
 
+The following is the format returned when API v2 version header is 20220705 or higher. Exceptions apply (f.ex. doesn't apply for legacy match score).
+
+Field              | Type                     | Description
+------------------ | ------------------------ | -----------
+accuracy           | float                    | |
+beatmap_id         | integer                  | |
+best_id            | integer?                 | |
+build_id           | integer?                 | |
+ended_at           | [Timestamp](#timestamp)  | |
+has_replay         | boolean                  | |
+id                 | integer                  | |
+is_perfect_combo   | boolean                  | |
+legacy_perfect     | boolean                  | |
+legacy_score_id    | integer?                 | |
+legacy_total_score | integer                  | |
+max_combo          | integer                  | |
+maximum_statistics | ScoreStatistics?         | |
+mods               | Mod[]                    | |
+passed             | boolean                  | |
+playlist_item_id   | integer                  | Only for multiplayer score
+pp                 | float?                   | |
+preserve           | boolean                  | Whether or not the score may eventually be deleted. Only for `solo_score` type
+rank               | string                   | |
+ranked             | boolean                  | Whether or not the score can have pp. Only for `solo_score` type
+room_id            | integer                  | Only for multiplayer score
+ruleset_id         | integer                  | |
+started_at         | [Timestamp](#timestamp)? | |
+statistics         | ScoreStatistics          | |
+total_score        | integer                  | |
+type               | string                   | |
+user_id            | integer                  | |
+
+### Initial version
+
 The following is the format returned when API v2 version header is 20220704 or lower.
 
 Field                 | Type    | Description
@@ -26,14 +60,17 @@ mode                  |         | |
 mode_int              |         | |
 replay                |         | |
 
-Optional attributes:
+### Optional attributes
 
-Field        | Type | Description
------------- | ---- | -----------
-beatmap      |      | |
-beatmapset   |      | |
-rank_country |      | |
-rank_global  |      | |
-weight       |      | |
-user         |      | |
-match        |      | |
+Field                   | Type                                                 | Description
+----------------------- | ---------------------------------------------------- | -----------
+beatmap                 |                                                      | |
+beatmapset              |                                                      | |
+current_user_attributes | integer?                                             | |
+match                   |                                                      | Only for legacy match score
+position                | integer?                                             | Only for multiplayer score
+rank_country            |                                                      | |
+rank_global             |                                                      | |
+scores_around           | [MultiplayerScoresAround](#multiplayerscoresaround)? | Scores around the specified score. Only for multiplayer score
+user                    |                                                      | |
+weight                  |                                                      | |

resources/views/docs/_structures/score.md

@@ -18,7 +18,7 @@
 @else
 {!! osu_trans('mail.supporter_gift.gift_message') !!}
 @foreach ($messages as $message)
-{{ $message }}
+{!! $message !!}
 @endforeach
 @endif
 

resources/views/emails/store/supporter_gift.blade.php

@@ -47,7 +47,7 @@ public function testHandle()
             $this->createScore($beatmapset);
         }
 
-        $this->expectCountChange(fn () => Score::count(), count($scores) * -2, 'removes scores');
+        $this->expectCountChange(fn () => Score::indexable()->count(), count($scores) * -2, 'removes scores');
 
         static::reindexScores();