add file upload via dnd + rework http

2 files changed, 5 insertions, 4 deletions

diff --git a/src/discord/chatsubmitparams.hpp b/src/discord/chatsubmitparams.hpp
index 0f0a0cd..6199634 100644
--- a/src/discord/chatsubmitparams.hpp
+++ b/src/discord/chatsubmitparams.hpp
@@ -2,6 +2,7 @@
 #include <vector>
 #include <string>
 #include <glibmm/ustring.h>
+#include <giomm/file.h>
 #include "discord/snowflake.hpp"
 
 struct ChatSubmitParams {
@@ -11,8 +12,9 @@ struct ChatSubmitParams {
     };
 
     struct Attachment {
-        std::string Path;
+        Glib::RefPtr<Gio::File> File;
         AttachmentType Type;
+        std::string Filename;
     };
 
     Snowflake ChannelID;
diff --git a/src/discord/discord.cpp b/src/discord/discord.cpp
index 9849ae6..d26f1fe 100644
--- a/src/discord/discord.cpp
+++ b/src/discord/discord.cpp
@@ -480,13 +480,12 @@ void DiscordClient::SendChatMessageAttachments(const ChatSubmitParams &params, c
     req.add_field("payload_json", nlohmann::json(obj).dump().c_str(), CURL_ZERO_TERMINATED);
     for (size_t i = 0; i < params.Attachments.size(); i++) {
         const auto field_name = "files[" + std::to_string(i) + "]";
-        req.add_file(field_name, params.Attachments.at(i).Path, "unknown.png");
+        req.add_file(field_name, params.Attachments.at(i).File, params.Attachments.at(i).Filename);
     }
     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) {
-                std::error_code ec;
-                std::filesystem::remove(attachment.Path, ec);
+                attachment.File->remove();
             }
         }
         ChatMessageCallback(nonce, res, callback);