Browse Source

Actually fix typechecking with latest types-jsonschema (#13724)

David Robertson 2 years ago
parent
commit
a4ecb8e353
2 changed files with 5 additions and 4 deletions
  1. 1 0
      changelog.d/13724.misc
  2. 4 4
      synapse/api/filtering.py

+ 1 - 0
changelog.d/13724.misc

@@ -0,0 +1 @@
+Fix typechecking with latest types-jsonschema.

+ 4 - 4
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: