summary refs log tree commit diff
path: root/synapse/handlers
diff options
context:
space:
mode:
authorAndrew Morgan <1342360+anoadragon453@users.noreply.github.com>2019-08-28 14:43:05 +0200
committerGitHub <noreply@github.com>2019-08-28 14:43:05 +0200
commit8f1346d82bb6ee3ebabe115a6329b9ae33467835 (patch)
tree706e4b6b8fa61df2f0c6dc47a861bf155fddba8a /synapse/handlers
parentWarn user when the id_server they chose does not support any of the hs' desir... (diff)
downloadsynapse-8f1346d82bb6ee3ebabe115a6329b9ae33467835.tar.xz
Apply suggestions from code review
Co-Authored-By: Erik Johnston <erik@matrix.org>
Diffstat (limited to 'synapse/handlers')
-rw-r--r--synapse/handlers/room_member.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/synapse/handlers/room_member.py b/synapse/handlers/room_member.py
index 98f7d86ec0..3414d34882 100644
--- a/synapse/handlers/room_member.py
+++ b/synapse/handlers/room_member.py
@@ -525,7 +525,7 @@ class RoomMemberHandler(object):
             event (SynapseEvent): The membership event.
             context: The context of the event.
             is_guest (bool): Whether the sender is a guest.
-            remote_room_hosts ([str]): Homeservers which are likely to already be in
+            remote_room_hosts (list[str]|None): Homeservers which are likely to already be in
                 the room, and could be danced with in order to join this
                 homeserver for the first time.
             ratelimit (bool): Whether to rate limit this request.
@@ -767,7 +767,7 @@ class RoomMemberHandler(object):
                 provided by an identity server.
 
         Returns:
-            str: the matrix ID of the 3pid, or None if it is not recognised.
+            Deferred[str|None]: the matrix ID of the 3pid, or None if it is not recognised.
         """
         # Extract information from hash_details
         supported_lookup_algorithms = hash_details["algorithms"]