Merge branch 'master' into forum-show-variable

app/Libraries/Ip.php → app/Enums/Ip.php

@@ -5,7 +5,7 @@
 
 declare(strict_types=1);
 
-namespace App\Libraries;
+namespace App\Enums;
 
 enum Ip: string
 {

app/Libraries/Ruleset.php → app/Enums/Ruleset.php

@@ -5,7 +5,7 @@
 
 declare(strict_types=1);
 
-namespace App\Libraries;
+namespace App\Enums;
 
 enum Ruleset: int
 {

app/Libraries/Countries.php

@@ -0,0 +1,25 @@
+<?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\Libraries;
+
+use App\Models\Country;
+use App\Traits\Memoizes;
+use Illuminate\Database\Eloquent\Collection;
+
+class Countries
+{
+    use Memoizes;
+
+    private function allByCode(): Collection
+    {
+        return $this->memoize(__FUNCTION__, fn () => Country::get(['acronym', 'name'])->keyBy('acronym'));
+    }
+
+    public function byCode(string $code): ?Country
+    {
+        return $this->allByCode()->get($code);
+    }
+}

app/Libraries/Ip2Asn.php

@@ -7,6 +7,7 @@
 
 namespace App\Libraries;
 
+use App\Enums\Ip;
 use Exception;
 use WeakMap;
 

app/Libraries/Ip2AsnUpdater.php

@@ -7,6 +7,7 @@
 
 namespace App\Libraries;
 
+use App\Enums\Ip;
 use Log;
 
 class Ip2AsnUpdater

app/Libraries/Markdown/CustomContainerInline/Renderer.php

@@ -23,6 +23,11 @@ public function render(Node $node, ChildNodeRendererInterface $childRenderer)
             $attrs->remove('flag');
             $attrs->set('class', 'flag-country flag-country--flat flag-country--wiki');
             $attrs->set('style', "background-image: url('".flag_url($code)."')");
+
+            $country = app('countries')->byCode($code);
+            if ($country !== null) {
+                $attrs->set('title', $country->name);
+            }
         }
 
         return new HtmlElement(

app/Models/Multiplayer/PlaylistItem.php

@@ -5,8 +5,8 @@
 
 namespace App\Models\Multiplayer;
 
+use App\Enums\Ruleset;
 use App\Exceptions\InvariantException;
-use App\Libraries\Ruleset;
 use App\Models\Beatmap;
 use App\Models\Model;
 use App\Models\ScoreToken;

app/Models/Multiplayer/ScoreLink.php

@@ -60,7 +60,7 @@ public static function complete(ScoreToken $token, array $params): static
     public $timestamps = false;
 
     protected $primaryKey = 'score_id';
-    protected $table = 'multiplayer_score_links';
+    protected $table = 'multiplayer_playlist_item_scores';
 
     public function playlistItem(): BelongsTo
     {

app/Models/ScoreToken.php

@@ -25,8 +25,6 @@
  */
 class ScoreToken extends Model
 {
-    protected $table = 'solo_score_tokens';
-
     public function beatmap()
     {
         return $this->belongsTo(Beatmap::class, 'beatmap_id');

app/Models/Solo/Score.php

@@ -39,7 +39,6 @@ class Score extends Model implements Traits\ReportableInterface
 
     const PROCESSING_QUEUE = 'osu-queue:score-statistics';
 
-    protected $table = 'solo_scores';
     protected $casts = [
         'data' => ScoreData::class,
         'has_replay' => 'boolean',

app/Models/Solo/ScorePerformance.php

@@ -17,5 +17,5 @@ class ScorePerformance extends Model
     public $timestamps = false;
 
     protected $primaryKey = 'score_id';
-    protected $table = 'solo_scores_performance';
+    protected $table = 'score_performance';
 }

app/Providers/AppServiceProvider.php

@@ -9,6 +9,7 @@
 use App\Libraries\AssetsManifest;
 use App\Libraries\ChatFilters;
 use App\Libraries\CleanHTML;
+use App\Libraries\Countries;
 use App\Libraries\Groups;
 use App\Libraries\Ip2Asn;
 use App\Libraries\LayoutCache;
@@ -38,6 +39,7 @@ class AppServiceProvider extends ServiceProvider
 {
     const LOCAL_CACHE_SINGLETONS = [
         'chat-filters' => ChatFilters::class,
+        'countries' => Countries::class,
         'groups' => Groups::class,
         'layout-cache' => LayoutCache::class,
         'medals' => Medals::class,

database/migrations/2023_10_31_074205_create_score_table_aliases.php

@@ -0,0 +1,34 @@
+<?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);
+
+use Illuminate\Database\Migrations\Migration;
+
+return new class extends Migration
+{
+    private const ALIASES = [
+        'multiplayer_score_links' => 'multiplayer_playlist_item_scores',
+        'solo_score_tokens' => 'score_tokens',
+        'solo_scores' => 'scores',
+        'solo_scores_legacy_id_map' => 'score_legacy_id_map',
+        'solo_scores_performance' => 'score_performance',
+        'solo_scores_process_history' => 'score_process_history',
+    ];
+
+    public function up(): void
+    {
+        foreach (static::ALIASES as $current => $alias) {
+            DB::statement("CREATE VIEW {$alias} AS SELECT * FROM {$current}");
+        }
+    }
+
+    public function down(): void
+    {
+        foreach (static::ALIASES as $alias) {
+            DB::statement("DROP VIEW {$alias}");
+        }
+    }
+};

tests/Controllers/BeatmapsControllerSoloScoresTest.php

@@ -166,7 +166,7 @@ public static function tearDownAfterClass(): void
             Genre::truncate();
             Group::truncate();
             Language::truncate();
-            SoloScore::truncate();
+            SoloScore::select()->delete(); // TODO: revert to truncate after the table is actually renamed
             User::truncate();
             UserGroup::truncate();
             UserGroupEvent::truncate();

tests/Jobs/RemoveBeatmapsetSoloScoresTest.php

@@ -72,8 +72,8 @@ public function testHandle()
             Genre::truncate();
             Group::truncate();
             Language::truncate();
-            Score::truncate();
-            ScorePerformance::truncate();
+            Score::select()->delete(); // TODO: revert to truncate after the table is actually renamed
+            ScorePerformance::select()->delete(); // TODO: revert to truncate after the table is actually renamed
             User::truncate();
             UserGroup::truncate();
             UserGroupEvent::truncate();

tests/Libraries/ModsTest.php

@@ -5,8 +5,8 @@
 
 namespace Tests\Libraries;
 
+use App\Enums\Ruleset;
 use App\Exceptions\InvariantException;
-use App\Libraries\Ruleset;
 use Tests\TestCase;
 
 class ModsTest extends TestCase

tests/Models/Solo/ScoreEsIndexTest.php

@@ -107,7 +107,7 @@ public static function tearDownAfterClass(): void
             Genre::truncate();
             Group::truncate();
             Language::truncate();
-            Score::truncate();
+            Score::select()->delete(); // TODO: revert to truncate after the table is actually renamed
             User::truncate();
             UserGroup::truncate();
             UserGroupEvent::truncate();