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(group): store peer list in a more intelligent way

Browse Source
This commit is contained in:
sudden6 2018-03-04 19:59:35 +01:00
parent 0d74134dc1
commit 498c04ba50
No known key found for this signature in database
GPG Key ID: 279509B499E032B9
2 changed files with 10 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/model/group.cpp
View File

@ -47,13 +47,11 @@ void Group::updatePeer(int peerId, QString name)
{ {
ToxPk peerKey = Core::getInstance()->getGroupPeerPk(groupId, peerId); ToxPk peerKey = Core::getInstance()->getGroupPeerPk(groupId, peerId);
QByteArray peerPk = peerKey.getKey(); QByteArray peerPk = peerKey.getKey();
peers[peerId] = name;
toxids[peerPk] = name; toxids[peerPk] = name;
Friend* f = FriendList::findFriend(peerKey); Friend* f = FriendList::findFriend(peerKey);
if (f != nullptr) { if (f != nullptr) {
// use the displayed name from the friends list // use the displayed name from the friends list
peers[peerId] = f->getDisplayedName();
toxids[peerPk] = f->getDisplayedName(); toxids[peerPk] = f->getDisplayedName();
} else { } else {
emit userListChanged(groupId, toxids); emit userListChanged(groupId, toxids);
@ -94,24 +92,26 @@ QString Group::getDisplayedName() const
void Group::regeneratePeerList() void Group::regeneratePeerList()
{ {
const Core* core = Core::getInstance(); const Core* core = Core::getInstance();
peers = core->getGroupPeerNames(groupId); const ToxPk self = core->getSelfId().getPublicKey();
QStringList peers = core->getGroupPeerNames(groupId);
toxids.clear(); toxids.clear();
nPeers = peers.size(); nPeers = peers.size();
for (int i = 0; i < nPeers; ++i) { for (int i = 0; i < nPeers; ++i) {
ToxPk id = core->getGroupPeerPk(groupId, i); ToxPk id = core->getGroupPeerPk(groupId, i);
ToxPk self = core->getSelfId().getPublicKey(); if (id == self) {
if (id == self)
selfPeerNum = i; selfPeerNum = i;
}
QByteArray peerPk = id.getKey(); QByteArray peerPk = id.getKey();
toxids[peerPk] = peers[i]; toxids[peerPk] = peers[i];
if (toxids[peerPk].isEmpty()) if (toxids[peerPk].isEmpty()) {
toxids[peerPk] = toxids[peerPk] =
tr("<Empty>", "Placeholder when someone's name in a group chat is empty"); tr("<Empty>", "Placeholder when someone's name in a group chat is empty");
}
Friend* f = FriendList::findFriend(id); Friend* f = FriendList::findFriend(id);
if (f != nullptr && f->hasAlias()) { if (f != nullptr && f->hasAlias()) {
peers[i] = f->getDisplayedName();
toxids[peerPk] = f->getDisplayedName(); toxids[peerPk] = f->getDisplayedName();
} }
} }
@ -136,7 +136,7 @@ int Group::getPeersCount() const
QStringList Group::getPeerList() const QStringList Group::getPeerList() const
{ {
return peers; return toxids.values();
} }
bool Group::isSelfPeerNumber(int num) const bool Group::isSelfPeerNumber(int num) const
@ -169,8 +169,9 @@ QString Group::resolveToxId(const ToxPk& id) const
QByteArray key = id.getKey(); QByteArray key = id.getKey();
auto it = toxids.find(key); auto it = toxids.find(key);
if (it != toxids.end()) if (it != toxids.end()) {
return *it; return *it;
}
return QString(); return QString();
} }

2
src/model/group.h
View File

@ -65,8 +65,6 @@ signals:
private: private:
QString selfName; QString selfName;
QString title; QString title;
GroupChatForm* chatForm;
QStringList peers;
QMap<QByteArray, QString> toxids; QMap<QByteArray, QString> toxids;
bool hasNewMessages; bool hasNewMessages;
bool userWasMentioned; bool userWasMentioned;