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

* by default include m.room.encryption on invites * fix constant * changelog
HubbeKing · Jan 30, 2019 · ad7ac88 · ad7ac88
1 parent d534a27
commit ad7ac88
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 0 deletions.
diff --git a/changelog.d/3902.feature b/changelog.d/3902.feature
@@ -0,0 +1 @@
+Include m.room.encryption on invites by default
diff --git a/synapse/api/constants.py b/synapse/api/constants.py
@@ -73,6 +73,7 @@ class EventTypes(object):
     RoomHistoryVisibility = "m.room.history_visibility"
     CanonicalAlias = "m.room.canonical_alias"
     RoomAvatar = "m.room.avatar"
+    RoomEncryption = "m.room.encryption"
     GuestAccess = "m.room.guest_access"
 
     # These are used for validation

diff --git a/synapse/config/api.py b/synapse/config/api.py
@@ -24,6 +24,7 @@ def read_config(self, config):
             EventTypes.JoinRules,
             EventTypes.CanonicalAlias,
             EventTypes.RoomAvatar,
+            EventTypes.RoomEncryption,
             EventTypes.Name,
         ])
 
@@ -36,5 +37,6 @@ def default_config(cls, **kwargs):
             - "{JoinRules}"
             - "{CanonicalAlias}"
             - "{RoomAvatar}"
+            - "{RoomEncryption}"
             - "{Name}"
         """.format(**vars(EventTypes))
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		Include m.room.encryption on invites by default