fix: channel fixes

laravel-notification-channels · Feb 17, 2024 · 42d37f7 · 42d37f7
1 parent f39e903
commit 42d37f7
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 18 deletions.
diff --git a/src/Exceptions/CouldNotSendNotification.php b/src/Exceptions/CouldNotSendNotification.php
@@ -4,8 +4,4 @@
 
 class CouldNotSendNotification extends \Exception
 {
-    public static function touchSmsError(string $message, int $code): self
-    {
-        return new static(sprintf('TouchSms responded with error %d, message: %s', $code, $message), $code);
-    }
 }
diff --git a/src/TouchSmsChannel.php b/src/TouchSmsChannel.php
@@ -22,11 +22,11 @@ public function send($notifiable, Notification $notification): void
     {
         $to = $notifiable->routeNotificationFor('touchsms');
 
-        if (! $to) {
+        if (!$to) {
             $to = $notifiable->routeNotificationFor(TouchSmsChannel::class);
         }
 
-        if (! $to) {
+        if (!$to) {
             return;
         }
 
@@ -36,13 +36,13 @@ public function send($notifiable, Notification $notification): void
             $message = new TouchSmsMessage($message);
         }
 
-        if (! $message instanceof TouchSmsMessage) {
+        if (!$message instanceof TouchSmsMessage) {
             return;
         }
 
         $apiMessage = (new OutboundMessage())
             ->setTo($to)
-            ->setFrom($message->sender ?? config('services.touchsms.default_sender'))
+            ->setFrom($message->sender ?? config('services.touchsms.default_sender') ?? 'SHARED_NUMBER')
             ->setBody($message->content)
             ->setReference($message->reference)
             ->setMetadata($message->metadata);
@@ -51,13 +51,13 @@ public function send($notifiable, Notification $notification): void
             $apiMessage->setDate($message->sendAt->format(\DateTimeInterface::ATOM));
         }
 
-        $response = $this->client->sendMessages(new SendMessageBody([
-            'messages' => [$apiMessage],
-        ]));
+        $response = $this->client->sendMessages(
+            (new SendMessageBody())->setMessages([$apiMessage])
+        );
 
-        if (! $response || count($response->getData()->getErrors())) {
+        if (!$response || count($response->getData()->getErrors())) {
             $error = $response->getData()->getErrors()[0];
-            throw CouldNotSendNotification::touchSmsError($error->getErrorCode().$error->getErrorHelp() ? ' - '.$error->getErrorHelp() : '', 400);
+            throw new CouldNotSendNotification($error->getErrorCode() . ($error->getErrorHelp() ? ' - ' . $error->getErrorHelp() : ''), 400);
         }
     }
 }
diff --git a/src/TouchSmsMessage.php b/src/TouchSmsMessage.php
@@ -10,19 +10,19 @@ class TouchSmsMessage
     public string $content;
 
     /** @var string|null */
-    public ?string $sender;
+    public ?string $sender = null;
 
     /** @var string|null */
-    public ?string $campaign;
+    public ?string $campaign = null;
 
     /** @var string|null */
-    public ?string $reference;
+    public ?string $reference = null;
 
     /** @var DateTimeInterface|null */
-    public ?DateTimeInterface $sendAt;
+    public ?DateTimeInterface $sendAt = null;
 
     /** @var array|null */
-    public ?array $metadata;
+    public ?array $metadata = null;
 
     public function __construct(string $content = '')
     {

diff --git a/src/TouchSmsServiceProvider.php b/src/TouchSmsServiceProvider.php
@@ -28,4 +28,9 @@ public function register(): void
                 );
             });
     }
+
+    public function provides(): array
+    {
+        return [Client::class];
+    }
 }
-Original file line number
+Diff line change
@@ Expand Up / @@ -28,4 +28,9 @@ public function register(): void @@
                     );
                 });
         }
+        public function provides(): array
+        {
+            return [Client::class];
+        }
     }