summary refs log tree commit diff
path: root/synapse/handlers
diff options
context:
space:
mode:
authorPatrick Cloke <clokep@users.noreply.github.com>2023-10-02 13:17:05 -0400
committerGitHub <noreply@github.com>2023-10-02 13:17:05 -0400
commitb22a14c828a988610a9b1d6205f8d46529720fa5 (patch)
tree5cadc982f8ae534d7412f7dbaca168176bf638e5 /synapse/handlers
parentFix-up types. (diff)
parentClean-up old release notes (#16418) (diff)
downloadsynapse-b22a14c828a988610a9b1d6205f8d46529720fa5.tar.xz
Merge branch 'develop' into clokep/db-upgrades
Diffstat (limited to 'synapse/handlers')
-rw-r--r--synapse/handlers/room_list.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/synapse/handlers/room_list.py b/synapse/handlers/room_list.py
index bb0bdb8e6f..36e2db8975 100644
--- a/synapse/handlers/room_list.py
+++ b/synapse/handlers/room_list.py
@@ -33,7 +33,7 @@ from synapse.api.errors import (
     RequestSendFailed,
     SynapseError,
 )
-from synapse.types import JsonDict, ThirdPartyInstanceID
+from synapse.types import JsonDict, JsonMapping, ThirdPartyInstanceID
 from synapse.util.caches.descriptors import _CacheContext, cached
 from synapse.util.caches.response_cache import ResponseCache
 
@@ -256,7 +256,7 @@ class RoomListHandler:
         cache_context: _CacheContext,
         with_alias: bool = True,
         allow_private: bool = False,
-    ) -> Optional[JsonDict]:
+    ) -> Optional[JsonMapping]:
         """Returns the entry for a room
 
         Args: