Merge branch 'master' into team-file-null

gagahpangeran · Feb 21, 2025 · aecdc46 · aecdc46
2 parents 676b344 + 91b0ed4
commit aecdc46
Show file tree

Hide file tree

Showing 25 changed files with 306 additions and 61 deletions.
diff --git a/app/Http/Controllers/Teams/ApplicationsController.php b/app/Http/Controllers/Teams/ApplicationsController.php
@@ -8,7 +8,6 @@
 namespace App\Http\Controllers\Teams;
 
 use App\Http\Controllers\Controller;
-use App\Jobs\Notifications\TeamApplicationAccept;
 use App\Jobs\Notifications\TeamApplicationReject;
 use App\Models\Team;
 use App\Models\TeamApplication;
@@ -30,12 +29,8 @@ public function accept(string $teamId, string $id): Response
 
         priv_check('TeamApplicationAccept', $application)->ensureCan();
 
-        \DB::transaction(function () use ($application, $team) {
-            $application->delete();
-            $team->members()->create(['user_id' => $application->getKey()]);
-        });
+        $team->addMember($application);
 
-        (new TeamApplicationAccept($application, \Auth::user()))->dispatch();
         \Session::flash('popup', osu_trans('teams.applications.accept.ok'));
 
         return response(null, 204);

diff --git a/app/Http/Controllers/Teams/MembersController.php b/app/Http/Controllers/Teams/MembersController.php
@@ -27,14 +27,12 @@ public function destroy(string $teamId, string $userId): Response
             'team_id' => $teamId,
             'user_id' => $userId,
         ])->firstOrFail();
+        $team = $teamMember->team;
 
-        if ($teamMember->user_id === \Auth::user()->getKey()) {
-            abort(422, 'can not remove self from team');
-        }
+        priv_check('TeamUpdate', $team)->ensureCan();
 
-        priv_check('TeamUpdate', $teamMember->team)->ensureCan();
+        $team->removeMember($teamMember);
 
-        $teamMember->delete();
         \Session::flash('popup', osu_trans('teams.members.destroy.success'));
 
         return response(null, 204);

diff --git a/app/Http/Controllers/TeamsController.php b/app/Http/Controllers/TeamsController.php
@@ -115,7 +115,8 @@ public function part(string $id): Response
         $team = Team::findOrFail($id);
         priv_check('TeamPart', $team)->ensureCan();
 
-        $team->members()->findOrFail(\Auth::user()->getKey())->delete();
+        $teamMember = $team->members()->findOrFail(\Auth::user()->getKey());
+        $team->removeMember($teamMember);
         \Session::flash('popup', osu_trans('teams.part.ok'));
 
         return ujs_redirect(route('teams.show', ['team' => $team]));
@@ -145,8 +146,10 @@ public function store(): Response
         $team = (new Team([...$params, 'leader_id' => $user->getKey()]));
         try {
             \DB::transaction(function () use ($team, $user) {
+                $channel = $team->createChannel();
                 $team->saveOrExplode();
                 $team->members()->create(['user_id' => $user->getKey()]);
+                $channel->addUser($user);
             });
         } catch (ModelNotSavedException) {
             return ext_view('teams.create', compact('team'), status: 422);

diff --git a/app/Libraries/ImageProcessor.php b/app/Libraries/ImageProcessor.php
@@ -83,36 +83,48 @@ public function process()
             $this->inputDim[0] <= $this->targetDim[0] &&
             $this->inputDim[1] <= $this->targetDim[1]
         ) {
-            if ($this->inputFileSize < $this->targetFileSize) {
+            if (
+                $this->inputFileSize < $this->targetFileSize &&
+                $this->inputDim[0] === $this->targetDim[0] &&
+                $this->inputDim[1] === $this->targetDim[1]
+            ) {
                 return;
             }
 
-            $image = $inputImage;
-        } else {
-            $start = [0, 0];
-            $inDim = [$this->inputDim[0], $this->inputDim[1]];
-            $outDim = [$this->targetDim[0], $this->targetDim[1]];
-
-            // figure out how to crop.
-            if ($this->inputDim[0] / $this->inputDim[1] >= $this->targetDim[0] / $this->targetDim[1]) {
-                $inDim[0] = $this->targetDim[0] / $this->targetDim[1] * $this->inputDim[1];
-                $start[0] = ($this->inputDim[0] - $inDim[0]) / 2;
-            } else {
-                $inDim[1] = $this->targetDim[1] / $this->targetDim[0] * $this->inputDim[0];
-                $start[1] = ($this->inputDim[1] - $inDim[1]) / 2;
-            }
+            $newHeight = $this->inputDim[0] * $this->targetDim[1] / $this->targetDim[0];
+            $this->targetDim = $newHeight <= $this->inputDim[1]
+                ? [
+                    $this->inputDim[0],
+                    $newHeight,
+                ] : [
+                    $this->inputDim[1] * $this->targetDim[0] / $this->targetDim[1],
+                    $this->inputDim[1],
+                ];
+        }
 
-            // don't scale if input image is smaller.
-            if ($inDim[0] < $outDim[0] || $inDim[1] < $outDim[1]) {
-                $outDim = $inDim;
-            }
+        $start = [0, 0];
+        $inDim = [$this->inputDim[0], $this->inputDim[1]];
+        $outDim = [$this->targetDim[0], $this->targetDim[1]];
 
-            $image = imagecreatetruecolor($outDim[0], $outDim[1]);
-            imagesavealpha($image, true);
-            imagefill($image, 0, 0, imagecolorallocatealpha($image, 0, 0, 0, 127));
-            imagecopyresampled($image, $inputImage, 0, 0, $start[0], $start[1], $outDim[0], $outDim[1], $inDim[0], $inDim[1]);
+        // figure out how to crop.
+        if ($this->inputDim[0] / $this->inputDim[1] >= $this->targetDim[0] / $this->targetDim[1]) {
+            $inDim[0] = $this->targetDim[0] / $this->targetDim[1] * $this->inputDim[1];
+            $start[0] = ($this->inputDim[0] - $inDim[0]) / 2;
+        } else {
+            $inDim[1] = $this->targetDim[1] / $this->targetDim[0] * $this->inputDim[0];
+            $start[1] = ($this->inputDim[1] - $inDim[1]) / 2;
+        }
+
+        // don't scale if input image is smaller.
+        if ($inDim[0] < $outDim[0] || $inDim[1] < $outDim[1]) {
+            $outDim = $inDim;
         }
 
+        $image = imagecreatetruecolor($outDim[0], $outDim[1]);
+        imagesavealpha($image, true);
+        imagefill($image, 0, 0, imagecolorallocatealpha($image, 0, 0, 0, 127));
+        imagecopyresampled($image, $inputImage, 0, 0, $start[0], $start[1], $outDim[0], $outDim[1], $inDim[0], $inDim[1]);
+
         $toJpeg = true;
 
         if ($this->inputDim[2] === IMAGETYPE_PNG || $this->inputDim[2] === IMAGETYPE_GIF) {

diff --git a/app/Models/Chat/Channel.php b/app/Models/Chat/Channel.php
@@ -82,6 +82,7 @@ class Channel extends Model
         'temporary' => 'TEMPORARY',
         'pm' => 'PM',
         'group' => 'GROUP',
+        'team' => 'TEAM',
     ];
 
     public static function ack(int $channelId, int $userId, ?int $timestamp = null, ?Redis $redis = null): void
@@ -366,6 +367,11 @@ public function isGroup()
         return $this->type === static::TYPES['group'];
     }
 
+    public function isTeam(): bool
+    {
+        return $this->type === static::TYPES['team'];
+    }
+
     public function isBanchoMultiplayerChat()
     {
         return $this->type === static::TYPES['temporary'] && starts_with($this->name, ['#mp_', '#spect_']);

diff --git a/app/Models/Team.php b/app/Models/Team.php
@@ -7,6 +7,8 @@
 
 namespace App\Models;
 
+use App\Exceptions\InvariantException;
+use App\Jobs\Notifications\TeamApplicationAccept;
 use App\Libraries\BBCodeForDB;
 use App\Libraries\Uploader;
 use App\Libraries\UsernameValidation;
@@ -39,6 +41,11 @@ public function applications(): HasMany
         return $this->hasMany(TeamApplication::class);
     }
 
+    public function channel(): BelongsTo
+    {
+        return $this->belongsTo(Chat\Channel::class, 'channel_id');
+    }
+
     public function leader(): BelongsTo
     {
         return $this->belongsTo(User::class, 'leader_id');
@@ -88,13 +95,31 @@ public function setUrlAttribute(?string $value): void
             );
     }
 
-    public function descriptionHtml(): string
+    public function addMember(TeamApplication $application): void
     {
-        $description = presence($this->description);
+        $this->getConnection()->transaction(function () use ($application) {
+            $application->delete();
+            $this->members()->create(['user_id' => $application->getKey()]);
+            $this->channel->addUser($application->user);
+        });
 
-        return $description === null
-            ? ''
-            : bbcode((new BBCodeForDB($description))->generate());
+        (new TeamApplicationAccept($application, $this->leader))->dispatch();
+    }
+
+    public function createChannel(): Chat\Channel
+    {
+        if ($this->channel !== null) {
+            return $this->channel;
+        }
+
+        $channel = new Chat\Channel([
+            'name' => truncate($this->name, 50),
+            'type' => Chat\Channel::TYPES['team'],
+        ]);
+        $channel->saveOrExplode();
+        $this->channel()->associate($channel);
+
+        return $channel;
     }
 
     public function delete()
@@ -108,12 +133,36 @@ public function delete()
             if ($ret) {
                 $this->applications()->delete();
                 $this->members()->delete();
+
+                $channel = $this->channel;
+                if ($channel !== null) {
+                    $channel->loadMissing('userChannels.user');
+                    $channel->update(['name' => "#DeletedTeam_{$this->getKey()}"]);
+
+                    foreach ($channel->userChannels as $userChannel) {
+                        $user = $userChannel->user;
+                        if ($user === null) {
+                            $userChannel->delete();
+                        } else {
+                            $channel->removeUser($user);
+                        }
+                    }
+                }
             }
 
             return $ret;
         });
     }
 
+    public function descriptionHtml(): string
+    {
+        $description = presence($this->description);
+
+        return $description === null
+            ? ''
+            : bbcode((new BBCodeForDB($description))->generate());
+    }
+
     public function emptySlots(): int
     {
         $max = $this->maxMembers();
@@ -122,13 +171,29 @@ public function emptySlots(): int
         return max(0, $max - $current);
     }
 
+    public function flag(): Uploader
+    {
+        return $this->flag ??= new Uploader(
+            'teams/flag',
+            $this,
+            'flag_file',
+            ['image' => [
+                'maxDimensions' => static::FLAG_MAX_DIMENSIONS,
+                'maxFilesize' => 200_000,
+            ]],
+        );
+    }
+
     public function header(): Uploader
     {
         return $this->header ??= new Uploader(
             'teams/header',
             $this,
             'header_file',
-            ['image' => ['maxDimensions' => static::HEADER_MAX_DIMENSIONS]],
+            ['image' => [
+                'maxDimensions' => static::HEADER_MAX_DIMENSIONS,
+                'maxFilesize' => 4_000_000,
+            ]],
         );
     }
 
@@ -171,16 +236,6 @@ public function isValid(): bool
         return $this->validationErrors()->isEmpty();
     }
 
-    public function flag(): Uploader
-    {
-        return $this->flag ??= new Uploader(
-            'teams/flag',
-            $this,
-            'flag_file',
-            ['image' => ['maxDimensions' => static::FLAG_MAX_DIMENSIONS]],
-        );
-    }
-
     public function maxMembers(): int
     {
         $this->loadMissing('members.user');
@@ -190,6 +245,33 @@ public function maxMembers(): int
         return min(8 + (4 * $supporterCount), $GLOBALS['cfg']['osu']['team']['max_members']);
     }
 
+    public function removeMember(TeamMember $member): void
+    {
+        if ($member->user_id === $this->leader_id) {
+            throw new InvariantException('can not remove leader from the team');
+        }
+
+        $this->getConnection()->transaction(function () use ($member) {
+            $member->delete();
+            $user = $member->user;
+            if ($user !== null) {
+                $this->channel->removeUser($user);
+            }
+        });
+    }
+
+    public function resetChannelUsers(): void
+    {
+        $channel = $this->channel;
+        $this->loadMissing('members.user');
+
+        foreach ($this->members->pluck('user') as $user) {
+            if ($user !== null) {
+                $channel->addUser($user);
+            }
+        }
+    }
+
     public function save(array $options = [])
     {
         if (!$this->isValid()) {

diff --git a/app/Singletons/OsuAuthorize.php b/app/Singletons/OsuAuthorize.php
@@ -48,6 +48,7 @@ public static function alwaysCheck($ability)
         static $set;
 
         $set ??= new Ds\Set([
+            'ChannelPart',
             'ContestJudge',
             'IsNotOAuth',
             'IsOwnClient',
@@ -1046,7 +1047,8 @@ public function checkChatChannelJoin(?User $user, Channel $channel): ?string
         $this->ensureCleanRecord($user, $prefix);
 
         // joining multiplayer room is done through room endpoint
-        if ($channel->isMultiplayer()) {
+        // team channel handling is done through team model
+        if ($channel->isMultiplayer() || $channel->isTeam()) {
             return null;
         }
 
@@ -1070,7 +1072,8 @@ public function checkChatChannelPart(?User $user, Channel $channel): string
 
         $this->ensureLoggedIn($user);
 
-        if ($channel->type !== Channel::TYPES['private']) {
+        // team channel handling is done through team model
+        if (!$channel->isTeam() && $channel->type !== Channel::TYPES['private']) {
             return 'ok';
         }
 

diff --git a/database/factories/TeamFactory.php b/database/factories/TeamFactory.php
@@ -7,6 +7,7 @@
 
 namespace Database\Factories;
 
+use App\Models\Chat\Channel;
 use App\Models\Team;
 use App\Models\User;
 
@@ -18,6 +19,7 @@ public function configure(): static
     {
         return $this->afterCreating(function (Team $team): void {
             $team->members()->create(['user_id' => $team->leader_id]);
+            $team->channel->userChannels()->create(['user_id' => $team->leader_id]);
         });
     }
 
@@ -27,6 +29,8 @@ public function definition(): array
             'name' => fn () => strtr($this->faker->unique()->userName(), '.', ' '),
             'short_name' => fn () => substr(strtr($this->faker->unique()->userName(), '.', ' '), 0, 4),
             'leader_id' => User::factory(),
+
+            'channel_id' => fn (array $attrs) => Channel::factory()->state(fn () => ['name' => $attrs['name']]),
         ];
     }
 }