Merge branch 'master' into more-random

Author: notbakaneko

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/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());
+    }
+}

database/migrations/2025_10_01_140749_add_hit_count_to_oauth_access_tokens.php

@@ -0,0 +1,27 @@
+<?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('oauth_access_tokens', function (Blueprint $table) {
+            $table->unsignedBigInteger('hit_count')->default(0);
+        });
+    }
+
+    public function down(): void
+    {
+        Schema::table('oauth_access_tokens', function (Blueprint $table) {
+            $table->dropColumn('hit_count');
+        });
+    }
+};