update to rmmi

Green-Sky · Oct 6, 2024 · f7471ca · f7471ca
1 parent 70bc3a4
commit f7471ca
Show file tree

Hide file tree

Showing 10 changed files with 16 additions and 15 deletions.
diff --git a/external/solanaceae_message3 b/external/solanaceae_message3
diff --git a/external/solanaceae_tox b/external/solanaceae_tox
diff --git a/src/chat_gui4.cpp b/src/chat_gui4.cpp
@@ -201,7 +201,7 @@ void ChatGui4::setClipboardData(std::vector<std::string> mime_types, std::shared
 ChatGui4::ChatGui4(
 	ConfigModelI& conf,
 	ObjectStore2& os,
-	RegistryMessageModel& rmm,
+	RegistryMessageModelI& rmm,
 	Contact3Registry& cr,
 	TextureUploaderI& tu,
 	ContactTextureCache& contact_tc,

diff --git a/src/chat_gui4.hpp b/src/chat_gui4.hpp
@@ -27,7 +27,7 @@ using MessageTextureCache = TextureCache<void*, Message3Handle, MessageImageLoad
 class ChatGui4 {
 	ConfigModelI& _conf;
 	ObjectStore2& _os;
-	RegistryMessageModel& _rmm;
+	RegistryMessageModelI& _rmm;
 	Contact3Registry& _cr;
 
 	ContactTextureCache& _contact_tc;
@@ -60,7 +60,7 @@ class ChatGui4 {
 		ChatGui4(
 			ConfigModelI& conf,
 			ObjectStore2& os,
-			RegistryMessageModel& rmm,
+			RegistryMessageModelI& rmm,
 			Contact3Registry& cr,
 			TextureUploaderI& tu,
 			ContactTextureCache& contact_tc,

diff --git a/src/main_screen.cpp b/src/main_screen.cpp
@@ -75,7 +75,7 @@ MainScreen::MainScreen(SimpleConfigModel&& conf_, SDL_Renderer* renderer_, Theme
 
 		g_provideInstance<ConfigModelI>("ConfigModelI", "host", &conf);
 		g_provideInstance<Contact3Registry>("Contact3Registry", "1", "host", &cr);
-		g_provideInstance<RegistryMessageModel>("RegistryMessageModel", "host", &rmm);
+		g_provideInstance<RegistryMessageModelI>("RegistryMessageModelI", "host", &rmm);
 		g_provideInstance<MessageSerializerNJ>("MessageSerializerNJ", "host", &msnj);
 
 		g_provideInstance<ToxI>("ToxI", "host", &tc);

diff --git a/src/main_screen.hpp b/src/main_screen.hpp
@@ -6,6 +6,7 @@
 #include <solanaceae/util/simple_config_model.hpp>
 #include <solanaceae/contact/contact_model3.hpp>
 #include <solanaceae/message3/registry_message_model.hpp>
+#include <solanaceae/message3/registry_message_model_impl.hpp>
 #include <solanaceae/message3/message_time_sort.hpp>
 #include <solanaceae/message3/message_serializer.hpp>
 #include <solanaceae/plugin/plugin_manager.hpp>
@@ -58,7 +59,7 @@ struct MainScreen final : public Screen {
 
 	SimpleConfigModel conf;
 	Contact3Registry cr;
-	RegistryMessageModel rmm;
+	RegistryMessageModelImpl rmm;
 	MessageSerializerNJ msnj;
 	MessageTimeSort mts;
 

diff --git a/src/media_meta_info_loader.cpp b/src/media_meta_info_loader.cpp
@@ -120,7 +120,7 @@ void MediaMetaInfoLoader::handleMessage(const Message3Handle& m) {
 	_rmm.throwEventUpdate(m);
 }
 
-MediaMetaInfoLoader::MediaMetaInfoLoader(RegistryMessageModel& rmm) : _rmm(rmm) {
+MediaMetaInfoLoader::MediaMetaInfoLoader(RegistryMessageModelI& rmm) : _rmm(rmm) {
 	// HACK: make them be added externally?
 	_image_loaders.push_back(std::make_unique<ImageLoaderWebP>());
 	_image_loaders.push_back(std::make_unique<ImageLoaderSDLBMP>());

diff --git a/src/media_meta_info_loader.hpp b/src/media_meta_info_loader.hpp
@@ -13,14 +13,14 @@ namespace Message::Components {
 // adds metadata to file messages
 class MediaMetaInfoLoader : public RegistryMessageModelEventI {
 	protected:
-		RegistryMessageModel& _rmm;
+		RegistryMessageModelI& _rmm;
 
 		std::vector<std::unique_ptr<ImageLoaderI>> _image_loaders;
 
 		void handleMessage(const Message3Handle& m);
 
 	public:
-		MediaMetaInfoLoader(RegistryMessageModel& rmm);
+		MediaMetaInfoLoader(RegistryMessageModelI& rmm);
 		virtual ~MediaMetaInfoLoader(void);
 
 	protected: // rmm

diff --git a/src/tox_friend_faux_offline_messaging.cpp b/src/tox_friend_faux_offline_messaging.cpp
@@ -26,7 +26,7 @@ namespace Contact::Components {
 
 ToxFriendFauxOfflineMessaging::ToxFriendFauxOfflineMessaging(
 	Contact3Registry& cr,
-	RegistryMessageModel& rmm,
+	RegistryMessageModelI& rmm,
 	ToxContactModel2& tcm,
 	ToxI& t,
 	ToxEventProviderI& tep
@@ -54,7 +54,7 @@ float ToxFriendFauxOfflineMessaging::tick(float time_delta) {
 			// cleanup
 			if (_cr.all_of<Contact::Components::NextSendAttempt>(c)) {
 				_cr.remove<Contact::Components::NextSendAttempt>(c);
-				auto* mr = static_cast<const RegistryMessageModel&>(_rmm).get(c);
+				auto* mr = static_cast<const RegistryMessageModelI&>(_rmm).get(c);
 				if (mr != nullptr) {
 					mr->storage<Message::Components::LastSendAttempt>().clear();
 				}
@@ -99,7 +99,7 @@ ToxFriendFauxOfflineMessaging::dfmc_Ret ToxFriendFauxOfflineMessaging::doFriendM
 	// unacked message
 	// timeouts for exising unacked messages expired (send)
 
-	auto* mr = static_cast<const RegistryMessageModel&>(_rmm).get(c);
+	auto* mr = static_cast<const RegistryMessageModelI&>(_rmm).get(c);
 	if (mr == nullptr) {
 		// no messages
 		return dfmc_Ret::NO_MSG;

diff --git a/src/tox_friend_faux_offline_messaging.hpp b/src/tox_friend_faux_offline_messaging.hpp
@@ -15,7 +15,7 @@ namespace Contact::Components {
 // timers get reset on connection changes, and send order is preserved.
 class ToxFriendFauxOfflineMessaging : public ToxEventI {
 	Contact3Registry& _cr;
-	RegistryMessageModel& _rmm;
+	RegistryMessageModelI& _rmm;
 	ToxContactModel2& _tcm;
 	ToxI& _t;
 	ToxEventProviderI& _tep;
@@ -30,7 +30,7 @@ class ToxFriendFauxOfflineMessaging : public ToxEventI {
 	public:
 		ToxFriendFauxOfflineMessaging(
 			Contact3Registry& cr,
-			RegistryMessageModel& rmm,
+			RegistryMessageModelI& rmm,
 			ToxContactModel2& tcm,
 			ToxI& t,
 			ToxEventProviderI& tep
+2 −6		src/CMakeLists.txt
+0 −39		src/solanaceae/message3/components.hpp
+0 −8		src/solanaceae/message3/components_id.inl
+1 −1		src/solanaceae/message3/message_command_dispatcher.cpp
+2 −2		src/solanaceae/message3/message_command_dispatcher.hpp
+1 −1		src/solanaceae/message3/message_time_sort.cpp
+2 −2		src/solanaceae/message3/message_time_sort.hpp
+0 −135		src/solanaceae/message3/registry_message_model.cpp
+11 −31		src/solanaceae/message3/registry_message_model.hpp
+140 −0		src/solanaceae/message3/registry_message_model_impl.cpp
+44 −0		src/solanaceae/message3/registry_message_model_impl.hpp
+0 −3		solanaceae/tox_contacts/tox_contact_model2.cpp
+1 −1		solanaceae/tox_messages/tox_message_manager.cpp
+2 −2		solanaceae/tox_messages/tox_message_manager.hpp
+1 −1		solanaceae/tox_messages/tox_transfer_manager.cpp
+2 −2		solanaceae/tox_messages/tox_transfer_manager.hpp