From cd196562aff9b39e11a415bfb7a33f2066bf86c4 Mon Sep 17 00:00:00 2001 From: Green Sky Date: Wed, 6 Nov 2024 10:32:42 +0100 Subject: [PATCH] group can speak (temp, waiting for generic contact interface) --- .../tox_contacts/tox_contact_model2.cpp | 24 +++++++++++++++++++ .../tox_contacts/tox_contact_model2.hpp | 5 +++- 2 files changed, 28 insertions(+), 1 deletion(-) diff --git a/solanaceae/tox_contacts/tox_contact_model2.cpp b/solanaceae/tox_contacts/tox_contact_model2.cpp index c2d84ef..9a7352e 100644 --- a/solanaceae/tox_contacts/tox_contact_model2.cpp +++ b/solanaceae/tox_contacts/tox_contact_model2.cpp @@ -460,6 +460,30 @@ Contact3Handle ToxContactModel2::getContactGroupPeer(uint32_t group_number, cons return {_cr, c}; } +bool ToxContactModel2::groupPeerCanSpeak(uint32_t group_number, uint32_t peer_number) { + auto [role_opt, role_err] = _t.toxGroupPeerGetRole(group_number, peer_number); + if (!role_opt) { + return false; // group/peer not found, return true instead? + } + + if (role_opt.value() == TOX_GROUP_ROLE_OBSERVER) { + return false; // no in every case + } + + auto vs_opt = _t.toxGroupGetVoiceState(group_number); + if (!vs_opt.has_value()) { + return false; // group not found, return true instead? + } + + if (vs_opt.value() == TOX_GROUP_VOICE_STATE_ALL) { + return true; + } else if (vs_opt.value() == TOX_GROUP_VOICE_STATE_FOUNDER) { + return role_opt.value() == TOX_GROUP_ROLE_FOUNDER; + } else { // mod+f + return role_opt.value() == TOX_GROUP_ROLE_MODERATOR || role_opt.value() == TOX_GROUP_ROLE_FOUNDER; + } +} + bool ToxContactModel2::onToxEvent(const Tox_Event_Friend_Connection_Status* e) { const Tox_Connection connection_status = tox_event_friend_connection_status_get_connection_status(e); auto c = getContactFriend(tox_event_friend_connection_status_get_friend_number(e)); diff --git a/solanaceae/tox_contacts/tox_contact_model2.hpp b/solanaceae/tox_contacts/tox_contact_model2.hpp index dd0cbcf..5f802c4 100644 --- a/solanaceae/tox_contacts/tox_contact_model2.hpp +++ b/solanaceae/tox_contacts/tox_contact_model2.hpp @@ -20,7 +20,7 @@ class ToxContactModel2 : public ContactModel3I, public ToxEventI { float _group_status_timer {0.f}; public: - static constexpr const char* version {"2"}; + static constexpr const char* version {"3"}; ToxContactModel2(Contact3Registry& cr, ToxI& t, ToxEventProviderI& tep); virtual ~ToxContactModel2(void); @@ -41,6 +41,9 @@ class ToxContactModel2 : public ContactModel3I, public ToxEventI { //Contact3Handle getContactGroupPeer(const ToxKey& group_key, const ToxKey& peer_key); Contact3Handle getContactGroupPeer(uint32_t group_number, const ToxKey& peer_key); + // TODO: add proper perm api to contacts + bool groupPeerCanSpeak(uint32_t group_number, uint32_t peer_number); + protected: // tox events bool onToxEvent(const Tox_Event_Friend_Connection_Status* e) override; bool onToxEvent(const Tox_Event_Friend_Status* e) override;