Green-Sky/solanaceae_tox
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

tox status text (friend status message and group topic)

Browse Source
This commit is contained in:
Green Sky 2024-04-22 21:48:42 +02:00
parent 560eab1f6c
commit 2807239dea
No known key found for this signature in database
2 changed files with 32 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
solanaceae/tox_contacts/tox_contact_model2.cpp
View File

@ -18,6 +18,7 @@ ToxContactModel2::ToxContactModel2(Contact3Registry& cr, ToxI& t, ToxEventProvid
_tep.subscribe(this, Tox_Event_Type::TOX_EVENT_FRIEND_CONNECTION_STATUS); _tep.subscribe(this, Tox_Event_Type::TOX_EVENT_FRIEND_CONNECTION_STATUS);
_tep.subscribe(this, Tox_Event_Type::TOX_EVENT_FRIEND_STATUS); _tep.subscribe(this, Tox_Event_Type::TOX_EVENT_FRIEND_STATUS);
_tep.subscribe(this, Tox_Event_Type::TOX_EVENT_FRIEND_NAME); _tep.subscribe(this, Tox_Event_Type::TOX_EVENT_FRIEND_NAME);
_tep.subscribe(this, Tox_Event_Type::TOX_EVENT_FRIEND_STATUS_MESSAGE);
_tep.subscribe(this, Tox_Event_Type::TOX_EVENT_FRIEND_REQUEST); _tep.subscribe(this, Tox_Event_Type::TOX_EVENT_FRIEND_REQUEST);
// TODO: conf // TODO: conf
@ -27,6 +28,7 @@ ToxContactModel2::ToxContactModel2(Contact3Registry& cr, ToxI& t, ToxEventProvid
_tep.subscribe(this, Tox_Event_Type::TOX_EVENT_GROUP_PEER_JOIN); _tep.subscribe(this, Tox_Event_Type::TOX_EVENT_GROUP_PEER_JOIN);
_tep.subscribe(this, Tox_Event_Type::TOX_EVENT_GROUP_PEER_EXIT); _tep.subscribe(this, Tox_Event_Type::TOX_EVENT_GROUP_PEER_EXIT);
_tep.subscribe(this, Tox_Event_Type::TOX_EVENT_GROUP_PEER_NAME); _tep.subscribe(this, Tox_Event_Type::TOX_EVENT_GROUP_PEER_NAME);
_tep.subscribe(this, Tox_Event_Type::TOX_EVENT_GROUP_TOPIC);
// add tox profile root // add tox profile root
_root = _cr.create(); _root = _cr.create();
@ -177,6 +179,7 @@ Contact3Handle ToxContactModel2::getContactFriend(uint32_t friend_number) {
_cr.emplace_or_replace<Contact::Components::TagPrivate>(c); _cr.emplace_or_replace<Contact::Components::TagPrivate>(c);
_cr.emplace_or_replace<Contact::Components::Self>(c, _friend_self); _cr.emplace_or_replace<Contact::Components::Self>(c, _friend_self);
_cr.emplace_or_replace<Contact::Components::Name>(c, _t.toxFriendGetName(friend_number).value_or("<unk>")); _cr.emplace_or_replace<Contact::Components::Name>(c, _t.toxFriendGetName(friend_number).value_or("<unk>"));
_cr.emplace_or_replace<Contact::Components::StatusText>(c, _t.toxFriendGetStatusMessage(friend_number).value_or("")).fillFirstLineLength();
std::cout << "TCM2: created friend contact " << friend_number << "\n"; std::cout << "TCM2: created friend contact " << friend_number << "\n";
@ -242,6 +245,7 @@ Contact3Handle ToxContactModel2::getContactGroup(uint32_t group_number) {
_cr.emplace_or_replace<Contact::Components::ToxGroupPersistent>(c, g_key); _cr.emplace_or_replace<Contact::Components::ToxGroupPersistent>(c, g_key);
_cr.emplace_or_replace<Contact::Components::TagGroup>(c); _cr.emplace_or_replace<Contact::Components::TagGroup>(c);
_cr.emplace_or_replace<Contact::Components::Name>(c, _t.toxGroupGetName(group_number).value_or("<unk>")); _cr.emplace_or_replace<Contact::Components::Name>(c, _t.toxGroupGetName(group_number).value_or("<unk>"));
_cr.emplace_or_replace<Contact::Components::StatusText>(c, _t.toxGroupGetTopic(group_number).value_or("")).fillFirstLineLength();
_cr.emplace_or_replace<Contact::Components::ConnectionState>( _cr.emplace_or_replace<Contact::Components::ConnectionState>(
c, c,
_t.toxGroupIsConnected(group_number).value_or(false) _t.toxGroupIsConnected(group_number).value_or(false)
@ -495,6 +499,18 @@ bool ToxContactModel2::onToxEvent(const Tox_Event_Friend_Name* e) {
return false; // return true? return false; // return true?
} }
bool ToxContactModel2::onToxEvent(const Tox_Event_Friend_Status_Message* e) {
const std::string_view status_message {
reinterpret_cast<const char*>(tox_event_friend_status_message_get_message(e)),
tox_event_friend_status_message_get_message_length(e)
};
auto c = getContactFriend(tox_event_friend_status_message_get_friend_number(e));
c.emplace_or_replace<Contact::Components::StatusText>(std::string{status_message}).fillFirstLineLength();
return false; // true?
}
bool ToxContactModel2::onToxEvent(const Tox_Event_Friend_Request* e) { bool ToxContactModel2::onToxEvent(const Tox_Event_Friend_Request* e) {
const ToxKey pub_key{tox_event_friend_request_get_public_key(e), TOX_PUBLIC_KEY_SIZE}; const ToxKey pub_key{tox_event_friend_request_get_public_key(e), TOX_PUBLIC_KEY_SIZE};
@ -698,3 +714,17 @@ bool ToxContactModel2::onToxEvent(const Tox_Event_Group_Peer_Name* e) {
return false; return false;
} }
bool ToxContactModel2::onToxEvent(const Tox_Event_Group_Topic* e) {
const uint32_t group_number = tox_event_group_topic_get_group_number(e);
const std::string_view topic {
reinterpret_cast<const char*>(tox_event_group_topic_get_topic(e)),
tox_event_group_topic_get_topic_length(e)
};
auto c = getContactGroup(group_number);
c.emplace_or_replace<Contact::Components::StatusText>(std::string{topic}).fillFirstLineLength();
return false; // message model needs to produce a system message
}

2
solanaceae/tox_contacts/tox_contact_model2.hpp
View File

@ -45,6 +45,7 @@ class ToxContactModel2 : public ContactModel3I, public ToxEventI {
bool onToxEvent(const Tox_Event_Friend_Connection_Status* e) override; bool onToxEvent(const Tox_Event_Friend_Connection_Status* e) override;
bool onToxEvent(const Tox_Event_Friend_Status* e) override; bool onToxEvent(const Tox_Event_Friend_Status* e) override;
bool onToxEvent(const Tox_Event_Friend_Name* e) override; bool onToxEvent(const Tox_Event_Friend_Name* e) override;
bool onToxEvent(const Tox_Event_Friend_Status_Message* e) override;
bool onToxEvent(const Tox_Event_Friend_Request* e) override; bool onToxEvent(const Tox_Event_Friend_Request* e) override;
bool onToxEvent(const Tox_Event_Group_Invite* e) override; bool onToxEvent(const Tox_Event_Group_Invite* e) override;
@ -52,5 +53,6 @@ class ToxContactModel2 : public ContactModel3I, public ToxEventI {
bool onToxEvent(const Tox_Event_Group_Peer_Join* e) override; bool onToxEvent(const Tox_Event_Group_Peer_Join* e) override;
bool onToxEvent(const Tox_Event_Group_Peer_Exit* e) override; bool onToxEvent(const Tox_Event_Group_Peer_Exit* e) override;
bool onToxEvent(const Tox_Event_Group_Peer_Name* e) override; bool onToxEvent(const Tox_Event_Group_Peer_Name* e) override;
bool onToxEvent(const Tox_Event_Group_Topic* e) override;
}; };