diff options
| author | Richard van der Hoff <richard@matrix.org> | 2017-04-21 00:51:01 +0100 |
|---|---|---|
| committer | Richard van der Hoff <richard@matrix.org> | 2017-04-21 01:31:09 +0100 |
| commit | 736b9a478478f82ac27a9a6a4899aed66b0b64a8 (patch) | |
| tree | f1dcd8ecacfdbb0d769466eb8e38a530cc3d2acd /synapse/handlers | |
| parent | Fix some lies, and other clarifications, in docstrings (diff) | |
| download | synapse-736b9a478478f82ac27a9a6a4899aed66b0b64a8.tar.xz | |
Remove redundant function
inline `reject_remote_invite`, which only existed to make tracing the callflow more difficult.
Diffstat (limited to 'synapse/handlers')
| -rw-r--r-- | synapse/handlers/room_member.py | 15 |
1 files changed, 5 insertions, 10 deletions
diff --git a/synapse/handlers/room_member.py b/synapse/handlers/room_member.py index 2052d6d05f..08fc6d6783 100644 --- a/synapse/handlers/room_member.py +++ b/synapse/handlers/room_member.py @@ -139,13 +139,6 @@ class RoomMemberHandler(BaseHandler): ) yield user_joined_room(self.distributor, user, room_id) - def reject_remote_invite(self, user_id, room_id, remote_room_hosts): - return self.hs.get_handlers().federation_handler.do_remotely_reject_invite( - remote_room_hosts, - room_id, - user_id - ) - @defer.inlineCallbacks def update_membership( self, @@ -286,10 +279,12 @@ class RoomMemberHandler(BaseHandler): else: # send the rejection to the inviter's HS. remote_room_hosts = remote_room_hosts + [inviter.domain] - + fed_handler = self.hs.get_handlers().federation_handler try: - ret = yield self.reject_remote_invite( - target.to_string(), room_id, remote_room_hosts + ret = yield fed_handler.do_remotely_reject_invite( + remote_room_hosts, + room_id, + target.to_string(), ) defer.returnValue(ret) except SynapseError as e: |