Conform more code to strict null checking (#10167)

* Conform more code to strict null checking

* Delint

* Iterate PR based on feedback

src/settings/SettingsStore.ts

@@ -437,7 +437,7 @@ export default class SettingsStore {
         level: SettingLevel,
         roomId: string | null,
         calculatedValue: any,
-        calculatedAtLevel: SettingLevel,
+        calculatedAtLevel: SettingLevel | null,
     ): any {
         let resultingValue = calculatedValue;
 

src/settings/controllers/IncompatibleController.ts

@@ -36,7 +36,7 @@ export default class IncompatibleController extends SettingController {
         level: SettingLevel,
         roomId: string,
         calculatedValue: any,
-        calculatedAtLevel: SettingLevel,
+        calculatedAtLevel: SettingLevel | null,
     ): any {
         if (this.incompatibleSetting) {
             return this.forcedValue;

src/settings/controllers/NotificationControllers.ts

@@ -53,7 +53,7 @@ export class NotificationsEnabledController extends SettingController {
         level: SettingLevel,
         roomId: string,
         calculatedValue: any,
-        calculatedAtLevel: SettingLevel,
+        calculatedAtLevel: SettingLevel | null,
     ): any {
         if (!getNotifier().isPossible()) return false;
 

src/settings/controllers/OrderedMultiController.ts

@@ -35,7 +35,7 @@ export class OrderedMultiController extends SettingController {
         level: SettingLevel,
         roomId: string,
         calculatedValue: any,
-        calculatedAtLevel: SettingLevel,
+        calculatedAtLevel: SettingLevel | null,
     ): any {
         for (const controller of this.controllers) {
             const override = controller.getValueOverride(level, roomId, calculatedValue, calculatedAtLevel);

src/settings/controllers/ReducedMotionController.ts

@@ -27,7 +27,7 @@ export default class ReducedMotionController extends SettingController {
         level: SettingLevel,
         roomId: string,
         calculatedValue: any,
-        calculatedAtLevel: SettingLevel,
+        calculatedAtLevel: SettingLevel | null,
     ): any {
         if (this.prefersReducedMotion()) {
             return false;

src/settings/controllers/SettingController.ts

@@ -41,7 +41,7 @@ export default abstract class SettingController {
         level: SettingLevel,
         roomId: string | null,
         calculatedValue: any,
-        calculatedAtLevel: SettingLevel,
+        calculatedAtLevel: SettingLevel | null,
     ): any {
         return null; // no override
     }

src/settings/controllers/ThemeController.ts

@@ -26,7 +26,7 @@ export default class ThemeController extends SettingController {
         level: SettingLevel,
         roomId: string,
         calculatedValue: any,
-        calculatedAtLevel: SettingLevel,
+        calculatedAtLevel: SettingLevel | null,
     ): any {
         if (!calculatedValue) return null; // Don't override null themes
 

src/settings/controllers/UIFeatureController.ts

@@ -34,7 +34,7 @@ export default class UIFeatureController extends SettingController {
         level: SettingLevel,
         roomId: string,
         calculatedValue: any,
-        calculatedAtLevel: SettingLevel,
+        calculatedAtLevel: SettingLevel | null,
     ): any {
         if (this.settingDisabled) {
             // per the docs: we force a disabled state when the feature isn't active

src/settings/enums/ImageSize.ts

@@ -22,7 +22,7 @@ const SIZE_LARGE = { w: 800, h: 600 };
 const SIZE_NORMAL_LANDSCAPE = { w: 324, h: 324 }; // for w > h
 const SIZE_NORMAL_PORTRAIT = { w: Math.ceil(324 * (9 / 16)), h: 324 }; // for h > w
 
-type Dimensions = { w: number; h: number };
+type Dimensions = { w?: number; h?: number };
 
 export enum ImageSize {
     Normal = "normal",
@@ -36,7 +36,7 @@ export enum ImageSize {
  * @returns {Dimensions} The suggested maximum dimensions for the image
  */
 export function suggestedSize(size: ImageSize, contentSize: Dimensions, maxHeight?: number): Dimensions {
-    const aspectRatio = contentSize.w / contentSize.h;
+    const aspectRatio = contentSize.w! / contentSize.h!;
     const portrait = aspectRatio < 1;
 
     const maxSize = size === ImageSize.Large ? SIZE_LARGE : portrait ? SIZE_NORMAL_PORTRAIT : SIZE_NORMAL_LANDSCAPE;