From 6b5ecb21d4fe6c5721f745764a17145bfb0d501f Mon Sep 17 00:00:00 2001
From: OfficialDakari <squiggle_ground671@simplelogin.com>
Date: Sat, 25 Oct 2025 21:53:33 +0500
Subject: [PATCH] load more threads when requesting history

---
 lib/src/room.dart | 21 ++++++++++++++++++---
 1 file changed, 18 insertions(+), 3 deletions(-)

diff --git a/lib/src/room.dart b/lib/src/room.dart
index e6b8dbaa..5b5e1c8b 100644
--- a/lib/src/room.dart
+++ b/lib/src/room.dart
@@ -137,10 +137,14 @@ class Room {
   }
 
   Map<String, Thread> threads = <String, Thread>{};
+  String? getThreadRootsBatch;
+  bool loadedAllThreads = false;
 
   Future<void> _loadThreadsFromServer() async {
     try {
-      final response = await client.getThreadRoots(id);
+      if (loadedAllThreads) return;
+      final response =
+          await client.getThreadRoots(id, from: getThreadRootsBatch);
 
       for (final threadEvent in response.chunk) {
         final event = Event.fromMatrixEvent(threadEvent, this);
@@ -153,7 +157,14 @@ class Room {
           1, // count
           client,
         );
-        threads[event.eventId] = (await client.database.getThread(id, event.eventId, client))!;
+        threads[event.eventId] =
+            (await client.database.getThread(id, event.eventId, client))!;
+      }
+
+      if (response.nextBatch == null) {
+        loadedAllThreads = true;
+      } else {
+        getThreadRootsBatch = response.nextBatch;
       }
     } catch (e) {
       Logs().w('Failed to load threads from server', e);
@@ -232,7 +243,8 @@ class Room {
 
   Future<Thread> getThread(Event rootEvent) async {
     final threads = await getThreads();
-    if (threads.containsKey(rootEvent.eventId)) return threads[rootEvent.eventId]!;
+    if (threads.containsKey(rootEvent.eventId))
+      return threads[rootEvent.eventId]!;
     return Thread(
       room: this,
       rootEvent: rootEvent,
@@ -1511,6 +1523,9 @@ class Room {
     direction = Direction.b,
     StateFilter? filter,
   }) async {
+
+    unawaited(_loadThreadsFromServer());
+
     final prev_batch = this.prev_batch;
 
     final storeInDatabase = !isArchived;