Merge branch 'master' into asn-backup-url

Author: notbakaneko

app/Http/Controllers/Teams/ApplicationsController.php

@@ -9,6 +9,7 @@
 
 use App\Http\Controllers\Controller;
 use App\Jobs\Notifications\TeamApplicationReject;
+use App\Jobs\Notifications\TeamApplicationStore;
 use App\Models\Team;
 use App\Models\TeamApplication;
 use Symfony\Component\HttpFoundation\Response;
@@ -39,7 +40,7 @@ public function accept(string $teamId, string $id): Response
     public function destroy(string $teamId, string $id): Response
     {
         $currentUser = \Auth::user();
-        TeamApplication::where('team_id', $teamId)->findOrFail($currentUser->getKey())->delete();
+        TeamApplication::where('team_id', $teamId)->findOrFail($currentUser->getKey())->cancel();
 
         \Session::flash('popup', osu_trans('teams.applications.destroy.ok'));
 
@@ -65,7 +66,9 @@ public function store(string $teamId): Response
         $team = Team::findOrFail($teamId);
         priv_check('TeamApplicationStore', $team)->ensureCan();
 
-        $team->applications()->createOrFirst(['user_id' => \Auth::id()]);
+        $user = \Auth::user();
+        $application = $team->applications()->createOrFirst(['user_id' => $user->getKey()]);
+        (new TeamApplicationStore($application, $user))->dispatch();
         \Session::flash('popup', osu_trans('teams.applications.store.ok'));
 
         return response(null, 204);

app/Jobs/Notifications/BroadcastNotificationBase.php

@@ -177,7 +177,7 @@ public function handle()
         $deliverySettings = static::applyDeliverySettings($receiverIds);
 
         if (empty($deliverySettings)) {
-            return;
+            return null;
         }
 
         $notification = $this->makeNotification();
@@ -215,6 +215,11 @@ public function handle()
         if (!empty($pushReceiverIds)) {
             (new NewPrivateNotificationEvent($notification, $pushReceiverIds))->broadcast();
         }
+
+        return [
+            'notification' => $notification,
+            'receiverIds' => $receiverIds,
+        ];
     }
 
     public function makeNotification(): Notification

app/Jobs/Notifications/TeamApplicationStore.php

@@ -0,0 +1,46 @@
+<?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\Jobs\Notifications;
+
+use App\Models\User;
+
+class TeamApplicationStore extends TeamApplicationBase
+{
+    public function getListeningUserIds(): array
+    {
+        return [$this->team->leader_id];
+    }
+
+    public function getDetails(): array
+    {
+        return [
+            ...parent::getDetails(),
+            'title' => User::find($this->userId)?->username ?? '',
+        ];
+    }
+
+    public function handle()
+    {
+        $currentAppllication = $this->team->applications()->firstWhere([
+            'notification_id' => null,
+            'user_id' => $this->userId,
+        ]);
+
+        if ($currentAppllication === null) {
+            return null;
+        }
+
+        $data = parent::handle();
+
+        if ($data !== null) {
+            $currentAppllication->update(['notification_id' => $data['notification']->getKey()]);
+        }
+
+        return $data;
+    }
+}

app/Models/Notification.php

@@ -45,6 +45,7 @@ class Notification extends Model
     const FORUM_TOPIC_REPLY = 'forum_topic_reply';
     const TEAM_APPLICATION_ACCEPT = 'team_application_accept';
     const TEAM_APPLICATION_REJECT = 'team_application_reject';
+    const TEAM_APPLICATION_STORE = 'team_application_store';
     const USER_ACHIEVEMENT_UNLOCK = 'user_achievement_unlock';
     const USER_BEATMAPSET_NEW = 'user_beatmapset_new';
     const USER_BEATMAPSET_REVIVE = 'user_beatmapset_revive';
@@ -70,6 +71,7 @@ class Notification extends Model
         self::FORUM_TOPIC_REPLY => 'forum_topic_reply',
         self::TEAM_APPLICATION_ACCEPT => 'team_application',
         self::TEAM_APPLICATION_REJECT => 'team_application',
+        self::TEAM_APPLICATION_STORE => 'team_application',
         self::USER_ACHIEVEMENT_UNLOCK => 'user_achievement_unlock',
         self::USER_BEATMAPSET_NEW => 'user_beatmapset_new',
         self::USER_BEATMAPSET_REVIVE => 'user_beatmapset_new',

app/Models/TeamApplication.php

@@ -7,6 +7,7 @@
 
 namespace App\Models;
 
+use App\Libraries\Notification\BatchIdentities;
 use Illuminate\Database\Eloquent\Relations\BelongsTo;
 
 class TeamApplication extends Model
@@ -15,6 +16,11 @@ class TeamApplication extends Model
 
     protected $primaryKey = 'user_id';
 
+    public function notification(): BelongsTo
+    {
+        return $this->belongsTo(Notification::class);
+    }
+
     public function team(): BelongsTo
     {
         return $this->belongsTo(Team::class);
@@ -24,4 +30,21 @@ public function user(): BelongsTo
     {
         return $this->belongsTo(User::class, 'user_id');
     }
+
+    /**
+     * Removal from applicant side
+     */
+    public function cancel(): bool
+    {
+        if (($notification = $this->notification) !== null) {
+            UserNotification::batchDestroy(
+                $this->team->leader_id,
+                BatchIdentities::fromParams([
+                    'notifications' => [$notification->toIdentityJson()],
+                ]),
+            );
+        }
+
+        return parent::delete();
+    }
 }

database/migrations/2025_04_22_121439_add_notification_id_to_team_applications.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('team_applications', function (Blueprint $table) {
+            $table->bigInteger('notification_id')->nullable()->after('team_id');
+        });
+    }
+
+    public function down(): void
+    {
+        Schema::table('team_applications', function (Blueprint $table) {
+            $table->dropColumn('notification_id');
+        });
+    }
+};

database/migrations/2025_04_24_054138_fix_downloads_beatmapset_id_type.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('osu_downloads', function (Blueprint $table) {
+            $table->unsignedMediumInteger('beatmapset_id')->change();
+        });
+    }
+
+    public function down(): void
+    {
+        Schema::table('osu_downloads', function (Blueprint $table) {
+            $table->mediumInteger('beatmapset_id')->change();
+        });
+    }
+};

resources/js/notification-maps/category.ts

@@ -41,6 +41,7 @@ export const nameToCategory: Partial<Record<string, string>> = {
   forum_topic_reply: 'forum_topic_reply',
   team_application_accept: 'team_application',
   team_application_reject: 'team_application',
+  team_application_store: 'team_application',
   user_achievement_unlock: 'user_achievement_unlock',
   user_beatmapset_new: 'user_beatmapset_new',
   user_beatmapset_revive: 'user_beatmapset_new',

resources/js/notification-maps/icons.ts

@@ -39,6 +39,7 @@ export const nameToIcons: IconsMap = {
   forum_topic_reply: ['fas fa-comment-medical'],
   team_application_accept: ['fas fa-users', 'fas fa-check'],
   team_application_reject: ['fas fa-users', 'fas fa-times'],
+  team_application_store: ['fas fa-users', 'fas fa-scroll'],
   user_achievement_unlock: ['fas fa-trophy'],
   user_beatmapset_new: ['fas fa-music'],
   user_beatmapset_revive: ['fas fa-trash-restore'],
@@ -64,6 +65,7 @@ export const nameToIconsCompact: IconsMap = {
   forum_topic_reply: ['fas fa-comment-medical'],
   team_application_accept: ['fas fa-check'],
   team_application_reject: ['fas fa-times'],
+  team_application_store: ['fas fa-scroll'],
   user_beatmapset_new: ['fas fa-music'],
   user_beatmapset_revive: ['fas fa-trash-restore'],
 };

resources/js/notification-maps/message.ts

@@ -90,6 +90,8 @@ export function formatMessageGroup(item: Notification) {
     };
 
     return trans(`notifications.item.${item.displayType}.${item.category}.${item.category}_group`, replacements);
+  } else if (item.category === 'team_application') {
+    return trans('notifications.item.team.team_application.team_application_group');
   }
 
   return item.title;