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

remove waiting for update event (it might not come in case of dupe)

Browse source 
also remove duplicate logging impl for re(d)action at cost of
double haveAnnotation call
This commit is contained in:
Bruno Windels 2021-06-24 13:35:59 +02:00
parent b148368d5b
commit 366d3761b8
1 changed files with 15 additions and 61 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -27,7 +27,6 @@ export class BaseMessageTile extends SimpleTile {
if (this._entry.annotations || this._entry.pendingAnnotations) { if (this._entry.annotations || this._entry.pendingAnnotations) {
this._updateReactions(); this._updateReactions();
} }
this._pendingReactionChangeCallback = null;
} }
get _mediaRepository() { get _mediaRepository() {
@ -124,54 +123,25 @@ export class BaseMessageTile extends SimpleTile {
} }
react(key, log = null) { react(key, log = null) {
return this.logger.wrapOrRun(log, "react", log => { return this.logger.wrapOrRun(log, "react", async log => {
if (this._entry.haveAnnotation(key)) { if (this._entry.haveAnnotation(key)) {
log.set("already_reacted", true); log.set("already_reacted", true);
return; return;
} }
return this._react(key, log);
});
}
async _react(key, log) {
// This will also block concurently adding multiple reactions,
// but in practice it happens fast enough.
if (this._pendingReactionChangeCallback) {
log.set("ongoing", true);
return;
}
const redaction = this._entry.pendingAnnotations?.get(key)?.redactionEntry; const redaction = this._entry.pendingAnnotations?.get(key)?.redactionEntry;
try {
const updatePromise = new Promise(resolve => this._pendingReactionChangeCallback = resolve);
if (redaction && !redaction.pendingEvent.hasStartedSending) { if (redaction && !redaction.pendingEvent.hasStartedSending) {
log.set("abort_redaction", true); log.set("abort_redaction", true);
await redaction.pendingEvent.abort(); await redaction.pendingEvent.abort();
} else { } else {
await this._room.sendEvent("m.reaction", this._entry.annotate(key), null, log); await this._room.sendEvent("m.reaction", this._entry.annotate(key), null, log);
} }
await updatePromise;
} finally {
this._pendingReactionChangeCallback = null;
}
}
redactReaction(key, log = null) {
return this.logger.wrapOrRun(log, "redactReaction", log => {
if (!this._entry.haveAnnotation(key)) {
log.set("not_yet_reacted", true);
return;
}
return this._redactReaction(key, log);
}); });
} }
async _redactReaction(key, log) { redactReaction(key, log = null) {
// This will also block concurently removing multiple reactions, return this.logger.wrapOrRun(log, "redactReaction", async log => {
// but in practice it happens fast enough. if (!this._entry.haveAnnotation(key)) {
log.set("not_yet_reacted", true);
// TODO: remove this as we'll protect against reentry in the SendQueue
if (this._pendingReactionChangeCallback) {
log.set("ongoing", true);
return; return;
} }
let entry = this._entry.pendingAnnotations?.get(key)?.annotationEntry; let entry = this._entry.pendingAnnotations?.get(key)?.annotationEntry;
@ -179,24 +149,19 @@ export class BaseMessageTile extends SimpleTile {
entry = await this._timeline.getOwnAnnotationEntry(this._entry.id, key); entry = await this._timeline.getOwnAnnotationEntry(this._entry.id, key);
} }
if (entry) { if (entry) {
try {
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;
} finally {
this._pendingReactionChangeCallback = null;
}
} else { } else {
log.set("no_reaction", true); log.set("no_reaction", true);
} }
});
} }
toggleReaction(key, log = null) { toggleReaction(key, log = null) {
return this.logger.wrapOrRun(log, "toggleReaction", async log => { return this.logger.wrapOrRun(log, "toggleReaction", async log => {
if (this._entry.haveAnnotation(key)) { if (this._entry.haveAnnotation(key)) {
await log.wrap("redactReaction", log => this._redactReaction(key, log)); await this.redactReaction(key, log);
} else { } else {
await log.wrap("react", log => this._react(key, log)); await this.react(key, log);
} }
}); });
} }
@ -206,23 +171,12 @@ export class BaseMessageTile extends SimpleTile {
if (!annotations && !pendingAnnotations) { if (!annotations && !pendingAnnotations) {
if (this._reactions) { if (this._reactions) {
this._reactions = null; this._reactions = null;
// The update comes in async because pending events are mapped in the timeline
// to pending event entries using an AsyncMappedMap, because in rare cases, the target
// of a redaction needs to be loaded from storage in order to know for which message
// the reaction needs to be removed. The SendQueue also only adds pending events after
// storing them first.
// This makes that if we want to know the local echo for either react or redactReaction is available,
// we need to async wait for the update call. In theory the update can also be triggered
// by something else than the reaction local echo changing (e.g. from sync),
// but this is very unlikely and deemed good enough for now.
this._pendingReactionChangeCallback && this._pendingReactionChangeCallback();
} }
} else { } else {
if (!this._reactions) { if (!this._reactions) {
this._reactions = new ReactionsViewModel(this); this._reactions = new ReactionsViewModel(this);
} }
this._reactions.update(annotations, pendingAnnotations); this._reactions.update(annotations, pendingAnnotations);
this._pendingReactionChangeCallback && this._pendingReactionChangeCallback();
} }
} }
} }