Support multiple mappers on beatmap difficulties

.github/workflows/lint.yml

@@ -49,7 +49,7 @@ jobs:
       - name: Install js dependencies
         run: yarn --frozen-lockfile
 
-      - run: 'yarn lint --max-warnings 89 > /dev/null'
+      - run: 'yarn lint --max-warnings 88 > /dev/null'
 
       - run: yarn pretty
 

app/Console/Commands/BeatmapsMigrateOwners.php

@@ -0,0 +1,31 @@
+<?php
+
+// Copyright (c) ppy Pty Ltd <[email protected]>. 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\Models\Beatmap;
+use Illuminate\Console\Command;
+
+class BeatmapsMigrateOwners extends Command
+{
+    protected $signature = 'beatmaps:migrate-owners';
+
+    protected $description = 'Migrates beatmap owners to new table.';
+
+    public function handle()
+    {
+        $progress = $this->output->createProgressBar();
+
+        Beatmap::chunkById(1000, function ($beatmaps) use ($progress) {
+            foreach ($beatmaps as $beatmap) {
+                $beatmap->beatmapOwners()->firstOrCreate(['user_id' => $beatmap->user_id]);
+                $progress->advance();
+            }
+        });
+
+        $progress->finish();
+        $this->line('');
+    }
+}

app/Console/Kernel.php

@@ -31,6 +31,7 @@ class Kernel extends ConsoleKernel
         Commands\ModdingRankCommand::class,
 
         Commands\UserForumStatSyncCommand::class,
+        Commands\BeatmapsMigrateOwners::class,
         Commands\BeatmapsetsHypeSyncCommand::class,
         Commands\BeatmapsetNominationSyncCommand::class,
 

app/Http/Controllers/BeatmapsController.php

@@ -7,14 +7,12 @@
 
 use App\Enums\Ruleset;
 use App\Exceptions\InvariantException;
-use App\Jobs\Notifications\BeatmapOwnerChange;
 use App\Libraries\BeatmapDifficultyAttributes;
 use App\Libraries\Score\BeatmapScores;
 use App\Libraries\Score\UserRank;
 use App\Libraries\Search\ScoreSearch;
 use App\Libraries\Search\ScoreSearchParams;
 use App\Models\Beatmap;
-use App\Models\BeatmapsetEvent;
 use App\Models\User;
 use App\Transformers\BeatmapTransformer;
 use App\Transformers\ScoreTransformer;
@@ -25,7 +23,7 @@
 class BeatmapsController extends Controller
 {
     const DEFAULT_API_INCLUDES = ['beatmapset.ratings', 'failtimes', 'max_combo'];
-    const DEFAULT_SCORE_INCLUDES = ['user', 'user.country', 'user.cover'];
+    const DEFAULT_SCORE_INCLUDES = ['user', 'user.country', 'user.cover', 'beatmap.owners'];
 
     public function __construct()
     {
@@ -380,27 +378,11 @@ public function soloScores($id)
 
     public function updateOwner($id)
     {
-        $beatmap = Beatmap::findOrFail($id);
-        $currentUser = auth()->user();
-
-        priv_check('BeatmapUpdateOwner', $beatmap->beatmapset)->ensureCan();
-
-        $newUserId = get_int(request('beatmap.user_id'));
+        $newUserIds = get_arr(request('user_ids'), 'get_int');
 
-        $beatmap->getConnection()->transaction(function () use ($beatmap, $currentUser, $newUserId) {
-            $beatmap->setOwner($newUserId);
-
-            BeatmapsetEvent::log(BeatmapsetEvent::BEATMAP_OWNER_CHANGE, $currentUser, $beatmap->beatmapset, [
-                'beatmap_id' => $beatmap->getKey(),
-                'beatmap_version' => $beatmap->version,
-                'new_user_id' => $beatmap->user_id,
-                'new_user_username' => $beatmap->user->username,
-            ])->saveOrExplode();
-        });
+        $beatmap = Beatmap::findOrFail($id);
 
-        if ($beatmap->user_id !== $currentUser->getKey()) {
-            (new BeatmapOwnerChange($beatmap, $currentUser))->dispatch();
-        }
+        $beatmap->setOwner($newUserIds ?? [], \Auth::user());
 
         return $beatmap->beatmapset->defaultDiscussionJson();
     }
@@ -459,7 +441,7 @@ public function userScore($beatmapId, $userId)
             'score' => json_item(
                 $score,
                 new ScoreTransformer(),
-                ['beatmap', ...static::DEFAULT_SCORE_INCLUDES]
+                ['beatmap.mappers', ...static::DEFAULT_SCORE_INCLUDES]
             ),
         ];
     }

app/Http/Controllers/BeatmapsetsController.php

@@ -399,6 +399,7 @@ private function showJson($beatmapset)
             "{$beatmapRelation}.baseDifficultyRatings",
             "{$beatmapRelation}.baseMaxCombo",
             "{$beatmapRelation}.failtimes",
+            "{$beatmapRelation}.beatmapOwners",
             'genre',
             'language',
             'user',
@@ -410,6 +411,7 @@ private function showJson($beatmapset)
         return json_item($beatmapset, $transformer, [
             'beatmaps',
             'beatmaps.failtimes',
+            'beatmaps.mappers',
             'beatmaps.max_combo',
             'converts',
             'converts.failtimes',

app/Http/Controllers/Chat/UsersController.php → app/Http/Controllers/Users/LookupController.php

@@ -5,18 +5,23 @@
 
 declare(strict_types=1);
 
-namespace App\Http\Controllers\Chat;
+namespace App\Http\Controllers\Users;
 
-use App\Http\Controllers\Controller as BaseController;
+use App\Http\Controllers\Controller;
 use App\Models\User;
 use App\Transformers\UserCompactTransformer;
 
-class UsersController extends BaseController
+class LookupController extends Controller
 {
-    public function index()
+    public function __construct()
     {
-        priv_check('ChatAnnounce')->ensureCan();
+        $this->middleware('auth');
+        $this->middleware('throttle:30,1');
+    }
 
+    public function lookup()
+    {
+        // TODO: referer check?
         $params = get_params(request()->all(), null, ['ids:string[]'], ['null_missing' => true]);
         $ids = array_slice($params['ids'], 0, 50);
 
@@ -31,6 +36,7 @@ public function index()
         }
 
         $users = User::where(fn ($q) => $q->whereIn('user_id', $numericIds)->orWhereIn('username', $stringIds))
+            ->where('group_id', '<>', app('groups')->byIdentifier('no_profile')->getKey())
             ->default()
             ->with(UserCompactTransformer::CARD_INCLUDES_PRELOAD)
             ->get();

app/Libraries/Beatmapset/ChangeBeatmapOwners.php

@@ -0,0 +1,80 @@
+<?php
+
+// Copyright (c) ppy Pty Ltd <[email protected]>. 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);
+
+namespace App\Libraries\Beatmapset;
+
+use App\Exceptions\InvariantException;
+use App\Jobs\Notifications\BeatmapOwnerChange;
+use App\Models\Beatmap;
+use App\Models\BeatmapOwner;
+use App\Models\BeatmapsetEvent;
+use App\Models\DeletedUser;
+use App\Models\User;
+use Ds\Set;
+
+class ChangeBeatmapOwners
+{
+    private Set $userIds;
+
+    public function __construct(private Beatmap $beatmap, array $newUserIds, private User $source)
+    {
+        priv_check_user($source, 'BeatmapUpdateOwner', $beatmap->beatmapset)->ensureCan();
+
+        $this->userIds = new Set($newUserIds);
+
+        if ($this->userIds->isEmpty()) {
+            throw new InvariantException('user_ids must be specified');
+        }
+    }
+
+    public function handle(): void
+    {
+        $currentOwners = new Set($this->beatmap->mappers->pluck('user_id'));
+        if ($currentOwners->xor($this->userIds)->isEmpty()) {
+            return;
+        }
+
+        $newUserIds = $this->userIds->diff($currentOwners);
+
+        if (User::whereIn('user_id', $newUserIds->toArray())->count() !== $newUserIds->count()) {
+            throw new InvariantException('invalid user_id');
+        }
+
+        $this->beatmap->getConnection()->transaction(function () {
+            $userIds = $this->userIds->toArray();
+            $params = [];
+
+            foreach ($userIds as $userId) {
+                $params[] = ['beatmap_id' => $this->beatmap->getKey(), 'user_id' => $userId];
+            }
+
+            $this->beatmap->fill(['user_id' => $userIds[0]])->saveOrExplode();
+            $this->beatmap->beatmapOwners()->delete();
+            BeatmapOwner::insert($params);
+
+            $this->beatmap->refresh();
+
+            // TODO: use select instead (needs newer laravel)
+            $newUsers = $this->beatmap->mappers->map(
+                fn ($user) => ['id' => $user->user_id, 'username' => ($user ?? new DeletedUser())->username],
+            )->all();
+            $beatmapset = $this->beatmap->beatmapset;
+
+            BeatmapsetEvent::log(BeatmapsetEvent::BEATMAP_OWNER_CHANGE, $this->source, $beatmapset, [
+                'beatmap_id' => $this->beatmap->getKey(),
+                'beatmap_version' => $this->beatmap->version,
+                'new_user_id' => $this->beatmap->user_id,
+                'new_user_username' => ($this->beatmap->user ?? new DeletedUser())->username,
+                'new_users' => $newUsers,
+            ])->saveOrExplode();
+
+            $beatmapset->update(['eligible_main_rulesets' => null]);
+        });
+
+        (new BeatmapOwnerChange($this->beatmap, $this->source))->dispatch();
+    }
+}

app/Models/Beatmap.php

@@ -7,14 +7,17 @@
 
 use App\Exceptions\InvariantException;
 use App\Jobs\EsDocument;
+use App\Libraries\Beatmapset\ChangeBeatmapOwners;
 use App\Libraries\Transactions\AfterCommit;
 use DB;
+use Ds\Set;
 use Illuminate\Database\Eloquent\Builder;
+use Illuminate\Database\Eloquent\Collection;
 use Illuminate\Database\Eloquent\SoftDeletes;
 
 /**
  * @property int $approved
- * @property \Illuminate\Database\Eloquent\Collection $beatmapDiscussions BeatmapDiscussion
+ * @property-read Collection<BeatmapDiscussion> $beatmapDiscussions
  * @property int $beatmap_id
  * @property Beatmapset $beatmapset
  * @property int|null $beatmapset_id
@@ -29,20 +32,22 @@
  * @property float $diff_drain
  * @property float $diff_overall
  * @property float $diff_size
- * @property \Illuminate\Database\Eloquent\Collection $difficulty BeatmapDifficulty
- * @property \Illuminate\Database\Eloquent\Collection $difficultyAttribs BeatmapDifficultyAttrib
+ * @property-read Collection<BeatmapDifficulty> $difficulty
+ * @property-read Collection<BeatmapDifficultyAttrib> $difficultyAttribs
  * @property float $difficultyrating
- * @property \Illuminate\Database\Eloquent\Collection $failtimes BeatmapFailtimes
+ * @property-read Collection<BeatmapFailtimes> $failtimes
  * @property string|null $filename
  * @property int $hit_length
  * @property \Carbon\Carbon $last_update
  * @property int $max_combo
  * @property mixed $mode
+ * @property-read Collection<User> $mappers
  * @property int $passcount
  * @property int $playcount
  * @property int $playmode
  * @property int $score_version
  * @property int $total_length
+ * @property User $user
  * @property int $user_id
  * @property string $version
  * @property string|null $youtube_preview
@@ -107,6 +112,11 @@ public function baseMaxCombo()
         return $this->difficultyAttribs()->noMods()->maxCombo();
     }
 
+    public function beatmapOwners()
+    {
+        return $this->hasMany(BeatmapOwner::class);
+    }
+
     public function beatmapset()
     {
         return $this->belongsTo(Beatmapset::class, 'beatmapset_id')->withTrashed();
@@ -256,6 +266,7 @@ public function getAttribute($key)
 
             'diff_size' => $this->getDiffSize(),
             'difficultyrating' => $this->getDifficultyrating(),
+            'mappers' => $this->getMappers(),
             'mode' => $this->getMode(),
             'version' => $this->getVersion(),
 
@@ -300,22 +311,9 @@ public function maxCombo()
         return $maxCombo?->value;
     }
 
-    public function setOwner($newUserId)
+    public function setOwner(array $newUserIds, User $source): void
     {
-        if ($newUserId === null) {
-            throw new InvariantException('user_id must be specified');
-        }
-
-        if (User::find($newUserId) === null) {
-            throw new InvariantException('invalid user_id');
-        }
-
-        if ($newUserId === $this->user_id) {
-            throw new InvariantException('the specified user_id is already the owner');
-        }
-
-        $this->fill(['user_id' => $newUserId])->saveOrExplode();
-        $this->beatmapset->update(['eligible_main_rulesets' => null]);
+        (new ChangeBeatmapOwners($this, $newUserIds, $source))->handle();
     }
 
     public function status()
@@ -376,6 +374,30 @@ private function getDiffSize()
         return $value;
     }
 
+    private function getMappers(): Collection
+    {
+        $beatmapOwners = $this->beatmapOwners()->pluck('user_id');
+
+        $mappers = User::whereIn('user_id', $beatmapOwners)->get();
+        // compatiblity for anything that isn't writing to beatmap_owners yet.
+        if ($mappers->find($this->user_id) === null && $this->user !== null) {
+            $mappers->prepend($this->user);
+        }
+
+        // Add deleted/missing users.
+        if ($beatmapOwners->count() !== $mappers->count()) {
+            $beatmapOwnersSet = new Set($beatmapOwners);
+            $mappersSet = new Set($mappers->pluck('user_id')->toArray());
+
+            $missingIds = $beatmapOwnersSet->diff($mappersSet);
+            foreach ($missingIds as $id) {
+                $mappers->push(new DeletedUser(['user_id' => $id]));
+            }
+        }
+
+        return $mappers;
+    }
+
     private function getMode()
     {
         return static::modeStr($this->playmode);

app/Models/BeatmapOwner.php

@@ -0,0 +1,31 @@
+<?php
+
+// Copyright (c) ppy Pty Ltd <[email protected]>. Licensed under the GNU Affero General Public License v3.0.
+// See the LICENCE file in the repository root for full licence text.
+
+namespace App\Models;
+
+/**
+ * @property Beatmap $beatmap
+ * @property int $beatmap_id
+ * @property User $user
+ * @property int $user_id
+ */
+class BeatmapOwner extends Model
+{
+    public $incrementing = false;
+    public $timestamps = false;
+
+    protected $primaryKey = ':composite';
+    protected $primaryKeys = ['beatmap_id', 'user_id'];
+
+    public function beatmap()
+    {
+        return $this->belongsTo(Beatmap::class, 'beatmap_id');
+    }
+
+    public function user()
+    {
+        return $this->belongsTo(User::class, 'user_id');
+    }
+}