Merge branch 'master' into feature/channel-mark-as-read-tweak

.github/workflows/tests.yml

@@ -149,3 +149,10 @@ jobs:
 
       - name: Run Dusk
         run: ./bin/run_dusk.sh
+
+      # this only tests that the rollback functions are valid and doesn't check
+      # if they actually do what they're expected to do.
+      - name: Migration rollback test
+        run: |
+          php artisan migrate:reset | tee rollback.log
+          grep -Fq 'no rolling back from this migration =)' rollback.log

Dockerfile.deployment

@@ -55,6 +55,8 @@ ARG APP_URL
 ARG DOCS_URL
 RUN yarn production
 
+RUN php artisan scribe:generate
+
 RUN rm -rf node_modules
 
 ARG GIT_SHA
@@ -69,4 +71,4 @@ EXPOSE 8000
 EXPOSE 8080
 
 ENTRYPOINT ["/app/docker/deployment/entrypoint.sh"]
-CMD ["php"]
+CMD ["octane"]

app/Http/Controllers/Chat/ChatController.php

@@ -139,8 +139,9 @@ public function newConversation()
         ];
     }
 
-    // TODO: I don't think anything actually calls this?
+    // TODO: move the listing to channels.index
     /**
+     * @deprecated
      * @group Undocumented
      */
     public function presence()
@@ -286,7 +287,7 @@ public function updates()
 
         // messages need presence
         if ($includeMessages || $includePresence) {
-            $presence = $this->presence();
+            $presence = (new UserChannelList(auth()->user()))->get();
         }
 
         if ($includeMessages) {

app/Models/Chat/Channel.php

@@ -517,6 +517,8 @@ public function removeUser(User $user)
             $userChannel->delete();
         }
 
+        $this->resetMemoized();
+
         (new ChatChannelEvent($this, $user, 'part'))->broadcast(true);
 
         Datadog::increment('chat.channel.part', 1, ['type' => $this->type]);

config/scribe.php

@@ -331,11 +331,8 @@
             \Knuckles\Scribe\Extracting\Strategies\BodyParameters\GetFromBodyParamTag::class,
         ],
         'responses' => [
-            \Knuckles\Scribe\Extracting\Strategies\Responses\UseTransformerTags::class,
             \Knuckles\Scribe\Extracting\Strategies\Responses\UseResponseTag::class,
             \Knuckles\Scribe\Extracting\Strategies\Responses\UseResponseFileTag::class,
-            \Knuckles\Scribe\Extracting\Strategies\Responses\UseApiResourceTags::class,
-            \Knuckles\Scribe\Extracting\Strategies\Responses\ResponseCalls::class,
         ],
         'responseFields' => [
             \Knuckles\Scribe\Extracting\Strategies\ResponseFields\GetFromResponseFieldTag::class,

database/migrations/2019_08_21_104727_add_index_to_beatmapset_events.php

@@ -29,7 +29,7 @@ public function up()
     public function down()
     {
         Schema::table('beatmapset_events', function (Blueprint $table) {
-            $table->dropIndex('user_id');
+            $table->dropIndex(['user_id']);
         });
     }
 }

database/migrations/2020_05_15_083037_sync_structure.php

@@ -447,6 +447,6 @@ public function up()
      */
     public function down()
     {
-        // no going back =)
+        throw new Exception('no rolling back from this migration =)');
     }
 }

database/migrations/2020_07_22_045416_add_timestamp_index_to_user_account_history.php

@@ -28,7 +28,7 @@ public function up()
      */
     public function down()
     {
-        Schema::table('user_account_history', function (Blueprint $table) {
+        Schema::table('osu_user_banhistory', function (Blueprint $table) {
             $table->dropIndex(['timestamp']);
         });
     }

database/migrations/2020_10_13_064901_add_provider_reference_to_orders.php

@@ -30,10 +30,9 @@ public function up()
      */
     public function down()
     {
-        Schema::connection('mysql-store')('orders', function (Blueprint $table) {
+        Schema::connection('mysql-store')->table('orders', function (Blueprint $table) {
             $table->dropColumn('provider');
             $table->dropColumn('reference');
-            $table->dropIndex(['provider', 'reference']);
         });
     }
 }

database/migrations/2021_08_30_153214_add_track_id_to_beatmapsets.php

@@ -31,7 +31,6 @@ public function down()
     {
         Schema::table('osu_beatmapsets', function (Blueprint $table) {
             $table->dropColumn('track_id');
-            $table->dropIndex('track_id');
         });
     }
 }

database/migrations/2022_07_08_085310_add_allow_performance_to_osu_builds.php

@@ -0,0 +1,36 @@
+<?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.
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+class AddAllowPerformanceToOsuBuilds extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        Schema::table('osu_builds', function (Blueprint $table) {
+            $table->boolean('allow_performance')->default(false)->after('allow_bancho');
+            $table->index('allow_performance');
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        Schema::table('osu_builds', function (Blueprint $table) {
+            $table->dropColumn('allow_performance');
+        });
+    }
+}

database/mods.json

@@ -443,7 +443,8 @@
           "RX",
           "AP",
           "SO",
-          "MG"
+          "MG",
+          "RP"
         ],
         "RequiresConfiguration": false,
         "UserPlayable": false,
@@ -487,7 +488,8 @@
           "AT",
           "CN",
           "AP",
-          "MG"
+          "MG",
+          "RP"
         ],
         "RequiresConfiguration": false,
         "UserPlayable": true,
@@ -508,7 +510,8 @@
           "CN",
           "RX",
           "SO",
-          "MG"
+          "MG",
+          "RP"
         ],
         "RequiresConfiguration": false,
         "UserPlayable": true,
@@ -540,7 +543,8 @@
         "Settings": [],
         "IncompatibleMods": [
           "WG",
-          "MG"
+          "MG",
+          "RP"
         ],
         "RequiresConfiguration": false,
         "UserPlayable": true,
@@ -555,7 +559,8 @@
         "Settings": [],
         "IncompatibleMods": [
           "TR",
-          "MG"
+          "MG",
+          "RP"
         ],
         "RequiresConfiguration": false,
         "UserPlayable": true,
@@ -819,7 +824,32 @@
           "RX",
           "AP",
           "TR",
-          "WG"
+          "WG",
+          "RP"
+        ],
+        "RequiresConfiguration": false,
+        "UserPlayable": true,
+        "ValidForMultiplayer": true,
+        "ValidForMultiplayerAsFreeMod": true
+      },
+      {
+        "Acronym": "RP",
+        "Name": "Repel",
+        "Description": "Hit objects run away!",
+        "Type": "Fun",
+        "Settings": [
+          {
+            "Name": "repulsion_strength",
+            "Type": "number"
+          }
+        ],
+        "IncompatibleMods": [
+          "AT",
+          "CN",
+          "AP",
+          "TR",
+          "WG",
+          "MG"
         ],
         "RequiresConfiguration": false,
         "UserPlayable": true,

docker/deployment/nginx-assets.conf

@@ -17,10 +17,24 @@ http {
         listen 8080;
         root /app/public;
 
+        expires 30d;
+
         location ~ \.php$ {
             access_log off;
 
             return 404;
         }
+
+        location = /docs/ {
+            expires off;
+        }
+
+        location = /docs/index.html {
+            expires off;
+        }
+
+        location /docs/ {
+            expires 7d;
+        }
     }
 }

public/site.webmanifest

@@ -3,12 +3,12 @@
     "short_name": "",
     "icons": [
         {
-            "src": "/android-chrome-192x192.png",
+            "src": "/images/favicon/android-chrome-192x192.png",
             "sizes": "192x192",
             "type": "image/png"
         },
         {
-            "src": "/android-chrome-512x512.png",
+            "src": "/images/favicon/android-chrome-512x512.png",
             "sizes": "512x512",
             "type": "image/png"
         }

resources/views/docs/info.blade.php

@@ -25,6 +25,9 @@
 
 ## Breaking Changes
 
+### 2022-07-06
+- `chat/presence` endpoint has been deprecated, it will be removed in the near future.
+
 ### 2022-06-08
 - `discussion_enabled` in Beatmapset(#beatmapset) is deprecated. All beatmapsets now have it enabled.
 

resources/views/layout/metadata.blade.php

@@ -2,11 +2,14 @@
     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.
 --}}
-<link rel="apple-touch-icon" sizes="180x180" href="{{ config('app.url') }}/apple-touch-icon.png">
-<link rel="icon" sizes="32x32" href="{{ config('app.url') }}/favicon-32x32.png">
-<link rel="icon" sizes="16x16" href="{{ config('app.url') }}/favicon-16x16.png">
-<link rel="manifest" href="{{ config('app.url') }}/site.webmanifest">
-<link rel="mask-icon" href="{{ config('app.url') }}/safari-pinned-tab.svg" color="#e2609a">
+@php
+    $appUrl = config('app.url');
+@endphp
+<link rel="apple-touch-icon" sizes="180x180" href="{{ $appUrl }}/images/favicon/apple-touch-icon.png">
+<link rel="icon" sizes="32x32" href="{{ $appUrl }}/images/favicon/favicon-32x32.png">
+<link rel="icon" sizes="16x16" href="{{ $appUrl }}/images/favicon/favicon-16x16.png">
+<link rel="manifest" href="{{ $appUrl }}/site.webmanifest">
+<link rel="mask-icon" href="{{ $appUrl }}/images/favicon/safari-pinned-tab.svg" color="#e2609a">
 <meta name="msapplication-TileColor" content="#603cba">
 <meta name="theme-color" content="hsl({{ $currentHue }}, 10%, 40%)"> {{-- @osu-colour-b1 --}}
 
@@ -98,7 +101,7 @@
                 /^\/loaders\//i
             ],
             release: {!! json_encode(config('osu.git-sha')) !!},
-            whitelistUrls: [/^{!! preg_quote(config('app.url'), '/') !!}\/.*\.js(?:\?.*)?$/],
+            whitelistUrls: [/^{!! preg_quote($appUrl, '/') !!}\/.*\.js(?:\?.*)?$/],
         });
     </script>
 @endif