summary refs log tree commit diff
path: root/synapse/handlers
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2016-03-04 09:58:52 +0000
committerErik Johnston <erik@matrix.org>2016-03-04 09:58:52 +0000
commit389d558a3bd2c55b01a1e954d3b1c40b6d7711c0 (patch)
tree1fc497ffb28201bea8813f5065662cf13d6ca5cb /synapse/handlers
parentMerge pull request #596 from Rugvip/create (diff)
parenttests/utils: added room_invite_state_types to test config (diff)
downloadsynapse-389d558a3bd2c55b01a1e954d3b1c40b6d7711c0.tar.xz
Merge pull request #598 from Rugvip/invite-state
config,handlers/_base: added homeserver config for what state is included in a room invite
Diffstat (limited to '')
-rw-r--r--synapse/handlers/_base.py8
1 files changed, 2 insertions, 6 deletions
diff --git a/synapse/handlers/_base.py b/synapse/handlers/_base.py
index 4d9787c1a8..2d56af5027 100644
--- a/synapse/handlers/_base.py
+++ b/synapse/handlers/_base.py
@@ -333,12 +333,8 @@ class BaseHandler(object):
                         "sender": e.sender,
                     }
                     for k, e in context.current_state.items()
-                    if e.type in (
-                        EventTypes.JoinRules,
-                        EventTypes.CanonicalAlias,
-                        EventTypes.RoomAvatar,
-                        EventTypes.Name,
-                    ) or is_inviter_member_event(e)
+                    if e.type in self.hs.config.room_invite_state_types
+                    or is_inviter_member_event(e)
                 ]
 
                 invitee = UserID.from_string(event.state_key)