Skip to content
This repository has been archived by the owner on Apr 26, 2024. It is now read-only.

Various improvements to the federation client #9129

Merged
merged 4 commits into from
Jan 20, 2021
Merged

Various improvements to the federation client #9129

Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
ca7c382
Add more type hints to FederationClient.
clokep Dec 30, 2020
b8f2522
Use async functions instead of returning awaitables.
clokep Dec 30, 2020
82230e1
Remove some unnecessary variables.
clokep Dec 30, 2020
ec13109
Newsfragment.
clokep Jan 15, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Remove some unnecessary variables.
  • Loading branch information
@clokep
clokep committed Jan 15, 2021
commit 82230e163ddcf8f426df00ec600e6ab887eac28c
14 changes: 4 additions & 10 deletions synapse/federation/federation_client.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -718,14 +718,12 @@ async def _do_send_join(self, destination: str, pdu: EventBase) -> JsonDict:
time_now = self._clock.time_msec()

try:
content = await self.transport_layer.send_join_v2(
return await self.transport_layer.send_join_v2(
destination=destination,
room_id=pdu.room_id,
event_id=pdu.event_id,
content=pdu.get_pdu_json(time_now),
)

return content
except HttpResponseException as e:
if e.code in [400, 404]:
err = e.to_synapse_error()
Expand Down Expand Up @@ -783,7 +781,7 @@ async def _do_send_invite(
time_now = self._clock.time_msec()

try:
content = await self.transport_layer.send_invite_v2(
return await self.transport_layer.send_invite_v2(
destination=destination,
room_id=pdu.room_id,
event_id=pdu.event_id,
Expand All @@ -793,7 +791,6 @@ async def _do_send_invite(
"invite_room_state": pdu.unsigned.get("invite_room_state", []),
},
)
return content
except HttpResponseException as e:
if e.code in [400, 404]:
err = e.to_synapse_error()
Expand Down Expand Up @@ -860,14 +857,12 @@ async def _do_send_leave(self, destination: str, pdu: EventBase) -> JsonDict:
time_now = self._clock.time_msec()

try:
content = await self.transport_layer.send_leave_v2(
return await self.transport_layer.send_leave_v2(
destination=destination,
room_id=pdu.room_id,
event_id=pdu.event_id,
content=pdu.get_pdu_json(time_now),
)

return content
except HttpResponseException as e:
if e.code in [400, 404]:
err = e.to_synapse_error()
Expand Down Expand Up @@ -1023,10 +1018,9 @@ async def get_room_complexity(
could not fetch the complexity.
"""
try:
complexity = await self.transport_layer.get_room_complexity(
return await self.transport_layer.get_room_complexity(
destination=destination, room_id=room_id
)
return complexity
except CodeMessageException as e:
# We didn't manage to get it -- probably a 404. We are okay if other
# servers don't give it to us.
Expand Down