From f8fbfbff9aa6599024988f16e0740ca4f2974587 Mon Sep 17 00:00:00 2001
From: Bruno Windels <brunow@matrix.org>
Date: Sat, 1 Jun 2019 17:04:05 +0200
Subject: [PATCH] implement reading n events from end of live fragment

---
 src/matrix/room/timeline/Timeline.js          |  3 +-
 .../timeline/persistence/TimelineReader.js    | 34 +++++++++++++++++--
 2 files changed, 33 insertions(+), 4 deletions(-)

diff --git a/src/matrix/room/timeline/Timeline.js b/src/matrix/room/timeline/Timeline.js
index 2ac74e64..600fe143 100644
--- a/src/matrix/room/timeline/Timeline.js
+++ b/src/matrix/room/timeline/Timeline.js
@@ -19,8 +19,7 @@ export default class Timeline {
 
     /** @package */
     async load() {
-        const txn = await this._storage.readTxn([this._storage.storeNames.timelineEvents]);
-        const entries = await txn.roomTimeline.lastEvents(this._roomId, 100);
+        const entries = this._timelineReader.readFromEnd(100);
         for (const entry of entries) {
             this._entriesList.append(entry);
         }
diff --git a/src/matrix/room/timeline/persistence/TimelineReader.js b/src/matrix/room/timeline/persistence/TimelineReader.js
index ee7c7865..0fbc59e6 100644
--- a/src/matrix/room/timeline/persistence/TimelineReader.js
+++ b/src/matrix/room/timeline/persistence/TimelineReader.js
@@ -1,5 +1,6 @@
 import {directionalConcat, directionalAppend} from "./common.js";
 import EventKey from "../EventKey.js";
+import Direction from "../Direction.js";
 import EventEntry from "../entries/EventEntry.js";
 import FragmentBoundaryEntry from "../entries/FragmentBoundaryEntry.js";
 
@@ -10,11 +11,19 @@ export default class TimelineReader {
         this._fragmentIdComparer = fragmentIdComparer;
     }
 
-    async readFrom(eventKey, direction, amount) {
-        const txn = this._storage.readTxn([
+    _openTxn() {
+        return this._storage.readTxn([
             this._storage.storeNames.timelineEvents,
             this._storage.storeNames.timelineFragments,
         ]);
+    }
+
+    async readFrom(eventKey, direction, amount) {
+        const txn = await this._openTxn();
+        return this._readFrom(eventKey, direction, amount, txn);
+    }
+
+    async _readFrom(eventKey, direction, amount, txn) {
         let entries = [];
 
         const timelineStore = txn.timelineEvents;
@@ -52,4 +61,25 @@ export default class TimelineReader {
 
         return entries;
     }
+
+    async readFromEnd(amount) {
+        const txn = await this._openTxn();
+        const liveFragment = await txn.timelineFragments.liveFragment(this._roomId);
+        // room hasn't been synced yet
+        if (!liveFragment) {
+            return [];
+        }
+        this._fragmentIdComparer.add(liveFragment);
+        const liveFragmentEntry = new FragmentBoundaryEntry(liveFragment, Direction.Forward, this._fragmentIdComparer);
+        const eventKey = new EventKey(liveFragmentEntry.fragmentId, liveFragmentEntry.eventIndex);
+        const entries = this._readFrom(eventKey, Direction.Backward, amount, txn);
+        entries.unshift(liveFragmentEntry);
+        return entries;
+    }
+
+    // reads distance up and down from eventId
+    // or just expose eventIdToKey?
+    readAtEventId(eventId, distance) {
+        return null;
+    }
 }