From 593951b4092a5fd826aa38192b572c095a0cb61e Mon Sep 17 00:00:00 2001
From: "waffle.lord" <waffle.lord@hotmail.com>
Date: Sat, 23 Nov 2024 11:27:10 -0500
Subject: [PATCH] remove disabled scope

---
 app/Livewire/Mod/ModerationOptions.php         |  9 ++++++---
 app/Models/Mod.php                             |  2 --
 app/Models/ModVersion.php                      |  3 ---
 app/Models/Scopes/DisabledScope.php            | 18 ------------------
 resources/views/components/mod-card.blade.php  |  4 ++--
 .../livewire/mod/moderation-options.blade.php  |  6 ++++--
 6 files changed, 12 insertions(+), 30 deletions(-)
 delete mode 100644 app/Models/Scopes/DisabledScope.php

diff --git a/app/Livewire/Mod/ModerationOptions.php b/app/Livewire/Mod/ModerationOptions.php
index 8784216..ccde594 100644
--- a/app/Livewire/Mod/ModerationOptions.php
+++ b/app/Livewire/Mod/ModerationOptions.php
@@ -2,11 +2,13 @@
 
 namespace App\Livewire\Mod;
 
-use Illuminate\Support\Facades\Log;
+use App\Models\Mod;
 use Livewire\Component;
 
 class ModerationOptions extends Component
 {
+    public Mod $mod;
+
     public function render()
     {
         return view('livewire.mod.moderation-options');
@@ -14,11 +16,12 @@ class ModerationOptions extends Component
 
     public function deleteMod(): void
     {
-        Log::info('delete');
+        $this->mod->delete();
     }
 
     public function disableMod(): void
     {
-        Log::info('disable');
+        $this->mod->disabled = true;
+        $this->mod->save();
     }
 }
diff --git a/app/Models/Mod.php b/app/Models/Mod.php
index b7a9877..8aae2e8 100644
--- a/app/Models/Mod.php
+++ b/app/Models/Mod.php
@@ -3,7 +3,6 @@
 namespace App\Models;
 
 use App\Http\Filters\V1\QueryFilter;
-use App\Models\Scopes\DisabledScope;
 use App\Models\Scopes\PublishedScope;
 use Illuminate\Database\Eloquent\Builder;
 use Illuminate\Database\Eloquent\Casts\Attribute;
@@ -30,7 +29,6 @@ class Mod extends Model
      */
     protected static function booted(): void
     {
-        static::addGlobalScope(new DisabledScope);
         static::addGlobalScope(new PublishedScope);
     }
 
diff --git a/app/Models/ModVersion.php b/app/Models/ModVersion.php
index 100d99c..0626a00 100644
--- a/app/Models/ModVersion.php
+++ b/app/Models/ModVersion.php
@@ -3,7 +3,6 @@
 namespace App\Models;
 
 use App\Exceptions\InvalidVersionNumberException;
-use App\Models\Scopes\DisabledScope;
 use App\Models\Scopes\PublishedScope;
 use App\Support\Version;
 use Illuminate\Database\Eloquent\Factories\HasFactory;
@@ -29,8 +28,6 @@ class ModVersion extends Model
      */
     protected static function booted(): void
     {
-        static::addGlobalScope(new DisabledScope);
-
         static::addGlobalScope(new PublishedScope);
 
         static::saving(function (ModVersion $model) {
diff --git a/app/Models/Scopes/DisabledScope.php b/app/Models/Scopes/DisabledScope.php
deleted file mode 100644
index 517d3ba..0000000
--- a/app/Models/Scopes/DisabledScope.php
+++ /dev/null
@@ -1,18 +0,0 @@
-<?php
-
-namespace App\Models\Scopes;
-
-use Illuminate\Database\Eloquent\Builder;
-use Illuminate\Database\Eloquent\Model;
-use Illuminate\Database\Eloquent\Scope;
-
-class DisabledScope implements Scope
-{
-    /**
-     * Apply the scope to a given Eloquent query builder.
-     */
-    public function apply(Builder $builder, Model $model): void
-    {
-        $builder->where($model->getTable().'.disabled', false);
-    }
-}
diff --git a/resources/views/components/mod-card.blade.php b/resources/views/components/mod-card.blade.php
index e88e162..ed4059c 100644
--- a/resources/views/components/mod-card.blade.php
+++ b/resources/views/components/mod-card.blade.php
@@ -6,9 +6,9 @@
     @endif
     <div class="flex flex-col group h-full w-full bg-white dark:bg-gray-950 rounded-xl shadow-md dark:shadow-gray-950 drop-shadow-2xl overflow-hidden hover:shadow-lg hover:bg-gray-50 dark:hover:bg-black hover:shadow-gray-400 dark:hover:shadow-black transition-colors ease-out duration-700">
         <div class="h-auto md:h-full md:flex">
-            @if (auth()->check() && auth()->user()->isAdmin())
+            @if (auth()->check() && (auth()->user()->isAdmin() || auth()->user()->isMod()))
             <div class="absolute right-0 z-50 m-2">
-                <livewire:mod.moderation-options />
+                <livewire:mod.moderation-options :mod="$mod"/>
             </div>
             @endif
             <div class="relative h-auto md:h-full md:shrink-0 overflow-hidden">
diff --git a/resources/views/livewire/mod/moderation-options.blade.php b/resources/views/livewire/mod/moderation-options.blade.php
index fbf6d03..d629145 100644
--- a/resources/views/livewire/mod/moderation-options.blade.php
+++ b/resources/views/livewire/mod/moderation-options.blade.php
@@ -12,7 +12,7 @@
 
         <x-slot name="content">
             <div>
-                <button wire:click.prevent="disableMod" wire:confirm="Disable the mod?" class="p-2 h-full w-full text-blue-500 dark:text-blue-500 bg-gray-200 dark:bg-gray-800 hover:text-blue-400 dark:hover:text-blue-400">
+                <button wire:click.prevent="disableMod" wire:confirm="Disable the mod '{{$this->mod->name}}'?" class="p-2 h-full w-full text-blue-500 dark:text-blue-500 bg-gray-200 dark:bg-gray-800 hover:text-blue-400 dark:hover:text-blue-400">
                     <div class="flex">
                         <span class="pr-2">
                             {{-- Icon (circle with dash) --}}
@@ -24,8 +24,9 @@
                     </div>
                 </button>
             </div>
+            @if(auth()->user()->isAdmin())
             <div>
-                <button wire:click.prevent="deleteMod" wire:confirm="Delete the mod?" class="p-2 h-full w-full text-red-500 dark:text-red-500 bg-gray-200 dark:bg-gray-800 hover:text-red-400 dark:hover:text-red-400">
+                <button wire:click.prevent="deleteMod" wire:confirm="Delete the mod '{{$this->mod->name}}'?" class="p-2 h-full w-full text-red-500 dark:text-red-500 bg-gray-200 dark:bg-gray-800 hover:text-red-400 dark:hover:text-red-400">
                     <div class="flex">
                         <span class="pr-2">
                             {{-- Icon (trash can) --}}
@@ -37,6 +38,7 @@
                     </div>
                 </button>
             </div>
+            @endif
         </x-slot>
 
     </x-dropdown>