From 451b7edda3482bbf763acf0a3ceff4f92c3d1072 Mon Sep 17 00:00:00 2001 From: Remco Date: Mon, 19 Jan 2026 21:02:53 +0100 Subject: [PATCH] =?UTF-8?q?=F0=9F=86=99=20More=20fixes=20=F0=9F=86=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../app/Models/Community/Staff/WebsiteTeam.php | 3 +++ Updated_Cms/app/Models/EmulatorText.php | 3 --- .../app/Models/Game/Furniture/CatalogItem.php | 3 +++ .../app/Models/Game/Furniture/CatalogPage.php | 3 +++ Updated_Cms/app/Models/Game/Furniture/Item.php | 3 +++ .../app/Models/Game/Furniture/ItemBase.php | 3 +++ Updated_Cms/app/Models/Game/Guild/Guild.php | 3 +++ .../app/Models/Game/Guild/GuildMember.php | 3 +++ Updated_Cms/app/Models/Game/Permission.php | 18 ++++++++++++------ .../Help/WebsiteHelpCenterTicketReply.php | 6 ++++++ 10 files changed, 39 insertions(+), 9 deletions(-) diff --git a/Updated_Cms/app/Models/Community/Staff/WebsiteTeam.php b/Updated_Cms/app/Models/Community/Staff/WebsiteTeam.php index bc30a59e9b..adade808e0 100644 --- a/Updated_Cms/app/Models/Community/Staff/WebsiteTeam.php +++ b/Updated_Cms/app/Models/Community/Staff/WebsiteTeam.php @@ -10,6 +10,9 @@ class WebsiteTeam extends Model { protected $guarded = []; + /** + * @return HasMany + */ public function users(): HasMany { return $this->hasMany(User::class, 'team_id', 'id'); diff --git a/Updated_Cms/app/Models/EmulatorText.php b/Updated_Cms/app/Models/EmulatorText.php index f4b88b86c0..7dfc57d554 100644 --- a/Updated_Cms/app/Models/EmulatorText.php +++ b/Updated_Cms/app/Models/EmulatorText.php @@ -2,13 +2,10 @@ namespace App\Models; -use Illuminate\Database\Eloquent\Factories\HasFactory; use Illuminate\Database\Eloquent\Model; class EmulatorText extends Model { - use HasFactory; - protected $guarded = []; public $timestamps = false; diff --git a/Updated_Cms/app/Models/Game/Furniture/CatalogItem.php b/Updated_Cms/app/Models/Game/Furniture/CatalogItem.php index 2b819917a8..a6ef93839d 100644 --- a/Updated_Cms/app/Models/Game/Furniture/CatalogItem.php +++ b/Updated_Cms/app/Models/Game/Furniture/CatalogItem.php @@ -11,6 +11,9 @@ class CatalogItem extends Model public $timestamps = false; + /** + * @return BelongsTo + */ public function itemBase(): BelongsTo { return $this->belongsTo(ItemBase::class, 'item_ids', 'id'); diff --git a/Updated_Cms/app/Models/Game/Furniture/CatalogPage.php b/Updated_Cms/app/Models/Game/Furniture/CatalogPage.php index 7959156953..879d4ab874 100644 --- a/Updated_Cms/app/Models/Game/Furniture/CatalogPage.php +++ b/Updated_Cms/app/Models/Game/Furniture/CatalogPage.php @@ -11,6 +11,9 @@ class CatalogPage extends Model public $timestamps = false; + /** + * @return HasMany + */ public function catalogItems(): HasMany { return $this->hasMany(CatalogItem::class, 'page_id'); diff --git a/Updated_Cms/app/Models/Game/Furniture/Item.php b/Updated_Cms/app/Models/Game/Furniture/Item.php index 57093ea87d..edafe77d2a 100644 --- a/Updated_Cms/app/Models/Game/Furniture/Item.php +++ b/Updated_Cms/app/Models/Game/Furniture/Item.php @@ -12,6 +12,9 @@ class Item extends Model public $timestamps = false; + /** + * @return BelongsTo + */ public function user(): BelongsTo { return $this->belongsTo(User::class); diff --git a/Updated_Cms/app/Models/Game/Furniture/ItemBase.php b/Updated_Cms/app/Models/Game/Furniture/ItemBase.php index 998bc6b2a5..a44e882330 100644 --- a/Updated_Cms/app/Models/Game/Furniture/ItemBase.php +++ b/Updated_Cms/app/Models/Game/Furniture/ItemBase.php @@ -18,6 +18,9 @@ class ItemBase extends Model return sprintf('%s/%s_icon.png', setting('furniture_icons_path'), $this->item_name); } + /** + * @return HasMany + */ public function catalogItems(): HasMany { return $this->hasMany(CatalogItem::class, 'item_ids', 'id'); diff --git a/Updated_Cms/app/Models/Game/Guild/Guild.php b/Updated_Cms/app/Models/Game/Guild/Guild.php index 169f10571d..f5a6c2a2c4 100644 --- a/Updated_Cms/app/Models/Game/Guild/Guild.php +++ b/Updated_Cms/app/Models/Game/Guild/Guild.php @@ -11,6 +11,9 @@ class Guild extends Model public $timestamps = false; + /** + * @return HasMany + */ public function members(): HasMany { return $this->hasMany(GuildMember::class); diff --git a/Updated_Cms/app/Models/Game/Guild/GuildMember.php b/Updated_Cms/app/Models/Game/Guild/GuildMember.php index 6883f8042a..e46d4b6b85 100644 --- a/Updated_Cms/app/Models/Game/Guild/GuildMember.php +++ b/Updated_Cms/app/Models/Game/Guild/GuildMember.php @@ -13,6 +13,9 @@ class GuildMember extends Model public $timestamps = false; + /** + * @return HasMany + */ public function guilds(): HasMany { return $this->hasMany(Guild::class); diff --git a/Updated_Cms/app/Models/Game/Permission.php b/Updated_Cms/app/Models/Game/Permission.php index f1c5d5d879..ba46fe87b4 100644 --- a/Updated_Cms/app/Models/Game/Permission.php +++ b/Updated_Cms/app/Models/Game/Permission.php @@ -3,7 +3,7 @@ namespace App\Models\Game; use App\Models\Compositions\HasBadge; -use App\Models\StaffApplication; +use App\Models\Community\Staff\WebsiteStaffApplications; use App\Models\User; use Illuminate\Database\Eloquent\Model; use Illuminate\Database\Eloquent\Relations\HasMany; @@ -16,19 +16,25 @@ class Permission extends Model implements HasBadge protected $guarded = ['id', 'rank_name']; + /** + * @return HasMany + */ public function users(): HasMany { return $this->hasMany(User::class, 'rank', 'id'); } - public function roles(): HasMany - { - return $this->hasMany(PermissionRole::class); - } + // public function roles(): HasMany + // { + // return $this->hasMany(PermissionRole::class); + // } + /** + * @return HasMany + */ public function staffApplications(): HasMany { - return $this->hasMany(StaffApplication::class, 'rank_id'); + return $this->hasMany(WebsiteStaffApplications::class, 'rank_id'); } public function getBadgePath(): string diff --git a/Updated_Cms/app/Models/Help/WebsiteHelpCenterTicketReply.php b/Updated_Cms/app/Models/Help/WebsiteHelpCenterTicketReply.php index c57a81a421..ad29449c87 100644 --- a/Updated_Cms/app/Models/Help/WebsiteHelpCenterTicketReply.php +++ b/Updated_Cms/app/Models/Help/WebsiteHelpCenterTicketReply.php @@ -12,11 +12,17 @@ class WebsiteHelpCenterTicketReply extends Model { protected $guarded = ['id']; + /** + * @return BelongsTo + */ public function ticket(): BelongsTo { return $this->belongsTo(WebsiteHelpCenterTicket::class, 'ticket_id'); } + /** + * @return BelongsTo + */ public function user(): BelongsTo { return $this->belongsTo(User::class, 'user_id');