From 570742dcbaa8cd1029e20d26ef7a69f4d7bd0bb1 Mon Sep 17 00:00:00 2001 From: "waffle.lord" Date: Mon, 9 Dec 2024 15:58:11 -0500 Subject: [PATCH] swap ModeratedModel for CanModerate trait --- app/Models/Mod.php | 9 +++------ app/Models/ModVersion.php | 9 +++------ app/Models/ModeratedModel.php | 16 ---------------- app/Traits/CanModerate.php | 12 ++++++++++++ 4 files changed, 18 insertions(+), 28 deletions(-) delete mode 100644 app/Models/ModeratedModel.php create mode 100644 app/Traits/CanModerate.php diff --git a/app/Models/Mod.php b/app/Models/Mod.php index af3988c..48aa929 100644 --- a/app/Models/Mod.php +++ b/app/Models/Mod.php @@ -4,6 +4,7 @@ namespace App\Models; use App\Http\Filters\V1\QueryFilter; use App\Models\Scopes\PublishedScope; +use App\Traits\CanModerate; use Illuminate\Database\Eloquent\Builder; use Illuminate\Database\Eloquent\Casts\Attribute; use Illuminate\Database\Eloquent\Factories\HasFactory; @@ -18,8 +19,9 @@ use Illuminate\Support\Facades\Storage; use Illuminate\Support\Str; use Laravel\Scout\Searchable; -class Mod extends ModeratedModel +class Mod extends Model { + use CanModerate; use HasFactory; use Searchable; use SoftDeletes; @@ -257,9 +259,4 @@ class Mod extends ModeratedModel set: fn (string $value) => Str::slug($value), ); } - - public function getFriendlyName(): string - { - return $this->name; - } } diff --git a/app/Models/ModVersion.php b/app/Models/ModVersion.php index ff84764..21e572e 100644 --- a/app/Models/ModVersion.php +++ b/app/Models/ModVersion.php @@ -5,6 +5,7 @@ namespace App\Models; use App\Exceptions\InvalidVersionNumberException; use App\Models\Scopes\PublishedScope; use App\Support\Version; +use App\Traits\CanModerate; use Illuminate\Database\Eloquent\Factories\HasFactory; use Illuminate\Database\Eloquent\Model; use Illuminate\Database\Eloquent\Relations\BelongsTo; @@ -13,8 +14,9 @@ use Illuminate\Database\Eloquent\Relations\HasMany; use Illuminate\Database\Eloquent\Relations\HasOneThrough; use Illuminate\Database\Eloquent\SoftDeletes; -class ModVersion extends ModeratedModel +class ModVersion extends Model { + use CanModerate; use HasFactory; use SoftDeletes; @@ -168,9 +170,4 @@ class ModVersion extends ModeratedModel 'published_at' => 'datetime', ]; } - - public function getFriendlyName(): string - { - return $this->version; - } } diff --git a/app/Models/ModeratedModel.php b/app/Models/ModeratedModel.php deleted file mode 100644 index 59afe14..0000000 --- a/app/Models/ModeratedModel.php +++ /dev/null @@ -1,16 +0,0 @@ -disabled = ! $this->disabled; - $this->save(); - } -} diff --git a/app/Traits/CanModerate.php b/app/Traits/CanModerate.php new file mode 100644 index 0000000..2be415b --- /dev/null +++ b/app/Traits/CanModerate.php @@ -0,0 +1,12 @@ +disabled = ! $this->disabled; + $this->save(); + } +}