wip

src/Actions/RegisterWebhooks.php

@@ -2,16 +2,19 @@
 
 namespace Vormkracht10\Mails\Actions;
 
-use Illuminate\Console\Concerns\InteractsWithIO;
-use Illuminate\Console\View\Components\Factory;
 use Vormkracht10\Mails\Shared\AsAction;
+use Vormkracht10\Mails\Facades\MailProvider;
+use Illuminate\Console\View\Components\Factory;
+use Illuminate\Console\Concerns\InteractsWithIO;
 
 class RegisterWebhooks
 {
     use AsAction, InteractsWithIO;
 
     public function handle(Factory $components)
     {
-        MailProvider::with('postmark')->registerWebhooks();
+        MailProvider::with('postmark')->registerWebhooks(
+            components: $components
+        );
     }
-}
+}

src/Actions/SendHighBounceRateNotifications.php

@@ -13,15 +13,18 @@ class SendHighBounceRateNotifications
     /**
      * @param  float|int  $rate
      * @param  float|int  $threshold
+     * @return bool
      */
-    public function handle($rate, $threshold): void
+    public function handle($rate, $threshold): bool
     {
         if (! $channels = config('mails.events.bouncerate.notify')) {
-            return;
+            return false;
         }
 
         $notification = new HighBounceRateNotification($rate, $threshold);
 
         $this->send($notification, $channels);
+
+        return true;
     }
-}
+}

src/Drivers/MailDriver.php

@@ -6,7 +6,7 @@
 use Illuminate\Support\Str;
 use Vormkracht10\Mails\Models\Mail;
 
-class MailDriver
+abstract class MailDriver
 {
     protected string $mailModel;
 
@@ -21,6 +21,14 @@ public function __construct()
         $this->uuidHeaderName = config('mails.headers.uuid');
     }
 
+    abstract protected function getUuidFromPayload(array $payload): ?string;
+
+    abstract protected function dataMapping(): array;
+
+    abstract protected function getTimestampFromPayload(array $payload): string;
+
+    abstract protected function eventMapping(): array;
+
     public function getMailFromPayload(array $payload): ?Mail
     {
         return $this->mailModel::query()
@@ -30,7 +38,7 @@ public function getMailFromPayload(array $payload): ?Mail
     public function getDataFromPayload(array $payload): array
     {
         return collect($this->dataMapping())
-            ->mapWithKeys(fn ($value, $key) => [$key => data_get($payload, $value)])
+            ->mapWithKeys(fn($value, $key) => [$key => data_get($payload, $value)])
             ->filter()
             ->merge([
                 'type' => $this->getEventFromPayload($payload),
@@ -42,7 +50,7 @@ public function getDataFromPayload(array $payload): array
     public function getEventFromPayload(array $payload): string
     {
         foreach ($this->eventMapping() as $event => $mapping) {
-            if (collect($mapping)->every(fn ($value, $key) => data_get($payload, $key) === $value)) {
+            if (collect($mapping)->every(fn($value, $key) => data_get($payload, $key) === $value)) {
                 return $event;
             }
         }
@@ -129,4 +137,4 @@ public function unsubscribed(Mail $mail, string $timestamp): void
             'opens' => $mail->opens + 1,
         ]);
     }
-}
+}

src/Drivers/MailgunDriver.php

@@ -36,7 +36,7 @@ public function getUuidFromPayload(array $payload): ?string
             null;
     }
 
-    protected function getTimestampFromPayload(array $payload)
+    protected function getTimestampFromPayload(array $payload): string
     {
         return $payload['event-data']['timestamp'];
     }

src/Drivers/PostmarkDriver.php

@@ -69,7 +69,7 @@ public function getUuidFromPayload(array $payload): ?string
             null;
     }
 
-    protected function getTimestampFromPayload(array $payload)
+    protected function getTimestampFromPayload(array $payload): string
     {
         return $payload['DeliveredAt'] ?? $payload['BouncedAt'] ?? $payload['ReceivedAt'] ?? now();
     }

src/Jobs/ResendMailJob.php

@@ -24,7 +24,7 @@ public function __construct(
         private array $to,
         private array $cc = [],
         private array $bcc = [],
-        private array $replyTo = [],
+        private array $replyTo = []
     ) {
         //
     }
@@ -43,7 +43,11 @@ private function setMessageContent(Message $message): self
             ->text($this->mail->text ?? '');
 
         foreach ($this->mail->attachments as $attachment) {
-            $message->attachData($attachment->fileData, $attachment->filename, ['mime' => $attachment->mime]);
+            $message->attachData(
+                $attachment->file_data ?? $attachment->fileData ?? '',
+                $attachment->file_name ?? $attachment->filename ?? '',
+                ['mime' => $attachment->mime_type ?? $attachment->mime ?? '']
+            );
         }
 
         return $this;
@@ -73,7 +77,6 @@ private function setMessageRecipients(Message $message): self
     private function getFirstAddress(string $jsonAddresses): string
     {
         $addresses = json_decode($jsonAddresses, true);
-
         return array_key_first($addresses);
     }
-}
+}

src/Listeners/LogMailEvent.php

@@ -30,8 +30,8 @@ private function record($provider, $payload): void
             ->logMailEvent($payload);
     }
 
-    private function dispatch($payload): void
+    private function dispatch($provider, $payload): void
     {
-        dispatch(fn () => $this->record($payload));
+        dispatch(fn () => $this->record($provider, $payload));
     }
 }

src/Traits/SendsNotifications.php

@@ -4,12 +4,11 @@
 
 use Illuminate\Notifications\Notification;
 use Illuminate\Support\Facades\Notification as Notifications;
-use Vormkracht10\Mails\Notifications\Concerns\HasDynamicDrivers;
 
 trait SendsNotifications
 {
     /**
-     * @param  HasDynamicDrivers & Notification  $notification
+     * @param  Notification  $notification
      */
     public function send(Notification $notification, array $channels): void
     {
@@ -21,14 +20,30 @@ public function send(Notification $notification, array $channels): void
             );
 
             if (empty($accounts)) {
-                return;
+                continue;
             }
 
             foreach ($accounts as $route) {
                 Notifications::route($channel, $route)->notify(
-                    $notification->on($channel),
+                    $this->prepareNotification($notification, $channel)
                 );
             }
         }
     }
-}
+
+    /**
+     * Prepare the notification for sending.
+     *
+     * @param  Notification  $notification
+     * @param  string  $channel
+     * @return Notification
+     */
+    protected function prepareNotification(Notification $notification, string $channel): Notification
+    {
+        if (method_exists($notification, 'on')) {
+            return $notification->on($channel);
+        }
+
+        return $notification;
+    }
+}