diff options
| author | Andrew Morgan <andrew@amorgan.xyz> | 2020-02-25 12:16:00 +0000 |
|---|---|---|
| committer | Andrew Morgan <andrew@amorgan.xyz> | 2020-02-25 12:16:00 +0000 |
| commit | a2e8eede6494502fa74f6b4bdd8694e40d969073 (patch) | |
| tree | dbaf003efe427b426b6bb7473d6bad4dcd37c538 /synapse/federation | |
| parent | Merge pull request #6011 from matrix-org/anoa/fix_3pid_validation (diff) | |
| parent | Remove origin parameter from add_display_name_to_third_party_invite and add p... (diff) | |
| download | synapse-a2e8eede6494502fa74f6b4bdd8694e40d969073.tar.xz | |
Remove origin parameter from add_display_name_to_third_party_invite and add params to docstring (#6010)
Diffstat (limited to 'synapse/federation')
| -rw-r--r-- | synapse/federation/federation_server.py | 4 | ||||
| -rw-r--r-- | synapse/federation/transport/server.py | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/synapse/federation/federation_server.py b/synapse/federation/federation_server.py index e5f0b90aec..da06ab379d 100644 --- a/synapse/federation/federation_server.py +++ b/synapse/federation/federation_server.py @@ -669,9 +669,9 @@ class FederationServer(FederationBase): 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 132a8fb5e6..7dc696c7ae 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 |