d3v1l/matrixion
1
0
Fork 0
mirror of https://github.com/Nheko-Reborn/nheko.git synced 2024-11-22 03:00:46 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix room name calculation with 3 members

Browse source 
fixes #1598
This commit is contained in:
Nicolas Werner 2023-10-28 13:46:35 +02:00
parent c3db2bc843
commit 7c21c41638
No known key found for this signature in database
GPG key ID: C8D75E610773F2D9
1 changed files with 17 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
src/Cache.cpp
View file

@ -3123,11 +3123,26 @@ Cache::getRoomName(lmdb::txn &txn, lmdb::dbi &statesdb, lmdb::dbi &membersdb)
return localUserId_; return localUserId_;
}(); }();
auto second_member = [&members, this]() {
bool first = true;
for (const auto &m : members) {
if (m.first != localUserId_.toStdString()) {
if (first)
first = false;
else
return QString::fromStdString(m.second.name);
}
}
return localUserId_;
}();
if (total == 2) if (total == 2)
return first_member; return first_member;
else if (total > 2) else if (total == 3)
return tr("%1 and %n other(s)", "", (int)total - 1).arg(first_member); return tr("%1 and %2", "RoomName").arg(first_member, second_member);
else if (total > 3)
return tr("%1 and %n other(s)", "", (int)total - 2).arg(first_member);
return tr("Empty Room"); return tr("Empty Room");
} }