mystiq/hydrogen-web
Archived
4
1
Fork 1
Code Issues Pull requests Projects Releases Packages Wiki Activity

Fix many small issues from before I ran the code

Browse source
This commit is contained in:
Danila Fedorin 2021-09-07 15:44:21 -07:00
parent 8592fcf8c7
commit e06abcc399
2 changed files with 6 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/matrix/room/Room.js
View file

@ -112,11 +112,11 @@ export class Room extends BaseRoom {
async fetchContext(eventId, log = null) { async fetchContext(eventId, log = null) {
const response = await this._hsApi.context(this._roomId, eventId, {}, {log}).response(); const response = await this._hsApi.context(this._roomId, eventId, {}, {log}).response();
await this._fetchEvents(response, async (txn, gapWriter) => { await this._fetchEvents(async (txn, gapWriter) => {
// Just in case we somehow receive remote echoes during event fetch // Just in case we somehow receive remote echoes during event fetch
const beforeExtra = await this._writeGapFill(response.events_before, txn, log); const beforeExtra = await this._writeGapFill(response.events_before, txn, log);
const afterExtra = await this._writeGapFill(response.events_after, txn, log); const afterExtra = await this._writeGapFill(response.events_after, txn, log);
beforeExtra.append(...afterExtra); beforeExtra.push(...afterExtra);
const gapResult = await gapWriter.writeContext(response, txn, log); const gapResult = await gapWriter.writeContext(response, txn, log);
return { extraGapFillChanges: beforeExtra, gapResult }; return { extraGapFillChanges: beforeExtra, gapResult };
}, log); }, log);

7
src/matrix/room/timeline/persistence/GapWriter.js
View file

@ -16,6 +16,7 @@ limitations under the License.
import {EventKey} from "../EventKey"; import {EventKey} from "../EventKey";
import {EventEntry} from "../entries/EventEntry.js"; import {EventEntry} from "../entries/EventEntry.js";
import {FragmentBoundaryEntry} from "../entries/FragmentBoundaryEntry.js";
import {createEventEntry, directionalAppend} from "./common.js"; import {createEventEntry, directionalAppend} from "./common.js";
import {RoomMember, EVENT_TYPE as MEMBER_EVENT_TYPE} from "../../members/RoomMember.js"; import {RoomMember, EVENT_TYPE as MEMBER_EVENT_TYPE} from "../../members/RoomMember.js";
@ -232,7 +233,7 @@ export class GapWriter {
return { entries: [], updatedEntries: [], fragments: [] } return { entries: [], updatedEntries: [], fragments: [] }
} }
const maxFragmentKey = await tnx.timelineFragments.getMaxFragmentId(this._roomId); const maxFragmentKey = await txn.timelineFragments.getMaxFragmentId(this._roomId);
const newFragment = { const newFragment = {
roomId: this._roomId, roomId: this._roomId,
id: maxFragmentKey + 1, id: maxFragmentKey + 1,
@ -244,11 +245,11 @@ export class GapWriter {
const eventKey = EventKey.defaultFragmentKey(newFragment.id); const eventKey = EventKey.defaultFragmentKey(newFragment.id);
const startEntry = FragmentBoundaryEntry.start(newFragment, this._fragmentIdComparer); const startEntry = FragmentBoundaryEntry.start(newFragment, this._fragmentIdComparer);
const startFill = this._storeAndUpdate(startEntry, eventsBefore, eventKey, start, state, txn, log); const startFill = await this._storeAndUpdate(startEntry, eventsBefore, eventKey, start, state, txn, log);
eventsAfter.unshift(event); eventsAfter.unshift(event);
const endEntry = FragmentBoundaryEntry.end(newFragment, this._fragmentIdComparer); const endEntry = FragmentBoundaryEntry.end(newFragment, this._fragmentIdComparer);
const endFill = this._storeAndUpdate(endEntry, eventsAfter, eventKey, end, state, txn, log); const endFill = await this._storeAndUpdate(endEntry, eventsAfter, eventKey, end, state, txn, log);
// Both startFill and endFill are throwaway objects, so we // Both startFill and endFill are throwaway objects, so we
// may as well modify one of them in-place instead of returning a third. // may as well modify one of them in-place instead of returning a third.