mirrors/synapse
1
0
Fork 0
mirror of https://github.com/matrix-org/synapse.git synced 2025-10-27 06:11:36 +01:00
Code Issues Projects Releases Wiki Activity

Merge pull request #2991 from matrix-org/erikj/fixup_rm

Browse Source 
_remote_join and co take a requester
This commit is contained in:
Erik Johnston 2018-03-14 09:40:57 +00:00 committed by GitHub
commit cfe75a9fb6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
synapse/handlers/room_member.py
View File

@ -370,7 +370,7 @@ class RoomMemberHandler(object):
content["kind"] = "guest"
ret = yield self._remote_join(
remote_room_hosts, room_id, target, content
requester, remote_room_hosts, room_id, target, content
)
defer.returnValue(ret)
@ -392,7 +392,7 @@ class RoomMemberHandler(object):
# send the rejection to the inviter's HS.
remote_room_hosts = remote_room_hosts + [inviter.domain]
res = yield self._remote_reject_invite(
remote_room_hosts, room_id, target,
requester, remote_room_hosts, room_id, target,
)
defer.returnValue(res)
@ -849,7 +849,7 @@ class RoomMemberMasterHandler(RoomMemberHandler):
self.distributor.declare("user_left_room")
@defer.inlineCallbacks
def _remote_join(self, remote_room_hosts, room_id, user, content):
def _remote_join(self, requester, remote_room_hosts, room_id, user, content):
"""Implements RoomMemberHandler._remote_join
"""
if len(remote_room_hosts) == 0:
@ -868,7 +868,7 @@ class RoomMemberMasterHandler(RoomMemberHandler):
yield self._user_joined_room(user, room_id)
@defer.inlineCallbacks
def _remote_reject_invite(self, remote_room_hosts, room_id, target):
def _remote_reject_invite(self, requester, remote_room_hosts, room_id, target):
"""Implements RoomMemberHandler._remote_reject_invite
"""
fed_handler = self.federation_handler