diff options
| author | Patrick Cloke <clokep@users.noreply.github.com> | 2023-03-07 10:06:02 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-03-07 10:06:02 -0500 |
| commit | 820f02b70badfc04d35c95f8ffb9682c8310e91e (patch) | |
| tree | 8a77e9468656b0d75d968a5a309541e9a0b1d256 /synapse | |
| parent | Remove duplicate entry from changelog (diff) | |
| download | synapse-820f02b70badfc04d35c95f8ffb9682c8310e91e.tar.xz | |
Stabilize support for MSC3966: event_property_contains push condition. (#15187)
This removes the configuration flag & updates the identifiers to use the stable version.
Diffstat (limited to 'synapse')
| -rw-r--r-- | synapse/config/experimental.py | 10 | ||||
| -rw-r--r-- | synapse/push/bulk_push_rule_evaluator.py | 1 |
2 files changed, 2 insertions, 9 deletions
diff --git a/synapse/config/experimental.py b/synapse/config/experimental.py index 489f2601ac..9ff382ccc3 100644 --- a/synapse/config/experimental.py +++ b/synapse/config/experimental.py @@ -171,15 +171,9 @@ class ExperimentalConfig(Config): "msc3873_escape_event_match_key", False ) - # MSC3966: exact_event_property_contains push rule condition. - self.msc3966_exact_event_property_contains = experimental.get( - "msc3966_exact_event_property_contains", False - ) - # MSC3952: Intentional mentions, this depends on MSC3966. - self.msc3952_intentional_mentions = ( - experimental.get("msc3952_intentional_mentions", False) - and self.msc3966_exact_event_property_contains + self.msc3952_intentional_mentions = experimental.get( + "msc3952_intentional_mentions", False ) # MSC3959: Do not generate notifications for edits. diff --git a/synapse/push/bulk_push_rule_evaluator.py b/synapse/push/bulk_push_rule_evaluator.py index ba12b6d79a..45622a9e9b 100644 --- a/synapse/push/bulk_push_rule_evaluator.py +++ b/synapse/push/bulk_push_rule_evaluator.py @@ -413,7 +413,6 @@ class BulkPushRuleEvaluator: self._related_event_match_enabled, event.room_version.msc3931_push_features, self.hs.config.experimental.msc1767_enabled, # MSC3931 flag - self.hs.config.experimental.msc3966_exact_event_property_contains, ) users = rules_by_user.keys() |