diff --git a/scripts/synapse_port_db b/scripts/synapse_port_db
index 2e4aabdd26..bc1a989fc1 100755
--- a/scripts/synapse_port_db
+++ b/scripts/synapse_port_db
@@ -47,8 +47,8 @@ from synapse.storage.databases.main.events_bg_updates import (
from synapse.storage.databases.main.media_repository import (
MediaRepositoryBackgroundUpdateStore,
)
-from synapse.storage.databases.main.pusher import PusherWorkerStore
from synapse.storage.databases.main.profile import ProfileStore
+from synapse.storage.databases.main.pusher import PusherWorkerStore
from synapse.storage.databases.main.registration import (
RegistrationBackgroundUpdateStore,
find_max_generated_user_id_localpart,
diff --git a/synapse/handlers/profile.py b/synapse/handlers/profile.py
index 469614fed6..ee8f868791 100644
--- a/synapse/handlers/profile.py
+++ b/synapse/handlers/profile.py
@@ -87,8 +87,8 @@ class ProfileHandler(BaseHandler):
)
if len(self.hs.config.replicate_user_profiles_to) > 0:
- reactor.callWhenRunning(self._do_assign_profile_replication_batches)
- reactor.callWhenRunning(self._start_replicate_profiles)
+ reactor.callWhenRunning(self._do_assign_profile_replication_batches) # type: ignore
+ reactor.callWhenRunning(self._start_replicate_profiles) # type: ignore
# Add a looping call to replicate_profiles: this handles retries
# if the replication is unsuccessful when the user updated their
# profile.
diff --git a/synapse/replication/http/membership.py b/synapse/replication/http/membership.py
index b8491ca80e..2812ac12fc 100644
--- a/synapse/replication/http/membership.py
+++ b/synapse/replication/http/membership.py
@@ -146,7 +146,7 @@ class ReplicationRemoteKnockRestServlet(ReplicationEndpoint):
async def _handle_request( # type: ignore
self,
- request: Request,
+ request: SynapseRequest,
room_id: str,
user_id: str,
):
@@ -284,7 +284,7 @@ class ReplicationRemoteRescindKnockRestServlet(ReplicationEndpoint):
async def _handle_request( # type: ignore
self,
- request: Request,
+ request: SynapseRequest,
knock_event_id: str,
):
content = parse_json_object_from_request(request)
diff --git a/synapse/rest/client/v2_alpha/knock.py b/synapse/rest/client/v2_alpha/knock.py
index 75b7f665c9..51dac88fc7 100644
--- a/synapse/rest/client/v2_alpha/knock.py
+++ b/synapse/rest/client/v2_alpha/knock.py
@@ -25,6 +25,7 @@ from synapse.http.servlet import (
parse_json_object_from_request,
parse_list_from_args,
)
+from synapse.http.site import SynapseRequest
from synapse.logging.opentracing import set_tag
from synapse.rest.client.transactions import HttpTransactionCache
from synapse.types import JsonDict, RoomAlias, RoomID
@@ -54,7 +55,7 @@ class KnockRoomAliasServlet(RestServlet):
async def on_POST(
self,
- request: Request,
+ request: SynapseRequest,
room_identifier: str,
txn_id: Optional[str] = None,
) -> Tuple[int, JsonDict]:
@@ -68,7 +69,7 @@ class KnockRoomAliasServlet(RestServlet):
if RoomID.is_valid(room_identifier):
room_id = room_identifier
try:
- remote_room_hosts = parse_list_from_args(request.args, "server_name")
+ remote_room_hosts = parse_list_from_args(request.args, "server_name") # type: ignore
except KeyError:
remote_room_hosts = None
elif RoomAlias.is_valid(room_identifier):
|
