Add feature to pardon player from web

MineTrax · Jan 12, 2025 · d858db8 · d858db8
1 parent 1eb0981
commit d858db8
Show file tree

Hide file tree

Showing 201 changed files with 2,230 additions and 2,085 deletions.
diff --git a/app/Http/Controllers/Admin/CommandQueueController.php b/app/Http/Controllers/Admin/CommandQueueController.php
@@ -66,7 +66,7 @@ public function index()
                 ])),
             ])
             ->allowedSorts($fields)
-            ->defaultSort('-updated_at')
+            ->defaultSort('-created_at')
             ->simplePaginate($perPage)
             ->through(function ($commandQueue) {
                 if ($commandQueue->tag === 'player_password_reset') {

diff --git a/app/Http/Controllers/BanWardenController.php b/app/Http/Controllers/BanWardenController.php
@@ -15,6 +15,7 @@
 use Spatie\QueryBuilder\QueryBuilder;
 use Illuminate\Support\Facades\Cache;
 use Illuminate\Support\Facades\Gate;
+use Illuminate\Support\Facades\Log;
 
 class BanWardenController extends Controller
 {
@@ -326,15 +327,15 @@ public function deleteEvidence(PlayerPunishment $playerPunishment, $evidence)
     public function pardon(PlayerPunishment $playerPunishment, Request $request)
     {
         $request->validate([
-            'reason' => 'nullable|string|max:255',
+            'reason' => 'nullable|string|max:100',
         ]);
 
         $this->authorize('delete', $playerPunishment);
 
         try {
-            PardonPlayerPunishmentJob::dispatchSync($playerPunishment, $request->input('reason'));
+            PardonPlayerPunishmentJob::dispatchSync($playerPunishment, $request->input('reason'), $request->user()->username);
         } catch (\Exception $e) {
-            \Log::error($e);
+            Log::error($e);
             return redirect()->back()
                 ->with(['toast' => ['type' => 'error', 'title' => __('Pardon Failed'), 'body' => 'Failed to execute pardon job to due webquery issue.']]);
         }

diff --git a/app/Jobs/GeneratePunishmentInsightsJob.php b/app/Jobs/GeneratePunishmentInsightsJob.php
@@ -56,7 +56,7 @@ public function handle(AiService $aiService): void
             ]);
 
         // Details
-        $this->punishment->victimPlayer->makeHidden([
+        $this->punishment->victimPlayer?->makeHidden([
             'skin_texture_id',
             'avatar_url',
         ]);

diff --git a/app/Jobs/PardonPlayerPunishmentJob.php b/app/Jobs/PardonPlayerPunishmentJob.php
@@ -16,7 +16,7 @@ class PardonPlayerPunishmentJob implements ShouldQueue
 {
     use Dispatchable, InteractsWithQueue, Queueable, SerializesModels;
 
-    public function __construct(public PlayerPunishment $playerPunishment, public $reason)
+    public function __construct(public PlayerPunishment $playerPunishment, public $reason, public $admin = null)
     {
         //
     }
@@ -27,12 +27,11 @@ public function handle(): void
         // 1. If we have origin_server_id & that server has webquery, use that server.
         // 2. else, send to all servers that have webquery.
         if ($this->playerPunishment->origin_server_id && $this->playerPunishment->originServer?->webquery_port) {
-            $server = [$this->playerPunishment->originServer];
+            $servers = [$this->playerPunishment->originServer];
         } else {
             $servers = Server::select(['id', 'name', 'hostname'])->whereNotNull('webquery_port')->get();
         }
 
-
         foreach ($servers as $server) {
             $this->pardonPlayerPunishment($server);
         }
@@ -44,9 +43,10 @@ private function pardonPlayerPunishment(Server $server): void
 
         $victim = $this->playerPunishment->uuid ?? $this->playerPunishment->ip_address;
         $webQuery->banwardenPardon(
-            $this->playerPunishment->type->value,
+            $this->playerPunishment->type,
             $victim,
             $this->reason,
+            $this->admin,
         );
     }
 }
diff --git a/app/Utils/MinecraftQuery/MinecraftWebQuery.php b/app/Utils/MinecraftQuery/MinecraftWebQuery.php
@@ -14,12 +14,13 @@ public function __construct(public $HOST, public $PORT)
     {
     }
 
-    public function banwardenPardon(PlayerPunishmentType $type, string $victim, string $reason = null)
+    public function banwardenPardon(PlayerPunishmentType $type, string $victim, string $reason = null, string $admin = null)
     {
         $payload = [
-            'type' => $type->value,
+            'punishment_type' => $type->value,
             'victim' => $victim,
             'reason' => $reason,
+            'admin' => $admin,
         ];
         $status = $this->sendQuery('banwarden-pardon', $payload);
 
@@ -150,6 +151,11 @@ public function sendQuery($type, array $data = [])
 
     public function makePayload($type, array $data = [])
     {
+        // In data, make sure type and timestamp are not present as they are reserved throw exception if they are.
+        if (array_key_exists('type', $data) || array_key_exists('timestamp', $data)) {
+            throw new \Exception('type and timestamp are reserved keys and cannot be used in data.');
+        }
+
         // Get the API Key and Secret from the plugin settings.
         $pluginSettings = app(PluginSettings::class);
         $apiKey = $pluginSettings->plugin_api_key;

diff --git a/composer.json b/composer.json
@@ -10,7 +10,7 @@
     ],
     "license": "MIT",
     "require": {
-        "php": ">=8.2",
+        "php": ">=8.3",
         "ext-json": "*",
         "ext-sockets": "*",
         "ext-zip": "*",
@@ -59,13 +59,14 @@
     "require-dev": {
         "barryvdh/laravel-debugbar": "^3.14",
         "barryvdh/laravel-ide-helper": "^3.2",
-        "nunomaduro/phpinsights": "^2.12",
         "fakerphp/faker": "^1.24",
         "laravel/pint": "^1.18",
         "mockery/mockery": "^1.6",
         "nunomaduro/collision": "^8.5",
+        "nunomaduro/phpinsights": "^2.12",
         "pestphp/pest": "^3.0",
         "pestphp/pest-plugin-laravel": "^3.0",
+        "rector/rector": "^2.0",
         "spatie/laravel-ignition": "^2.9"
     },
     "autoload": {