Fix invites crashing the whole app

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

View file

@ -2614,6 +2614,12 @@ Cache::getInviteRoomName(lmdb::txn &txn, lmdb::dbi &statesdb, lmdb::dbi &members
return QString("Empty Room"); return QString("Empty Room");
} }
RoomMember
Cache::getDirectInviteMember(const std::string &room_id)
{
return getMembersFromInvitedRoom(room_id, 0, 1).front();
}
QString QString
Cache::getInviteRoomAvatarUrl(lmdb::txn &txn, lmdb::dbi &statesdb, lmdb::dbi &membersdb) 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; 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 bool
Cache::isRoomMember(const std::string &user_id, const std::string &room_id) 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); return instance_->getMembers(room_id, startIndex, len);
} }
RoomMember
getDirectInviteMember(const std::string &room_id)
{
return instance_->getDirectInviteMember(room_id);
}
void void
saveState(const mtx::responses::Sync &res) saveState(const mtx::responses::Sync &res)
{ {

View file

@ -84,6 +84,10 @@ getRoomAvatarUrl(lmdb::txn &txn, lmdb::dbi &statesdb, lmdb::dbi &membersdb);
std::vector<RoomMember> std::vector<RoomMember>
getMembers(const std::string &room_id, std::size_t startIndex = 0, std::size_t len = 30); getMembers(const std::string &room_id, std::size_t startIndex = 0, std::size_t len = 30);
//! Get the other person from an invite to a direct chat.
RoomMember
getDirectInviteMember(const std::string &room_id);
bool bool
isInitialized(); isInitialized();

View file

@ -109,6 +109,10 @@ public:
std::vector<RoomMember> getMembers(const std::string &room_id, std::vector<RoomMember> getMembers(const std::string &room_id,
std::size_t startIndex = 0, std::size_t startIndex = 0,
std::size_t len = 30); std::size_t len = 30);
std::vector<RoomMember> getMembersFromInvitedRoom(const std::string &room_id,
std::size_t startIndex = 0,
std::size_t len = 30);
size_t memberCount(const std::string &room_id); size_t memberCount(const std::string &room_id);
void saveState(const mtx::responses::Sync &res); void saveState(const mtx::responses::Sync &res);
@ -135,6 +139,9 @@ public:
//! Retrieve all the user ids from a room. //! Retrieve all the user ids from a room.
std::vector<std::string> roomMembers(const std::string &room_id); std::vector<std::string> roomMembers(const std::string &room_id);
//! Get the other user from an invite to a direct chat.
RoomMember getDirectInviteMember(const std::string &room_id);
//! Check if the given user has power leve greater than than //! Check if the given user has power leve greater than than
//! lowest power level of the given events. //! lowest power level of the given events.
bool hasEnoughPowerLevel(const std::vector<mtx::events::EventType> &eventTypes, bool hasEnoughPowerLevel(const std::vector<mtx::events::EventType> &eventTypes,
@ -313,7 +320,6 @@ public:
return get_skey(a).compare(get_skey(b)); return get_skey(a).compare(get_skey(b));
} }
signals: signals:
void newReadReceipts(const QString &room_id, const std::vector<QString> &event_ids); void newReadReceipts(const QString &room_id, const std::vector<QString> &event_ids);
void roomReadStatus(const std::map<QString, bool> &status); void roomReadStatus(const std::map<QString, bool> &status);

View file

@ -167,10 +167,7 @@ RoomlistModel::data(const QModelIndex &index, int role) const
case Roles::IsDirect: case Roles::IsDirect:
return room.member_count == 1; return room.member_count == 1;
case Roles::DirectChatOtherUserId: case Roles::DirectChatOtherUserId:
// if this is a direct chat, the front member is correct; otherwise, return cache::getDirectInviteMember(roomid.toStdString()).user_id;
// it won't be used anyway
return QString::fromStdString(
cache::roomMembers(roomid.toStdString()).front());
default: default:
return {}; return {};
} }