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

Revert "Count notifications in encrypted rooms client-side"

Browse Source
This commit is contained in:
Travis Ralston
2021-09-07 14:15:01 -06:00
committed by GitHub
parent 95d80772d7
commit 14ba851daf
3 changed files with 49 additions and 58 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/models/event.ts
View File

@@ -157,7 +157,6 @@ export interface IDecryptOptions {
export class MatrixEvent extends EventEmitter {
private pushActions: IActionsObject = null;
private wirePushActions: IActionsObject = null;
private _replacingEvent: MatrixEvent = null;
private _localRedactionEvent: MatrixEvent = null;
private _isCancelled = false;
@@ -989,16 +988,7 @@ export class MatrixEvent extends EventEmitter {
* @return {?Object} push actions
*/
public getPushActions(): IActionsObject | null {
return this.pushActions || this.wirePushActions;
}
/**
* Get the push actions, if known, for this event
*
* @return {?Object} push actions
*/
public getWirePushActions(): IActionsObject | null {
return this.wirePushActions;
return this.pushActions;
}
/**
@@ -1007,11 +997,7 @@ export class MatrixEvent extends EventEmitter {
* @param {Object} pushActions push actions
*/
public setPushActions(pushActions: IActionsObject): void {
if (this._decryptionPromise) {
this.wirePushActions = pushActions;
} else {
this.pushActions = pushActions;
}
this.pushActions = pushActions;
}
/**