summary refs log tree commit diff
diff options
context:
space:
mode:
authorDavid Robertson <davidr@element.io>2022-09-06 14:29:16 +0100
committerGitHub <noreply@github.com>2022-09-06 14:29:16 +0100
commita4ecb8e35309d780f5d4e93fb4998b90c9068e8a (patch)
tree7628cfa6369909afadcccc423d8185ecb03fb32e
parentUpdate trial old deps CI to use poetry 1.2.0 (#13707) (diff)
downloadsynapse-a4ecb8e35309d780f5d4e93fb4998b90c9068e8a.tar.xz
Actually fix typechecking with latest types-jsonschema (#13724)
-rw-r--r--changelog.d/13724.misc1
-rw-r--r--synapse/api/filtering.py8
2 files changed, 5 insertions, 4 deletions
diff --git a/changelog.d/13724.misc b/changelog.d/13724.misc
new file mode 100644
index 0000000000..2c4f6b19f6
--- /dev/null
+++ b/changelog.d/13724.misc
@@ -0,0 +1 @@
+Fix typechecking with latest types-jsonschema.
diff --git a/synapse/api/filtering.py b/synapse/api/filtering.py
index 102889ac49..f7f46f8d80 100644
--- a/synapse/api/filtering.py
+++ b/synapse/api/filtering.py
@@ -140,13 +140,13 @@ USER_FILTER_SCHEMA = {
 
 
 @FormatChecker.cls_checks("matrix_room_id")
-def matrix_room_id_validator(room_id_str: str) -> bool:
-    return RoomID.is_valid(room_id_str)
+def matrix_room_id_validator(room_id: object) -> bool:
+    return isinstance(room_id, str) and RoomID.is_valid(room_id)
 
 
 @FormatChecker.cls_checks("matrix_user_id")
-def matrix_user_id_validator(user_id_str: str) -> bool:
-    return UserID.is_valid(user_id_str)
+def matrix_user_id_validator(user_id: object) -> bool:
+    return isinstance(user_id, str) and UserID.is_valid(user_id)
 
 
 class Filtering: