thek0tyara/nheko
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix invites crashing the whole app

Browse source
This commit is contained in:
Loren Burkholder 2021-09-09 21:31:23 -04:00
parent 96edc0bb75
commit fb53fc86b6
4 changed files with 66 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

54
src/Cache.cpp
View file

@ -2614,6 +2614,12 @@ Cache::getInviteRoomName(lmdb::txn &txn, lmdb::dbi &statesdb, lmdb::dbi &members
return QString("Empty Room");
}
RoomMember
Cache::getDirectInviteMember(const std::string &room_id)
{
return getMembersFromInvitedRoom(room_id, 0, 1).front();
}
QString
Cache::getInviteRoomAvatarUrl(lmdb::txn &txn, lmdb::dbi &statesdb, lmdb::dbi &membersdb)
{
@ -2777,6 +2783,48 @@ Cache::getMembers(const std::string &room_id, std::size_t startIndex, std::size_
return members;
}
std::vector<RoomMember>
Cache::getMembersFromInvitedRoom(const std::string &room_id,
std::size_t startIndex,
std::size_t len)
{
auto txn = ro_txn(env_);
auto db = getInviteMembersDb(txn, room_id);
auto cursor = lmdb::cursor::open(txn, db);
std::size_t currentIndex = 0;
const auto endIndex = std::min(startIndex + len, db.size(txn));
std::vector<RoomMember> members;
std::string_view user_id, user_data;
while (cursor.get(user_id, user_data, MDB_NEXT)) {
if (currentIndex < startIndex) {
currentIndex += 1;
continue;
}
if (currentIndex >= endIndex)
break;
try {
MemberInfo tmp = json::parse(user_data);
members.emplace_back(
RoomMember{QString::fromStdString(std::string(user_id)),
QString::fromStdString(tmp.name)});
} catch (const json::exception &e) {
nhlog::db()->warn("{}", e.what());
}
currentIndex += 1;
}
cursor.close();
return members;
}
bool
Cache::isRoomMember(const std::string &user_id, const std::string &room_id)
{
@ -4816,6 +4864,12 @@ getMembers(const std::string &room_id, std::size_t startIndex, std::size_t len)
return instance_->getMembers(room_id, startIndex, len);
}
RoomMember
getDirectInviteMember(const std::string &room_id)
{
return instance_->getDirectInviteMember(room_id);
}
void
saveState(const mtx::responses::Sync &res)
{