Always send default and rule_id to clients (matrix-org#13904)

beeper · Sep 30, 2022 · 35d0062 · 35d0062
1 parent 814e5da
commit 35d0062
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 4 deletions.
diff --git a/changelog.d/13904.bugfix b/changelog.d/13904.bugfix
@@ -0,0 +1 @@
+Fix a bug introduced in 1.66 where some required fields in the pushrules sent to clients were not present anymore. Contributed by Nico.
diff --git a/synapse/push/clientformat.py b/synapse/push/clientformat.py
@@ -103,10 +103,8 @@ def _rule_to_template(rule: PushRule) -> Optional[Dict[str, Any]]:
         # with PRIORITY_CLASS_INVERSE_MAP.
         raise ValueError("Unexpected template_name: %s" % (template_name,))
 
-    if unscoped_rule_id:
-        templaterule["rule_id"] = unscoped_rule_id
-    if rule.default:
-        templaterule["default"] = True
+    templaterule["rule_id"] = unscoped_rule_id
+    templaterule["default"] = rule.default
     return templaterule
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		Fix a bug introduced in 1.66 where some required fields in the pushrules sent to clients were not present anymore. Contributed by Nico.