From 4957374bb8bb68f5ce932ccaa44c5c2cd3ad7df4 Mon Sep 17 00:00:00 2001 From: Andrew Morgan Date: Tue, 10 Sep 2019 13:54:43 +0100 Subject: [PATCH 1/3] Remove origin parameter from add_display_name_to_third_party_invite --- synapse/federation/federation_server.py | 4 ++-- synapse/federation/transport/server.py | 2 +- synapse/handlers/federation.py | 7 ++++++- 3 files changed, 9 insertions(+), 4 deletions(-) diff --git a/synapse/federation/federation_server.py b/synapse/federation/federation_server.py index e5f0b90aeca8..da06ab379d60 100644 --- a/synapse/federation/federation_server.py +++ b/synapse/federation/federation_server.py @@ -669,9 +669,9 @@ def exchange_third_party_invite( return ret @defer.inlineCallbacks - def on_exchange_third_party_invite_request(self, origin, room_id, event_dict): + def on_exchange_third_party_invite_request(self, room_id, event_dict): ret = yield self.handler.on_exchange_third_party_invite_request( - origin, room_id, event_dict + room_id, event_dict ) return ret diff --git a/synapse/federation/transport/server.py b/synapse/federation/transport/server.py index 132a8fb5e674..7dc696c7ae55 100644 --- a/synapse/federation/transport/server.py +++ b/synapse/federation/transport/server.py @@ -575,7 +575,7 @@ class FederationThirdPartyInviteExchangeServlet(BaseFederationServlet): async def on_PUT(self, origin, content, query, room_id): content = await self.handler.on_exchange_third_party_invite_request( - origin, room_id, content + room_id, content ) return 200, content diff --git a/synapse/handlers/federation.py b/synapse/handlers/federation.py index 538b16efd633..90f3f7a0521e 100644 --- a/synapse/handlers/federation.py +++ b/synapse/handlers/federation.py @@ -2530,12 +2530,17 @@ def exchange_third_party_invite( @defer.inlineCallbacks @log_function - def on_exchange_third_party_invite_request(self, origin, room_id, event_dict): + def jn_exchange_third_party_invite_request(self, room_id, event_dict): """Handle an exchange_third_party_invite request from a remote server The remote server will call this when it wants to turn a 3pid invite into a normal m.room.member invite. + Args: + room_id (str): The ID of the room. + + event_dict (dict[str, Any]): Dictionary containing the event body. + Returns: Deferred: resolves (to None) """ From 8b8cf40c79489bbbea7e5c63cd781e3121a7c76d Mon Sep 17 00:00:00 2001 From: Andrew Morgan Date: Tue, 10 Sep 2019 13:58:26 +0100 Subject: [PATCH 2/3] Add changelog --- changelog.d/6010.misc | 1 + 1 file changed, 1 insertion(+) create mode 100644 changelog.d/6010.misc diff --git a/changelog.d/6010.misc b/changelog.d/6010.misc new file mode 100644 index 000000000000..0659f12ebd8e --- /dev/null +++ b/changelog.d/6010.misc @@ -0,0 +1 @@ +Remove unused `origin` argument on FederationHandler.add_display_name_to_third_party_invite. \ No newline at end of file From ba050103559aa234ddd10d78978fac32df4118e9 Mon Sep 17 00:00:00 2001 From: Andrew Morgan Date: Tue, 10 Sep 2019 14:02:25 +0100 Subject: [PATCH 3/3] Fix silly typo --- synapse/handlers/federation.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/synapse/handlers/federation.py b/synapse/handlers/federation.py index 90f3f7a0521e..f72b81d4193f 100644 --- a/synapse/handlers/federation.py +++ b/synapse/handlers/federation.py @@ -2530,7 +2530,7 @@ def exchange_third_party_invite( @defer.inlineCallbacks @log_function - def jn_exchange_third_party_invite_request(self, room_id, event_dict): + def on_exchange_third_party_invite_request(self, room_id, event_dict): """Handle an exchange_third_party_invite request from a remote server The remote server will call this when it wants to turn a 3pid invite