StarMirror/qTox
1
0
Fork 0
mirror of https://github.com/qTox/qTox.git synced 2024-03-22 14:00:36 +08:00
Code Issues Projects Releases Wiki Activity

refactor(core, widget): Update toxcore group API (new: conference)

Browse Source
This commit is contained in:
Diadlo 2016-09-22 09:48:01 +03:00
parent 49b3c4d4af
commit e9a2fc6b57
No known key found for this signature in database
GPG Key ID: 5AF9F2E29107C727
5 changed files with 83 additions and 54 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

115
src/core/core.cpp
View File

@ -296,11 +296,10 @@ void Core::start()
tox_callback_friend_status(tox, onUserStatusChanged, this);
tox_callback_friend_connection_status(tox, onConnectionStatusChanged, this);
tox_callback_friend_read_receipt(tox, onReadReceiptCallback, this);
tox_callback_group_invite(tox, onGroupInvite, this);
tox_callback_group_message(tox, onGroupMessage, this);
tox_callback_group_namelist_change(tox, onGroupNamelistChange, this);
tox_callback_group_title(tox, onGroupTitleChange, this);
tox_callback_group_action(tox, onGroupAction, this);
tox_callback_conference_invite(tox, onGroupInvite);
tox_callback_conference_message(tox, onGroupMessage);
tox_callback_conference_namelist_change(tox, onGroupNamelistChange);
tox_callback_conference_title(tox, onGroupTitleChange);
tox_callback_file_chunk_request(tox, CoreFile::onFileDataCallback, this);
tox_callback_file_recv(tox, CoreFile::onFileReceiveCallback, this);
tox_callback_file_recv_chunk(tox, CoreFile::onFileRecvChunkCallback, this);
@ -513,12 +512,12 @@ void Core::onGroupAction(Tox*, int groupnumber, int peernumber, const uint8_t *a
void Core::onGroupInvite(Tox*, int32_t friendNumber, uint8_t type, const uint8_t *data, uint16_t length,void *core)
{
QByteArray pk((char*)data, length);
if (type == TOX_GROUPCHAT_TYPE_TEXT)
if (type == TOX_CONFERENCE_TYPE_TEXT)
{
qDebug() << QString("Text group invite by %1").arg(friendNumber);
emit static_cast<Core*>(core)->groupInviteReceived(friendNumber,type,pk);
}
else if (type == TOX_GROUPCHAT_TYPE_AV)
else if (type == TOX_CONFERENCE_TYPE_AV)
{
qDebug() << QString("AV group invite by %1").arg(friendNumber);
emit static_cast<Core*>(core)->groupInviteReceived(friendNumber,type,pk);
@ -650,10 +649,13 @@ void Core::sendGroupMessage(int groupId, const QString& message)
for (auto &cMsg :cMessages)
{
int ret = tox_group_message_send(tox, groupId, cMsg.data(), cMsg.size());
TOX_ERR_CONFERENCE_SEND_MESSAGE error;
if (ret == -1)
emit groupSentResult(groupId, message, ret);
bool success = tox_conference_send_message(tox, groupId, TOX_MESSAGE_TYPE_NORMAL,
cMsg.data(), cMsg.size(), &error);
if (!success)
emit groupSentResult(groupId, message, -1);
}
}
@ -663,18 +665,22 @@ void Core::sendGroupAction(int groupId, const QString& message)
for (auto &cMsg :cMessages)
{
int ret = tox_group_action_send(tox, groupId, cMsg.data(), cMsg.size());
TOX_ERR_CONFERENCE_SEND_MESSAGE error;
bool success = tox_conference_send_message(tox, groupId, TOX_MESSAGE_TYPE_ACTION,
cMsg.data(), cMsg.size(), &error);
if (ret == -1)
emit groupSentResult(groupId, message, ret);
if (!success)
emit groupSentResult(groupId, message, -1);
}
}
void Core::changeGroupTitle(int groupId, const QString& title)
{
CString cTitle(title);
int err = tox_group_set_title(tox, groupId, cTitle.data(), cTitle.size());
if (!err)
TOX_ERR_CONFERENCE_TITLE error;
bool ret = tox_conference_set_title(tox, groupId, cTitle.data(),
cTitle.size(), &error);
if (ret)
emit groupTitleChanged(groupId, getUsername(), title);
}
@ -738,8 +744,11 @@ void Core::removeGroup(int groupId, bool fake)
if (!isReady() || fake)
return;
tox_del_groupchat(tox, groupId);
av->leaveGroupCall(groupId);
TOX_ERR_CONFERENCE_DELETE error;
bool ret = tox_conference_delete(tox, groupId, &error);
if (ret)
av->leaveGroupCall(groupId);
}
/**
@ -981,7 +990,8 @@ QVector<uint32_t> Core::getFriendList() const
*/
int Core::getGroupNumberPeers(int groupId) const
{
return tox_group_number_peers(tox, groupId);
TOX_ERR_CONFERENCE_PEER_QUERY error;
return tox_conference_peer_count(tox, groupId, &error);
}
/**
@ -989,16 +999,23 @@ int Core::getGroupNumberPeers(int groupId) const
*/
QString Core::getGroupPeerName(int groupId, int peerId) const
{
QString name;
uint8_t nameArray[TOX_MAX_NAME_LENGTH];
int length = tox_group_peername(tox, groupId, peerId, nameArray);
if (length == -1)
TOX_ERR_CONFERENCE_PEER_QUERY error;
size_t length = tox_conference_peer_get_name_size(tox, groupId, peerId, &error);
if (error != TOX_ERR_CONFERENCE_PEER_QUERY_OK)
{
qWarning() << "getGroupPeerName: Unknown error";
return name;
return QString();
}
name = CString::toString(nameArray, length);
return name;
bool ret = tox_conference_peer_get_name(tox, groupId, peerId, nameArray, &error);
if (!ret)
{
qWarning() << "getGroupPeerName: Unknown error";
return QString();
}
return CString::toString(nameArray, length);
}
/**
@ -1006,18 +1023,16 @@ QString Core::getGroupPeerName(int groupId, int peerId) const
*/
ToxId Core::getGroupPeerToxId(int groupId, int peerId) const
{
ToxId peerToxId;
uint8_t rawID[TOX_PUBLIC_KEY_SIZE];
int res = tox_group_peer_pubkey(tox, groupId, peerId, rawID);
if (res == -1)
TOX_ERR_CONFERENCE_PEER_QUERY error;
bool success = tox_conference_peer_get_public_key(tox, groupId, peerId, rawID, &error);
if (!success)
{
qWarning() << "getGroupPeerToxId: Unknown error";
return peerToxId;
return ToxId();
}
peerToxId = ToxId(CUserId::toString(rawID));
return peerToxId;
return ToxId(CUserId::toString(rawID));
}
/**
@ -1042,14 +1057,22 @@ QList<QString> Core::getGroupPeerNames(int groupId) const
std::unique_ptr<uint8_t[][TOX_MAX_NAME_LENGTH]> namesArray{new uint8_t[nPeers][TOX_MAX_NAME_LENGTH]};
std::unique_ptr<uint16_t[]> lengths{new uint16_t[nPeers]};
result = tox_group_get_names(tox, groupId, namesArray.get(), lengths.get(), nPeers);
if (result != nPeers)
TOX_ERR_CONFERENCE_PEER_QUERY error;
uint32_t count = tox_conference_peer_count(tox, groupId, &error);
if (count != nPeers)
{
qWarning() << "getGroupPeerNames: Unexpected tox_group_get_names result";
qWarning() << "getGroupPeerNames: Unexpected peer count";
return names;
}
for (uint16_t i=0; i<nPeers; ++i)
names.push_back(CString::toString(namesArray[i], lengths[i]));
for (uint16_t i = 0; i < nPeers; ++i)
{
lengths[i] = tox_conference_peer_get_name_size(tox, groupId, i, &error);
bool ok = tox_conference_peer_get_name(tox, groupId, i, namesArray[i], &error);
if (ok)
names.push_back(CString::toString(namesArray[i], lengths[i]));
}
return names;
}
@ -1059,12 +1082,13 @@ QList<QString> Core::getGroupPeerNames(int groupId) const
*/
int Core::joinGroupchat(int32_t friendnumber, uint8_t type, const uint8_t* friend_group_public_key,uint16_t length) const
{
if (type == TOX_GROUPCHAT_TYPE_TEXT)
if (type == TOX_CONFERENCE_TYPE_TEXT)
{
qDebug() << QString("Trying to join text groupchat invite sent by friend %1").arg(friendnumber);
return tox_join_groupchat(tox, friendnumber, friend_group_public_key,length);
TOX_ERR_CONFERENCE_JOIN error;
return tox_conference_join(tox, friendnumber, friend_group_public_key, length, &error);
}
else if (type == TOX_GROUPCHAT_TYPE_AV)
else if (type == TOX_CONFERENCE_TYPE_AV)
{
qDebug() << QString("Trying to join AV groupchat invite sent by friend %1").arg(friendnumber);
return toxav_join_av_groupchat(tox, friendnumber, friend_group_public_key, length,
@ -1083,23 +1107,26 @@ int Core::joinGroupchat(int32_t friendnumber, uint8_t type, const uint8_t* frien
*/
void Core::quitGroupChat(int groupId) const
{
tox_del_groupchat(tox, groupId);
TOX_ERR_CONFERENCE_DELETE error;
tox_conference_delete(tox, groupId, &error);
}
void Core::groupInviteFriend(uint32_t friendId, int groupId)
{
tox_invite_friend(tox, friendId, groupId);
TOX_ERR_CONFERENCE_INVITE error;
tox_conference_invite(tox, friendId, groupId, &error);
}
int Core::createGroup(uint8_t type)
{
if (type == TOX_GROUPCHAT_TYPE_TEXT)
if (type == TOX_CONFERENCE_TYPE_TEXT)
{
int group = tox_add_groupchat(tox);
TOX_ERR_CONFERENCE_NEW error;
uint32_t group = tox_conference_new(tox, &error);
emit emptyGroupCreated(group);
return group;
}
else if (type == TOX_GROUPCHAT_TYPE_AV)
else if (type == TOX_CONFERENCE_TYPE_AV)
{
int group = toxav_add_av_groupchat(tox, CoreAV::groupCallCallback,
this);

2
src/core/core.h
View File

@ -102,7 +102,7 @@ public slots:
void acceptFriendRequest(const QString& userId);
void requestFriendship(const QString& friendAddress, const QString& message);
void groupInviteFriend(uint32_t friendId, int groupId);
int createGroup(uint8_t type = TOX_GROUPCHAT_TYPE_AV);
int createGroup(uint8_t type = TOX_CONFERENCE_TYPE_AV);
void removeFriend(uint32_t friendId, bool fake = false);
void removeGroup(int groupId, bool fake = false);

5
src/core/coreav.cpp
View File

@ -594,7 +594,10 @@ bool CoreAV::isGroupCallOutputMuted(const Group* g) const
*/
bool CoreAV::isGroupAvEnabled(int groupId) const
{
return tox_group_get_type(Core::getInstance()->tox, groupId) == TOX_GROUPCHAT_TYPE_AV;
Tox* tox = Core::getInstance()->tox;
TOX_ERR_CONFERENCE_GET_TYPE error;
TOX_CONFERENCE_TYPE type = tox_conference_get_type(tox, groupId, &error);
return type == TOX_CONFERENCE_TYPE_AV;
}
/**

2
src/widget/form/groupinviteform.cpp
View File

@ -44,7 +44,7 @@ GroupInviteForm::GroupInviteForm()
createButton = new QPushButton(this);
connect(createButton, &QPushButton::released, [this]()
{
emit groupCreate(TOX_GROUPCHAT_TYPE_AV);
emit groupCreate(TOX_CONFERENCE_TYPE_AV);
});
inviteBox = new QGroupBox(this);

13
src/widget/widget.cpp
View File

@ -1550,7 +1550,7 @@ void Widget::onGroupInviteReceived(int32_t friendId, uint8_t type, QByteArray in
{
updateFriendActivity(FriendList::findFriend(friendId));
if (type == TOX_GROUPCHAT_TYPE_TEXT || type == TOX_GROUPCHAT_TYPE_AV)
if (type == TOX_CONFERENCE_TYPE_TEXT || type == TOX_CONFERENCE_TYPE_AV)
{
++unreadGroupInvites;
groupInvitesUpdate();
@ -1610,23 +1610,22 @@ void Widget::onGroupNamelistChanged(int groupnumber, int peernumber, uint8_t Cha
return;
}
TOX_CHAT_CHANGE change = static_cast<TOX_CHAT_CHANGE>(Change);
if (change == TOX_CHAT_CHANGE_PEER_ADD)
TOX_CONFERENCE_STATE_CHANGE change = static_cast<TOX_CONFERENCE_STATE_CHANGE>(Change);
if (change == TOX_CONFERENCE_STATE_CHANGE_PEER_JOIN)
{
// g->addPeer(peernumber,name);
g->regeneratePeerList();
// g->getChatForm()->addSystemInfoMessage(tr("%1 has joined the chat").arg(name), "white", QDateTime::currentDateTime());
// we can't display these messages until irungentoo fixes peernumbers
// we can't display these messages until toxcore fixes peernumbers
// https://github.com/irungentoo/toxcore/issues/1128
}
else if (change == TOX_CHAT_CHANGE_PEER_DEL)
else if (change == TOX_CONFERENCE_STATE_CHANGE_PEER_EXIT)
{
// g->removePeer(peernumber);
g->regeneratePeerList();
// g->getChatForm()->addSystemInfoMessage(tr("%1 has left the chat").arg(name), "white", QDateTime::currentDateTime());
}
else if (change == TOX_CHAT_CHANGE_PEER_NAME) // core overwrites old name before telling us it changed...
else if (change == TOX_CONFERENCE_STATE_CHANGE_PEER_NAME_CHANGE) // core overwrites old name before telling us it changed...
{
QString name = Nexus::getCore()->getGroupPeerName(groupnumber, peernumber);
if (name.isEmpty())