From 29fd1bfb627dbfa69a32a697809343245a9b89f4 Mon Sep 17 00:00:00 2001
From: Green Sky <green@g-s.xyz>
Date: Sat, 20 Apr 2024 15:24:58 +0200
Subject: [PATCH] comp name changes and small behavior changes

---
 external/solanaceae_message3              |  2 +-
 external/solanaceae_message_serializer    |  2 +-
 external/solanaceae_tox                   |  2 +-
 src/chat_gui4.cpp                         | 12 ++++++------
 src/tox_friend_faux_offline_messaging.cpp |  4 ++--
 5 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/external/solanaceae_message3 b/external/solanaceae_message3
index f9f70a0..96b76dc 160000
--- a/external/solanaceae_message3
+++ b/external/solanaceae_message3
@@ -1 +1 @@
-Subproject commit f9f70a05b1d248e84198c83abeda3579107d09bb
+Subproject commit 96b76dc67f549b6815846d0b9ea73f53679d8f3d
diff --git a/external/solanaceae_message_serializer b/external/solanaceae_message_serializer
index 1409485..1a3fcc6 160000
--- a/external/solanaceae_message_serializer
+++ b/external/solanaceae_message_serializer
@@ -1 +1 @@
-Subproject commit 1409485ef1ee4a2bcf38d7f4631f33e8646d8718
+Subproject commit 1a3fcc67576adb96f873f053cd5e836f5c9296b6
diff --git a/external/solanaceae_tox b/external/solanaceae_tox
index 1d724ef..560eab1 160000
--- a/external/solanaceae_tox
+++ b/external/solanaceae_tox
@@ -1 +1 @@
-Subproject commit 1d724ef95146f2588de4bd34ffacff2244c4d68f
+Subproject commit 560eab1f6cceff122987646ffa927cd660bc0a73
diff --git a/src/chat_gui4.cpp b/src/chat_gui4.cpp
index 311f3a5..aa9c2e5 100644
--- a/src/chat_gui4.cpp
+++ b/src/chat_gui4.cpp
@@ -457,11 +457,11 @@ float ChatGui4::render(float time_delta) {
 							if (ImGui::TableNextColumn()) {
 								// TODO: theming for hardcoded values
 
-								if (!msg_reg.all_of<Message::Components::Remote::TimestampReceived>(e)) {
+								if (!msg_reg.all_of<Message::Components::ReceivedBy>(e)) {
 									// TODO: dedup?
 									ImGui::TextDisabled("_");
 								} else {
-									const auto list = msg_reg.get<Message::Components::Remote::TimestampReceived>(e).ts;
+									const auto list = msg_reg.get<Message::Components::ReceivedBy>(e).ts;
 									// wrongly assumes contacts never get removed from a group
 									if (sub_contacts != nullptr && list.size() < sub_contacts->size()) {
 										// if partically delivered
@@ -503,8 +503,8 @@ float ChatGui4::render(float time_delta) {
 								ImGui::SameLine();
 
 								// TODO: dedup
-								if (msg_reg.all_of<Message::Components::Remote::TimestampRead>(e)) {
-									const auto list = msg_reg.get<Message::Components::Remote::TimestampRead>(e).ts;
+								if (msg_reg.all_of<Message::Components::ReadBy>(e)) {
+									const auto list = msg_reg.get<Message::Components::ReadBy>(e).ts;
 									// wrongly assumes contacts never get removed from a group
 									if (sub_contacts != nullptr && list.size() < sub_contacts->size()) {
 										// if partially read
@@ -1053,11 +1053,11 @@ void ChatGui4::renderMessageExtra(Message3Registry& reg, const Message3 e) {
 	}
 
 	// TODO: remove?
-	if (reg.all_of<Message::Components::Remote::TimestampReceived>(e)) {
+	if (reg.all_of<Message::Components::ReceivedBy>(e)) {
 		std::string synced_by_text {"receivedBy:"};
 		const int64_t now_ts_s = int64_t(Message::getTimeMS() / 1000u);
 
-		for (const auto& [c, syned_ts] : reg.get<Message::Components::Remote::TimestampReceived>(e).ts) {
+		for (const auto& [c, syned_ts] : reg.get<Message::Components::ReceivedBy>(e).ts) {
 			if (_cr.all_of<Contact::Components::TagSelfStrong>(c)) {
 				synced_by_text += "\n sself"; // required (except when synced externally)
 			} else if (_cr.all_of<Contact::Components::TagSelfWeak>(c)) {
diff --git a/src/tox_friend_faux_offline_messaging.cpp b/src/tox_friend_faux_offline_messaging.cpp
index 1ca5b18..9ba1964 100644
--- a/src/tox_friend_faux_offline_messaging.cpp
+++ b/src/tox_friend_faux_offline_messaging.cpp
@@ -134,7 +134,7 @@ ToxFriendFauxOfflineMessaging::dfmc_Ret ToxFriendFauxOfflineMessaging::doFriendM
 		}
 
 		if (!mr->any_of<
-				Message::Components::Remote::TimestampReceived
+				Message::Components::ReceivedBy
 			>(msg)
 		) {
 			continue; // skip
@@ -144,7 +144,7 @@ ToxFriendFauxOfflineMessaging::dfmc_Ret ToxFriendFauxOfflineMessaging::doFriendM
 			continue; // not outbound (in private)
 		}
 
-		const auto& ts_received = mr->get<Message::Components::Remote::TimestampReceived>(msg).ts;
+		const auto& ts_received = mr->get<Message::Components::ReceivedBy>(msg).ts;
 		// not target
 		if (ts_received.contains(c)) {
 			continue;