From 7987e6f2883e6450a1045c281abeb18a70d9aa00 Mon Sep 17 00:00:00 2001 From: Andrew Morgan Date: Tue, 10 Sep 2019 13:33:33 +0100 Subject: [PATCH 1/4] Remove extra args from send_membership_event and call to remote_reject_invite --- synapse/handlers/room_member.py | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) diff --git a/synapse/handlers/room_member.py b/synapse/handlers/room_member.py index 093f2ea36e49..9646586442c5 100644 --- a/synapse/handlers/room_member.py +++ b/synapse/handlers/room_member.py @@ -492,7 +492,7 @@ def _update_membership( # send the rejection to the inviter's HS. remote_room_hosts = remote_room_hosts + [inviter.domain] res = yield self._remote_reject_invite( - requester, remote_room_hosts, room_id, target + remote_room_hosts, room_id, target ) return res @@ -510,9 +510,7 @@ def _update_membership( return res @defer.inlineCallbacks - def send_membership_event( - self, requester, event, context, remote_room_hosts=None, ratelimit=True - ): + def send_membership_event(self, requester, event, context, ratelimit=True): """ Change the membership status of a user in a room. @@ -522,16 +520,10 @@ def send_membership_event( act as the sender, will be skipped. event (SynapseEvent): The membership event. context: The context of the event. - is_guest (bool): Whether the sender is a guest. - room_hosts ([str]): Homeservers which are likely to already be in - the room, and could be danced with in order to join this - homeserver for the first time. ratelimit (bool): Whether to rate limit this request. Raises: SynapseError if there was a problem changing the membership. """ - remote_room_hosts = remote_room_hosts or [] - target_user = UserID.from_string(event.state_key) room_id = event.room_id From 5566b4d8936edb05d73e797769d801eb4c7b66c2 Mon Sep 17 00:00:00 2001 From: Andrew Morgan Date: Tue, 10 Sep 2019 13:36:59 +0100 Subject: [PATCH 2/4] Add changelog --- changelog.d/6009.misc | 1 + 1 file changed, 1 insertion(+) create mode 100644 changelog.d/6009.misc diff --git a/changelog.d/6009.misc b/changelog.d/6009.misc new file mode 100644 index 000000000000..fea479e1ddae --- /dev/null +++ b/changelog.d/6009.misc @@ -0,0 +1 @@ +Small refactor of function arguments and docstrings in RoomMemberHandler. \ No newline at end of file From d116bab513434ec6ebd960245c662ea64c2be7b1 Mon Sep 17 00:00:00 2001 From: Andrew Morgan Date: Tue, 10 Sep 2019 16:13:46 +0100 Subject: [PATCH 3/4] Actually this is doing the right thing. it's just confusing --- synapse/handlers/room_member.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/synapse/handlers/room_member.py b/synapse/handlers/room_member.py index 9646586442c5..e421dfb94ab6 100644 --- a/synapse/handlers/room_member.py +++ b/synapse/handlers/room_member.py @@ -491,8 +491,10 @@ def _update_membership( else: # send the rejection to the inviter's HS. remote_room_hosts = remote_room_hosts + [inviter.domain] + # Note: This is calling _remote_reject_invite on RoomMemberMasterHandler, + # hence the `requester` arg res = yield self._remote_reject_invite( - remote_room_hosts, room_id, target + requester, remote_room_hosts, room_id, target ) return res From 6309a8ce80c2666c0c322e9eeed18b5e49cf18a1 Mon Sep 17 00:00:00 2001 From: Andrew Morgan Date: Wed, 11 Sep 2019 10:45:33 +0100 Subject: [PATCH 4/4] Remove comment and fix base class definition --- synapse/handlers/room_member.py | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/synapse/handlers/room_member.py b/synapse/handlers/room_member.py index e421dfb94ab6..a3a3d4d14379 100644 --- a/synapse/handlers/room_member.py +++ b/synapse/handlers/room_member.py @@ -100,7 +100,7 @@ def _remote_join(self, requester, remote_room_hosts, room_id, user, content): raise NotImplementedError() @abc.abstractmethod - def _remote_reject_invite(self, remote_room_hosts, room_id, target): + def _remote_reject_invite(self, requester, remote_room_hosts, room_id, target): """Attempt to reject an invite for a room this server is not in. If we fail to do so we locally mark the invite as rejected. @@ -491,8 +491,6 @@ def _update_membership( else: # send the rejection to the inviter's HS. remote_room_hosts = remote_room_hosts + [inviter.domain] - # Note: This is calling _remote_reject_invite on RoomMemberMasterHandler, - # hence the `requester` arg res = yield self._remote_reject_invite( requester, remote_room_hosts, room_id, target )