summary refs log tree commit diff
path: root/synapse/api
diff options
context:
space:
mode:
authorBrendan Abolivier <babolivier@matrix.org>2021-03-19 16:12:40 +0100
committerBrendan Abolivier <babolivier@matrix.org>2021-03-19 16:12:40 +0100
commit592d6305fda97ceda92a8ce6079a9fdbe9928567 (patch)
tree7a0edf2be5f22754bf8da194a1412d740ef0a004 /synapse/api
parentFix lint (diff)
parentfix mypy (diff)
downloadsynapse-592d6305fda97ceda92a8ce6079a9fdbe9928567.tar.xz
Merge branch 'develop' into babolivier/msc3026
Diffstat (limited to 'synapse/api')
-rw-r--r--synapse/api/constants.py6
1 files changed, 6 insertions, 0 deletions
diff --git a/synapse/api/constants.py b/synapse/api/constants.py
index cc8541bc16..8f37d2cf3b 100644
--- a/synapse/api/constants.py
+++ b/synapse/api/constants.py
@@ -101,6 +101,9 @@ class EventTypes:
 
     Dummy = "org.matrix.dummy_event"
 
+    MSC1772_SPACE_CHILD = "org.matrix.msc1772.space.child"
+    MSC1772_SPACE_PARENT = "org.matrix.msc1772.space.parent"
+
 
 class EduTypes:
     Presence = "m.presence"
@@ -161,6 +164,9 @@ class EventContentFields:
     # cf https://github.com/matrix-org/matrix-doc/pull/2228
     SELF_DESTRUCT_AFTER = "org.matrix.self_destruct_after"
 
+    # cf https://github.com/matrix-org/matrix-doc/pull/1772
+    MSC1772_ROOM_TYPE = "org.matrix.msc1772.type"
+
 
 class RoomEncryptionAlgorithms:
     MEGOLM_V1_AES_SHA2 = "m.megolm.v1.aes-sha2"