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

Merge pull request #5698

Browse Source 
jenli669 (2):
      fix(group): always retain own name when updating group peer list
      fix(group): fix logic oversight and code style
This commit is contained in:
sudden6 2019-06-17 23:37:40 +02:00
commit 0a95f9fc1d
No known key found for this signature in database
GPG Key ID: 279509B499E032B9
1 changed files with 19 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
src/model/group.cpp
View File

@ -19,12 +19,12 @@
#include "group.h"
#include "friend.h"
#include "src/friendlist.h"
#include "src/core/contactid.h"
#include "src/core/core.h"
#include "src/core/coreav.h"
#include "src/core/contactid.h"
#include "src/core/groupid.h"
#include "src/core/toxpk.h"
#include "src/friendlist.h"
#include "src/persistence/settings.h"
#include "src/widget/form/groupchatform.h"
#include "src/widget/groupwidget.h"
@ -32,7 +32,8 @@
static const int MAX_GROUP_TITLE_LENGTH = 128;
Group::Group(int groupId, const GroupId persistentGroupId, const QString& name, bool isAvGroupchat, const QString& selfName)
Group::Group(int groupId, const GroupId persistentGroupId, const QString& name, bool isAvGroupchat,
const QString& selfName)
: selfName{selfName}
, title{name}
, toxGroupNum(groupId)
@ -80,12 +81,13 @@ QString Group::getDisplayedName() const
void Group::regeneratePeerList()
{
// NOTE: there's a bit of a race here. Core emits a signal for both groupPeerlistChanged and groupPeerNameChanged
// back-to-back when a peer joins our group. If we get both before we process this slot, core->getGroupPeerNames
// will contain the new peer name, and we'll ignore the name changed signal, and emit a single userJoined with
// the correct name. But, if we receive the name changed signal a little later, we will emit userJoined before we
// have their username, using just their ToxPk, then shortly after emit another peerNameChanged signal. This can
// cause double-updated to UI and chatlog, but is unavoidable given the API of toxcore.
// NOTE: there's a bit of a race here. Core emits a signal for both groupPeerlistChanged and
// groupPeerNameChanged back-to-back when a peer joins our group. If we get both before we
// process this slot, core->getGroupPeerNames will contain the new peer name, and we'll ignore
// the name changed signal, and emit a single userJoined with the correct name. But, if we
// receive the name changed signal a little later, we will emit userJoined before we have their
// username, using just their ToxPk, then shortly after emit another peerNameChanged signal.
// This can cause double-updated to UI and chatlog, but is unavoidable given the API of toxcore.
const Core* core = Core::getInstance();
QStringList peers = core->getGroupPeerNames(toxGroupNum);
const auto oldPeerNames = peerDisplayNames;
@ -93,20 +95,24 @@ void Group::regeneratePeerList()
const int nPeers = peers.size();
for (int i = 0; i < nPeers; ++i) {
const auto pk = core->getGroupPeerPk(toxGroupNum, i);
peerDisplayNames[pk] = FriendList::decideNickname(pk, peers[i]);
if (pk == core->getSelfPublicKey()) {
peerDisplayNames[pk] = core->getUsername();
} else {
peerDisplayNames[pk] = FriendList::decideNickname(pk, peers[i]);
}
}
for (const auto& pk: oldPeerNames.keys()) {
for (const auto& pk : oldPeerNames.keys()) {
if (!peerDisplayNames.contains(pk)) {
emit userLeft(pk, oldPeerNames.value(pk));
stopAudioOfDepartedPeers(pk);
}
}
for (const auto& pk: peerDisplayNames.keys()) {
for (const auto& pk : peerDisplayNames.keys()) {
if (!oldPeerNames.contains(pk)) {
emit userJoined(pk, peerDisplayNames.value(pk));
}
}
for (const auto& pk: peerDisplayNames.keys()) {
for (const auto& pk : peerDisplayNames.keys()) {
if (oldPeerNames.contains(pk) && oldPeerNames.value(pk) != peerDisplayNames.value(pk)) {
emit peerNameChanged(pk, oldPeerNames.value(pk), peerDisplayNames.value(pk));
}