diff --git a/src/Cache.cpp b/src/Cache.cpp
index d9db99b0..993fbfe7 100644
--- a/src/Cache.cpp
+++ b/src/Cache.cpp
@@ -2280,34 +2280,22 @@ Cache::joinedRooms()
return room_ids;
}
-void
-Cache::populateMembers()
+std::optional<MemberInfo>
+Cache::getMember(const std::string &room_id, const std::string &user_id)
{
- auto rooms = joinedRooms();
- nhlog::db()->info("loading {} rooms", rooms.size());
-
- auto txn = lmdb::txn::begin(env_);
-
- for (const auto &room : rooms) {
- const auto roomid = QString::fromStdString(room);
-
- auto membersdb = getMembersDb(txn, room);
- auto cursor = lmdb::cursor::open(txn, membersdb);
-
- std::string user_id, info;
- while (cursor.get(user_id, info, MDB_NEXT)) {
- MemberInfo m = json::parse(info);
+ try {
+ auto txn = lmdb::txn::begin(env_, nullptr, MDB_RDONLY);
- const auto userid = QString::fromStdString(user_id);
+ auto membersdb = getMembersDb(txn, room_id);
- insertDisplayName(roomid, userid, QString::fromStdString(m.name));
- insertAvatarUrl(roomid, userid, QString::fromStdString(m.avatar_url));
+ lmdb::val info;
+ if (lmdb::dbi_get(txn, membersdb, lmdb::val(user_id), info)) {
+ MemberInfo m = json::parse(std::string_view(info.data(), info.size()));
+ return m;
}
-
- cursor.close();
+ } catch (...) {
}
-
- txn.commit();
+ return std::nullopt;
}
std::vector<RoomSearchResult>
@@ -2724,8 +2712,19 @@ Cache::saveOldMessages(const std::string &room_id, const mtx::responses::Message
}
}
- if (res.chunk.empty())
+ if (res.chunk.empty()) {
+ if (lmdb::dbi_get(txn, orderDb, lmdb::val(&index, sizeof(index)), val)) {
+ auto orderEntry = json::parse(std::string_view(val.data(), val.size()));
+ orderEntry["prev_batch"] = res.end;
+ lmdb::dbi_put(txn,
+ orderDb,
+ lmdb::val(&index, sizeof(index)),
+ lmdb::val(orderEntry.dump()));
+ nhlog::db()->debug("saving '{}'", orderEntry.dump());
+ txn.commit();
+ }
return index;
+ }
std::string event_id_val;
for (const auto &e : res.chunk) {
@@ -3145,15 +3144,12 @@ Cache::roomMembers(const std::string &room_id)
return members;
}
-QHash<QString, QString> Cache::DisplayNames;
-QHash<QString, QString> Cache::AvatarUrls;
-
QString
Cache::displayName(const QString &room_id, const QString &user_id)
{
- auto fmt = QString("%1 %2").arg(room_id).arg(user_id);
- if (DisplayNames.contains(fmt))
- return DisplayNames[fmt];
+ if (auto info = getMember(room_id.toStdString(), user_id.toStdString());
+ info && !info->name.empty())
+ return QString::fromStdString(info->name);
return user_id;
}
@@ -3161,9 +3157,8 @@ Cache::displayName(const QString &room_id, const QString &user_id)
std::string
Cache::displayName(const std::string &room_id, const std::string &user_id)
{
- auto fmt = QString::fromStdString(room_id + " " + user_id);
- if (DisplayNames.contains(fmt))
- return DisplayNames[fmt].toStdString();
+ if (auto info = getMember(room_id, user_id); info && !info->name.empty())
+ return info->name;
return user_id;
}
@@ -3171,41 +3166,11 @@ Cache::displayName(const std::string &room_id, const std::string &user_id)
QString
Cache::avatarUrl(const QString &room_id, const QString &user_id)
{
- auto fmt = QString("%1 %2").arg(room_id).arg(user_id);
- if (AvatarUrls.contains(fmt))
- return AvatarUrls[fmt];
-
- return QString();
-}
-
-void
-Cache::insertDisplayName(const QString &room_id,
- const QString &user_id,
- const QString &display_name)
-{
- auto fmt = QString("%1 %2").arg(room_id).arg(user_id);
- DisplayNames.insert(fmt, display_name);
-}
-
-void
-Cache::removeDisplayName(const QString &room_id, const QString &user_id)
-{
- auto fmt = QString("%1 %2").arg(room_id).arg(user_id);
- DisplayNames.remove(fmt);
-}
-
-void
-Cache::insertAvatarUrl(const QString &room_id, const QString &user_id, const QString &avatar_url)
-{
- auto fmt = QString("%1 %2").arg(room_id).arg(user_id);
- AvatarUrls.insert(fmt, avatar_url);
-}
+ if (auto info = getMember(room_id.toStdString(), user_id.toStdString());
+ info && !info->avatar_url.empty())
+ return QString::fromStdString(info->avatar_url);
-void
-Cache::removeAvatarUrl(const QString &room_id, const QString &user_id)
-{
- auto fmt = QString("%1 %2").arg(room_id).arg(user_id);
- AvatarUrls.remove(fmt);
+ return "";
}
mtx::presence::PresenceState
@@ -3793,28 +3758,6 @@ avatarUrl(const QString &room_id, const QString &user_id)
return instance_->avatarUrl(room_id, user_id);
}
-void
-removeDisplayName(const QString &room_id, const QString &user_id)
-{
- instance_->removeDisplayName(room_id, user_id);
-}
-void
-removeAvatarUrl(const QString &room_id, const QString &user_id)
-{
- instance_->removeAvatarUrl(room_id, user_id);
-}
-
-void
-insertDisplayName(const QString &room_id, const QString &user_id, const QString &display_name)
-{
- instance_->insertDisplayName(room_id, user_id, display_name);
-}
-void
-insertAvatarUrl(const QString &room_id, const QString &user_id, const QString &avatar_url)
-{
- instance_->insertAvatarUrl(room_id, user_id, avatar_url);
-}
-
mtx::presence::PresenceState
presenceState(const std::string &user_id)
{
@@ -3826,13 +3769,6 @@ statusMessage(const std::string &user_id)
return instance_->statusMessage(user_id);
}
-//! Load saved data for the display names & avatars.
-void
-populateMembers()
-{
- instance_->populateMembers();
-}
-
// user cache stores user keys
std::optional<UserKeyCache>
userKeys(const std::string &user_id)
|
