diff options
| author | Nicolas Werner <89468146+nico-famedly@users.noreply.github.com> | 2022-09-29 10:57:00 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-09-29 11:57:00 +0100 |
| commit | 99a7e7e0230cba5d00ec204926edae89d4b6b8c3 (patch) | |
| tree | a90e24eefe7c9ce256cebf4a34cfe5e1fbc58040 | |
| parent | Improve backfill robustness by trying more servers. (#13890) (diff) | |
| download | synapse-99a7e7e0230cba5d00ec204926edae89d4b6b8c3.tar.xz | |
Always send default and rule_id to clients (#13904)
| -rw-r--r-- | changelog.d/13904.bugfix | 1 | ||||
| -rw-r--r-- | synapse/push/clientformat.py | 6 |
2 files changed, 3 insertions, 4 deletions
diff --git a/changelog.d/13904.bugfix b/changelog.d/13904.bugfix new file mode 100644 index 0000000000..397a3108ac --- /dev/null +++ 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 index ebc13beda1..7095ae83f9 100644 --- a/synapse/push/clientformat.py +++ b/synapse/push/clientformat.py @@ -102,10 +102,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 |