summary refs log tree commit diff
path: root/synapse/rest
diff options
context:
space:
mode:
authorMichael Telatynski <7t3chguy@gmail.com>2021-07-20 12:59:23 +0100
committerGitHub <noreply@github.com>2021-07-20 12:59:23 +0100
commit69226c1ab4e88d1f104ad8aaa13fb9dd0ff5dbb2 (patch)
treec2de39f8a5110a4eea70b6a28d198fd86316011f /synapse/rest
parentRevert "Fix dropping locks on shut down" (diff)
downloadsynapse-69226c1ab4e88d1f104ad8aaa13fb9dd0ff5dbb2.tar.xz
MSC3244 room capabilities implementation (#10283)
Diffstat (limited to 'synapse/rest')
-rw-r--r--synapse/rest/client/v2_alpha/capabilities.py8
1 files changed, 7 insertions, 1 deletions
diff --git a/synapse/rest/client/v2_alpha/capabilities.py b/synapse/rest/client/v2_alpha/capabilities.py
index 6a24021484..88e3aac797 100644
--- a/synapse/rest/client/v2_alpha/capabilities.py
+++ b/synapse/rest/client/v2_alpha/capabilities.py
@@ -14,7 +14,7 @@
 import logging
 from typing import TYPE_CHECKING, Tuple
 
-from synapse.api.room_versions import KNOWN_ROOM_VERSIONS
+from synapse.api.room_versions import KNOWN_ROOM_VERSIONS, MSC3244_CAPABILITIES
 from synapse.http.servlet import RestServlet
 from synapse.http.site import SynapseRequest
 from synapse.types import JsonDict
@@ -55,6 +55,12 @@ class CapabilitiesRestServlet(RestServlet):
                 "m.change_password": {"enabled": change_password},
             }
         }
+
+        if self.config.experimental.msc3244_enabled:
+            response["capabilities"]["m.room_versions"][
+                "org.matrix.msc3244.room_capabilities"
+            ] = MSC3244_CAPABILITIES
+
         return 200, response