make ts-strict happier

matrix-org · Jun 14, 2023 · fe5d0da · fe5d0da
1 parent 66fc8df
commit fe5d0da
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/src/models/notificationsettings/reconcileNotificationSettings.ts b/src/models/notificationsettings/reconcileNotificationSettings.ts
@@ -211,7 +211,7 @@ export function reconcileNotificationSettings(
                 enabled: model.mentions.keywords,
             });
         }
-        newKeywords.delete(rule.pattern);
+        newKeywords.delete(rule.pattern!);
     }
     for (const keyword of newKeywords) {
         changes.added.push({

diff --git a/src/models/notificationsettings/toNotificationSettings.ts b/src/models/notificationsettings/toNotificationSettings.ts
@@ -30,20 +30,20 @@ function shouldNotify(rules: (IPushRule | null | undefined | false)[]): boolean
             continue;
         }
         const actions = NotificationUtils.decodeActions(rule.actions);
-        if (actions.notify) {
+        if (actions !== null && actions.notify) {
             return true;
         }
     }
     return false;
 }
 
-function determineSound(rules: (IPushRule | null | undefined | false)[]): string | null {
+function determineSound(rules: (IPushRule | null | undefined | false)[]): string | undefined {
     for (const rule of rules) {
         if (rule === null || rule === undefined || rule === false || !rule.enabled) {
             continue;
         }
         const actions = NotificationUtils.decodeActions(rule.actions);
-        if (actions.notify && actions.sound !== undefined) {
+        if (actions !== null && actions.notify && actions.sound !== undefined) {
             return actions.sound;
         }
     }
@@ -90,6 +90,6 @@ export function toNotificationSettings(
             ]),
             keywords: shouldNotify(contentRules),
         },
-        keywords: contentRules.map((it) => it.pattern),
+        keywords: contentRules.map((it) => it.pattern!),
     };
 }