diff options
| author | Andrew Morgan <andrew@amorgan.xyz> | 2020-02-19 16:06:06 +0000 |
|---|---|---|
| committer | Andrew Morgan <andrew@amorgan.xyz> | 2020-02-19 16:06:06 +0000 |
| commit | c89770f0e63c1925107efebf7b78bd375a1bcd4b (patch) | |
| tree | 1ba2f47559cecdf54891a473a09b0fd0a2f4fc73 /synapse/federation | |
| parent | Convert RedactionTestCase to modern test style (#5768) (diff) | |
| parent | Merge branch 'erikj/log_leave_origin_mismatch' into release-v1.2.1 (diff) | |
| download | synapse-c89770f0e63c1925107efebf7b78bd375a1bcd4b.tar.xz | |
Merge branch 'erikj/log_leave_origin_mismatch' into release-v1.2.1
Diffstat (limited to 'synapse/federation')
| -rw-r--r-- | synapse/federation/federation_server.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/synapse/federation/federation_server.py b/synapse/federation/federation_server.py index b4b9a05ca6..d216c46dfe 100644 --- a/synapse/federation/federation_server.py +++ b/synapse/federation/federation_server.py @@ -364,7 +364,7 @@ class FederationServer(FederationBase): logger.warn("Room version %s not in %s", room_version, supported_versions) raise IncompatibleRoomVersionError(room_version=room_version) - pdu = yield self.handler.on_make_join_request(room_id, user_id) + pdu = yield self.handler.on_make_join_request(origin, room_id, user_id) time_now = self._clock.time_msec() return {"event": pdu.get_pdu_json(time_now), "room_version": room_version} @@ -414,7 +414,7 @@ class FederationServer(FederationBase): def on_make_leave_request(self, origin, room_id, user_id): origin_host, _ = parse_server_name(origin) yield self.check_server_matches_acl(origin_host, room_id) - pdu = yield self.handler.on_make_leave_request(room_id, user_id) + pdu = yield self.handler.on_make_leave_request(origin, room_id, user_id) room_version = yield self.store.get_room_version(room_id) |