Fix bugs.

matrix-org · May 23, 2022 · 1e9fc9b · 1e9fc9b
1 parent 820ca7f
commit 1e9fc9b
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/synapse/push/bulk_push_rule_evaluator.py b/synapse/push/bulk_push_rule_evaluator.py
@@ -226,7 +226,7 @@ async def action_for_event_by_user(
                 rel_types = set()
                 for rule in itertools.chain(*rules_by_user.values()):
                     # Skip disabled rules.
-                    if not rule.get("enabled"):
+                    if "enabled" in rule and not rule["enabled"]:
                         continue
 
                     for condition in rule["conditions"]:

diff --git a/synapse/storage/databases/main/relations.py b/synapse/storage/databases/main/relations.py
@@ -796,7 +796,7 @@ async def get_mutual_event_relations(
                     The event type
         """
         rel_type_sql, rel_type_args = make_in_list_sql_clause(
-            self.database_engine, "rel_type", relation_types
+            self.database_engine, "relation_type", relation_types
         )
 
         sql = f"""