From ad7ac8853cab27cb7f5aedcde4f1aaae82f8d5c9 Mon Sep 17 00:00:00 2001
From: Matthew Hodgson <matthew@arasphere.net>
Date: Wed, 30 Jan 2019 16:26:13 +0000
Subject: [PATCH] by default include m.room.encryption on invites (#3902)

* by default include m.room.encryption on invites

* fix constant

* changelog
---
 changelog.d/3902.feature | 1 +
 synapse/api/constants.py | 1 +
 synapse/config/api.py    | 2 ++
 3 files changed, 4 insertions(+)
 create mode 100644 changelog.d/3902.feature

diff --git a/changelog.d/3902.feature b/changelog.d/3902.feature
new file mode 100644
index 000000000..eb8d9f239
--- /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 0cbae9429..39ff4f62e 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 403d96ba7..9f25bbc5c 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))