mirrors/vector-im-hydrogen-web
1
0
Fork 0
mirror of https://github.com/vector-im/hydrogen-web.git synced 2024-12-23 19:45:05 +01:00
Code Issues Projects Releases Wiki Activity

WIP3

Browse Source
This commit is contained in:
Bruno Windels 2021-06-09 16:52:30 +02:00
parent 206d18f498
commit cb051ad161
2 changed files with 41 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
src/matrix/room/timeline/Timeline.js
View File

@ -23,6 +23,7 @@ import {PendingEventEntry} from "./entries/PendingEventEntry.js";
import {RoomMember} from "../members/RoomMember.js"; import {RoomMember} from "../members/RoomMember.js";
import {PowerLevels} from "./PowerLevels.js"; import {PowerLevels} from "./PowerLevels.js";
import {getRelationFromContent, getRelation, ANNOTATION_RELATION_TYPE} from "./relations.js"; import {getRelationFromContent, getRelation, ANNOTATION_RELATION_TYPE} from "./relations.js";
import {REDACTION_TYPE} from "../common.js";
export class Timeline { export class Timeline {
constructor({roomId, storage, closeCallback, fragmentIdComparer, pendingEvents, clock}) { constructor({roomId, storage, closeCallback, fragmentIdComparer, pendingEvents, clock}) {
@ -125,13 +126,17 @@ export class Timeline {
return params; return params;
}); });
if (redactedEntry) { if (redactedEntry) {
const redactedRelation = getRelationFromContent(redactedEntry.content); this._addLocallyRedactedRelationToTarget(redactedEntry);
if (redactedRelation?.event_id) { }
const found = this._remoteEntries.findAndUpdate( }
e => e.id === redactedRelation.event_id,
relationTarget => relationTarget.addLocalRelation(redactedEntry) || false _addLocallyRedactedRelationToTarget(redactedEntry) {
); const redactedRelation = getRelationFromContent(redactedEntry.content);
} if (redactedRelation?.event_id) {
const found = this._remoteEntries.findAndUpdate(
e => e.id === redactedRelation.event_id,
relationTarget => relationTarget.addLocalRelation(redactedEntry) || false
);
} }
} }
@ -180,7 +185,6 @@ export class Timeline {
} }
} }
async getOwnAnnotationEntry(targetId, key) { async getOwnAnnotationEntry(targetId, key) {
const txn = await this._storage.readWriteTxn([ const txn = await this._storage.readWriteTxn([
this._storage.storeNames.timelineEvents, this._storage.storeNames.timelineEvents,
@ -227,9 +231,33 @@ export class Timeline {
for (const pee of this._localEntries) { for (const pee of this._localEntries) {
// this will work because we set relatedEventId when removing remote echos // this will work because we set relatedEventId when removing remote echos
if (pee.relatedEventId) { if (pee.relatedEventId) {
const relationTarget = entries.find(e => e.id === pee.relatedEventId); const relationTarget = entries.find(e => e.id === pee.relatedEventId);
// no need to emit here as this entry is about to be added if (relationTarget) {
relationTarget?.addLocalRelation(pee); const wasRedacted = relationTarget.isRedacted;
// no need to emit here as this entry is about to be added
relationTarget.addLocalRelation(pee);
if (!wasRedacted && relationTarget.isRedacted) {
this._addLocallyRedactedRelationToTarget(relationTarget);
}
} else if (pee.eventType === REDACTION_TYPE) {
// if pee is a redaction, we need to lookup the event it is redacting,
// and see if that is a relation of one of the entries
const redactedEntry = this.getByEventId(pee.relatedEventId);
if (redactedEntry) {
const relation = getRelation(redactedEntry);
if (relation) {
const redactedRelationTarget = entries.find(e => e.id === relation.event_id);
redactedRelationTarget?.addLocalRelation(redactedEntry);
}
}
} else {
// TODO: errors are swallowed here
// console.log(`could not find target for pee ${pee.relatedEventId} ` + entries.filter(e => !["m.reaction", "m.room.redaction"].includes(e.eventType)).map(e => `${e.id}: ${e.content?.body}`).join(","));
// console.log(`could not find target for pee ${pee.relatedEventId} ` + entries.filter(e => "m.reaction" === e.eventType).map(e => `${e.id}: ${getRelation(e)?.key}`).join(","));
// console.log(`could not find target for pee ${pee.relatedEventId} ` + entries.map(e => `${e.id}: ${e._eventEntry.key.substr(e._eventEntry.key.lastIndexOf("|") + 1)}`).join(","));
}
} }
} }
} }

3
src/platform/web/dom/request/fetch.js
View File

@ -103,6 +103,8 @@ export function createFetchRequest(createTimeout, serviceWorkerHandler) {
} }
options.headers = fetchHeaders; options.headers = fetchHeaders;
} }
const promise = Promise.reject(new ConnectionError());
/*
const promise = fetch(url, options).then(async response => { const promise = fetch(url, options).then(async response => {
const {status} = response; const {status} = response;
let body; let body;
@ -135,6 +137,7 @@ export function createFetchRequest(createTimeout, serviceWorkerHandler) {
} }
throw err; throw err;
}); });
*/
const result = new RequestResult(promise, controller); const result = new RequestResult(promise, controller);
if (timeout) { if (timeout) {