refactor: update property type for events in Webhook model and enhance server status checks in event listener

Author: =

discord-webhooks/src/Models/Webhook.php

@@ -15,7 +15,7 @@
  * @property string $name
  * @property string $webhook_url
  * @property int|null $server_id
- * @property array<WebhookEvent> $events
+ * @property array<string> $events
  * @property bool $enabled
  * @property Carbon|null $last_triggered_at
  * @property Carbon $created_at
@@ -60,7 +60,8 @@ public function server(): BelongsTo
      */
     public function hasEvent(WebhookEvent|string $event): bool
     {
-        $value = $event instanceof WebhookEvent ? $event->value : $event;
+        $value = $event instanceof WebhookEvent ? $event->value : (string)$event;
+        // $this->events ist array<string>
         return in_array($value, $this->events, true);
     }
 

discord-webhooks/src/Providers/WebhooksPluginProvider.php

@@ -2,6 +2,7 @@
 
 namespace Notjami\Webhooks\Providers;
 
+use Illuminate\Support\Facades\DB;
 use App\Models\Role;
 use App\Models\Server;
 use Illuminate\Console\Scheduling\Schedule;
@@ -42,14 +43,20 @@ protected function registerServerStatusListeners(): void
         // Server Installation Events
         Event::listen('eloquent.updating: App\Models\Server', function (Server $server) {
             // Check if status changed to installing
-            if ($server->isDirty('status') && $server->status === 'installing') {
+            if (
+                $server->isDirty('status') &&
+                ((is_string($server->status) && $server->status === 'installing') ||
+                (method_exists($server->status, 'value') && $server->status->value === 'installing'))
+            ) {
                 DB::afterCommit(function () use ($server) {
                     app(DiscordWebhookService::class)->triggerEvent(WebhookEvent::ServerInstalling, $server);
                 });
             }
 
             // Check if installation completed (status changed from installing to null/running)
-            if ($server->isDirty('status') && $server->getOriginal('status') === 'installing' && $server->status === null) {
+            $original = $server->getOriginal('status');
+            $isOriginalInstalling = (is_string($original) && $original === 'installing') || (method_exists($original, 'value') && $original->value === 'installing');
+            if ($server->isDirty('status') && $isOriginalInstalling && $server->status === null) {
                 DB::afterCommit(function () use ($server) {
                     app(DiscordWebhookService::class)->triggerEvent(WebhookEvent::ServerInstalled, $server);
                 });

discord-webhooks/src/Services/DiscordWebhookService.php

@@ -105,6 +105,9 @@ public function triggerEvent(WebhookEvent $event, Server $server): void
         }
     }
 
+    /**
+     * @param array<string, mixed> $payload
+     */
     protected function send(Webhook $webhook, array $payload): bool
     {
         // Enforce Discord webhook URL pattern as a second layer of validation