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

Fix joined rooms dropping to the bottom at first

Browse source
This commit is contained in:
Nicolas Werner 2020-05-04 20:17:57 +02:00
parent db24f174b1
commit 692c6119b4
3 changed files with 51 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
src/Cache.cpp
View file

@ -1314,16 +1314,33 @@ Cache::getLastMessageInfo(lmdb::txn &txn, const std::string &room_id)
std::string timestamp, msg; std::string timestamp, msg;
QSettings settings;
const auto local_user = utils::localUser(); const auto local_user = utils::localUser();
DescInfo fallbackDesc{};
auto cursor = lmdb::cursor::open(txn, db); auto cursor = lmdb::cursor::open(txn, db);
while (cursor.get(timestamp, msg, MDB_NEXT)) { while (cursor.get(timestamp, msg, MDB_NEXT)) {
auto obj = json::parse(msg); auto obj = json::parse(msg);
if (obj.count("event") == 0 || !(obj["event"]["type"] == "m.room.message" || if (obj.count("event") == 0)
obj["event"]["type"] == "m.sticker" || continue;
obj["event"]["type"] == "m.room.encrypted"))
if (fallbackDesc.event_id.isEmpty() && obj["event"]["type"] == "m.room.member" &&
obj["event"]["state_key"] == local_user.toStdString() &&
obj["event"]["content"]["membership"] == "join") {
uint64_t ts = obj["event"]["origin_server_ts"];
auto time = QDateTime::fromMSecsSinceEpoch(ts);
fallbackDesc = DescInfo{QString::fromStdString(obj["event"]["event_id"]),
local_user,
tr("You joined this room"),
utils::descriptiveTime(time),
ts,
time};
}
if (!(obj["event"]["type"] == "m.room.message" ||
obj["event"]["type"] == "m.sticker" ||
obj["event"]["type"] == "m.room.encrypted"))
continue; continue;
mtx::events::collections::TimelineEvent event; mtx::events::collections::TimelineEvent event;
@ -1335,7 +1352,7 @@ Cache::getLastMessageInfo(lmdb::txn &txn, const std::string &room_id)
} }
cursor.close(); cursor.close();
return DescInfo{}; return fallbackDesc;
} }
std::map<QString, bool> std::map<QString, bool>

4
src/ChatPage.cpp
View file

@ -1009,13 +1009,13 @@ ChatPage::trySync()
cache::saveState(res); cache::saveState(res);
olm::handle_to_device_messages(res.to_device); olm::handle_to_device_messages(res.to_device);
emit syncUI(res.rooms);
auto updates = cache::roomUpdates(res); auto updates = cache::roomUpdates(res);
emit syncTopBar(updates); emit syncTopBar(updates);
emit syncRoomlist(updates); emit syncRoomlist(updates);
emit syncUI(res.rooms);
emit syncTags(cache::roomTagUpdates(res)); emit syncTags(cache::roomTagUpdates(res));
// if we process a lot of syncs (1 every 200ms), this means we clean the // if we process a lot of syncs (1 every 200ms), this means we clean the

27
src/timeline/TimelineModel.cpp
View file

@ -518,6 +518,20 @@ isMessage(const mtx::events::EncryptedEvent<T> &)
return true; return true;
} }
// Workaround. We also want to see a room at the top, if we just joined it
auto
isYourJoin(const mtx::events::StateEvent<mtx::events::state::Member> &e)
{
return e.content.membership == mtx::events::state::Membership::Join &&
e.state_key == http::client()->user_id().to_string();
}
template<typename T>
auto
isYourJoin(const mtx::events::Event<T> &)
{
return false;
}
void void
TimelineModel::updateLastMessage() TimelineModel::updateLastMessage()
{ {
@ -530,6 +544,19 @@ TimelineModel::updateLastMessage()
} }
} }
if (std::visit([](const auto &e) -> bool { return isYourJoin(e); }, event)) {
auto time = mtx::accessors::origin_server_ts(event);
uint64_t ts = time.toMSecsSinceEpoch();
emit manager_->updateRoomsLastMessage(
room_id_,
DescInfo{QString::fromStdString(mtx::accessors::event_id(event)),
QString::fromStdString(http::client()->user_id().to_string()),
tr("You joined this room"),
utils::descriptiveTime(time),
ts,
time});
return;
}
if (!std::visit([](const auto &e) -> bool { return isMessage(e); }, event)) if (!std::visit([](const auto &e) -> bool { return isMessage(e); }, event))
continue; continue;