Merge branch 'master' into singletons

Author: notbakaneko

Diff for: .github/workflows/lint.yml

@@ -15,13 +15,13 @@ jobs:
 
     steps:
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: Setup node.js
-        uses: actions/setup-node@v3
+        uses: actions/setup-node@v4
         with:
           cache: yarn
-          node-version: '18'
+          node-version: '20'
 
       - name: Set php version
         uses: shivammathur/setup-php@v2
@@ -35,7 +35,7 @@ jobs:
         run: echo "dir=$(composer config cache-files-dir)" >> $GITHUB_OUTPUT
 
       - name: Cache composer
-        uses: actions/cache@v3
+        uses: actions/cache@v4
         with:
           path: ${{ steps.composercache.outputs.dir }}
           key: ${{ runner.os }}-composer-${{ hashFiles('composer.lock') }}

Diff for: .github/workflows/tests.yml

@@ -99,7 +99,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: Services
         run: 'docker compose up --quiet-pull --wait
@@ -112,10 +112,10 @@ jobs:
         '
 
       - name: Setup node.js
-        uses: actions/setup-node@v3
+        uses: actions/setup-node@v4
         with:
           cache: yarn
-          node-version: '18'
+          node-version: '20'
 
       - name: Set php version
         uses: shivammathur/setup-php@v2
@@ -130,7 +130,7 @@ jobs:
         run: echo "dir=$(composer config cache-files-dir)" >> $GITHUB_OUTPUT
 
       - name: Cache composer
-        uses: actions/cache@v3
+        uses: actions/cache@v4
         with:
           path: ${{ steps.composercache.outputs.dir }}
           key: ${{ runner.os }}-composer-${{ hashFiles('composer.lock') }}

Diff for: 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;

Diff for: 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.

Diff for: app/Jobs/Notifications/UserAchievementUnlock.php

@@ -11,7 +11,10 @@
 
 class UserAchievementUnlock extends BroadcastNotificationBase
 {
-    const NOTIFICATION_OPTION_NAME = Notification::USER_ACHIEVEMENT_UNLOCK;
+    // Mainly to ensure client always getting the event.
+    // Also it probably doesn't really make sense to mail the event
+    // in the first place.
+    const DELIVERY_MODE_DEFAULTS = ['mail' => false, 'push' => true];
 
     protected $achievement;
 

Diff for: 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();
-        });
     }
 }

Diff for: 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();

Diff for: 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',
         ];
 

Diff for: 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;
 
@@ -164,6 +161,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 +425,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;

Diff for: 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;
             }
         }

Diff for: app/Models/UserNotificationOption.php

@@ -39,7 +39,6 @@ class UserNotificationOption extends Model
         Notification::CHANNEL_MESSAGE,
         Notification::COMMENT_NEW,
         self::FORUM_TOPIC_REPLY,
-        Notification::USER_ACHIEVEMENT_UNLOCK,
     ];
 
     const SUPPORTS_NOTIFICATIONS = [

Diff for: 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,

Diff for: database/factories/BanchoStatsFactory.php

@@ -19,6 +19,7 @@ public function definition(): array
         return [
             'users_irc' => fn() => 100 + $this->faker->randomNumber(2),
             'users_osu' => fn() => 10000 + $this->faker->randomNumber(4),
+            'users_lazer' => fn() => 1000 + $this->faker->randomNumber(3),
             'multiplayer_games' => fn() => 200 + $this->faker->randomNumber(3),
             'date' => fn() => Carbon::now(),
         ];

Diff for: database/migrations/2024_02_27_134104_add_defaults_to_banchostats.php

@@ -0,0 +1,33 @@
+<?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.
+
+declare(strict_types=1);
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+return new class extends Migration
+{
+    public function up(): void
+    {
+        Schema::table('osu_banchostats', function (Blueprint $table) {
+            $table->smallInteger('users_irc')->default(0)->change();
+            $table->mediumInteger('users_osu')->default(0)->change();
+            $table->unsignedMediumInteger('users_lazer')->default(0)->change();
+            $table->smallInteger('multiplayer_games')->default(0)->change();
+        });
+    }
+
+    public function down(): void
+    {
+        Schema::table('osu_banchostats', function (Blueprint $table) {
+            $table->smallInteger('users_irc')->change();
+            $table->mediumInteger('users_osu')->change();
+            $table->unsignedMediumInteger('users_lazer')->change();
+            $table->smallInteger('multiplayer_games')->change();
+        });
+    }
+};

Diff for: resources/js/core/wiki/reference-link-tooltip.ts

@@ -44,12 +44,9 @@ export default class ReferenceLinkTooltip {
 
     if (targetId == null) return;
 
-    const footnoteContent = document.querySelector(targetId)?.firstElementChild;
+    const tooltipContent = document.querySelector(targetId)?.firstElementChild?.cloneNode(true);
 
-    if (!(footnoteContent instanceof HTMLParagraphElement)) return;
-
-    const tooltipContent = document.createElement('div');
-    tooltipContent.insertAdjacentHTML('afterbegin', footnoteContent.innerHTML);
+    if (!(tooltipContent instanceof HTMLParagraphElement)) return;
 
     tooltipContent.querySelectorAll('*').forEach((node) => {
       if (node.getAttribute('role') === 'doc-backlink') {
@@ -58,6 +55,15 @@ export default class ReferenceLinkTooltip {
         node.removeAttribute('class');
       }
     });
+    // Remove extra non-breaking spaces between backlink elements
+    for (let i = tooltipContent.childNodes.length - 1; i >= 0; i--) {
+      const node = tooltipContent.childNodes[i];
+      if (node.textContent === ' ') {
+        node.remove();
+      } else {
+        break;
+      }
+    }
 
     this.createTooltip(el, tooltipContent);
   };

Diff for: 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 {

Diff for: resources/js/turbolinks-overrides.coffee

@@ -2,7 +2,7 @@
 # See the LICENCE file in the repository root for full licence text.
 
 import { currentUrl } from 'utils/turbolinks'
-import { isHTML, isInternal } from 'utils/url'
+import { isHTML } from 'utils/url'
 
 # Anchor navigation with turbolinks. Works around [1].
 # [1] https://github.com/turbolinks/turbolinks/issues/75
@@ -61,4 +61,7 @@ Turbolinks.Controller::replaceHistory = (url) ->
 Turbolinks.Snapshot::hasAnchor = -> true
 
 Turbolinks.Controller::locationIsVisitable = (location) ->
-  location.isPrefixedBy(@view.getRootLocation()) && isInternal(location) && isHTML(location)
+  location.isPrefixedBy(@view.getRootLocation()) &&
+    # old website pages
+    !location.getPath().startsWith('/p/') &&
+    isHTML(location)

Diff for: 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) {