Fix up type annotations for get_new_events on EventSource subclasses

synapse/handlers/account_data.py

@@ -174,6 +174,7 @@ def get_current_key(self, direction: str = "f") -> int:
     async def get_new_events(
         self,
         user: UserID,
+        *,
         from_key: int,
         limit: Optional[int],
         room_ids: Collection[str],

synapse/handlers/presence.py

@@ -52,6 +52,7 @@
 from synapse.api.constants import EventTypes, Membership, PresenceState
 from synapse.api.errors import SynapseError
 from synapse.api.presence import UserPresenceState
+from synapse.appservice import ApplicationService
 from synapse.events.presence_router import PresenceRouter
 from synapse.logging.context import run_in_background
 from synapse.logging.utils import log_function
@@ -1519,12 +1520,14 @@ def __init__(self, hs: "HomeServer"):
     async def get_new_events(
         self,
         user: UserID,
+        *,
         from_key: Optional[int],
         limit: Optional[int] = None,
-        room_ids: Optional[List[str]] = None,
+        room_ids: Optional[Collection[str]] = None,
         is_guest: bool = False,
         explicit_room_id: Optional[str] = None,
         include_offline: bool = True,
+        service: Optional[ApplicationService] = None,
     ) -> Tuple[List[UserPresenceState], int]:
         # The process for getting presence events are:
         #  1. Get the rooms the user is in.

synapse/handlers/receipts.py

@@ -219,6 +219,7 @@ def filter_out_hidden(events: List[JsonDict], user_id: str) -> List[JsonDict]:
     async def get_new_events(
         self,
         user: UserID,
+        *,
         from_key: int,
         limit: Optional[int],
         room_ids: Iterable[str],

synapse/handlers/room.py

@@ -1198,6 +1198,7 @@ def __init__(self, hs: "HomeServer"):
     async def get_new_events(
         self,
         user: UserID,
+        *,
         from_key: RoomStreamToken,
         limit: Optional[int],
         room_ids: Collection[str],

synapse/handlers/typing.py

@@ -488,6 +488,7 @@ async def get_new_events_as(
     async def get_new_events(
         self,
         user: UserID,
+        *,
         from_key: int,
         limit: Optional[int],
         room_ids: Iterable[str],

synapse/streams/__init__.py

@@ -26,6 +26,7 @@ class EventSource(Generic[K, R]):
     async def get_new_events(
         self,
         user: UserID,
+        *,
         from_key: K,
         limit: Optional[int],
         room_ids: Collection[str],