Implemented ability to add attachments to message (#6)

* Implemented ability to add attachments to message * Fix styling * Fix phpstan issue --------- Co-authored-by: Plytas <[email protected]>
Plytas · Jul 16, 2024 · 4bfbc97 · 4bfbc97
1 parent 5ddab09
commit 4bfbc97
Show file tree

Hide file tree

Showing 5 changed files with 94 additions and 3 deletions.
diff --git a/src/Data/DiscordMessage.php b/src/Data/DiscordMessage.php
@@ -15,6 +15,10 @@ public function __construct(
         public Collection $embeds = new Collection(),
         /** @var Collection<int, DiscordComponent> */
         public Collection $components = new Collection(),
+        /** @var array<int, mixed> */
+        public ?array $attachments = null,
+        /** @var Collection<int, DiscordMessageFile> */
+        private Collection $files = new Collection(),
     ) {}
 
     public static function new(): self
@@ -53,4 +57,31 @@ public function addComponent(DiscordComponent $component): self
 
         return $this;
     }
+
+    public function removeAttachments(): self
+    {
+        $this->attachments = [];
+
+        return $this;
+    }
+
+    public function addFile(DiscordMessageFile $file): self
+    {
+        $this->files->push($file);
+
+        return $this;
+    }
+
+    /**
+     * @return Collection<int, DiscordMessageFile>
+     */
+    public function getFiles(): Collection
+    {
+        return $this->files;
+    }
+
+    public function isMultipart(): bool
+    {
+        return $this->files->isNotEmpty();
+    }
 }
diff --git a/src/Data/DiscordMessageEmbed.php b/src/Data/DiscordMessageEmbed.php
@@ -14,6 +14,7 @@ public function __construct(
         public int|EmbedColor $color = EmbedColor::Default,
         /** @var Collection<int, DiscordMessageEmbedField> */
         public Collection $fields = new Collection(),
+        public ?DiscordMessageEmbedImage $image = null,
     ) {}
 
     public static function new(): self
@@ -52,4 +53,11 @@ public function addField(?DiscordMessageEmbedField $field): self
 
         return $this;
     }
+
+    public function setImage(?DiscordMessageEmbedImage $image): self
+    {
+        $this->image = $image;
+
+        return $this;
+    }
 }
diff --git a/src/Data/DiscordMessageEmbedImage.php b/src/Data/DiscordMessageEmbedImage.php
@@ -0,0 +1,15 @@
+<?php
+
+namespace Plytas\Discord\Data;
+
+use Spatie\LaravelData\Data;
+
+class DiscordMessageEmbedImage extends Data
+{
+    public function __construct(
+        public string $url,
+        public ?string $proxy_url = null,
+        public ?int $height = null,
+        public ?int $width = null,
+    ) {}
+}
diff --git a/src/Data/DiscordMessageFile.php b/src/Data/DiscordMessageFile.php
@@ -0,0 +1,18 @@
+<?php
+
+namespace Plytas\Discord\Data;
+
+use Spatie\LaravelData\Data;
+
+class DiscordMessageFile extends Data
+{
+    public function __construct(
+        public string $filename,
+        public string $content,
+    ) {}
+
+    public static function new(string $filename, string $content): self
+    {
+        return new self($filename, $content);
+    }
+}
diff --git a/src/Discord.php b/src/Discord.php
@@ -37,7 +37,6 @@ public function __construct()
         $this->client = Http::baseUrl('https://discord.com/api/v10')
             ->withUserAgent("DiscordBot ($appUrl, 1)")
             ->acceptJson()
-            ->asJson()
             ->withToken($botToken, 'Bot');
     }
 
@@ -64,12 +63,32 @@ public function deleteInteractionMessage(DiscordInteraction $interaction): Respo
 
     public function createMessage(string $channelId, DiscordMessage $message): Response
     {
-        return $this->client->post("/channels/{$channelId}/messages", $message->toArray());
+        if ($message->isMultipart()) {
+            $this->client->attach('payload_json', $message->toJson());
+
+            foreach ($message->getFiles() as $index => $file) {
+                $this->client->attach("files[{$index}]", $file->content, $file->filename);
+            }
+
+            return $this->client->post("/channels/{$channelId}/messages");
+        }
+
+        return $this->client->asJson()->post("/channels/{$channelId}/messages", $message->toArray());
     }
 
     public function updateMessage(string $channelId, string $messageId, DiscordMessage $message): Response
     {
-        return $this->client->patch("/channels/{$channelId}/messages/{$messageId}", $message->toArray());
+        if ($message->isMultipart()) {
+            $this->client->attach('payload_json', $message->toJson());
+
+            foreach ($message->getFiles() as $index => $file) {
+                $this->client->attach("files[{$index}]", $file->content, $file->filename);
+            }
+
+            return $this->client->patch("/channels/{$channelId}/messages/{$messageId}");
+        }
+
+        return $this->client->asJson()->patch("/channels/{$channelId}/messages/{$messageId}", $message->toArray());
     }
 
     public function deleteMessage(string $channelId, string $messageId): Response