ruff + ty

jackharrhy · jackharrhy · commit 09d50084320e · 2026-06-22T23:04:47.000-02:30
diff --git a/alembic/env.py b/alembic/env.py
@@ -38,7 +38,10 @@ def run_migrations_offline() -> None:
 
 def run_migrations_online() -> None:
     connectable = engine_from_config(
-        {**config.get_section(config.config_ini_section, {}), "sqlalchemy.url": _resolve_url()},
+        {
+            **config.get_section(config.config_ini_section, {}),
+            "sqlalchemy.url": _resolve_url(),
+        },
         prefix="sqlalchemy.",
         poolclass=pool.NullPool,
     )
@@ -57,4 +60,4 @@ def run_migrations_online() -> None:
 if context.is_offline_mode():
     run_migrations_offline()
 else:
-    run_migrations_online()
+    run_migrations_online()
diff --git a/alembic/versions/0001_initial_schema.py b/alembic/versions/0001_initial_schema.py
@@ -34,8 +34,12 @@ def upgrade() -> None:
         "pots",
         sa.Column("pot_id", sa.Integer, primary_key=True, autoincrement=True),
         sa.Column("guild_id", sa.Text, nullable=False),
-        sa.Column("is_active", sa.Boolean, nullable=False, server_default=sa.text("TRUE")),
-        sa.Column("created_at", sa.TIMESTAMP, server_default=sa.text("CURRENT_TIMESTAMP")),
+        sa.Column(
+            "is_active", sa.Boolean, nullable=False, server_default=sa.text("TRUE")
+        ),
+        sa.Column(
+            "created_at", sa.TIMESTAMP, server_default=sa.text("CURRENT_TIMESTAMP")
+        ),
         sa.Column("ended_at", sa.TIMESTAMP, nullable=True),
         sa.Column("winner_discord_id", sa.Text, nullable=True),
         sa.Column("winning_amount", sa.Integer, nullable=True),
@@ -50,7 +54,9 @@ def upgrade() -> None:
         sa.Column("amount", sa.Integer, nullable=False),
         sa.Column("status", sa.Text, nullable=False, server_default="pending"),
         sa.Column("stackcoin_request_id", sa.Text, nullable=True),
-        sa.Column("created_at", sa.TIMESTAMP, server_default=sa.text("CURRENT_TIMESTAMP")),
+        sa.Column(
+            "created_at", sa.TIMESTAMP, server_default=sa.text("CURRENT_TIMESTAMP")
+        ),
         sa.ForeignKeyConstraint(["pot_id"], ["pots.pot_id"]),
     )
 
@@ -66,15 +72,22 @@ def upgrade() -> None:
         sa.Column("discord_id", sa.Text, nullable=False),
         sa.Column("guild_id", sa.Text, nullable=False),
         sa.Column("reason", sa.Text, nullable=False),
-        sa.Column("banned_at", sa.TIMESTAMP, server_default=sa.text("CURRENT_TIMESTAMP")),
+        sa.Column(
+            "banned_at", sa.TIMESTAMP, server_default=sa.text("CURRENT_TIMESTAMP")
+        ),
         sa.Column("expires_at", sa.TIMESTAMP, nullable=False),
     )
 
     op.create_table(
         "auto_enter_users",
         sa.Column("discord_id", sa.Text, nullable=False),
         sa.Column("guild_id", sa.Text, nullable=False),
-        sa.Column("enabled_at", sa.Text, nullable=False, server_default=sa.text("datetime('now')")),
+        sa.Column(
+            "enabled_at",
+            sa.Text,
+            nullable=False,
+            server_default=sa.text("datetime('now')"),
+        ),
         sa.PrimaryKeyConstraint("discord_id", "guild_id"),
     )
 
@@ -88,7 +101,9 @@ def upgrade() -> None:
         sqlite_where=sa.text("is_active = TRUE"),
     )
     op.create_index("idx_pot_entries_pot_id", "pot_entries", ["pot_id"])
-    op.create_index("idx_pot_entries_request_id", "pot_entries", ["stackcoin_request_id"])
+    op.create_index(
+        "idx_pot_entries_request_id", "pot_entries", ["stackcoin_request_id"]
+    )
     op.create_index(
         "idx_pot_entries_active_request_id_unique",
         "pot_entries",
@@ -98,16 +113,16 @@ def upgrade() -> None:
             "stackcoin_request_id IS NOT NULL AND status IN ('pending', 'confirmed')"
         ),
     )
-    op.create_index("idx_user_bans_lookup", "user_bans", ["discord_id", "guild_id", "expires_at"])
+    op.create_index(
+        "idx_user_bans_lookup", "user_bans", ["discord_id", "guild_id", "expires_at"]
+    )
     op.create_index("idx_auto_enter_guild", "auto_enter_users", ["guild_id"])
 
 
 def downgrade() -> None:
     op.drop_index("idx_auto_enter_guild", table_name="auto_enter_users")
     op.drop_index("idx_user_bans_lookup", table_name="user_bans")
-    op.drop_index(
-        "idx_pot_entries_active_request_id_unique", table_name="pot_entries"
-    )
+    op.drop_index("idx_pot_entries_active_request_id_unique", table_name="pot_entries")
     op.drop_index("idx_pot_entries_request_id", table_name="pot_entries")
     op.drop_index("idx_pot_entries_pot_id", table_name="pot_entries")
     op.drop_index("idx_pots_one_active_per_guild", table_name="pots")
@@ -117,4 +132,4 @@ def downgrade() -> None:
     op.drop_table("user_bans")
     op.drop_table("gateway_state")
     op.drop_table("pot_entries")
-    op.drop_table("pots")
+    op.drop_table("pots")
diff --git a/alembic/versions/0002_add_rounds.py b/alembic/versions/0002_add_rounds.py
@@ -60,4 +60,4 @@ def downgrade() -> None:
         batch_op.drop_column("entry_round")
 
     with op.batch_alter_table("pots", schema=None) as batch_op:
-        batch_op.drop_column("current_round")
+        batch_op.drop_column("current_round")
diff --git a/lucky_pot.py b/lucky_pot.py
@@ -75,10 +75,13 @@ async def _fetch_stackcoin_discord_id_or_die() -> str:
             last_exc = RuntimeError("fetch_stackcoin_discord_id returned None")
         except stackcoin.StackCoinError as e:
             last_exc = e
-        delay = min(
-            STACKCOIN_CONNECT_MAX_DELAY,
-            STACKCOIN_CONNECT_BASE_DELAY * (2 ** (attempt - 1)),
-        ) + random.random()
+        delay = (
+            min(
+                STACKCOIN_CONNECT_MAX_DELAY,
+                STACKCOIN_CONNECT_BASE_DELAY * (2 ** (attempt - 1)),
+            )
+            + random.random()
+        )
         logger.warning(
             f"StackCoin not ready (attempt {attempt}/"
             f"{STACKCOIN_CONNECT_MAX_ATTEMPTS}), retrying in {delay:.1f}s: "
diff --git a/luckypot/db.py b/luckypot/db.py
@@ -4,7 +4,13 @@
 
 from loguru import logger
 from luckypot.config import settings
-from luckypot.types import PotEntryRow, PotEntryWithPotRow, PotRow, PotStatus, UserBanRow
+from luckypot.types import (
+    PotEntryRow,
+    PotEntryWithPotRow,
+    PotRow,
+    PotStatus,
+    UserBanRow,
+)
 
 
 def get_connection() -> sqlite3.Connection:
@@ -36,7 +42,9 @@ def init_database():
     from alembic.config import Config
 
     cfg = Config()
-    cfg.set_main_option("script_location", str(Path(__file__).parent.parent / "alembic"))
+    cfg.set_main_option(
+        "script_location", str(Path(__file__).parent.parent / "alembic")
+    )
     cfg.set_main_option("sqlalchemy.url", f"sqlite:///{db_path}")
     command.upgrade(cfg, "head")
 
@@ -54,14 +62,20 @@ def _is_legacy_db(db_path: Path) -> bool:
         return False
     conn = sqlite3.connect(str(db_path))
     try:
-        has_alembic = conn.execute(
-            "SELECT name FROM sqlite_master WHERE type='table' AND name='alembic_version'"
-        ).fetchone() is not None
+        has_alembic = (
+            conn.execute(
+                "SELECT name FROM sqlite_master WHERE type='table' AND name='alembic_version'"
+            ).fetchone()
+            is not None
+        )
         if has_alembic:
             return False
-        has_pots = conn.execute(
-            "SELECT name FROM sqlite_master WHERE type='table' AND name='pots'"
-        ).fetchone() is not None
+        has_pots = (
+            conn.execute(
+                "SELECT name FROM sqlite_master WHERE type='table' AND name='pots'"
+            ).fetchone()
+            is not None
+        )
         return has_pots
     finally:
         conn.close()
@@ -76,7 +90,9 @@ def _stamp_legacy_db(db_path: Path) -> None:
         f"Legacy pre-alembic database detected at {db_path}; stamping to 0001_initial"
     )
     cfg = Config()
-    cfg.set_main_option("script_location", str(Path(__file__).parent.parent / "alembic"))
+    cfg.set_main_option(
+        "script_location", str(Path(__file__).parent.parent / "alembic")
+    )
     cfg.set_main_option("sqlalchemy.url", f"sqlite:///{db_path}")
     command.stamp(cfg, "0001_initial")
 
diff --git a/luckypot/discord/commands.py b/luckypot/discord/commands.py
@@ -182,6 +182,7 @@ async def invoke(self, ctx: lightbulb.Context) -> None:
                     # Always check preauth status even if already opted in,
                     # because the user may have revoked their preauth since.
                     from luckypot import stk as stk_mod
+
                     stk_user = await stk_mod.get_user_by_discord_id(discord_id)
                     if stk_user:
                         preauths = await stk_mod.get_preauths(user_id=stk_user["id"])
@@ -199,7 +200,9 @@ async def invoke(self, ctx: lightbulb.Context) -> None:
                                 window_hours=24,
                             )
                             if result:
-                                container = ui.build_auto_enter_opted_in_preauth_requested()
+                                container = (
+                                    ui.build_auto_enter_opted_in_preauth_requested()
+                                )
                             else:
                                 container = ui.build_auto_enter_opted_in()
                     else:
diff --git a/luckypot/discord/ui.py b/luckypot/discord/ui.py
@@ -102,7 +102,9 @@ def build_pot_status(status: PotStatus) -> ContainerComponentBuilder:
     return container
 
 
-def build_pot_history(history: list[PotRow], page: int = 1) -> ContainerComponentBuilder:
+def build_pot_history(
+    history: list[PotRow], page: int = 1
+) -> ContainerComponentBuilder:
     """Build the pot history display."""
     container = ContainerComponentBuilder(accent_color=BRAND_COLOR)
     header = "📜 Pot History" if page == 1 else f"📜 Pot History - Page {page}"
diff --git a/luckypot/game.py b/luckypot/game.py
@@ -291,7 +291,9 @@ async def process_pot_win(
             )
             retry_conn = db.get_connection()
             try:
-                db.end_pot(retry_conn, pot["pot_id"], winner_id, winning_amount, win_type)
+                db.end_pot(
+                    retry_conn, pot["pot_id"], winner_id, winning_amount, win_type
+                )
             except Exception:
                 db.reopen_pot_after_failed_payout(retry_conn, pot["pot_id"])
                 raise
@@ -585,7 +587,9 @@ async def on_request_accepted(
                     )
             elif entry["status"] == "pending":
                 if not db.confirm_pending_entry(conn, entry_id):
-                    logger.warning(f"Entry {entry_id} was no longer pending at confirm time")
+                    logger.warning(
+                        f"Entry {entry_id} was no longer pending at confirm time"
+                    )
                     return
                 logger.info(f"Entry {entry_id} confirmed for discord_id={discord_id}")
                 instant_win = await maybe_process_instant_win(
@@ -602,10 +606,8 @@ async def on_request_accepted(
                     if pot:
                         participants = db.get_pot_participants(conn, pot["pot_id"])
                         total_pot = sum(p["amount"] for p in participants)
-                    await announce(
-                        guild_id,
-                        f"<@{discord_id}> entered the pot! The pot is now at {total_pot} STK. Use `/enter-pot` to enter!",
-                        user_mentions=False,
+                    await announce_fn(
+                        f"<@{discord_id}> entered the pot! The pot is now at {total_pot} STK. Use `/enter-pot` to enter!"
                     )
             else:
                 logger.warning(
diff --git a/luckypot/stk.py b/luckypot/stk.py
@@ -70,7 +70,13 @@ async def get_user_by_discord_id(discord_id: str) -> StackCoinUser | None:
         if not users:
             return None
         user = users[0]
-        return {"id": user.id, "username": user.username, "balance": user.balance}
+        if user.id is None:
+            logger.error(f"StackCoin user for discord_id={discord_id} had no id")
+            return None
+        return cast(
+            StackCoinUser,
+            {"id": user.id, "username": user.username, "balance": user.balance},
+        )
     except stackcoin.StackCoinError as e:
         logger.error(f"Failed to look up user by discord_id={discord_id}: {e}")
         return None
@@ -135,7 +141,9 @@ async def create_preauth(
 async def get_preauths(user_id: int | None = None) -> list[StackCoinPreauth]:
     """List preauths for this bot."""
     try:
-        return cast(list[StackCoinPreauth], await get_client().get_preauths(user_id=user_id))
+        return cast(
+            list[StackCoinPreauth], await get_client().get_preauths(user_id=user_id)
+        )
     except stackcoin.StackCoinError as e:
         logger.error(f"Failed to get preauths: {e}")
         return []
