From 9728f71c9833baa65995e19e993d3450da750c20 Mon Sep 17 00:00:00 2001
From: Green Sky <green@g-s.xyz>
Date: Mon, 29 Jul 2024 16:04:42 +0200
Subject: [PATCH] interface refinement and disabling old transfer components

---
 src/CMakeLists.txt                                 | 2 +-
 src/solanaceae/message3/components.hpp             | 2 ++
 src/solanaceae/message3/components_id.inl          | 2 ++
 src/solanaceae/message3/message_model3.hpp         | 6 +++---
 src/solanaceae/message3/registry_message_model.hpp | 4 +++-
 5 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 35202e1..7b3c1bd 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -28,7 +28,7 @@ target_compile_features(solanaceae_message3 PUBLIC cxx_std_17)
 target_link_libraries(solanaceae_message3 PUBLIC
 	solanaceae_util
 	solanaceae_contact
-	solanaceae_object_store # for fwd.hpp in components
+	solanaceae_object_store # for fwd.hpp
 	EnTT::EnTT
 )
 
diff --git a/src/solanaceae/message3/components.hpp b/src/solanaceae/message3/components.hpp
index 6c54911..ed81260 100644
--- a/src/solanaceae/message3/components.hpp
+++ b/src/solanaceae/message3/components.hpp
@@ -76,6 +76,7 @@ namespace Message::Components {
 		ObjectHandle o;
 	};
 
+#if 0
 	namespace Transfer {
 
 		//struct TransferState {
@@ -153,6 +154,7 @@ namespace Message::Components {
 		};
 
 	} // Transfer
+#endif
 
 	// points to the front/newer message
 	// together they define a range that is,
diff --git a/src/solanaceae/message3/components_id.inl b/src/solanaceae/message3/components_id.inl
index 10d83f6..06754b3 100644
--- a/src/solanaceae/message3/components_id.inl
+++ b/src/solanaceae/message3/components_id.inl
@@ -32,6 +32,7 @@ DEFINE_COMP_ID(Message::Components::MessageText)
 DEFINE_COMP_ID(Message::Components::TagMessageIsAction)
 DEFINE_COMP_ID(Message::Components::MessageFileObject)
 
+#if 0
 DEFINE_COMP_ID(Message::Components::Transfer::TagHaveAll)
 DEFINE_COMP_ID(Message::Components::Transfer::BytesSent)
 DEFINE_COMP_ID(Message::Components::Transfer::BytesReceived)
@@ -43,6 +44,7 @@ DEFINE_COMP_ID(Message::Components::Transfer::StateCanceled)
 DEFINE_COMP_ID(Message::Components::Transfer::FileInfo)
 DEFINE_COMP_ID(Message::Components::Transfer::FileInfoLocal)
 DEFINE_COMP_ID(Message::Components::Transfer::ActionAccept)
+#endif
 
 #undef DEFINE_COMP_ID
 
diff --git a/src/solanaceae/message3/message_model3.hpp b/src/solanaceae/message3/message_model3.hpp
index f3dce05..7442714 100644
--- a/src/solanaceae/message3/message_model3.hpp
+++ b/src/solanaceae/message3/message_model3.hpp
@@ -1,8 +1,7 @@
 #pragma once
 
 #include <solanaceae/contact/contact_model3.hpp>
-
-//#include "./file.hpp"
+#include <solanaceae/object_store/fwd.hpp>
 
 // TODO: move, rename, do something?, change in favor of tox?
 //enum class FileKind : uint32_t {
@@ -20,8 +19,9 @@ struct MessageModel3I {
 
 	//virtual bool sendFile(const Contact& c, std::string_view file_name, std::unique_ptr<FileI> file) { (void)c,(void)message,(void)action; return false; }
 	virtual bool sendFilePath(const Contact3 c, std::string_view file_name, std::string_view file_path) { (void)c,(void)file_name,(void)file_path; return false; }
+	virtual bool sendFileObj(const Contact3 c, ObjectHandle o) { (void)c,(void)o; return false; } // ideal for forwarding
 
-
+	// we want this back :)
 	//virtual bool sendFileMem(const Contact& c, std::string_view file_name, const std::vector<uint8_t>& file) = 0;
 };
 
diff --git a/src/solanaceae/message3/registry_message_model.hpp b/src/solanaceae/message3/registry_message_model.hpp
index a5f8b6a..fa9b1b9 100644
--- a/src/solanaceae/message3/registry_message_model.hpp
+++ b/src/solanaceae/message3/registry_message_model.hpp
@@ -45,6 +45,7 @@ enum class RegistryMessageModel_Event : uint32_t {
 	message_updated,
 	message_destroy,
 
+	//???
 	send_text,
 	send_file_path,
 
@@ -64,12 +65,13 @@ struct RegistryMessageModelEventI : public MessageModel3I {
 	// mm3
 	// send text
 	// send file path
+	// send file obj
 };
 using RegistryMessageModelEventProviderI = EventProviderI<RegistryMessageModelEventI>;
 
 class RegistryMessageModel : public RegistryMessageModelEventProviderI, public MessageModel3I {
 	public:
-		static constexpr const char* version {"1"};
+		static constexpr const char* version {"2"};
 
 	protected:
 		Contact3Registry& _cr;