diff options
author | Patrick Cloke <clokep@users.noreply.github.com> | 2020-07-24 10:53:25 -0400 |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-07-24 10:53:25 -0400 |
commit | e739b205885a7132f3dde67545d56655d83096d7 (patch) | |
tree | 726d1078029d89f57ef6adb9f7c0118b801bcbf1 /synapse/handlers/federation.py | |
parent | Do not convert async functions to Deferreds in the interactive_auth_handler (... (diff) | |
download | synapse-e739b205885a7132f3dde67545d56655d83096d7.tar.xz |
Fix up types and comments that refer to Deferreds. (#7945)
Diffstat (limited to 'synapse/handlers/federation.py')
-rw-r--r-- | synapse/handlers/federation.py | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/synapse/handlers/federation.py b/synapse/handlers/federation.py index 71ac5dca99..758ffdf01d 100644 --- a/synapse/handlers/federation.py +++ b/synapse/handlers/federation.py @@ -1394,7 +1394,7 @@ class FederationHandler(BaseHandler): # it's just a best-effort thing at this point. We do want to do # them roughly in order, though, otherwise we'll end up making # lots of requests for missing prev_events which we do actually - # have. Hence we fire off the deferred, but don't wait for it. + # have. Hence we fire off the background task, but don't wait for it. run_in_background(self._handle_queued_pdus, room_queue) @@ -2994,7 +2994,9 @@ class FederationHandler(BaseHandler): else: user_joined_room(self.distributor, user, room_id) - async def get_room_complexity(self, remote_room_hosts, room_id): + async def get_room_complexity( + self, remote_room_hosts: List[str], room_id: str + ) -> Optional[dict]: """ Fetch the complexity of a remote room over federation. @@ -3003,7 +3005,7 @@ class FederationHandler(BaseHandler): room_id (str): The room ID to ask about. Returns: - Deferred[dict] or Deferred[None]: Dict contains the complexity + Dict contains the complexity metric versions, while None means we could not fetch the complexity. """ |