diff options
| author | Erik Johnston <erik@matrix.org> | 2016-03-01 09:43:27 +0000 |
|---|---|---|
| committer | Erik Johnston <erik@matrix.org> | 2016-03-01 09:43:27 +0000 |
| commit | 903fb34b39cd750050b4c89d9c0f5492652b8fcd (patch) | |
| tree | 7e74b35c054227b2897ed46bccfb2b4de40f47f6 /synapse/handlers/_base.py | |
| parent | Report size of ExpiringCache (diff) | |
| parent | Merge pull request #607 from matrix-org/dbkr/send_inviter_member_event (diff) | |
| download | synapse-903fb34b39cd750050b4c89d9c0f5492652b8fcd.tar.xz | |
Merge branch 'develop' of github.com:matrix-org/synapse into erikj/expiring_cache_size
Diffstat (limited to 'synapse/handlers/_base.py')
| -rw-r--r-- | synapse/handlers/_base.py | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/synapse/handlers/_base.py b/synapse/handlers/_base.py index 5613bd2059..bdade98bf7 100644 --- a/synapse/handlers/_base.py +++ b/synapse/handlers/_base.py @@ -293,6 +293,12 @@ class BaseHandler(object): if event.type == EventTypes.Member: if event.content["membership"] == Membership.INVITE: + def is_inviter_member_event(e): + return ( + e.type == EventTypes.Member and + e.sender == event.sender + ) + event.unsigned["invite_room_state"] = [ { "type": e.type, @@ -306,7 +312,7 @@ class BaseHandler(object): EventTypes.CanonicalAlias, EventTypes.RoomAvatar, EventTypes.Name, - ) + ) or is_inviter_member_event(e) ] invitee = UserID.from_string(event.state_key) |