Skip to content
This repository has been archived by the owner on Oct 22, 2024. It is now read-only.

Commit

Permalink
Refactor MatrixClientBackedController.ts
Browse files Browse the repository at this point in the history
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
  • Loading branch information
t3chguy committed Oct 1, 2024
1 parent 39a0f6e commit 3a24061
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 9 deletions.
8 changes: 4 additions & 4 deletions src/settings/controllers/MatrixClientBackedController.ts
Original file line number Diff line number Diff line change
Expand Up @@ -18,15 +18,15 @@ import SettingController from "./SettingController";
* This class performs no logic and should be overridden.
*/
export default abstract class MatrixClientBackedController extends SettingController {
private static _matrixClient: MatrixClient;
private static _matrixClient?: MatrixClient;
private static instances: MatrixClientBackedController[] = [];

public static set matrixClient(client: MatrixClient) {
const oldClient = MatrixClientBackedController._matrixClient;
MatrixClientBackedController._matrixClient = client;

for (const instance of MatrixClientBackedController.instances) {
instance.initMatrixClient(oldClient, client);
instance.initMatrixClient(client, oldClient);
}
}

Expand All @@ -36,9 +36,9 @@ export default abstract class MatrixClientBackedController extends SettingContro
MatrixClientBackedController.instances.push(this);
}

public get client(): MatrixClient {
public get client(): MatrixClient | undefined {
return MatrixClientBackedController._matrixClient;
}

protected abstract initMatrixClient(oldClient: MatrixClient, newClient: MatrixClient): void;
protected abstract initMatrixClient(newClient: MatrixClient, oldClient?: MatrixClient): void;
}
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,6 @@ SPDX-License-Identifier: AGPL-3.0-only OR GPL-3.0-only
Please see LICENSE files in the repository root for full details.
*/

import { MatrixClient } from "matrix-js-sdk/src/matrix";

import { SettingLevel } from "../SettingLevel";
import MatrixClientBackedController from "./MatrixClientBackedController";
import { WatchManager } from "../WatchManager";
Expand Down Expand Up @@ -53,9 +51,9 @@ export default class ServerSupportUnstableFeatureController extends MatrixClient
this.watchers.notifyUpdate(this.settingName, null, level, settingValue);
}

protected async initMatrixClient(oldClient: MatrixClient, newClient: MatrixClient): Promise<void> {
protected async initMatrixClient(): Promise<void> {
// Check for stable version support first
if (this.stableVersion && (await this.client.isVersionSupported(this.stableVersion))) {
if (this.stableVersion && (await this.client!.isVersionSupported(this.stableVersion))) {
this.disabled = false;
return;
}
Expand All @@ -66,7 +64,7 @@ export default class ServerSupportUnstableFeatureController extends MatrixClient
for (const featureGroup of this.unstableFeatureGroups) {
const featureSupportList = await Promise.all(
featureGroup.map(async (feature) => {
const isFeatureSupported = await this.client.doesServerSupportUnstableFeature(feature);
const isFeatureSupported = await this.client!.doesServerSupportUnstableFeature(feature);
return isFeatureSupported;
}),
);
Expand Down

0 comments on commit 3a24061

Please sign in to comment.