Fix timeline becoming corrupted on backfill

Fixes #273

CMakeLists.txt

@@ -354,7 +354,7 @@ if(USE_BUNDLED_MTXCLIENT)
 	FetchContent_Declare(
 		MatrixClient
 		GIT_REPOSITORY https://github.com/Nheko-Reborn/mtxclient.git
-		GIT_TAG        d44158e17e8eb872bee762a81fc04bfad117f0c5
+		GIT_TAG        f364a5e83db3f1978b6c3d3453accae02c9267c3
 		)
 	set(BUILD_LIB_EXAMPLES OFF CACHE INTERNAL "")
 	set(BUILD_LIB_TESTS OFF CACHE INTERNAL "")

io.github.NhekoReborn.Nheko.json

@@ -152,7 +152,7 @@
       "name": "mtxclient",
       "sources": [
         {
-          "commit": "d44158e17e8eb872bee762a81fc04bfad117f0c5",
+          "commit": "f364a5e83db3f1978b6c3d3453accae02c9267c3",
           "type": "git",
           "url": "https://github.com/Nheko-Reborn/mtxclient.git"
         }

src/Cache.cpp

@@ -1208,10 +1208,11 @@ Cache::saveState(const mtx::responses::Sync &res)
                 for (const auto &ev : res.account_data.events)
                         std::visit(
                           [&txn, &accountDataDb](const auto &event) {
+                                  auto j = json(event);
                                   lmdb::dbi_put(txn,
                                                 accountDataDb,
-                                                lmdb::val(to_string(event.type)),
-                                                lmdb::val(json(event).dump()));
+                                                lmdb::val(j["type"].get<std::string>()),
+                                                lmdb::val(j.dump()));
                           },
                           ev);
         }
@@ -1242,10 +1243,11 @@ Cache::saveState(const mtx::responses::Sync &res)
                         for (const auto &evt : room.second.account_data.events) {
                                 std::visit(
                                   [&txn, &accountDataDb](const auto &event) {
+                                          auto j = json(event);
                                           lmdb::dbi_put(txn,
                                                         accountDataDb,
-                                                        lmdb::val(to_string(event.type)),
-                                                        lmdb::val(json(event).dump()));
+                                                        lmdb::val(j["type"].get<std::string>()),
+                                                        lmdb::val(j.dump()));
                                   },
                                   evt);
 
@@ -1391,10 +1393,11 @@ Cache::saveInvite(lmdb::txn &txn,
                 } else {
                         std::visit(
                           [&txn, &statesdb](auto msg) {
+                                  auto j   = json(msg);
                                   bool res = lmdb::dbi_put(txn,
                                                            statesdb,
-                                                           lmdb::val(to_string(msg.type)),
-                                                           lmdb::val(json(msg).dump()));
+                                                           lmdb::val(j["type"].get<std::string>()),
+                                                           lmdb::val(j.dump()));
 
                                   if (!res)
                                           nhlog::db()->warn("couldn't save data: {}",

src/timeline/EventStore.cpp

@@ -67,11 +67,25 @@ EventStore::EventStore(std::string room_id, QObject *)
                   if (newFirst == first)
                           fetchMore();
                   else {
+                          if (this->last != std::numeric_limits<uint64_t>::max()) {
                                   emit beginInsertRows(toExternalIdx(newFirst),
                                                        toExternalIdx(this->first - 1));
                                   this->first = newFirst;
                                   emit endInsertRows();
                                   emit fetchedMore();
+                          } else {
+                                  auto range = cache::client()->getTimelineRange(room_id_);
+
+                                  if (range && range->last - range->first != 0) {
+                                          emit beginInsertRows(0, int(range->last - range->first));
+                                          this->first = range->first;
+                                          this->last  = range->last;
+                                          emit endInsertRows();
+                                          emit fetchedMore();
+                                  } else {
+                                          fetchMore();
+                                  }
+                          }
                   }
           },
           Qt::QueuedConnection);
@@ -247,15 +261,19 @@ EventStore::handleSync(const mtx::responses::Timeline &events)
                 nhlog::db()->warn("{} called from a different thread!", __func__);
 
         auto range = cache::client()->getTimelineRange(room_id_);
-        if (!range)
+        if (!range) {
+                emit beginResetModel();
+                this->first = std::numeric_limits<uint64_t>::max();
+                this->last  = std::numeric_limits<uint64_t>::max();
+                emit endResetModel();
                 return;
+        }
 
         if (events.limited) {
                 emit beginResetModel();
                 this->last  = range->last;
                 this->first = range->first;
                 emit endResetModel();
-
         } else if (range->last > this->last) {
                 emit beginInsertRows(toExternalIdx(this->last + 1), toExternalIdx(range->last));
                 this->last = range->last;

src/timeline/EventStore.h

@@ -74,7 +74,7 @@ public:
 
         int size() const
         {
-                return last != std::numeric_limits<uint64_t>::max()
+                return (last != std::numeric_limits<uint64_t>::max() && last >= first)
                          ? static_cast<int>(last - first) + 1
                          : 0;
         }