update deps and adopt

external/solanaceae_message3

@@ -1 +1 @@
-Subproject commit 4ae7c4068f91cedd4291521a5777af00c0ff052f
+Subproject commit 60fc0d34eba30989ff634a797516d11aeb81e327

external/solanaceae_toxcore

@@ -1 +1 @@
-Subproject commit 9d3d81d4ff55b152cb779cec2a37b960fcedd584
+Subproject commit 3df91258770ddaf12e8b4c6116890422d77438c1

external/solanaceae_util

@@ -1 +1 @@
-Subproject commit 2b20c2d2a45ad1005e794c704b3fc831ca1d3830
+Subproject commit fa0a09df8743a502df69cddebf28f31790db3f06

src/chat_gui4.cpp

@@ -5,10 +5,10 @@
 #include <solanaceae/message3/components.hpp>
 #include <solanaceae/tox_messages/components.hpp>
 #include <solanaceae/contact/components.hpp>
+#include <solanaceae/util/utils.hpp>
 
 // HACK: remove them
 #include <solanaceae/tox_contacts/components.hpp>
-#include <solanaceae/toxcore/utils.hpp>
 
 #include <imgui/imgui.h>
 #include <imgui/misc/cpp/imgui_stdlib.h>
@@ -197,6 +197,7 @@ void ChatGui4::render(float time_delta) {
 
 							ImGui::SeparatorText("tox");
 
+							// TODO: cheese it and rename to copy id?
 							if (_cr.all_of<Contact::Components::ToxGroupPersistent>(*_selected_contact)) {
 								if (ImGui::MenuItem("copy ngc chatid")) {
 									const auto& chat_id = _cr.get<Contact::Components::ToxGroupPersistent>(*_selected_contact).chat_id.data;

src/tox_avatar_manager.cpp

@@ -9,7 +9,7 @@
 #include <solanaceae/contact/components.hpp>
 #include <solanaceae/tox_contacts/components.hpp>
 
-#include <solanaceae/toxcore/utils.hpp>
+#include <solanaceae/util/utils.hpp>
 
 #include <filesystem>
 #include <string_view>

src/tox_ui_utils.cpp

@@ -3,7 +3,7 @@
 #include <tox/tox.h>
 
 #include <solanaceae/toxcore/tox_interface.hpp>
-#include <solanaceae/toxcore/utils.hpp>
+#include <solanaceae/util/utils.hpp>
 
 #include <solanaceae/util/config_model.hpp>