Implemented ability to add attachments to message

src/Components/ActionRow.php

@@ -14,7 +14,8 @@ class ActionRow extends Data implements DiscordComponent
     public function __construct(
         /** @var Collection<int, DiscordComponent> */
         public Collection $components = new Collection(),
-    ) {}
+    ) {
+    }
 
     public static function new(): self
     {

src/Components/Button.php

@@ -19,7 +19,8 @@ public function __construct(
         public ?bool $disabled = null,
         public ?string $url = null,
         public ButtonStyle $style = ButtonStyle::Primary,
-    ) {}
+    ) {
+    }
 
     public static function new(): self
     {

src/Components/SelectOption.php

@@ -13,7 +13,8 @@ public function __construct(
         public ?string $description = null,
         public ?DiscordEmoji $emoji = null,
         public ?bool $default = null,
-    ) {}
+    ) {
+    }
 
     public static function new(string $label, string $value): self
     {

src/Components/StringSelect.php

@@ -19,7 +19,8 @@ public function __construct(
         public ?int $min_values = 1,
         public ?int $max_values = 1,
         public ?bool $disabled = false,
-    ) {}
+    ) {
+    }
 
     public static function new(string $custom_id): self
     {

src/Components/TextInput.php

@@ -21,7 +21,8 @@ public function __construct(
         public ?int $min_length = null,
         public ?int $max_length = null,
         public TextInputStyle $style = TextInputStyle::Short,
-    ) {}
+    ) {
+    }
 
     public static function new(string $custom_id, string $label): self
     {

src/Contracts/DiscordComponent.php

@@ -2,4 +2,6 @@
 
 namespace Plytas\Discord\Contracts;
 
-interface DiscordComponent {}
+interface DiscordComponent
+{
+}

src/Data/DiscordApplicationCommand.php

@@ -14,7 +14,8 @@ public function __construct(
         public ?string $description = null,
         /** @var Collection<int, DiscordApplicationCommandOption> */
         public ?Collection $options = null,
-    ) {}
+    ) {
+    }
 
     public static function new(string $name, CommandType $type): self
     {

src/Data/DiscordApplicationCommandOption.php

@@ -14,7 +14,8 @@ public function __construct(
         public ?string $description = null,
         /** @var Collection<int, DiscordApplicationCommandOption> */
         public ?Collection $options = null,
-    ) {}
+    ) {
+    }
 
     public static function new(string $name, CommandOptionType $type): self
     {

src/Data/DiscordChannel.php

@@ -14,5 +14,6 @@ public function __construct(
         public string $guild_id,
         public ?string $parent_id,
         public int $position,
-    ) {}
+    ) {
+    }
 }

src/Data/DiscordEmoji.php

@@ -8,7 +8,8 @@ class DiscordEmoji extends Data
 {
     public function __construct(
         public string $name,
-    ) {}
+    ) {
+    }
 
     public static function new(string $name): self
     {

src/Data/DiscordGuild.php

@@ -10,5 +10,6 @@ public function __construct(
         public string $id,
         public string $name,
         public ?string $icon = null,
-    ) {}
+    ) {
+    }
 }

src/Data/DiscordInteraction.php

@@ -24,7 +24,8 @@ public function __construct(
         private ?DiscordApplicationCommand $applicationCommand = null,
         private ?DiscordMessageComponent $messageComponent = null,
         private ?DiscordModalComponent $modalComponent = null,
-    ) {}
+    ) {
+    }
 
     public function pong(): DiscordResponse
     {

src/Data/DiscordMember.php

@@ -8,5 +8,6 @@ class DiscordMember extends Data
 {
     public function __construct(
         public ?DiscordUser $user = null,
-    ) {}
+    ) {
+    }
 }

src/Data/DiscordMessage.php

@@ -15,7 +15,12 @@ public function __construct(
         public Collection $embeds = new Collection(),
         /** @var Collection<int, DiscordComponent> */
         public Collection $components = new Collection(),
-    ) {}
+
+        public ?array $attachments = null,
+        /** @var Collection<int, DiscordMessageFile> */
+        private Collection $files = new Collection(),
+    ) {
+    }
 
     public static function new(): self
     {
@@ -53,4 +58,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();
+    }
 }

src/Data/DiscordMessageComponent.php

@@ -15,5 +15,6 @@ public function __construct(
          * @var array<int, string>
          */
         public ?array $values,
-    ) {}
+    ) {
+    }
 }

src/Data/DiscordMessageEmbed.php

@@ -14,7 +14,9 @@ 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 +54,11 @@ public function addField(?DiscordMessageEmbedField $field): self
 
         return $this;
     }
+
+    public function setImage(?DiscordMessageEmbedImage $image): self
+    {
+        $this->image = $image;
+
+        return $this;
+    }
 }

src/Data/DiscordMessageEmbedField.php

@@ -10,5 +10,6 @@ public function __construct(
         public string $name,
         public string $value,
         public bool $inline = false,
-    ) {}
+    ) {
+    }
 }

src/Data/DiscordMessageEmbedImage.php

@@ -0,0 +1,16 @@
+<?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,
+    ) {
+    }
+}

src/Data/DiscordMessageFile.php

@@ -0,0 +1,19 @@
+<?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);
+    }
+}

src/Data/DiscordModal.php

@@ -14,7 +14,8 @@ public function __construct(
         public string $title,
         /** @var Collection<int, DiscordComponent> */
         public Collection $components = new Collection(),
-    ) {}
+    ) {
+    }
 
     public static function new(string $custom_id, string $title): self
     {

src/Data/DiscordModalActionRow.php

@@ -12,5 +12,6 @@ public function __construct(
         public ComponentType $type,
         /** @var Collection<int, DiscordModalTextInput> */
         public Collection $components,
-    ) {}
+    ) {
+    }
 }

src/Data/DiscordModalComponent.php

@@ -11,7 +11,8 @@ public function __construct(
         public string $custom_id,
         /** @var Collection<int, DiscordModalActionRow> */
         public Collection $components,
-    ) {}
+    ) {
+    }
 
     /**
      * @return Collection<string, DiscordModalTextInput>

src/Data/DiscordModalTextInput.php

@@ -11,5 +11,6 @@ public function __construct(
         public string $custom_id,
         public string $value,
         public ComponentType $type,
-    ) {}
+    ) {
+    }
 }

src/Data/DiscordResponse.php

@@ -11,7 +11,8 @@ class DiscordResponse extends Data
     public function __construct(
         public ResponseType $type,
         public Data|Optional $data,
-    ) {}
+    ) {
+    }
 
     public static function pong(): self
     {

src/Data/DiscordRole.php

@@ -11,7 +11,8 @@ public function __construct(
         public string $name,
         public ?string $description,
         public int $color,
-    ) {}
+    ) {
+    }
 
     public function colorToHex(): string
     {

src/Data/DiscordUser.php

@@ -14,5 +14,6 @@ public function __construct(
         public ?string $avatar = null,
         public ?bool $bot = false,
         public ?bool $system = false,
-    ) {}
+    ) {
+    }
 }

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

src/Events/DiscordCommandInteractionEvent.php

@@ -11,5 +11,6 @@ class DiscordCommandInteractionEvent
 
     public function __construct(
         public DiscordInteraction $interaction
-    ) {}
+    ) {
+    }
 }

src/Events/DiscordMessageComponentInteractionEvent.php

@@ -11,5 +11,6 @@ class DiscordMessageComponentInteractionEvent
 
     public function __construct(
         public DiscordInteraction $interaction
-    ) {}
+    ) {
+    }
 }

src/Events/DiscordModalInteractionEvent.php

@@ -11,5 +11,6 @@ class DiscordModalInteractionEvent
 
     public function __construct(
         public DiscordInteraction $interaction
-    ) {}
+    ) {
+    }
 }