Merge branch 'henri/fragmented-timeline-v2' into 'main'

Henri/fragmented timeline v2 Closes #293 See merge request famedly/company/frontend/famedlysdk!1038
famedly · May 16, 2022 · be0adde · be0adde
2 parents 4fec950 + bfdd4c8
commit be0adde
Show file tree

Hide file tree

Showing 15 changed files with 1,030 additions and 129 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,6 @@
+## [0.9.5] - 13th May 2022
+- fix: Fix deep copy issue in the fragmented timeline feature and restored it
+
 ## [0.9.4] - 12th May 2022
 - fix: Revert fragmented timeline feature temporarily to fix SENDING timeline
 

diff --git a/lib/src/client.dart b/lib/src/client.dart
@@ -1389,7 +1389,7 @@ class Client extends MatrixApi {
         await roomsLoading;
         await _accountDataLoading;
         _currentTransaction = database.transaction(() async {
-          await _handleSync(syncResp);
+          await _handleSync(syncResp, direction: Direction.f);
           if (prevBatch != syncResp.nextBatch) {
             await database.storePrevBatch(syncResp.nextBatch);
           }
@@ -1401,7 +1401,7 @@ class Client extends MatrixApi {
         );
         onSyncStatus.add(SyncStatusUpdate(SyncStatus.cleaningUp));
       } else {
-        await _handleSync(syncResp);
+        await _handleSync(syncResp, direction: Direction.f);
       }
       if (_disposed || _aborted) return;
       if (prevBatch == null) {
@@ -1445,13 +1445,13 @@ class Client extends MatrixApi {
   }
 
   /// Use this method only for testing utilities!
-  Future<void> handleSync(SyncUpdate sync, {bool sortAtTheEnd = false}) async {
+  Future<void> handleSync(SyncUpdate sync, {Direction? direction}) async {
     // ensure we don't upload keys because someone forgot to set a key count
     sync.deviceOneTimeKeysCount ??= {'signed_curve25519': 100};
-    await _handleSync(sync, sortAtTheEnd: sortAtTheEnd);
+    await _handleSync(sync, direction: direction);
   }
 
-  Future<void> _handleSync(SyncUpdate sync, {bool sortAtTheEnd = false}) async {
+  Future<void> _handleSync(SyncUpdate sync, {Direction? direction}) async {
     final syncToDevice = sync.toDevice;
     if (syncToDevice != null) {
       await _handleToDeviceEvents(syncToDevice);
@@ -1460,15 +1460,15 @@ class Client extends MatrixApi {
     if (sync.rooms != null) {
       final join = sync.rooms?.join;
       if (join != null) {
-        await _handleRooms(join, sortAtTheEnd: sortAtTheEnd);
+        await _handleRooms(join, direction: direction);
       }
       final invite = sync.rooms?.invite;
       if (invite != null) {
-        await _handleRooms(invite, sortAtTheEnd: sortAtTheEnd);
+        await _handleRooms(invite, direction: direction);
       }
       final leave = sync.rooms?.leave;
       if (leave != null) {
-        await _handleRooms(leave, sortAtTheEnd: sortAtTheEnd);
+        await _handleRooms(leave, direction: direction);
       }
     }
     for (final newPresence in sync.presence ?? []) {
@@ -1532,7 +1532,7 @@ class Client extends MatrixApi {
   }
 
   Future<void> _handleRooms(Map<String, SyncRoomUpdate> rooms,
-      {bool sortAtTheEnd = false}) async {
+      {Direction? direction}) async {
     var handledRooms = 0;
     for (final entry in rooms.entries) {
       onSyncStatus.add(SyncStatusUpdate(
@@ -1548,20 +1548,26 @@ class Client extends MatrixApi {
       /// Handle now all room events and save them in the database
       if (room is JoinedRoomUpdate) {
         final state = room.state;
+
         if (state != null && state.isNotEmpty) {
           // TODO: This method seems to be comperatively slow for some updates
           await _handleRoomEvents(
-              id, state.map((i) => i.toJson()).toList(), EventUpdateType.state,
-              sortAtTheEnd: sortAtTheEnd);
+            id,
+            state.map((i) => i.toJson()).toList(),
+            EventUpdateType.state,
+          );
         }
 
         final timelineEvents = room.timeline?.events;
         if (timelineEvents != null && timelineEvents.isNotEmpty) {
           await _handleRoomEvents(
               id,
               timelineEvents.map((i) => i.toJson()).toList(),
-              sortAtTheEnd ? EventUpdateType.history : EventUpdateType.timeline,
-              sortAtTheEnd: sortAtTheEnd);
+              direction != null
+                  ? (direction == Direction.b
+                      ? EventUpdateType.history
+                      : EventUpdateType.timeline)
+                  : EventUpdateType.timeline);
         }
 
         final ephemeral = room.ephemeral;
@@ -1584,10 +1590,10 @@ class Client extends MatrixApi {
         final timelineEvents = room.timeline?.events;
         if (timelineEvents != null && timelineEvents.isNotEmpty) {
           await _handleRoomEvents(
-              id,
-              timelineEvents.map((i) => i.toJson()).toList(),
-              EventUpdateType.timeline,
-              sortAtTheEnd: sortAtTheEnd);
+            id,
+            timelineEvents.map((i) => i.toJson()).toList(),
+            EventUpdateType.timeline,
+          );
         }
         final accountData = room.accountData;
         if (accountData != null && accountData.isNotEmpty) {
@@ -1658,16 +1664,14 @@ class Client extends MatrixApi {
   }
 
   Future<void> _handleRoomEvents(
-      String chat_id, List<dynamic> events, EventUpdateType type,
-      {bool sortAtTheEnd = false}) async {
+      String chat_id, List<dynamic> events, EventUpdateType type) async {
     for (final event in events) {
-      await _handleEvent(event, chat_id, type, sortAtTheEnd: sortAtTheEnd);
+      await _handleEvent(event, chat_id, type);
     }
   }
 
   Future<void> _handleEvent(
-      Map<String, dynamic> event, String roomID, EventUpdateType type,
-      {bool sortAtTheEnd = false}) async {
+      Map<String, dynamic> event, String roomID, EventUpdateType type) async {
     if (event['type'] is String && event['content'] is Map<String, dynamic>) {
       // The client must ignore any new m.room.encryption event to prevent
       // man-in-the-middle attacks!
@@ -1680,11 +1684,7 @@ class Client extends MatrixApi {
         return;
       }
 
-      var update = EventUpdate(
-        roomID: roomID,
-        type: type,
-        content: event,
-      );
+      var update = EventUpdate(roomID: roomID, type: type, content: event);
       if (event['type'] == EventTypes.Encrypted && encryptionEnabled) {
         update = await update.decrypt(room);
       }

diff --git a/lib/src/database/database_api.dart b/lib/src/database/database_api.dart
@@ -83,6 +83,7 @@ abstract class DatabaseApi {
   Future<List<Event>> getEventList(
     Room room, {
     int start = 0,
+    bool onlySending,
     int limit,
   });
 

diff --git a/lib/src/database/fluffybox_database.dart b/lib/src/database/fluffybox_database.dart
@@ -345,6 +345,7 @@ class FluffyBoxDatabase extends DatabaseApi {
   Future<List<Event>> getEventList(
     Room room, {
     int start = 0,
+    bool onlySending = false,
     int? limit,
   }) =>
       runBenchmarked<List<Event>>('Get event list', () async {
@@ -367,7 +368,7 @@ class FluffyBoxDatabase extends DatabaseApi {
         final end = min(timelineEventIds.length,
             start + (limit ?? timelineEventIds.length));
         final eventIds = sendingEventIds +
-            (start < timelineEventIds.length
+            (start < timelineEventIds.length && !onlySending
                 ? timelineEventIds.getRange(start, end).toList()
                 : []);
 

diff --git a/lib/src/database/hive_database.dart b/lib/src/database/hive_database.dart
@@ -387,6 +387,7 @@ class FamedlySdkHiveDatabase extends DatabaseApi {
   Future<List<Event>> getEventList(
     Room room, {
     int start = 0,
+    bool onlySending = false,
     int? limit,
   }) =>
       runBenchmarked<List<Event>>('Get event list', () async {
@@ -410,7 +411,7 @@ class FamedlySdkHiveDatabase extends DatabaseApi {
         final end = min(timelineEventIds.length,
             start + (limit ?? timelineEventIds.length));
         final eventIds = sendingEventIds +
-            (start < timelineEventIds.length
+            (start < timelineEventIds.length && !onlySending
                 ? timelineEventIds.getRange(start, end).toList()
                 : []);
 

diff --git a/lib/src/models/timeline_chunk.dart b/lib/src/models/timeline_chunk.dart
@@ -0,0 +1,10 @@
+import '../../matrix.dart';
+
+class TimelineChunk {
+  String prevBatch; // pos of the first event of the database timeline chunk
+  String nextBatch;
+
+  List<Event> events;
+  TimelineChunk(
+      {required this.events, this.prevBatch = '', this.nextBatch = ''});
+}