Fix wrongly asserting that PushRule::conditions is non-null (#2217)

matrix-org · Mar 4, 2022 · 9e4f109 · 9e4f109
1 parent 5d54bf5
commit 9e4f109
Showing 1 changed file with 3 additions and 2 deletions.
diff --git a/src/pushprocessor.ts b/src/pushprocessor.ts
@@ -158,8 +158,7 @@ export class PushProcessor {
                 .find((r) => r.rule_id === override.rule_id);
 
             if (existingRule) {
-                // Copy over the actions, default, and conditions. Don't touch the user's
-                // preference.
+                // Copy over the actions, default, and conditions. Don't touch the user's preference.
                 existingRule.default = override.default;
                 existingRule.conditions = override.conditions;
                 existingRule.actions = override.actions;
@@ -447,6 +446,8 @@ export class PushProcessor {
     }
 
     public ruleMatchesEvent(rule: IPushRule, ev: MatrixEvent): boolean {
+        if (!rule.conditions?.length) return true;
+
         let ret = true;
         for (let i = 0; i < rule.conditions.length; ++i) {
             const cond = rule.conditions[i];