diff options
| author | Andrew Morgan <andrew@amorgan.xyz> | 2019-08-28 13:44:02 +0100 |
|---|---|---|
| committer | Andrew Morgan <andrew@amorgan.xyz> | 2019-08-28 13:44:02 +0100 |
| commit | 849d8dc19f5229f991eb4232717f315cbfc9389b (patch) | |
| tree | 75674fbb9f808bd592fd9201af982e0e917a07a0 | |
| parent | lint (diff) | |
| parent | Apply suggestions from code review (diff) | |
| download | synapse-849d8dc19f5229f991eb4232717f315cbfc9389b.tar.xz | |
Merge branch 'anoa/v2_lookup' of github.com:matrix-org/synapse into anoa/v2_lookup
| -rw-r--r-- | synapse/handlers/room_member.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/synapse/handlers/room_member.py b/synapse/handlers/room_member.py index 3ab6fc55f8..4605cb9c0b 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"] |