Run black/isort on everything

Keeps us closer inline with upstream.

Author: Fizzadar

synapse/api/auth.py

@@ -285,7 +285,10 @@ async def _wrapped_get_user_by_req(
             raise MissingClientTokenError()
 
     async def validate_appservice_can_control_user_id(
-        self, app_service: ApplicationService, user_id: str, also_allow_user: Optional[str] = None
+        self,
+        app_service: ApplicationService,
+        user_id: str,
+        also_allow_user: Optional[str] = None,
     ) -> None:
         """Validates that the app service is allowed to control
         the given user.
@@ -305,7 +308,10 @@ async def validate_appservice_can_control_user_id(
         if app_service.sender == user_id:
             pass
         # Check to make sure the app service is allowed to control the user
-        elif not app_service.is_interested_in_user(user_id) and user_id != also_allow_user:
+        elif (
+            not app_service.is_interested_in_user(user_id)
+            and user_id != also_allow_user
+        ):
             raise AuthError(
                 403,
                 "Application service cannot masquerade as this user (%s)." % user_id,

synapse/appservice/api.py

@@ -54,11 +54,15 @@
 )
 
 sent_ephemeral_counter = Counter(
-    "synapse_appservice_api_sent_ephemeral", "Number of ephemeral events sent to the AS", ["service"]
+    "synapse_appservice_api_sent_ephemeral",
+    "Number of ephemeral events sent to the AS",
+    ["service"],
 )
 
 sent_todevice_counter = Counter(
-    "synapse_appservice_api_sent_todevice", "Number of todevice messages sent to the AS", ["service"]
+    "synapse_appservice_api_sent_todevice",
+    "Number of todevice messages sent to the AS",
+    ["service"],
 )
 
 HOUR_IN_MS = 60 * 60 * 1000

synapse/config/experimental.py

@@ -32,7 +32,9 @@ def read_config(self, config: JsonDict, **kwargs: Any) -> None:
         # MSC2716 (importing historical messages)
         self.msc2716_enabled: bool = experimental.get("msc2716_enabled", False)
 
-        self.msc2716_also_allow_user: bool = experimental.get("com.beeper.msc2716_also_allow_user", False)
+        self.msc2716_also_allow_user: bool = experimental.get(
+            "com.beeper.msc2716_also_allow_user", False
+        )
 
         # MSC2285 (private read receipts)
         self.msc2285_enabled: bool = experimental.get("msc2285_enabled", False)

synapse/handlers/message.py

@@ -1359,7 +1359,9 @@ async def _persist_event(
         # The historical messages also do not have the proper `context.current_state_ids`
         # and `state_groups` because they have `prev_events` that aren't persisted yet
         # (historical messages persisted in reverse-chronological order).
-        if not event.internal_metadata.is_historical() and not event.content.get(EventContentFields.MSC2716_HISTORICAL):
+        if not event.internal_metadata.is_historical() and not event.content.get(
+            EventContentFields.MSC2716_HISTORICAL
+        ):
             await self._bulk_push_rule_evaluator.action_for_event_by_user(
                 event, context
             )
@@ -1394,7 +1396,12 @@ async def _persist_event(
                 return event
 
             event = await self.persist_and_notify_client_event(
-                requester, event, context, ratelimit=ratelimit, extra_users=extra_users, dont_notify=dont_notify,
+                requester,
+                event,
+                context,
+                ratelimit=ratelimit,
+                extra_users=extra_users,
+                dont_notify=dont_notify,
             )
 
             return event

synapse/handlers/pagination.py

@@ -17,8 +17,8 @@
 from typing import TYPE_CHECKING, Collection, Dict, List, Optional, Set
 
 import attr
-
 from prometheus_client import Histogram
+
 from twisted.python.failure import Failure
 
 from synapse.api.constants import EventTypes, Membership

synapse/handlers/read_marker.py

@@ -15,8 +15,8 @@
 import logging
 from typing import TYPE_CHECKING, Optional
 
-from synapse.util.async_helpers import Linearizer
 from synapse.types import JsonDict
+from synapse.util.async_helpers import Linearizer
 
 if TYPE_CHECKING:
     from synapse.server import HomeServer
@@ -32,7 +32,11 @@ def __init__(self, hs: "HomeServer"):
         self.read_marker_linearizer = Linearizer(name="read_marker")
 
     async def received_client_read_marker(
-        self, room_id: str, user_id: str, event_id: str, extra_content: Optional[JsonDict] = None
+        self,
+        room_id: str,
+        user_id: str,
+        event_id: str,
+        extra_content: Optional[JsonDict] = None,
     ) -> None:
         """Updates the read marker for a given user in a given room if the event ID given
         is ahead in the stream relative to the current read marker.

synapse/handlers/receipts.py

@@ -146,7 +146,11 @@ async def _handle_new_receipts(self, receipts: List[ReadReceipt]) -> bool:
         return True
 
     async def received_client_receipt(
-        self, room_id: str, receipt_type: str, user_id: str, event_id: str,
+        self,
+        room_id: str,
+        receipt_type: str,
+        user_id: str,
+        event_id: str,
         extra_content: Optional[JsonDict] = None,
     ) -> None:
         """Called when a client tells us a local user has read up to the given

synapse/handlers/room.py

@@ -32,8 +32,8 @@
 )
 
 import attr
-from typing_extensions import TypedDict
 from prometheus_client import Histogram
+from typing_extensions import TypedDict
 
 import synapse.events.snapshot
 from synapse.api.constants import (

synapse/handlers/room_batch.py

@@ -1,5 +1,5 @@
 import logging
-from typing import TYPE_CHECKING, List, Tuple, Optional
+from typing import TYPE_CHECKING, List, Optional, Tuple
 
 from synapse.api.constants import EventContentFields, EventTypes
 from synapse.appservice import ApplicationService
@@ -104,7 +104,10 @@ def create_insertion_event_dict(
         return insertion_event
 
     async def create_requester_for_user_id_from_app_service(
-        self, user_id: str, app_service: ApplicationService, also_allow_user: Optional[str] = None,
+        self,
+        user_id: str,
+        app_service: ApplicationService,
+        also_allow_user: Optional[str] = None,
     ) -> Requester:
         """Creates a new requester for the given user_id
         and validates that the app service is allowed to control
@@ -119,7 +122,9 @@ async def create_requester_for_user_id_from_app_service(
             Requester object
         """
 
-        await self.auth.validate_appservice_can_control_user_id(app_service, user_id, also_allow_user)
+        await self.auth.validate_appservice_can_control_user_id(
+            app_service, user_id, also_allow_user
+        )
 
         return create_requester(user_id, app_service=app_service)
 
@@ -212,7 +217,8 @@ async def persist_state_events_at_start(
                 membership = event_dict["content"].get("membership", None)
                 event_id, _ = await self.room_member_handler.update_membership(
                     await self.create_requester_for_user_id_from_app_service(
-                        state_event["sender"], app_service_requester.app_service,
+                        state_event["sender"],
+                        app_service_requester.app_service,
                         also_allow_user,
                     ),
                     target=UserID.from_string(event_dict["state_key"]),
@@ -241,7 +247,8 @@ async def persist_state_events_at_start(
                     _,
                 ) = await self.event_creation_handler.create_and_send_nonmember_event(
                     await self.create_requester_for_user_id_from_app_service(
-                        state_event["sender"], app_service_requester.app_service,
+                        state_event["sender"],
+                        app_service_requester.app_service,
                         also_allow_user,
                     ),
                     event_dict,
@@ -341,7 +348,9 @@ async def persist_historical_events(
 
             event, context = await self.event_creation_handler.create_event(
                 await self.create_requester_for_user_id_from_app_service(
-                    ev["sender"], app_service_requester.app_service, also_allow_user,
+                    ev["sender"],
+                    app_service_requester.app_service,
+                    also_allow_user,
                 ),
                 event_dict,
                 # Only the first event (which is the insertion event) in the
@@ -386,11 +395,13 @@ async def persist_historical_events(
             for index, (event, context) in enumerate(events_to_persist):
                 await self.event_creation_handler.handle_new_client_event(
                     await self.create_requester_for_user_id_from_app_service(
-                        event.sender, app_service_requester.app_service, also_allow_user,
+                        event.sender,
+                        app_service_requester.app_service,
+                        also_allow_user,
                     ),
                     event=event,
                     context=context,
-                    dont_notify=index < len(events_to_persist) - 1
+                    dont_notify=index < len(events_to_persist) - 1,
                 )
             return event_ids
 
@@ -401,7 +412,9 @@ async def persist_historical_events(
         for (event, context) in reversed(events_to_persist):
             await self.event_creation_handler.handle_new_client_event(
                 await self.create_requester_for_user_id_from_app_service(
-                    event.sender, app_service_requester.app_service, also_allow_user,
+                    event.sender,
+                    app_service_requester.app_service,
+                    also_allow_user,
                 ),
                 event=event,
                 context=context,

synapse/push/bulk_push_rule_evaluator.py

@@ -15,19 +15,19 @@
 
 import itertools
 import logging
+import re
 from typing import TYPE_CHECKING, Any, Dict, Iterable, List, Optional, Set, Tuple, Union
 
 import attr
-import re
 from prometheus_client import Counter
 
 from synapse.api.constants import EventTypes, Membership, RelationTypes
 from synapse.event_auth import auth_types_for_event, get_user_power_level
 from synapse.events import EventBase, relation_from_event
 from synapse.events.snapshot import EventContext
 from synapse.state import POWER_KEY
-from synapse.storage.roommember import ProfileInfo
 from synapse.storage.databases.main.roommember import EventIdMembership
+from synapse.storage.roommember import ProfileInfo
 from synapse.util.async_helpers import Linearizer
 from synapse.util.caches import CacheMetric, register_cache
 from synapse.util.caches.descriptors import lru_cache
@@ -67,7 +67,7 @@ def _should_count_as_unread(
     context: EventContext,
     room_members: Dict[str, ProfileInfo],
     current_user: str,
-    related_event: Optional[EventBase]
+    related_event: Optional[EventBase],
 ) -> bool:
     # Exclude rejected and soft-failed events.
     if context.rejected or event.internal_metadata.is_soft_failed():
@@ -266,7 +266,9 @@ async def action_for_event_by_user(
 
         related_event_id = event.content.get("m.relates_to", {}).get("event_id")
         related_event = (
-            (await self.store.get_event(related_event_id, allow_none=True)) if related_event_id else None
+            (await self.store.get_event(related_event_id, allow_none=True))
+            if related_event_id
+            else None
         )
 
         non_bot_room_members = [x for x in room_members if not BOT_PATTERN.match(x)]
@@ -318,7 +320,9 @@ async def action_for_event_by_user(
 
             # Beeper: Need to calculate this per user as whether it should count as unread or not depends on who the
             # current user is
-            count_as_unread_by_user[uid] = _should_count_as_unread(event, context, non_bot_room_members, uid, related_event)
+            count_as_unread_by_user[uid] = _should_count_as_unread(
+                event, context, non_bot_room_members, uid, related_event
+            )
 
             if count_as_unread_by_user[uid]:
                 # Add an element for the current user if the event needs to be marked as