Lint

Author: babolivier

synapse/rest/client/user_directory.py

@@ -25,7 +25,7 @@
     parse_json_object_from_request,
 )
 from synapse.http.site import SynapseRequest
-from synapse.types import JsonMapping, UserID
+from synapse.types import JsonDict, JsonMapping, UserID
 
 from ._base import client_patterns
 
@@ -133,7 +133,7 @@ async def on_GET(
         user_id_to_info = await self.store.get_info_for_users([user_id])
         return 200, user_id_to_info[user_id]
 
-    async def _on_federation_query(self, args: JsonMapping) -> JsonMapping:
+    async def _on_federation_query(self, args: dict) -> JsonDict:
         """Called when a request for user information appears over federation
 
         Args:

tests/rest/admin/test_user.py

@@ -1057,7 +1057,7 @@ def test_deactivate_user_erase_true_avatar_nonnull_but_empty(self) -> None:
         Reproduces #12257.
         """
         # Patch `self.other_user` to have an empty string as their avatar.
-        self.get_success(self.store.set_profile_avatar_url("user", ""))
+        self.get_success(self.store.set_profile_avatar_url("user", "", None))
 
         # Check we can still erase them.
         channel = self.make_request(