From 4bd6de3498916e89f229d514455b961d339652ad Mon Sep 17 00:00:00 2001 From: Matthew Hodgson Date: Tue, 18 Sep 2018 14:55:54 +0100 Subject: [PATCH 1/3] by default include m.room.encryption on invites --- synapse/config/api.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/synapse/config/api.py b/synapse/config/api.py index 403d96ba76c1..9f25bbc5cbc1 100644 --- 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)) From 8de9db2e2d486ba2bd8c50304fd4bf14f4cd89d3 Mon Sep 17 00:00:00 2001 From: Matthew Hodgson Date: Tue, 18 Sep 2018 15:21:51 +0100 Subject: [PATCH 2/3] fix constant --- synapse/api/constants.py | 1 + 1 file changed, 1 insertion(+) diff --git a/synapse/api/constants.py b/synapse/api/constants.py index c2630c4c6436..4948864db2bd 100644 --- a/synapse/api/constants.py +++ b/synapse/api/constants.py @@ -70,6 +70,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 From edbd9b2c1e9f0640c01d2c11156b3063d6091428 Mon Sep 17 00:00:00 2001 From: Matthew Hodgson Date: Tue, 18 Sep 2018 15:27:49 +0100 Subject: [PATCH 3/3] changelog --- changelog.d/3902.feature | 1 + 1 file changed, 1 insertion(+) create mode 100644 changelog.d/3902.feature diff --git a/changelog.d/3902.feature b/changelog.d/3902.feature new file mode 100644 index 000000000000..eb8d9f239370 --- /dev/null +++ b/changelog.d/3902.feature @@ -0,0 +1 @@ +Include m.room.encryption on invites by default