Arsharth/hydrogen-web
1
0
Fork 0
forked from mystiq/hydrogen-web
Code Issues Pull requests Projects Releases Packages Wiki Activity

also clear pending reaction promise when an error is thrown

Browse source
This commit is contained in:
Bruno Windels 2021-06-23 17:47:47 +02:00
parent 1a5a64864a
commit c585d76ce5
1 changed files with 18 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

30
src/domain/session/room/timeline/tiles/BaseMessageTile.js
View file

@ -142,15 +142,18 @@ export class BaseMessageTile extends SimpleTile {
return; return;
} }
const redaction = this._entry.getAnnotationPendingRedaction(key); const redaction = this._entry.getAnnotationPendingRedaction(key);
const updatePromise = new Promise(resolve => this._pendingReactionChangeCallback = resolve); try {
if (redaction && !redaction.pendingEvent.hasStartedSending) { const updatePromise = new Promise(resolve => this._pendingReactionChangeCallback = resolve);
log.set("abort_redaction", true); if (redaction && !redaction.pendingEvent.hasStartedSending) {
await redaction.pendingEvent.abort(); log.set("abort_redaction", true);
} else { await redaction.pendingEvent.abort();
await this._room.sendEvent("m.reaction", this._entry.annotate(key), null, log); } else {
await this._room.sendEvent("m.reaction", this._entry.annotate(key), null, log);
}
await updatePromise;
} finally {
this._pendingReactionChangeCallback = null;
} }
await updatePromise;
this._pendingReactionChangeCallback = null;
} }
redactReaction(key, log = null) { redactReaction(key, log = null) {
@ -171,15 +174,18 @@ export class BaseMessageTile extends SimpleTile {
log.set("ongoing", true); log.set("ongoing", true);
return; return;
} }
const entry = await this._entry.getOwnAnnotationEntry(this._timeline, key); const entry = await this._entry.getOwnAnnotationEntry(this._timeline, key);
if (entry) { if (entry) {
try {
const updatePromise = new Promise(resolve => this._pendingReactionChangeCallback = resolve); const updatePromise = new Promise(resolve => this._pendingReactionChangeCallback = resolve);
await this._room.sendRedaction(entry.id, null, log); await this._room.sendRedaction(entry.id, null, log);
await updatePromise; await updatePromise;
} finally {
this._pendingReactionChangeCallback = null; this._pendingReactionChangeCallback = null;
} else {
log.set("no_reaction", true);
} }
} else {
log.set("no_reaction", true);
}
} }
_updateReactions() { _updateReactions() {