diff options
| author | Matthew Hodgson <matthew@arasphere.net> | 2019-01-30 16:26:13 +0000 |
|---|---|---|
| committer | Amber Brown <hawkowl@atleastfornow.net> | 2019-01-30 16:26:13 +0000 |
| commit | ad7ac8853cab27cb7f5aedcde4f1aaae82f8d5c9 (patch) | |
| tree | 8ab3abc4d2ea23fd6701ea9e3b7528b82e39339a | |
| parent | Merge pull request #4527 from matrix-org/erikj/fix_sending_remote_invite_reje... (diff) | |
| download | synapse-ad7ac8853cab27cb7f5aedcde4f1aaae82f8d5c9.tar.xz | |
by default include m.room.encryption on invites (#3902)
* by default include m.room.encryption on invites * fix constant * changelog
| -rw-r--r-- | changelog.d/3902.feature | 1 | ||||
| -rw-r--r-- | synapse/api/constants.py | 1 | ||||
| -rw-r--r-- | synapse/config/api.py | 2 |
3 files changed, 4 insertions, 0 deletions
diff --git a/changelog.d/3902.feature b/changelog.d/3902.feature new file mode 100644 index 0000000000..eb8d9f2393 --- /dev/null +++ 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 index 0cbae9429b..39ff4f62eb 100644 --- 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 index 403d96ba76..9f25bbc5cb 100644 --- a/synapse/config/api.py +++ b/synapse/config/api.py @@ -24,6 +24,7 @@ class ApiConfig(Config): EventTypes.JoinRules, EventTypes.CanonicalAlias, EventTypes.RoomAvatar, + EventTypes.RoomEncryption, EventTypes.Name, ]) @@ -36,5 +37,6 @@ class ApiConfig(Config): - "{JoinRules}" - "{CanonicalAlias}" - "{RoomAvatar}" + - "{RoomEncryption}" - "{Name}" """.format(**vars(EventTypes)) |