summary refs log tree commit diff
path: root/synapse/handlers/_base.py
diff options
context:
space:
mode:
authorPatrik Oldsberg <patrik.oldsberg@ericsson.com>2016-02-23 14:22:07 +0100
committerPatrik Oldsberg <patrik.oldsberg@ericsson.com>2016-03-04 10:43:17 +0100
commit5fc59f009cca676ed8c9c932abf6cddc6614eae9 (patch)
tree24d3e43c5175b09a26b186736315cd07aa1551b0 /synapse/handlers/_base.py
parentMerge pull request #610 from Rugvip/unique-user (diff)
downloadsynapse-5fc59f009cca676ed8c9c932abf6cddc6614eae9.tar.xz
config,handlers/_base: added homeserver config for what state is included in a room invite
Signed-off-by: Patrik Oldsberg <patrik.oldsberg@ericsson.com>
Diffstat (limited to 'synapse/handlers/_base.py')
-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 c6a74b0e3d..884572df97 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)