Continuously load more messages until there are 20 or no more

lib/controllers/room_chat_controller.dart

@@ -123,9 +123,9 @@ class RoomChatController extends AsyncNotifier<InMemoryChatController> {
 
     ref.onDispose(controller.dispose);
 
-    // While there are under 20 messages, try up to two times to load more messages.
+    // While there are under 20 messages, try up to load more messages until theres no more or we have 20 messages.
-    for (var i = 0; i < 2 && messages.length < 20; i++) {
+    for (var more = true; more == true && controller.messages.length < 20;) {
-      await loadOlder(controller);
+      more = await loadOlder(controller);
     }
 
     return controller;
@@ -151,7 +151,7 @@ class RoomChatController extends AsyncNotifier<InMemoryChatController> {
         RedactEventRequest(eventId: message.id, roomId: roomId, reason: reason),
       );
 
-  Future<void> loadOlder([InMemoryChatController? chatController]) async {
+  Future<bool> loadOlder([InMemoryChatController? chatController]) async {
     final response = await ref
         .watch(ClientController.provider.notifier)
         .paginate(
@@ -183,11 +183,11 @@ class RoomChatController extends AsyncNotifier<InMemoryChatController> {
             ),
           }),
           const ISet.empty(),
+          addToNewEvents: false,
         );
 
     final room = ref.read(RoomsController.provider)[roomId];
-    if (room == null) return;
+    if (room != null) {
-
       final messages = await ref.watch(
         MessagesController.provider(
           MessagesConfig(room: room, events: response.events.reversed),
@@ -206,6 +206,8 @@ class RoomChatController extends AsyncNotifier<InMemoryChatController> {
         index: 0,
       );
     }
+    return response.hasMore;
+  }
 
   Future<void> send(
     String text, {

lib/controllers/rooms_controller.dart

@@ -11,7 +11,11 @@ class RoomsController extends Notifier<IMap<String, Room>> {
   @override
   IMap<String, Room> build() => const IMap.empty();
 
-  void update(IMap<String, Room> rooms, ISet<String> leftRooms) {
+  void update(
+    IMap<String, Room> rooms,
+    ISet<String> leftRooms, {
+    bool addToNewEvents = true,
+  }) {
     final homeserver =
         ref.watch(
           ClientStateController.provider.select(
@@ -29,6 +33,7 @@ class RoomsController extends Notifier<IMap<String, Room>> {
         (item) => item.eventId,
       );
 
+      if (addToNewEvents) {
         ref
             .watch(NewEventsController.provider(roomId).notifier)
             .add(
@@ -41,6 +46,7 @@ class RoomsController extends Notifier<IMap<String, Room>> {
                   .nonNulls
                   .toIList(),
             );
+      }
 
       return acc.add(
         roomId,