Update Slack and Discord notifier classes

README.md

@@ -24,7 +24,7 @@ Works for [Discord webhooks](https://support.discord.com/hc/en-us/articles/22838
 > When native Laravel notifications are for users, this package is designed for developers to help for debugging and monitoring, but you can use it for users too.
 
 > [!IMPORTANT]
-> This package offer a support for Discord and Slack webhooks, but Slack has only basic support, for more, you can use [`laravel/slack-notification-channel`](https://github.com/laravel/slack-notification-channel). To avoid dependencies, this package doesn't use it.
+> This package offer a support for Discord and Slack webhooks, but Slack has only basic support (without legacy API support), for more, you can use [`laravel/slack-notification-channel`](https://github.com/laravel/slack-notification-channel). To avoid dependencies, this package doesn't use it.
 
 ## Installation
 

src/Notifier/Discord/NotifierDiscordMessage.php

@@ -2,6 +2,8 @@
 
 namespace Kiwilan\Notifier\Notifier\Discord;
 
+use Kiwilan\Notifier\Utils\NotifierHelpers;
+
 class NotifierDiscordMessage extends NotifierDiscordContainer
 {
     protected function __construct(
@@ -13,9 +15,7 @@ protected function __construct(
 
     public static function create(string $webhook, string $message): self
     {
-        if (strlen($message) > 2000) {
-            $message = substr($message, 0, 1980).'...';
-        }
+        $message = NotifierHelpers::truncate($message);
 
         $self = new self($message);
         $self->webhook = $webhook;

src/Notifier/Discord/NotifierDiscordRich.php

@@ -4,6 +4,7 @@
 
 use Carbon\Carbon;
 use DateTime;
+use Kiwilan\Notifier\Utils\NotifierHelpers;
 
 class NotifierDiscordRich extends NotifierDiscordContainer
 {
@@ -28,6 +29,8 @@ protected function __construct(
 
     public static function create(string $webhook, string $description): self
     {
+        $description = NotifierHelpers::truncate($description);
+
         $self = new self($description);
         $self->webhook = $webhook;
 

src/Notifier/NotifierDiscord.php

@@ -23,13 +23,23 @@ public static function make(string $webhook): self
         return new self($webhook);
     }
 
-    public function message(string $message): NotifierDiscordMessage
+    /**
+     * @param  string[]|string  $message
+     */
+    public function message(array|string $message): NotifierDiscordMessage
     {
+        $message = $this->arrayToString($message);
+
         return NotifierDiscordMessage::create($this->webhook, $message);
     }
 
-    public function rich(string $message): NotifierDiscordRich
+    /**
+     * @param  string[]|string  $message
+     */
+    public function rich(array|string $message): NotifierDiscordRich
     {
+        $message = $this->arrayToString($message);
+
         return NotifierDiscordRich::create($this->webhook, $message);
     }
 }

src/Notifier/NotifierSlack.php

@@ -3,8 +3,12 @@
 namespace Kiwilan\Notifier\Notifier;
 
 use Kiwilan\Notifier\Notifier;
-use Kiwilan\Notifier\Utils\NotifierRequest;
+use Kiwilan\Notifier\Notifier\Slack\NotifierSlackMessage;
 
+/**
+ * @see https://api.slack.com/messaging/webhooks#advanced_message_formatting
+ * @see https://api.slack.com/block-kit
+ */
 class NotifierSlack extends Notifier
 {
     protected function __construct(
@@ -18,34 +22,13 @@ public static function make(string $webhook): self
         return new self($webhook);
     }
 
-    public function message(array|string $message): self
+    /**
+     * @param  string[]|string  $message
+     */
+    public function message(array|string $message): NotifierSlackMessage
     {
-        $this->message = $this->arrayToString($message);
+        $message = $this->arrayToString($message);
 
-        return $this;
-    }
-
-    public function send(): bool
-    {
-        $this->request = NotifierRequest::make($this->webhook)
-            ->requestData($this->toArray())
-            ->send();
-
-        if ($this->request->getStatusCode() !== 200) {
-            $this->logError("status code {$this->request->getStatusCode()}", [
-                $this->request->toArray(),
-            ]);
-
-            return false;
-        }
-
-        return true;
-    }
-
-    public function toArray(): array
-    {
-        return [
-            'text' => $this->message ?? '',
-        ];
+        return NotifierSlackMessage::create($this->webhook, $message);
     }
 }

src/Notifier/Slack/NotifierSlackContainer.php

@@ -14,7 +14,7 @@ protected function __construct(
     ) {
     }
 
-    abstract public static function create(string $webhook, string $description): self;
+    abstract public static function create(string $webhook, string $message): self;
 
     abstract public function toArray(): array;
 

src/Notifier/Slack/NotifierSlackMessage.php

@@ -2,51 +2,36 @@
 
 namespace Kiwilan\Notifier\Notifier\Slack;
 
+use Kiwilan\Notifier\Utils\NotifierHelpers;
+
 class NotifierSlackMessage extends NotifierSlackContainer
 {
     protected function __construct(
-        protected ?string $message = null,
-        protected ?string $username = null,
-        protected ?string $avatarUrl = null,
+        protected ?string $text = null,
+        protected string $type = 'plain_text',
     ) {
     }
 
     public static function create(string $webhook, string $message): self
     {
-        if (strlen($message) > 2000) {
-            $message = substr($message, 0, 1980).'...';
-        }
+        $message = NotifierHelpers::truncate($message);
 
         $self = new self($message);
         $self->webhook = $webhook;
 
         return $self;
     }
 
-    public function user(string $username, ?string $avatarUrl = null): self
-    {
-        $this->username = $username;
-
-        if ($avatarUrl) {
-            $this->avatarUrl = $avatarUrl;
-        }
-
-        return $this;
-    }
-
     public function toArray(): array
     {
         $data = [];
 
-        if ($this->username) {
-            $data['username'] = $this->username;
-        }
-
-        if ($this->avatarUrl) {
-            $data['avatar_url'] = $this->avatarUrl;
-        }
+        // $data['text'] = [
+        //     'type' => $this->type,
+        //     'text' => $this->text,
+        // ];
 
-        $data['content'] = $this->message ?? 'Empty message.';
+        $data['text'] = $this->text;
 
         return $data;
     }

src/Utils/NotifierHelpers.php

@@ -0,0 +1,19 @@
+<?php
+
+namespace Kiwilan\Notifier\Utils;
+
+class NotifierHelpers
+{
+    public static function truncate(?string $string, int $length = 2000): ?string
+    {
+        if (! $string) {
+            return null;
+        }
+
+        if (strlen($string) > $length) {
+            $string = substr($string, 0, $length - 20).'...';
+        }
+
+        return $string;
+    }
+}

tests/NotifierDiscordTest.php

@@ -50,7 +50,21 @@
     expect($notifier->isSuccess())->toBeTrue();
 
     $notifier = Notifier::discord()
-        ->rich('Rich simple')
+        ->message([
+            'Hello, Discord!',
+            'This is a message.',
+        ])
+        ->user('Notifier', 'https://raw.githubusercontent.com/kiwilan/notifier-laravel/main/docs/banner.jpg')
+        ->send();
+    expect($notifier->isSuccess())->toBeTrue();
+
+    $notifier = Notifier::discord()
+        ->rich([
+            'Rich',
+            'simple',
+            'for',
+            'Discord',
+        ])
         ->send();
     expect($notifier->isSuccess())->toBeTrue();
 

tests/NotifierSlackDefaultTest.php

@@ -0,0 +1,121 @@
+<?php
+
+// it('can use', function () {
+//     $default = [
+//         'text' => 'Content',
+//     ];
+
+//     $legacy = [
+//         'username' => 'Ghostbot',
+//         'icon_emoji' => ':ghost:',
+//         'channel' => '#random',
+//         'text' => 'Content',
+//     ];
+
+//     $attachments = [
+//         'text' => [
+//             'type' => 'mrkdwn',
+//             'text' => '*Content with attachment*',
+//         ],
+//         'attachments' => [
+//             [
+//                 'title' => 'Laravel',
+//                 'title_link' => 'https://laravel.com',
+//                 'text' => 'Attachment Content',
+//                 'fallback' => 'Attachment Fallback',
+//                 'fields' => [
+//                     [
+//                         'title' => 'Project',
+//                         'value' => 'Laravel',
+//                         'short' => true,
+//                     ],
+//                 ],
+//                 'mrkdwn_in' => ['text'],
+//                 'footer' => 'Laravel',
+//                 'footer_icon' => 'https://laravel.com/fake.png',
+//                 'author_name' => 'Author',
+//                 'author_link' => 'https://laravel.com/fake_author',
+//                 'author_icon' => 'https://laravel.com/fake_author.png',
+//                 'ts' => 1234567890,
+//             ],
+//         ],
+//     ];
+
+//     $blocks = [
+//         [
+//             'blocks' => [
+//                 [
+//                     'type' => 'section',
+//                     'text' => [
+//                         'type' => 'mrkdwn',
+//                         'text' => 'Danny Torrence left the following review for your property:',
+//                     ],
+//                     'fields' => [
+//                         [
+//                             'type' => 'mrkdwn',
+//                             'text' => '*Markdown!*',
+//                         ],
+//                         [
+//                             'type' => 'plain_text',
+//                             'text' => str_repeat('a', 1997).'...',
+//                         ],
+//                         [
+//                             'type' => 'mrkdwn',
+//                             'text' => 'Location: 123 Main Street, New York, NY 10010',
+//                         ],
+//                     ],
+//                 ],
+//                 [
+//                     'type' => 'divider',
+//                 ],
+//                 [
+//                     'type' => 'actions',
+//                     'elements' => [
+//                         [
+//                             'type' => 'button',
+//                             'text' => [
+//                                 'type' => 'plain_text',
+//                                 'text' => 'Example Button',
+//                             ],
+//                             'action_id' => 'button_example-button',
+//                         ],
+//                         [
+//                             'type' => 'button',
+//                             'text' => [
+//                                 'type' => 'plain_text',
+//                                 'text' => 'Scary Button',
+//                             ],
+//                             'action_id' => 'button_scary-button',
+//                             'style' => 'danger',
+//                         ],
+//                     ],
+//                 ],
+//                 [
+//                     'type' => 'header',
+//                     'text' => [
+//                         'type' => 'plain_text',
+//                         'text' => 'Budget Performance',
+//                     ],
+//                 ],
+//                 [
+//                     'type' => 'image',
+//                     'image_url' => 'https://raw.githubusercontent.com/kiwilan/notifier-laravel/main/docs/banner.jpg',
+//                     'alt_text' => 'notifier banner',
+//                 ],
+//                 [
+//                     'type' => 'section',
+//                     'block_id' => 'section567',
+//                     'text' => [
+//                         'type' => 'mrkdwn',
+//                         'text' => 'Markdown *can* be so fun!',
+//                     ],
+//                     'accessory' => [
+//                         'type' => 'image',
+//                         'image_url' => 'https://raw.githubusercontent.com/kiwilan/notifier-laravel/main/docs/banner.jpg',
+//                         'alt_text' => 'notifier banner',
+//                     ],
+//                 ],
+//             ],
+//         ],
+//     ];
+// });