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

provide redact method on tile and room

Browse Source 
also add some logging
This commit is contained in:
Bruno Windels 2021-05-20 14:53:17 +02:00
parent 9721432a8c
commit 8a8c5569dc
5 changed files with 19 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/domain/session/room/timeline/tiles/BaseMessageTile.js
View File

@ -97,4 +97,8 @@ export class BaseMessageTile extends SimpleTile {
this.emitChange("isContinuation"); this.emitChange("isContinuation");
} }
} }
redact(reason) {
this._room.sendRedaction(this._entry.id, reason);
}
} }

4
src/domain/session/room/timeline/tiles/GapTile.js
View File

@ -24,10 +24,6 @@ export class GapTile extends SimpleTile {
this._error = null; this._error = null;
} }
get _room() {
return this.getOption("room");
}
async fill() { async fill() {
// prevent doing this twice // prevent doing this twice
if (!this._loading) { if (!this._loading) {

4
src/domain/session/room/timeline/tiles/SimpleTile.js
View File

@ -118,4 +118,8 @@ export class SimpleTile extends ViewModel {
super.dispose(); super.dispose();
} }
// TilesCollection contract above // TilesCollection contract above
get _room() {
return this.getOption("room");
}
} }

8
src/matrix/room/Room.js
View File

@ -297,6 +297,14 @@ export class Room extends BaseRoom {
}); });
} }
/** @public */
sendRedaction(eventIdOrTxnId, reason, log = null) {
this._platform.logger.wrapOrRun(log, "redact", log => {
log.set("id", this.id);
return this._sendQueue.enqueueRedaction(eventIdOrTxnId, reason, log);
});
}
/** @public */ /** @public */
async ensureMessageKeyIsShared(log = null) { async ensureMessageKeyIsShared(log = null) {
if (!this._roomEncryption) { if (!this._roomEncryption) {

3
src/matrix/room/sending/SendQueue.js
View File

@ -201,6 +201,7 @@ export class SendQueue {
async enqueueRedaction(eventIdOrTxnId, reason, log) { async enqueueRedaction(eventIdOrTxnId, reason, log) {
if (isTxnId(eventIdOrTxnId)) { if (isTxnId(eventIdOrTxnId)) {
log.set("txnIdToRedact", eventIdOrTxnId);
const txnId = eventIdOrTxnId; const txnId = eventIdOrTxnId;
const pe = this._pendingEvents.array.find(pe => pe.txnId === txnId); const pe = this._pendingEvents.array.find(pe => pe.txnId === txnId);
if (pe && !pe.remoteId && pe.status !== SendStatus.Sending) { if (pe && !pe.remoteId && pe.status !== SendStatus.Sending) {
@ -216,6 +217,8 @@ export class SendQueue {
// and a bit complicated to fix. // and a bit complicated to fix.
return; return;
} }
} else {
log.set("eventIdToRedact", eventIdOrTxnId);
} }
await this._enqueueEvent(REDACTION_TYPE, {reason}, null, eventIdOrTxnId, log); await this._enqueueEvent(REDACTION_TYPE, {reason}, null, eventIdOrTxnId, log);
} }