Merge branch 'ppy:master' into capitalization-change

Author: godkama

app/Http/Controllers/BeatmapsetsController.php

@@ -24,6 +24,7 @@
 use Carbon\Carbon;
 use DB;
 use Request;
+use Symfony\Component\HttpFoundation\Response;
 
 /**
  * @group Beatmapsets
@@ -354,6 +355,23 @@ public function update($id)
         return $this->showJson($beatmapset);
     }
 
+    public function versions(string $id): Response
+    {
+        $beatmapset = Beatmapset::findOrFail($id)->load([
+            'versions' => fn ($q) => $q->orderByDesc('version_id'),
+            'versions.versionFiles',
+        ]);
+        $versions = $beatmapset->versions->keyBy('version_id');
+        foreach ($versions as $version) {
+            $version->setRelation('previousVersion', $versions[$version->previous_version_id] ?? null);
+        }
+
+        return ext_view('beatmapsets.versions', [
+            'beatmapset' => $beatmapset,
+            'versions' => $versions,
+        ]);
+    }
+
     private function getSearchResponse(?array $params = null)
     {
         $params = new BeatmapsetSearchRequestParams($params ?? request()->all(), auth()->user());
@@ -435,6 +453,7 @@ private function showJson($beatmapset)
             'related_tags',
             'related_users',
             'user',
+            'version_count',
         ]);
     }
 }

app/Http/Controllers/LegacyMatchesController.php

@@ -36,10 +36,12 @@ public function __construct()
      * matches       | [Match](#match)[]             | |
      * params.limit  | integer                       | |
      * params.sort   | string                        | |
+     * params.active | boolean?                      | |
      *
      * @usesCursor
      * @queryParam limit integer Maximum number of matches (50 default, 1 minimum, 50 maximum). No-example
      * @queryParam sort string `id_desc` for newest first; `id_asc` for oldest first. Defaults to `id_desc`. No-example
+     * @queryParam active boolean `true` for active matches only; `false` for inactive matches only. Defaults to not specified, returning both. No-example
      * @response {
      *     "matches": [
      *         {
@@ -52,7 +54,8 @@ public function __construct()
      *     ],
      *     "params": {
      *         "limit": 50,
-     *         "sort": "id_desc"
+     *         "sort": "id_desc",
+     *         "active": null
      *     },
      *     "cursor": {
      *         "match_id": 114428685

app/Http/Middleware/AuthApi.php

@@ -83,6 +83,11 @@ private function validTokenFromRequest($psr)
         $token->setRelation('client', $client);
         $token->validate();
 
+        // increment hit count for about every 10 hits
+        if (rand(0, 9) === 0) {
+            $token->incrementInstance('hit_count', 10);
+        }
+
         $user = $token->getResourceOwner();
 
         if ($token->isClientCredentials()) {

app/Models/Beatmapset.php

@@ -1316,6 +1316,7 @@ public function defaultDiscussionJson()
                 'nominations',
                 'related_users',
                 'related_users.groups',
+                'version_count',
             ]
         );
     }

app/Models/BeatmapsetVersion.php

@@ -39,4 +39,38 @@ public function versionFiles(): HasMany
     {
         return $this->hasMany(BeatmapsetVersionFile::class);
     }
+
+    public function changes(): array
+    {
+        $previous = $this->previousVersion;
+        if ($previous === null) {
+            $added = $this->versionFiles->all();
+        } else {
+            $previousVersionFilesByFilename = $previous->versionFiles->keyBy('filename');
+            $currentVersionFiles = $this->versionFiles;
+
+            $added = [];
+            $updated = [];
+            foreach ($currentVersionFiles as $versionFile) {
+                $previousVersionFile = $previousVersionFilesByFilename[$versionFile->filename] ?? null;
+                if ($previousVersionFile === null) {
+                    $added[] = $versionFile;
+                } else {
+                    // no update otherwise
+                    if ($previousVersionFile->file_id !== $versionFile->file_id) {
+                        $updated[] = $versionFile;
+                    }
+                    $previousVersionFilesByFilename->forget($versionFile->filename);
+                }
+            }
+
+            $removed = $previousVersionFilesByFilename->values()->all();
+        }
+
+        return [
+            'added' => $added ?? [],
+            'removed' => $removed ?? [],
+            'updated' => $updated ?? [],
+        ];
+    }
 }

app/Models/Model.php

@@ -19,7 +19,7 @@
 
 abstract class Model extends BaseModel
 {
-    use HasFactory, Traits\FasterAttributes, Validatable;
+    use HasFactory, Traits\FasterAttributes, Traits\IncrementInstance, Validatable;
 
     const MAX_FIELD_LENGTHS = [];
     const int PER_PAGE = 50;
@@ -201,18 +201,6 @@ public function delete()
         });
     }
 
-    /**
-     * Just like increment but only works on saved instance instead of falling back to entire model
-     */
-    public function incrementInstance()
-    {
-        if (!$this->exists) {
-            return false;
-        }
-
-        return $this->increment(...func_get_args());
-    }
-
     public function save(array $options = [])
     {
         return $this->runAfterCommitWrapper(function () use ($options) {

app/Models/OAuth/Token.php

@@ -9,6 +9,7 @@
 use App\Exceptions\InvalidScopeException;
 use App\Interfaces\SessionVerificationInterface;
 use App\Models\Traits\FasterAttributes;
+use App\Models\Traits\IncrementInstance;
 use App\Models\User;
 use Ds\Set;
 use Illuminate\Database\Eloquent\Factories\HasFactory;
@@ -18,7 +19,7 @@
 class Token extends PassportToken implements SessionVerificationInterface
 {
     // PassportToken doesn't have factory
-    use HasFactory, FasterAttributes;
+    use HasFactory, FasterAttributes, IncrementInstance;
 
     const SCOPES_CLIENT_CREDENTIALS_ONLY = ['delegate', 'forum.write_manage', 'group_permissions'];
     const SCOPES_EXCLUDE_FROM_ALL = ['delegate', 'group_permissions'];
@@ -76,6 +77,7 @@ public function getAttribute($key)
     {
         return match ($key) {
             'client_id',
+            'hit_count',
             'id',
             'name',
             'user_id',

app/Models/Traits/IncrementInstance.php

@@ -0,0 +1,23 @@
+<?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);
+
+namespace App\Models\Traits;
+
+trait IncrementInstance
+{
+    /**
+     * Just like increment but only works on saved instance instead of falling back to entire model
+     */
+    public function incrementInstance()
+    {
+        if (!$this->exists) {
+            return false;
+        }
+
+        return $this->increment(...func_get_args());
+    }
+}

app/Transformers/BeatmapsetCompactTransformer.php

@@ -18,6 +18,7 @@
 use Illuminate\Database\Eloquent\Collection as EloquentCollection;
 use League\Fractal;
 use League\Fractal\Resource\Collection;
+use League\Fractal\Resource\Primitive;
 
 class BeatmapsetCompactTransformer extends TransformerAbstract
 {
@@ -42,6 +43,7 @@ class BeatmapsetCompactTransformer extends TransformerAbstract
         'related_users',
         'related_tags',
         'user',
+        'version_count',
     ];
 
     // TODO: switch to enum after php 8.1
@@ -319,6 +321,11 @@ public function includeRelatedTags(Beatmapset $beatmapset)
         return $this->primitive($json);
     }
 
+    public function includeVersionCount(Beatmapset $beatmapset): Primitive
+    {
+        return $this->primitive($beatmapset->versions()->count());
+    }
+
     private function beatmaps(Beatmapset $beatmapset, ?Fractal\ParamBag $params = null): EloquentCollection
     {
         $rel = $beatmapset->trashed() || ($params !== null && $params->get('with_trashed')) ? 'allBeatmaps' : 'beatmaps';

database/factories/BeatmapsetFileFactory.php

@@ -28,7 +28,7 @@ public function configure(): static
     public function definition(): array
     {
         return [
-            'file_size' => rand(10, 100),
+            'file_size' => rand(10, 100000),
             'sha2_hash' => fn (array $attrs): string => hash(
                 'sha256',
                 static::generateContent($attrs['file_size']),