Fix all the type issues

Author: Fizzadar

synapse/appservice/scheduler.py

@@ -475,7 +475,7 @@ def __init__(
         self.as_api = as_api
         self.service = service
         self.callback = callback
-        self.backoff_counter = 0
+        self.backoff_counter = 0.0
 
     def recover(self) -> None:
         def _retry() -> None:

synapse/handlers/room_batch.py

@@ -285,7 +285,7 @@ async def persist_historical_events(
         app_service_requester: Requester,
         also_allow_user: Optional[str],
         beeper_new_messages: bool,
-        beeper_initial_prev_event_ids: List[str] = None,
+        beeper_initial_prev_event_ids: Optional[List[str]] = None,
     ) -> List[str]:
         """Create and persists all events provided sequentially. Handles the
         complexity of creating events in chronological order so they can
@@ -426,13 +426,13 @@ async def handle_batch_of_events(
         self,
         events_to_create: List[JsonDict],
         room_id: str,
-        batch_id_to_connect_to: str,
+        batch_id_to_connect_to: Optional[str],
         inherited_depth: int,
         initial_state_event_ids: List[str],
         app_service_requester: Requester,
         also_allow_user: Optional[str],
         beeper_new_messages: bool,
-        beeper_initial_prev_event_ids: List[str] = None,
+        beeper_initial_prev_event_ids: Optional[List[str]] = None,
     ) -> Tuple[List[str], str]:
         """
         Handles creating and persisting all of the historical events as well as

synapse/http/__init__.py

@@ -101,5 +101,5 @@ def get_request_user_agent(request: IRequest, default: str = "") -> str:
 
 
 def get_request_beeper_bridge(request: IRequest) -> str:
-    h = request.getHeader(b"X-Beeper-Bridge")  # type: ignore
+    h = request.getHeader(b"X-Beeper-Bridge")
     return h.decode("ascii", "replace") if h else ""

synapse/push/bulk_push_rule_evaluator.py

@@ -61,7 +61,7 @@ def _should_count_as_unread(
             return isinstance(body, str) and bool(body)
         # Beeper: We want reactions to only count as unread if they're reactions to the current user in rooms that
         # have fewer than 20 users.
-        elif event.type == "m.reaction":
+        elif event.type == "m.reaction" and related_event:
             return (
                 related_event.sender == current_user and non_bot_room_members_count < 20
             )

synapse/push/push_rule_evaluator.py

@@ -136,7 +136,7 @@ def __init__(
 
         self._related_event = related_event
         self._related_event_value_cache = (
-            _flatten_dict(related_event) if related_event else None
+            _flatten_dict(related_event) if related_event else {}
         )
 
         # Maps cache keys to final values.

synapse/rest/admin/users.py

@@ -94,7 +94,7 @@ async def on_GET(self, request: SynapseRequest) -> Tuple[int, JsonDict]:
         name = parse_string(request, "name")
         guests = parse_boolean(request, "guests", default=True)
         deactivated = parse_boolean(request, "deactivated", default=False)
-        appservice = parse_string(request, "appservice", default=False)
+        appservice = parse_string(request, "appservice")
 
         order_by = parse_string(
             request,

synapse/rest/client/room_batch.py

@@ -15,7 +15,7 @@
 import logging
 import re
 from http import HTTPStatus
-from typing import TYPE_CHECKING, Awaitable, Tuple
+from typing import TYPE_CHECKING, Awaitable, Optional, Tuple
 
 from twisted.web.server import Request
 
@@ -107,8 +107,8 @@ async def on_POST(
             if self.enable_also_allow_user
             else None
         )
-        beeper_new_messages = parse_boolean_from_args(
-            request.args, "com.beeper.new_messages"
+        beeper_new_messages = (
+            parse_boolean_from_args(request.args, "com.beeper.new_messages") or False
         )
 
         if prev_event_ids_from_query is None:
@@ -228,6 +228,8 @@ async def on_POST(
                 EventContentFields.MSC2716_NEXT_BATCH_ID
             ]
 
+        next_batch_id: Optional[str]
+
         # Create and persist all of the historical events as well as insertion
         # and batch meta events to make the batch navigable in the DAG.
         event_ids, next_batch_id = await self.room_batch_handler.handle_batch_of_events(

synapse/storage/databases/main/__init__.py

@@ -228,7 +228,7 @@ async def get_users_paginate(
         deactivated: bool = False,
         order_by: str = UserSortOrder.USER_ID.value,
         direction: str = "f",
-        appservice: bool = False,
+        appservice: Optional[str] = None,
     ) -> Tuple[List[JsonDict], int]:
         """Function to retrieve a paginated list of users from
         users list. This will return a json list of users and the

synapse/storage/databases/main/roommember.py

@@ -407,7 +407,7 @@ async def get_number_joined_users_in_room(self, room_id: str) -> int:
     async def get_number_joined_non_bot_users_in_room(self, room_id: str) -> int:
         def _get_number_joined_non_bot_users_in_room_txn(
             txn: LoggingTransaction,
-        ) -> Dict[str, MemberSummary]:
+        ) -> int:
             sql = """
                 SELECT COUNT(*)
                 FROM current_state_events

tests/replication/slave/storage/test_receipts.py

@@ -29,7 +29,7 @@ class SlavedReceiptTestCase(BaseSlavedStoreTestCase):
     STORE_TYPE = SlavedReceiptsStore
 
     def prepare(self, reactor, clock, homeserver):
-        self.clock._reactor.advance(1)
+        self.clock._reactor.advance(1)  # type: ignore
 
         super().prepare(reactor, clock, homeserver)
         self.room_creator = homeserver.get_room_creation_handler()