matrix/matrix-js-sdk
1
0
Fork 0
mirror of https://github.com/matrix-org/matrix-js-sdk.git synced 2025-11-25 05:23:13 +03:00
Code Activity

Differentiate between an undefined clearEvent and a falsey property of the clearEvent

Browse Source
This commit is contained in:
Brad Murray
2021-07-23 16:13:46 -04:00
parent 5aa60b8056
commit 980d6fc2ae
1 changed files with 13 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/models/event.ts
View File

@@ -285,7 +285,10 @@ export class MatrixEvent extends EventEmitter {
* @return {string} The event type, e.g. <code>m.room.message</code>
*/
public getType(): EventType | string {
return this.clearEvent?.type || this.event.type;
if (this.clearEvent) {
return this.clearEvent.type;
}
return this.event.type;
}
/**
@@ -334,7 +337,10 @@ export class MatrixEvent extends EventEmitter {
if (this._localRedactionEvent) {
return {} as T;
}
return (this.clearEvent?.content || this.event.content || {}) as T;
if (this.clearEvent) {
return this.clearEvent.content as T;
}
return (this.event.content || {}) as T;
}
/**
@@ -518,7 +524,7 @@ export class MatrixEvent extends EventEmitter {
throw new Error("Attempt to decrypt event which isn't encrypted");
}
if (this.clearEvent?.content?.msgtype !== "m.bad.encrypted") {
if (this.isDecryptionFailure()) {
// we may want to just ignore this? let's start with rejecting it.
throw new Error(
"Attempt to decrypt event which has already been decrypted",
@@ -726,7 +732,10 @@ export class MatrixEvent extends EventEmitter {
* @returns {Object} The cleartext (decrypted) content for the event
*/
public getClearContent(): IContent | null {
return this.clearEvent?.content || null;
if (this.clearEvent) {
return this.clearEvent.content;
}
return null;
}
/**