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

WIP

Browse source
This commit is contained in:
Bruno Windels 2021-06-15 19:06:41 +02:00
parent 75ee509361
commit e5c1094153
3 changed files with 35 additions and 29 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
src/domain/session/room/timeline/ReactionsViewModel.js
View file

@ -22,6 +22,7 @@ export class ReactionsViewModel {
this._reactions = this._map.sortValues((a, b) => a._compare(b)); this._reactions = this._map.sortValues((a, b) => a._compare(b));
} }
/** @package */
update(annotations, pendingAnnotations) { update(annotations, pendingAnnotations) {
if (annotations) { if (annotations) {
for (const key in annotations) { for (const key in annotations) {
@ -33,7 +34,7 @@ export class ReactionsViewModel {
this._map.update(key); this._map.update(key);
} }
} else { } else {
this._map.add(key, new ReactionViewModel(key, annotation, null, this._parentEntry)); this._map.add(key, new ReactionViewModel(key, annotation, 0, this._parentEntry));
} }
} }
} }
@ -60,7 +61,7 @@ export class ReactionsViewModel {
this._map.update(existingKey); this._map.update(existingKey);
} }
} else if (!hasPending) { } else if (!hasPending) {
if (this._map.get(existingKey)._tryUpdatePending(null)) { if (this._map.get(existingKey)._tryUpdatePending(0)) {
this._map.update(existingKey); this._map.update(existingKey);
} }
} }
@ -109,18 +110,15 @@ class ReactionViewModel {
} }
get count() { get count() {
let count = 0; let count = this._pendingCount;
if (this._annotation) { if (this._annotation) {
count += this._annotation.count; count += this._annotation.count;
} }
if (this._pendingCount !== null) {
count += this._pendingCount;
}
return count; return count;
} }
get isPending() { get isPending() {
return this._pendingCount !== null; return this._pendingCount !== 0;
} }
get haveReacted() { get haveReacted() {
@ -156,7 +154,6 @@ class ReactionViewModel {
async toggleReaction() { async toggleReaction() {
if (this._isToggling) { if (this._isToggling) {
console.log("blocking toggleReaction, call ongoing");
return; return;
} }
this._isToggling = true; this._isToggling = true;

36
src/matrix/room/timeline/Timeline.js
View file

@ -22,7 +22,7 @@ import {TimelineReader} from "./persistence/TimelineReader.js";
import {PendingEventEntry} from "./entries/PendingEventEntry.js"; 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 {getRelation, ANNOTATION_RELATION_TYPE} from "./relations.js"; import {getRelation, getRelationFromContent, ANNOTATION_RELATION_TYPE} from "./relations.js";
import {REDACTION_TYPE} from "../common.js"; import {REDACTION_TYPE} from "../common.js";
export class Timeline { export class Timeline {
@ -116,19 +116,34 @@ export class Timeline {
} }
async _mapPendingEventToEntry(pe) { async _mapPendingEventToEntry(pe) {
// we load the remote redaction target for pending events, // we load the redaction target for pending events,
// so if we are redacting a relation, we can pass the redaction // so if we are redacting a relation, we can pass the redaction
// to the relation target and the removal of the relation can // to the relation target and the removal of the relation can
// be taken into account for local echo. // be taken into account for local echo.
let redactionTarget; let redactingRelation;
if (pe.eventType === REDACTION_TYPE && pe.relatedEventId) { if (pe.eventType === REDACTION_TYPE) {
const txn = await this._storage.readWriteTxn([ if (pe.relatedEventId) {
this._storage.storeNames.timelineEvents, const txn = await this._storage.readWriteTxn([
]); this._storage.storeNames.timelineEvents,
const redactionTargetEntry = await txn.timelineEvents.getByEventId(this._roomId, pe.relatedEventId); ]);
redactionTarget = redactionTargetEntry?.event; const redactionTargetEntry = await txn.timelineEvents.getByEventId(this._roomId, pe.relatedEventId);
if (redactionTargetEntry) {
redactingRelation = getRelation(redactionTargetEntry.event);
}
} else if (pe.relatedTxnId) {
// also look for redacting relation in pending events, in case the target is already being sent
for (const p of this._localEntries) {
if (p.id === pe.relatedTxnId) {
redactingRelation = getRelationFromContent(p.content);
break;
}
}
}
} }
const pee = new PendingEventEntry({pendingEvent: pe, member: this._ownMember, clock: this._clock, redactionTarget}); const pee = new PendingEventEntry({
pendingEvent: pe, member: this._ownMember,
clock: this._clock, redactingRelation
});
this._applyAndEmitLocalRelationChange(pee, target => target.addLocalRelation(pee)); this._applyAndEmitLocalRelationChange(pee, target => target.addLocalRelation(pee));
return pee; return pee;
} }
@ -158,6 +173,7 @@ export class Timeline {
// also look for a relation target to update with this redaction // also look for a relation target to update with this redaction
if (pee.redactingRelation) { if (pee.redactingRelation) {
const eventId = pee.redactingRelation.event_id; const eventId = pee.redactingRelation.event_id;
// TODO: also support reacting to pending entries
this._remoteEntries.findAndUpdate( this._remoteEntries.findAndUpdate(
e => e.id === eventId, e => e.id === eventId,
updateOrFalse updateOrFalse

15
src/matrix/room/timeline/entries/PendingEventEntry.js
View file

@ -19,13 +19,13 @@ import {BaseEventEntry} from "./BaseEventEntry.js";
import {getRelationFromContent} from "../relations.js"; import {getRelationFromContent} from "../relations.js";
export class PendingEventEntry extends BaseEventEntry { export class PendingEventEntry extends BaseEventEntry {
constructor({pendingEvent, member, clock, redactionTarget}) { constructor({pendingEvent, member, clock, redactingRelation}) {
super(null); super(null);
this._pendingEvent = pendingEvent; this._pendingEvent = pendingEvent;
/** @type {RoomMember} */ /** @type {RoomMember} */
this._member = member; this._member = member;
this._clock = clock; this._clock = clock;
this._redactionTarget = redactionTarget; this._redactingRelation = redactingRelation;
} }
get fragmentId() { get fragmentId() {
@ -89,10 +89,7 @@ export class PendingEventEntry extends BaseEventEntry {
} }
get redactingRelation() { get redactingRelation() {
if (this._redactionTarget) { return this._redactingRelation;
return getRelationFromContent(this._redactionTarget.content);
}
return null;
} }
/** /**
* returns either the relationship on this entry, * returns either the relationship on this entry,
@ -100,10 +97,6 @@ export class PendingEventEntry extends BaseEventEntry {
* *
* Useful while aggregating relations for local echo. */ * Useful while aggregating relations for local echo. */
get ownOrRedactedRelation() { get ownOrRedactedRelation() {
if (this._redactionTarget) { return this.redactingRelation || getRelationFromContent(this._pendingEvent.content);
return getRelationFromContent(this._redactionTarget.content);
} else {
return getRelationFromContent(this._pendingEvent.content);
}
} }
} }