summary refs log tree commit diff
path: root/synapse/config/api.py
diff options
context:
space:
mode:
authorMatthew Hodgson <matthew@arasphere.net>2019-01-30 16:26:13 +0000
committerAmber Brown <hawkowl@atleastfornow.net>2019-01-30 16:26:13 +0000
commitad7ac8853cab27cb7f5aedcde4f1aaae82f8d5c9 (patch)
tree8ab3abc4d2ea23fd6701ea9e3b7528b82e39339a /synapse/config/api.py
parentMerge pull request #4527 from matrix-org/erikj/fix_sending_remote_invite_reje... (diff)
downloadsynapse-ad7ac8853cab27cb7f5aedcde4f1aaae82f8d5c9.tar.xz
by default include m.room.encryption on invites (#3902)
* by default include m.room.encryption on invites

* fix constant

* changelog
Diffstat (limited to '')
-rw-r--r--synapse/config/api.py2
1 files changed, 2 insertions, 0 deletions
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))