mirror of
https://github.com/vector-im/hydrogen-web.git
synced 2024-12-23 19:45:05 +01:00
Implement readById() in TimelineReader
This commit is contained in:
parent
0da94e51e0
commit
51b7b21082
@ -23,12 +23,12 @@ import {PendingEventEntry} from "./entries/PendingEventEntry.js";
|
|||||||
import {RoomMember} from "../members/RoomMember.js";
|
import {RoomMember} from "../members/RoomMember.js";
|
||||||
import {getRelation, ANNOTATION_RELATION_TYPE} from "./relations.js";
|
import {getRelation, ANNOTATION_RELATION_TYPE} from "./relations.js";
|
||||||
import {REDACTION_TYPE} from "../common.js";
|
import {REDACTION_TYPE} from "../common.js";
|
||||||
|
import {NonPersistedEventEntry} from "./entries/NonPersistedEventEntry.js";
|
||||||
|
import {DecryptionSource} from "../../e2ee/common.js";
|
||||||
|
|
||||||
export class Timeline {
|
export class Timeline {
|
||||||
constructor({roomId, storage, closeCallback, fragmentIdComparer, pendingEvents, clock, powerLevelsObservable, fetchEventFromStorage, fetchEventFromHomeserver}) {
|
constructor({roomId, storage, closeCallback, fragmentIdComparer, pendingEvents, clock, powerLevelsObservable, hsApi}) {
|
||||||
this._roomId = roomId;
|
this._roomId = roomId;
|
||||||
this._fetchEventFromStorage = fetchEventFromStorage;
|
|
||||||
this._fetchEventFromHomeserver = fetchEventFromHomeserver;
|
|
||||||
this._storage = storage;
|
this._storage = storage;
|
||||||
this._closeCallback = closeCallback;
|
this._closeCallback = closeCallback;
|
||||||
this._fragmentIdComparer = fragmentIdComparer;
|
this._fragmentIdComparer = fragmentIdComparer;
|
||||||
@ -47,6 +47,8 @@ export class Timeline {
|
|||||||
this._allEntries = null;
|
this._allEntries = null;
|
||||||
// Stores event entries that we fetch for reply previews
|
// Stores event entries that we fetch for reply previews
|
||||||
this._fetchedEventEntries = new Map();
|
this._fetchedEventEntries = new Map();
|
||||||
|
this._decryptEntries = null;
|
||||||
|
this._hsApi = hsApi;
|
||||||
this.initializePowerLevels(powerLevelsObservable);
|
this.initializePowerLevels(powerLevelsObservable);
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -267,7 +269,7 @@ export class Timeline {
|
|||||||
const id = entry.contextEventId;
|
const id = entry.contextEventId;
|
||||||
let contextEvent = this._getTrackedEvent(id);
|
let contextEvent = this._getTrackedEvent(id);
|
||||||
if (!contextEvent) {
|
if (!contextEvent) {
|
||||||
contextEvent = await this._fetchEventFromStorage(id) ?? await this._fetchEventFromHomeserver(id);
|
contextEvent = await this._timelineReader.readById(id) ?? await this._getEventFromHomeserver(id);
|
||||||
// this entry was created from storage/hs, so it's not tracked by remoteEntries
|
// this entry was created from storage/hs, so it's not tracked by remoteEntries
|
||||||
// we track them here so that we can update reply preview of dependents on redaction
|
// we track them here so that we can update reply preview of dependents on redaction
|
||||||
this._fetchedEventEntries.set(id, contextEvent);
|
this._fetchedEventEntries.set(id, contextEvent);
|
||||||
@ -285,6 +287,23 @@ export class Timeline {
|
|||||||
return this.getByEventId(id) ?? this._fetchedEventEntries.get(id);
|
return this.getByEventId(id) ?? this._fetchedEventEntries.get(id);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
async _getEventFromHomeserver(eventId) {
|
||||||
|
const response = await this._hsApi.context(this._roomId, eventId, 0).response();
|
||||||
|
const sender = response.event.sender;
|
||||||
|
const member = response.state.find(e => e.type === "m.room.member" && e.user_id === sender);
|
||||||
|
const entry = {
|
||||||
|
event: response.event,
|
||||||
|
displayName: member.content.displayname,
|
||||||
|
avatarUrl: member.content.avatar_url
|
||||||
|
};
|
||||||
|
const eventEntry = new NonPersistedEventEntry(entry, this._fragmentIdComparer);
|
||||||
|
if (this._decryptEntries) {
|
||||||
|
const request = this._decryptEntries(DecryptionSource.Timeline, [eventEntry]);
|
||||||
|
await request.complete();
|
||||||
|
}
|
||||||
|
return eventEntry;
|
||||||
|
}
|
||||||
|
|
||||||
// tries to prepend `amount` entries to the `entries` list.
|
// tries to prepend `amount` entries to the `entries` list.
|
||||||
/**
|
/**
|
||||||
* [loadAtTop description]
|
* [loadAtTop description]
|
||||||
@ -374,6 +393,7 @@ export class Timeline {
|
|||||||
|
|
||||||
/** @internal */
|
/** @internal */
|
||||||
enableEncryption(decryptEntries) {
|
enableEncryption(decryptEntries) {
|
||||||
|
this._decryptEntries = decryptEntries;
|
||||||
this._timelineReader.enableEncryption(decryptEntries);
|
this._timelineReader.enableEncryption(decryptEntries);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user