rnhmjoj
/
nheko
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Add some db logging and clean up avatar urls a bit

This commit is contained in:
Nicolas Werner 2020-11-25 22:45:33 +01:00
parent 140d927463
commit 7cda502edd
3 changed files with 14 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
src/Cache.cpp
View File

@ -1164,9 +1164,7 @@ Cache::saveState(const mtx::responses::Sync &res)
RoomInfo updatedInfo; RoomInfo updatedInfo;
updatedInfo.name = getRoomName(txn, statesdb, membersdb).toStdString(); updatedInfo.name = getRoomName(txn, statesdb, membersdb).toStdString();
updatedInfo.topic = getRoomTopic(txn, statesdb).toStdString(); updatedInfo.topic = getRoomTopic(txn, statesdb).toStdString();
updatedInfo.avatar_url = updatedInfo.avatar_url = getRoomAvatarUrl(txn, statesdb, membersdb).toStdString();
getRoomAvatarUrl(txn, statesdb, membersdb, QString::fromStdString(room.first))
.toStdString();
updatedInfo.version = getRoomVersion(txn, statesdb).toStdString(); updatedInfo.version = getRoomVersion(txn, statesdb).toStdString();
// Process the account_data associated with this room // Process the account_data associated with this room
@ -1881,10 +1879,7 @@ Cache::invites()
} }
QString QString
Cache::getRoomAvatarUrl(lmdb::txn &txn, Cache::getRoomAvatarUrl(lmdb::txn &txn, lmdb::dbi &statesdb, lmdb::dbi &membersdb)
lmdb::dbi &statesdb,
lmdb::dbi &membersdb,
const QString &room_id)
{ {
using namespace mtx::events; using namespace mtx::events;
using namespace mtx::events::state; using namespace mtx::events::state;
@ -1912,14 +1907,17 @@ Cache::getRoomAvatarUrl(lmdb::txn &txn,
auto cursor = lmdb::cursor::open(txn, membersdb); auto cursor = lmdb::cursor::open(txn, membersdb);
std::string user_id; std::string user_id;
std::string member_data; std::string member_data;
std::string fallback_url;
// Resolve avatar for 1-1 chats. // Resolve avatar for 1-1 chats.
while (cursor.get(user_id, member_data, MDB_NEXT)) { while (cursor.get(user_id, member_data, MDB_NEXT)) {
if (user_id == localUserId_.toStdString())
continue;
try { try {
MemberInfo m = json::parse(member_data); MemberInfo m = json::parse(member_data);
if (user_id == localUserId_.toStdString()) {
fallback_url = m.avatar_url;
continue;
}
cursor.close(); cursor.close();
return QString::fromStdString(m.avatar_url); return QString::fromStdString(m.avatar_url);
@ -1931,7 +1929,7 @@ Cache::getRoomAvatarUrl(lmdb::txn &txn,
cursor.close(); cursor.close();
// Default case when there is only one member. // Default case when there is only one member.
return avatarUrl(room_id, localUserId_); return QString::fromStdString(fallback_url);
} }
QString QString
@ -2291,7 +2289,8 @@ Cache::getMember(const std::string &room_id, const std::string &user_id)
MemberInfo m = json::parse(std::string_view(info.data(), info.size())); MemberInfo m = json::parse(std::string_view(info.data(), info.size()));
return m; return m;
} }
} catch (...) { } catch (std::exception &e) {
nhlog::db()->warn("Failed to read member ({}): {}", user_id, e.what());
} }
return std::nullopt; return std::nullopt;
} }
@ -3841,9 +3840,9 @@ getRoomTopic(lmdb::txn &txn, lmdb::dbi &statesdb)
return instance_->getRoomTopic(txn, statesdb); return instance_->getRoomTopic(txn, statesdb);
} }
QString QString
getRoomAvatarUrl(lmdb::txn &txn, lmdb::dbi &statesdb, lmdb::dbi &membersdb, const QString &room_id) getRoomAvatarUrl(lmdb::txn &txn, lmdb::dbi &statesdb, lmdb::dbi &membersdb)
{ {
return instance_->getRoomAvatarUrl(txn, statesdb, membersdb, room_id); return instance_->getRoomAvatarUrl(txn, statesdb, membersdb);
} }
QString QString

2
src/Cache.h
View File

@ -92,7 +92,7 @@ QString
getRoomTopic(lmdb::txn &txn, lmdb::dbi &statesdb); getRoomTopic(lmdb::txn &txn, lmdb::dbi &statesdb);
//! Retrieve the room avatar's url if any. //! Retrieve the room avatar's url if any.
QString QString
getRoomAvatarUrl(lmdb::txn &txn, lmdb::dbi &statesdb, lmdb::dbi &membersdb, const QString &room_id); getRoomAvatarUrl(lmdb::txn &txn, lmdb::dbi &statesdb, lmdb::dbi &membersdb);
//! Retrieve the version of the room if any. //! Retrieve the version of the room if any.
QString QString
getRoomVersion(lmdb::txn &txn, lmdb::dbi &statesdb); getRoomVersion(lmdb::txn &txn, lmdb::dbi &statesdb);

5
src/Cache_p.h
View File

@ -89,10 +89,7 @@ public:
//! Retrieve the topic of the room if any. //! Retrieve the topic of the room if any.
QString getRoomTopic(lmdb::txn &txn, lmdb::dbi &statesdb); QString getRoomTopic(lmdb::txn &txn, lmdb::dbi &statesdb);
//! Retrieve the room avatar's url if any. //! Retrieve the room avatar's url if any.
QString getRoomAvatarUrl(lmdb::txn &txn, QString getRoomAvatarUrl(lmdb::txn &txn, lmdb::dbi &statesdb, lmdb::dbi &membersdb);
lmdb::dbi &statesdb,
lmdb::dbi &membersdb,
const QString &room_id);
//! Retrieve the version of the room if any. //! Retrieve the version of the room if any.
QString getRoomVersion(lmdb::txn &txn, lmdb::dbi &statesdb); QString getRoomVersion(lmdb::txn &txn, lmdb::dbi &statesdb);