diff options
| author | Erik Johnston <erik@matrix.org> | 2016-04-05 09:12:27 +0100 |
|---|---|---|
| committer | Erik Johnston <erik@matrix.org> | 2016-04-05 09:12:27 +0100 |
| commit | 7a77f8b6d5e7b43bd9ebaed2336455f20deb428e (patch) | |
| tree | f7dade50bc9b3202cafbb0430e21221a552b4d02 /synapse/handlers/room_member.py | |
| parent | Merge pull request #689 from matrix-org/erikj/member (diff) | |
| parent | Docs and indents (diff) | |
| download | synapse-7a77f8b6d5e7b43bd9ebaed2336455f20deb428e.tar.xz | |
Merge pull request #690 from matrix-org/erikj/member
Store invites in a separate table.
Diffstat (limited to 'synapse/handlers/room_member.py')
| -rw-r--r-- | synapse/handlers/room_member.py | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/synapse/handlers/room_member.py b/synapse/handlers/room_member.py index 2f788a4b1b..f232081970 100644 --- a/synapse/handlers/room_member.py +++ b/synapse/handlers/room_member.py @@ -400,7 +400,10 @@ class RoomMemberHandler(BaseHandler): @defer.inlineCallbacks def get_inviter(self, user_id, room_id): - invite = yield self.store.get_room_member(user_id=user_id, room_id=room_id) + invite = yield self.store.get_invite_for_user_in_room( + user_id=user_id, + room_id=room_id, + ) if invite: defer.returnValue(UserID.from_string(invite.sender)) |