4 files changed, 24 insertions, 2 deletions
diff --git a/src/discord/chatsubmitparams.hpp b/src/discord/chatsubmitparams.hpp
index e195189..45fbb2a 100644
--- a/src/discord/chatsubmitparams.hpp
+++ b/src/discord/chatsubmitparams.hpp
@@ -1,4 +1,5 @@
 #pragma once
+#include <optional>
 #include <vector>
 #include <string>
 #include <glibmm/ustring.h>
@@ -15,6 +16,7 @@ struct ChatSubmitParams {
         Glib::RefPtr<Gio::File> File;
         AttachmentType Type;
         std::string Filename;
+        std::optional<std::string> Description;
     };
 
     bool Silent = false;
diff --git a/src/discord/discord.cpp b/src/discord/discord.cpp
index 0618e72..ac7e2f2 100644
--- a/src/discord/discord.cpp
+++ b/src/discord/discord.cpp
@@ -518,6 +518,7 @@ void DiscordClient::SendChatMessageAttachments(const ChatSubmitParams &params, c
     CreateMessageObject obj;
     obj.Content = params.Message;
     obj.Nonce = nonce;
+    obj.Attachments.emplace();
     if (params.Silent) {
         obj.Flags |= MessageFlags::SUPPRESS_NOTIFICATIONS;
     }
@@ -541,11 +542,16 @@ void DiscordClient::SendChatMessageAttachments(const ChatSubmitParams &params, c
         m_generic_dispatch.emit();
     });
     req.make_form();
-    req.add_field("payload_json", nlohmann::json(obj).dump().c_str(), CURL_ZERO_TERMINATED);
+
     for (size_t i = 0; i < params.Attachments.size(); i++) {
+        auto &attachment = params.Attachments.at(i);
         const auto field_name = "files[" + std::to_string(i) + "]";
-        req.add_file(field_name, params.Attachments.at(i).File, params.Attachments.at(i).Filename);
+        req.add_file(field_name, attachment.File, attachment.Filename);
+        obj.Attachments->push_back({ static_cast<int>(i), attachment.Description });
     }
+
+    req.add_field("payload_json", nlohmann::json(obj).dump().c_str(), CURL_ZERO_TERMINATED);
+
     m_http.Execute(std::move(req), [this, params, nonce, callback](const http::response_type &res) {
         for (const auto &attachment : params.Attachments) {
             if (attachment.Type == ChatSubmitParams::AttachmentType::PastedImage) {
diff --git a/src/discord/objects.cpp b/src/discord/objects.cpp
index 4ad17c3..804f10d 100644
--- a/src/discord/objects.cpp
+++ b/src/discord/objects.cpp
@@ -306,9 +306,15 @@ void to_json(nlohmann::json &j, const HeartbeatMessage &m) {
         j["d"] = m.Sequence;
 }
 
+void to_json(nlohmann::json &j, const CreateMessageAttachmentObject &m) {
+    j["id"] = m.ID;
+    JS_IF("description", m.Description);
+}
+
 void to_json(nlohmann::json &j, const CreateMessageObject &m) {
     j["content"] = m.Content;
     j["flags"] = m.Flags;
+    JS_IF("attachments", m.Attachments);
     JS_IF("message_reference", m.MessageReference);
     JS_IF("nonce", m.Nonce);
 }
diff --git a/src/discord/objects.hpp b/src/discord/objects.hpp
index 603a9c7..dfe99f0 100644
--- a/src/discord/objects.hpp
+++ b/src/discord/objects.hpp
@@ -433,11 +433,19 @@ struct HeartbeatMessage : GatewayMessage {
     friend void to_json(nlohmann::json &j, const HeartbeatMessage &m);
 };
 
+struct CreateMessageAttachmentObject {
+    int ID;
+    std::optional<std::string> Description;
+
+    friend void to_json(nlohmann::json &j, const CreateMessageAttachmentObject &m);
+};
+
 struct CreateMessageObject {
     std::string Content;
     MessageFlags Flags = MessageFlags::NONE;
     std::optional<MessageReferenceData> MessageReference;
     std::optional<std::string> Nonce;
+    std::optional<std::vector<CreateMessageAttachmentObject>> Attachments;
 
     friend void to_json(nlohmann::json &j, const CreateMessageObject &m);
 };