Matrix-Mirrors/synapse-product
1
0
Fork 0
mirror of https://git.anonymousland.org/anonymousland/synapse-product.git synced 2025-05-05 03:54:56 -04:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'develop' into babolivier/msc3026

Browse source
This commit is contained in:
Brendan Abolivier 2021-03-19 16:12:40 +01:00
commit 592d6305fd
No known key found for this signature in database
GPG key ID: 1E015C145F1916CD
18 changed files with 574 additions and 165 deletions
Download patch file Download diff file Expand all files Collapse all files

6
synapse/api/constants.py
View file

@ -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"