From 4456c8771da668cbadb411583624fe0e357fa687 Mon Sep 17 00:00:00 2001
From: ouwou <26526779+ouwou@users.noreply.github.com>
Date: Tue, 14 Jun 2022 02:36:04 -0400
Subject: refactor send message params into one struct

---
 src/components/chatinput.cpp | 20 ++++++++++++++------
 1 file changed, 14 insertions(+), 6 deletions(-)

(limited to 'src/components/chatinput.cpp')

diff --git a/src/components/chatinput.cpp b/src/components/chatinput.cpp
index f9bbce4..2b8b5a5 100644
--- a/src/components/chatinput.cpp
+++ b/src/components/chatinput.cpp
@@ -152,10 +152,10 @@ bool ChatInputAttachmentContainer::AddImage(const Glib::RefPtr<Gdk::Pixbuf> &pb)
     return true;
 }
 
-std::vector<std::string> ChatInputAttachmentContainer::GetFilePaths() const {
-    std::vector<std::string> ret;
+std::vector<ChatSubmitParams::Attachment> ChatInputAttachmentContainer::GetAttachments() const {
+    std::vector<ChatSubmitParams::Attachment> ret;
     for (auto *x : m_attachments)
-        ret.push_back(x->GetPath());
+        ret.push_back({ x->GetPath(), x->GetType() });
     return ret;
 }
 
@@ -165,7 +165,8 @@ ChatInputAttachmentContainer::type_signal_emptied ChatInputAttachmentContainer::
 
 ChatInputAttachmentItem::ChatInputAttachmentItem(std::string path, const Glib::RefPtr<Gdk::Pixbuf> &pb)
     : m_path(std::move(path))
-    , m_img(Gtk::make_managed<Gtk::Image>()) {
+    , m_img(Gtk::make_managed<Gtk::Image>())
+    , m_type(ChatSubmitParams::PastedImage) {
     get_style_context()->add_class("attachment-item");
 
     int outw, outh;
@@ -184,6 +185,10 @@ std::string ChatInputAttachmentItem::GetPath() const {
     return m_path;
 }
 
+ChatSubmitParams::AttachmentType ChatInputAttachmentItem::GetType() const {
+    return m_type;
+}
+
 void ChatInputAttachmentItem::SetupMenu() {
     m_menu_remove.set_label("Remove");
     m_menu_remove.signal_activate().connect([this] {
@@ -215,8 +220,11 @@ ChatInput::ChatInput()
         m_signal_escape.emit();
     });
     m_input.signal_submit().connect([this](const Glib::ustring &input) -> bool {
-        const auto attachments = m_attachments.GetFilePaths();
-        bool b = m_signal_submit.emit(input, attachments);
+        ChatSubmitParams data;
+        data.Message = input;
+        data.Attachments = m_attachments.GetAttachments();
+
+        bool b = m_signal_submit.emit(data);
         if (b) {
             m_attachments_revealer.set_reveal_child(false);
             m_attachments.ClearNoPurge();
-- 
cgit v1.2.3