imterah/element-portable
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Make more of the codebase conform to strict types (#10859)

Browse source
This commit is contained in:
Michael Telatynski 2023-05-12 09:49:37 +01:00 • committed by GitHub
parent 6f58dd49e3
commit f758cbd38a
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
46 changed files with 111 additions and 105 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/settings/handlers/AccountSettingsHandler.ts
View file

@ -50,7 +50,7 @@ export default class AccountSettingsHandler extends MatrixClientBackedSettingsHa
newClient.on(ClientEvent.AccountData, this.onAccountData);
}
private onAccountData = (event: MatrixEvent, prevEvent: MatrixEvent): void => {
private onAccountData = (event: MatrixEvent, prevEvent?: MatrixEvent): void => {
if (event.getType() === "org.matrix.preview_urls") {
let val = event.getContent()["disable"];
if (typeof val !== "boolean") {

4
src/settings/handlers/RoomAccountSettingsHandler.ts
View file

@ -44,7 +44,7 @@ export default class RoomAccountSettingsHandler extends MatrixClientBackedSettin
newClient.on(RoomEvent.AccountData, this.onAccountData);
}
private onAccountData = (event: MatrixEvent, room: Room, prevEvent: MatrixEvent): void => {
private onAccountData = (event: MatrixEvent, room: Room, prevEvent?: MatrixEvent): void => {
const roomId = room.roomId;
if (event.getType() === "org.matrix.room.preview_urls") {
@ -58,7 +58,7 @@ export default class RoomAccountSettingsHandler extends MatrixClientBackedSettin
this.watchers.notifyUpdate("urlPreviewsEnabled", roomId, SettingLevel.ROOM_ACCOUNT, val);
} else if (event.getType() === DEFAULT_SETTINGS_EVENT_TYPE) {
// Figure out what changed and fire those updates
const prevContent = prevEvent ? prevEvent.getContent() : {};
const prevContent = prevEvent?.getContent() ?? {};
const changedSettings = objectKeyChanges<Record<string, any>>(prevContent, event.getContent());
for (const settingName of changedSettings) {
const val = event.getContent()[settingName];

4
src/settings/handlers/RoomSettingsHandler.ts
View file

@ -43,7 +43,7 @@ export default class RoomSettingsHandler extends MatrixClientBackedSettingsHandl
newClient.on(RoomStateEvent.Events, this.onEvent);
}
private onEvent = (event: MatrixEvent, state: RoomState, prevEvent: MatrixEvent): void => {
private onEvent = (event: MatrixEvent, state: RoomState, prevEvent: MatrixEvent | null): void => {
const roomId = event.getRoomId()!;
const room = this.client.getRoom(roomId);
@ -67,7 +67,7 @@ export default class RoomSettingsHandler extends MatrixClientBackedSettingsHandl
this.watchers.notifyUpdate("urlPreviewsEnabled", roomId, SettingLevel.ROOM, val);
} else if (event.getType() === DEFAULT_SETTINGS_EVENT_TYPE) {
// Figure out what changed and fire those updates
const prevContent = prevEvent ? prevEvent.getContent() : {};
const prevContent = prevEvent?.getContent() ?? {};
const changedSettings = objectKeyChanges<Record<string, any>>(prevContent, event.getContent());
for (const settingName of changedSettings) {
this.watchers.notifyUpdate(settingName, roomId, SettingLevel.ROOM, event.getContent()[settingName]);