Merge pull request #598 from Rugvip/invite-state

config,handlers/_base: added homeserver config for what state is included in a room invite
This commit is contained in:
Erik Johnston 2016-03-04 09:58:52 +00:00
commit 389d558a3b
4 changed files with 45 additions and 7 deletions

View file

@ -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)