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

Merge branch 'develop' of github.com:matrix-org/matrix-js-sdk into t3chguy/ts/12

Browse Source
This commit is contained in:
Michael Telatynski
2021-08-10 10:21:13 +01:00
parent c2b5b14d26 94726aa1d5
commit 0ad5ef4e9b
45 changed files with 2127 additions and 839 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
src/models/event.ts
View File

@@ -153,7 +153,7 @@ export class MatrixEvent extends EventEmitter {
private _replacingEvent: MatrixEvent = null;
private _localRedactionEvent: MatrixEvent = null;
private _isCancelled = false;
private clearEvent: Partial<IClearEvent> = {};
private clearEvent?: IClearEvent;
/* curve25519 key which we believe belongs to the sender of the event. See
* getSenderKey()
@@ -296,7 +296,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;
}
/**
@@ -345,7 +348,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;
}
/**
@@ -497,7 +503,7 @@ export class MatrixEvent extends EventEmitter {
}
public shouldAttemptDecryption() {
return this.isEncrypted() && !this.isBeingDecrypted() && this.getClearContent() === null;
return this.isEncrypted() && !this.isBeingDecrypted() && !this.clearEvent;
}
/**
@@ -529,10 +535,7 @@ export class MatrixEvent extends EventEmitter {
throw new Error("Attempt to decrypt event which isn't encrypted");
}
if (
this.clearEvent && this.clearEvent.content &&
this.clearEvent.content.msgtype !== "m.bad.encrypted"
) {
if (this.clearEvent && !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",
@@ -740,8 +743,7 @@ export class MatrixEvent extends EventEmitter {
* @returns {Object} The cleartext (decrypted) content for the event
*/
public getClearContent(): IContent | null {
const ev = this.clearEvent;
return ev && ev.content ? ev.content : null;
return this.clearEvent ? this.clearEvent.content : null;
}
/**
@@ -932,8 +934,8 @@ export class MatrixEvent extends EventEmitter {
public getRedactionEvent(): object | null {
if (!this.isRedacted()) return null;
if (this.clearEvent.unsigned) {
return this.clearEvent.unsigned.redacted_because;
if (this.clearEvent?.unsigned) {
return this.clearEvent?.unsigned.redacted_because;
} else if (this.event.unsigned.redacted_because) {
return this.event.unsigned.redacted_because;
} else {