From 7283f6e887bc4d649ab5451f24c5243ea495c500 Mon Sep 17 00:00:00 2001 From: IceToast Date: Sun, 5 Feb 2023 16:36:55 +0100 Subject: [PATCH] =?UTF-8?q?fix:=20=F0=9F=9A=91=EF=B8=8F=20Delete=20all=20T?= =?UTF-8?q?ickets=20on=20user=20deletion?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/Models/User.php | 48 +++++++++++++++++++-------------------------- 1 file changed, 20 insertions(+), 28 deletions(-) diff --git a/app/Models/User.php b/app/Models/User.php index 328b7c11..85e2b240 100644 --- a/app/Models/User.php +++ b/app/Models/User.php @@ -94,23 +94,16 @@ class User extends Authenticatable implements MustVerifyEmail }); static::deleting(function (User $user) { - $user->servers()->chunk(10, function ($servers) { - foreach ($servers as $server) { - $server->delete(); - } + + + // delete every server the user owns without using chunks + $user->servers()->each(function ($server) { + $server->delete(); }); - $user->payments()->chunk(10, function ($payments) { - foreach ($payments as $payment) { - $payment->delete(); - } - }); + $user->payments()->delete(); - $user->tickets()->chunk(10, function ($tickets) { - foreach ($tickets as $ticket) { - $ticket->delete(); - } - }); + $user->tickets()->delete(); $user->ticketBlackList()->delete(); @@ -238,17 +231,17 @@ class User extends Authenticatable implements MustVerifyEmail public function getAvatar() { //TODO loading the images to confirm they exist is causing to much load time. alternative has to be found :) maybe onerror tag on the -// if ($this->discordUser()->exists()) { -// if(@getimagesize($this->discordUser->getAvatar())) { -// $avatar = $this->discordUser->getAvatar(); -// } else { -// $avatar = "https://www.gravatar.com/avatar/" . md5(strtolower(trim($this->email))); -// } -// } else { -// $avatar = "https://www.gravatar.com/avatar/" . md5(strtolower(trim($this->email))); -// } + // if ($this->discordUser()->exists()) { + // if(@getimagesize($this->discordUser->getAvatar())) { + // $avatar = $this->discordUser->getAvatar(); + // } else { + // $avatar = "https://www.gravatar.com/avatar/" . md5(strtolower(trim($this->email))); + // } + // } else { + // $avatar = "https://www.gravatar.com/avatar/" . md5(strtolower(trim($this->email))); + // } - return 'https://www.gravatar.com/avatar/'.md5(strtolower(trim($this->email))); + return 'https://www.gravatar.com/avatar/' . md5(strtolower(trim($this->email))); } /** @@ -298,9 +291,8 @@ class User extends Authenticatable implements MustVerifyEmail public function getActivitylogOptions(): LogOptions { return LogOptions::defaults() - -> logOnly(['role', 'name', 'server_limit', 'pterodactyl_id', 'email']) - -> logOnlyDirty() - -> dontSubmitEmptyLogs(); + ->logOnly(['role', 'name', 'server_limit', 'pterodactyl_id', 'email']) + ->logOnlyDirty() + ->dontSubmitEmptyLogs(); } - }