OpenCloud
/
MatrixSynapse
mirror of https://github.com/matrix-org/synapse
1
0
Fork 0
Code Issues Releases Wiki Activity

by default include m.room.encryption on invites (#3902) 

* by default include m.room.encryption on invites

* fix constant

* changelog
anoa/install_docs
Matthew Hodgson 2019-01-30 16:26:13 +00:00 committed by Amber Brown
parent d534a27fe8
commit ad7ac8853c
3 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
changelog.d/3902.feature Normal file
View File

@ -0,0 +1 @@
Include m.room.encryption on invites by default

1
synapse/api/constants.py
View File

@ -73,6 +73,7 @@ class EventTypes(object):
RoomHistoryVisibility = "m.room.history_visibility" RoomHistoryVisibility = "m.room.history_visibility"
CanonicalAlias = "m.room.canonical_alias" CanonicalAlias = "m.room.canonical_alias"
RoomAvatar = "m.room.avatar" RoomAvatar = "m.room.avatar"
RoomEncryption = "m.room.encryption"
GuestAccess = "m.room.guest_access" GuestAccess = "m.room.guest_access"
# These are used for validation # These are used for validation

2
synapse/config/api.py
View File

@ -24,6 +24,7 @@ class ApiConfig(Config):
EventTypes.JoinRules, EventTypes.JoinRules,
EventTypes.CanonicalAlias, EventTypes.CanonicalAlias,
EventTypes.RoomAvatar, EventTypes.RoomAvatar,
EventTypes.RoomEncryption,
EventTypes.Name, EventTypes.Name,
]) ])
@ -36,5 +37,6 @@ class ApiConfig(Config):
- "{JoinRules}" - "{JoinRules}"
- "{CanonicalAlias}" - "{CanonicalAlias}"
- "{RoomAvatar}" - "{RoomAvatar}"
- "{RoomEncryption}"
- "{Name}" - "{Name}"
""".format(**vars(EventTypes)) """.format(**vars(EventTypes))