Fix handling of stream tokens for push

changelog.d/8943.misc

@@ -0,0 +1 @@
+Add type hints to push module.

synapse/push/emailpusher.py

@@ -172,7 +172,6 @@ async def _unsafe_process(self) -> None:
         being run.
         """
         start = 0 if INCLUDE_ALL_UNREAD_NOTIFS else self.last_stream_ordering
-        assert self.max_stream_ordering is not None
         unprocessed = await self.store.get_unread_push_actions_for_user_in_range_for_email(
             self.user_id, start, self.max_stream_ordering
         )

synapse/push/httppusher.py

@@ -192,10 +192,7 @@ async def _unsafe_process(self) -> None:
         Never call this directly: use _process which will only allow this to
         run once per pusher.
         """
-
-        fn = self.store.get_unread_push_actions_for_user_in_range_for_http
-        assert self.max_stream_ordering is not None
-        unprocessed = await fn(
+        unprocessed = await self.store.get_unread_push_actions_for_user_in_range_for_http(
             self.user_id, self.last_stream_ordering, self.max_stream_ordering
         )
 

synapse/storage/databases/main/event_push_actions.py

@@ -209,7 +209,7 @@ async def get_unread_push_actions_for_user_in_range_for_http(
         self,
         user_id: str,
         min_stream_ordering: int,
-        max_stream_ordering: int,
+        max_stream_ordering: Optional[int],
         limit: int = 20,
     ) -> List[dict]:
         """Get a list of the most recent unread push actions for a given user,
@@ -314,7 +314,7 @@ async def get_unread_push_actions_for_user_in_range_for_email(
         self,
         user_id: str,
         min_stream_ordering: int,
-        max_stream_ordering: int,
+        max_stream_ordering: Optional[int],
         limit: int = 20,
     ) -> List[dict]:
         """Get a list of the most recent unread push actions for a given user,