diff options
| author | Patrick Cloke <clokep@users.noreply.github.com> | 2022-04-12 08:42:03 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-04-12 08:42:03 -0400 |
| commit | 86cf6a3a17376dd83a9222f77521d1619b528d66 (patch) | |
| tree | 3552f7be218aa0079d3a6edaddf4614566f1d25c /synapse/api | |
| parent | Add some type hints to datastore (#12423) (diff) | |
| download | synapse-86cf6a3a17376dd83a9222f77521d1619b528d66.tar.xz | |
Remove references to unstable identifiers from MSC3440. (#12382)
Removes references to unstable thread relation, unstable identifiers for filtering parameters, and the experimental config flag.
Diffstat (limited to 'synapse/api')
| -rw-r--r-- | synapse/api/constants.py | 2 | ||||
| -rw-r--r-- | synapse/api/filtering.py | 12 |
2 files changed, 0 insertions, 14 deletions
diff --git a/synapse/api/constants.py b/synapse/api/constants.py index 92907415e6..0172eb60b8 100644 --- a/synapse/api/constants.py +++ b/synapse/api/constants.py @@ -179,8 +179,6 @@ class RelationTypes: REPLACE: Final = "m.replace" REFERENCE: Final = "m.reference" THREAD: Final = "m.thread" - # TODO Remove this in Synapse >= v1.57.0. - UNSTABLE_THREAD: Final = "io.element.thread" class LimitBlockingTypes: diff --git a/synapse/api/filtering.py b/synapse/api/filtering.py index 27e97d6f37..4a808e33fe 100644 --- a/synapse/api/filtering.py +++ b/synapse/api/filtering.py @@ -89,9 +89,7 @@ ROOM_EVENT_FILTER_SCHEMA = { "org.matrix.not_labels": {"type": "array", "items": {"type": "string"}}, # MSC3440, filtering by event relations. "related_by_senders": {"type": "array", "items": {"type": "string"}}, - "io.element.relation_senders": {"type": "array", "items": {"type": "string"}}, "related_by_rel_types": {"type": "array", "items": {"type": "string"}}, - "io.element.relation_types": {"type": "array", "items": {"type": "string"}}, }, } @@ -323,16 +321,6 @@ class Filter: self.related_by_senders = self.filter_json.get("related_by_senders", None) self.related_by_rel_types = self.filter_json.get("related_by_rel_types", None) - # Fallback to the unstable prefix if the stable version is not given. - if hs.config.experimental.msc3440_enabled: - self.related_by_senders = self.related_by_senders or self.filter_json.get( - "io.element.relation_senders", None - ) - self.related_by_rel_types = ( - self.related_by_rel_types - or self.filter_json.get("io.element.relation_types", None) - ) - def filters_all_types(self) -> bool: return "*" in self.not_types |