Update Black to 2024 style and Python 3.10 target

.github/workflows/python-lint.yml

@@ -16,7 +16,7 @@ jobs:
     - uses: psf/black@stable
       with:
         src: "./mautrix_telegram"
-        version: "23.11.0"
+        version: "24.1.1"
     - name: pre-commit
       run: |
         pip install pre-commit

.pre-commit-config.yaml

@@ -1,6 +1,6 @@
 repos:
   - repo: https://github.com/pre-commit/pre-commit-hooks
-    rev: v4.4.0
+    rev: v4.5.0
     hooks:
       - id: trailing-whitespace
         exclude_types: [markdown]
@@ -8,13 +8,13 @@ repos:
       - id: check-yaml
       - id: check-added-large-files
   - repo: https://github.com/psf/black
-    rev: 23.1.0
+    rev: 24.1.1
     hooks:
       - id: black
         language_version: python3
         files: ^mautrix_telegram/.*\.pyi?$
   - repo: https://github.com/PyCQA/isort
-    rev: 5.12.0
+    rev: 5.13.2
     hooks:
       - id: isort
         files: ^mautrix_telegram/.*\.pyi?$

dev-requirements.txt

@@ -1,3 +1,3 @@
 pre-commit>=2.10.1,<3
 isort>=5.10.1,<6
-black>=23,<24
+black>=24,<25

mautrix_telegram/db/telethon_session.py

@@ -208,9 +208,9 @@ class PgSession(MemorySession):
             await self._locked_process_entities(tlo)
 
     async def _locked_process_entities(self, tlo) -> None:
-        rows: list[
+        rows: list[tuple[str, int, int, str | None, str | None, str | None]] = (
-            tuple[str, int, int, str | None, str | None, str | None]
+            self._entities_to_rows(tlo)
-        ] = self._entities_to_rows(tlo)
+        )
         if not rows:
             return
         if self.db.scheme == Scheme.POSTGRES:

mautrix_telegram/portal_util/power_levels.py

@@ -83,9 +83,11 @@ def get_base_power_levels(
         levels.users_default = overrides.get("users_default", 0)
         levels.events_default = overrides.get(
             "events_default",
-            50
+            (
-            if portal.peer_type == "channel" and not portal.megagroup or dbr.send_messages
+                50
-            else 0,
+                if portal.peer_type == "channel" and not portal.megagroup or dbr.send_messages
+                else 0
+            ),
         )
     for evt_type, value in overrides.get("events", {}).items():
         levels.events[EventType.find(evt_type)] = value

mautrix_telegram/user.py

@@ -298,9 +298,11 @@ class User(DBUser, AbstractUser, BaseUser):
             self._track_metric(METRIC_CONNECTED, connected)
             if connected:
                 await self.push_bridge_state(
-                    BridgeStateEvent.BACKFILLING
+                    (
-                    if self._is_backfilling
+                        BridgeStateEvent.BACKFILLING
-                    else BridgeStateEvent.CONNECTED,
+                        if self._is_backfilling
+                        else BridgeStateEvent.CONNECTED
+                    ),
                     info=self._bridge_state_info,
                 )
             else:

mautrix_telegram/web/provisioning/__init__.py

@@ -130,9 +130,9 @@ class ProvisioningAPI(AuthAPI):
                 "about": portal.about,
                 "username": portal.username,
                 "megagroup": portal.megagroup,
-                "can_unbridge": (await portal.can_user_perform(user, "unbridge"))
+                "can_unbridge": (
-                if user
+                    (await portal.can_user_perform(user, "unbridge")) if user else False
-                else False,
+                ),
             }
         )
 
@@ -188,9 +188,11 @@ class ProvisioningAPI(AuthAPI):
             if force in ("delete", "unbridge"):
                 delete = force == "delete"
                 await portal.cleanup_portal(
-                    "Portal deleted (moving to another room)"
+                    (
-                    if delete
+                        "Portal deleted (moving to another room)"
-                    else "Room unbridged (portal moving to another room)",
+                        if delete
+                        else "Room unbridged (portal moving to another room)"
+                    ),
                     puppets_only=not delete,
                 )
             else:

pyproject.toml

@@ -9,4 +9,4 @@ line_length = 99
 
 [tool.black]
 line-length = 99
-target-version = ["py38"]
+target-version = ["py310"]