Merge pull request CSS360-2026-Winter#163 from gracefulliberty/black-update

Check code formatting in CI

Author: rdum4

.github/workflows/pylint.yml

@@ -1,4 +1,4 @@
-name: Pylint
+name: Pylint and Format
 
 on:
   push:
@@ -24,7 +24,9 @@ jobs:
       run: |
         python -m pip install --upgrade pip
         python -m pip install pylint
+        python -m pip install black
         python -m pip install .[test]
     - name: Analysing the code with pylint
       run: |
         pylint $(git ls-files '*.py')
+        black --check $(git ls-files '*.py')

controllers/uno_cog.py

@@ -159,7 +159,7 @@ async def play(
         except (discord.Forbidden, discord.HTTPException):
             pass
 
-# pylint: disable=duplicate-code
+    # pylint: disable=duplicate-code
     @app_commands.command(name="kick", description="Kick a player from the game.")
     async def kick(self, interaction: discord.Interaction, player: discord.Member):
         """Allows the host to remove a player from the current game."""
@@ -172,33 +172,27 @@ async def kick(self, interaction: discord.Interaction, player: discord.Member):
 
             if interaction.user.id != lobby.user.id:
                 raise GameError(
-                    "Only the host can kick players.",
-                    private=True,
-                    title="Host Only"
+                    "Only the host can kick players.", private=True, title="Host Only"
                 )
 
             if player.id not in lobby.game.players():
                 raise GameError(
                     "That player is not in the game.",
                     private=True,
-                    title="Player Not Found"
+                    title="Player Not Found",
                 )
 
             self.game_service.kick_player(cid, player.id)
 
         except GameError as e:
             embed = self._renderer.lobby_views.error_embed(
-                "Game Error" if e.title == "" else e.title,
-                str(e)
+                "Game Error" if e.title == "" else e.title, str(e)
             )
             await interaction.followup.send(embeds=[embed], ephemeral=e.private)
             return
 
         await self._renderer.update_by_message_id(
-            self.bot,
-            cid,
-            lobby.main_message,
-            lobby
+            self.bot, cid, lobby.main_message, lobby
         )
 
         try:
@@ -207,8 +201,7 @@ async def kick(self, interaction: discord.Interaction, player: discord.Member):
             pass
 
         await interaction.followup.send(
-            f"{player.display_name} was kicked from the game.",
-            ephemeral=True
+            f"{player.display_name} was kicked from the game.", ephemeral=True
         )
 
     async def dm_current_player_turn(self, lobby, channel_id: int) -> None:
@@ -266,10 +259,7 @@ async def run_afk_timer(
                 game.draw_and_pass(player_id)
 
                 # update last move
-                lobby.last_move = {
-                    "type": "draw",
-                    "player": player_id
-                }
+                lobby.last_move = {"type": "draw", "player": player_id}
 
                 channel = self.bot.get_channel(channel_id)
                 if channel:

models/game_state.py

@@ -31,6 +31,7 @@ class Phase(Enum):
     PLAYING is when the game is being played and players can play cards. FINISHED is when the game
     has ended and a winner has been declared.
     """
+
     LOBBY = auto()
     PLAYING = auto()
     FINISHED = auto()
@@ -40,6 +41,7 @@ class Direction(Enum):
     """
     The current direction of turn progression.
     """
+
     COUNTER_CLOCKWISE = auto()
     CLOCKWISE = auto()
 
@@ -48,6 +50,7 @@ class GameError(Exception):
     """
     Describes an error that has occurred with the game.
     """
+
     def __init__(self, msg: str, private: bool = False, title: str = ""):
         super().__init__(msg)
         self.private = private
@@ -59,6 +62,7 @@ class PlayResult:
     """
     The result of a played card, containing information about its effects on the game.
     """
+
     # pylint: disable=too-many-instance-attributes
     played_by: int
     played_card: Card
@@ -78,6 +82,7 @@ class DrawResult:
     The result of drawing cards, containing information about who drew the cards and whose turn is
     next.
     """
+
     user_id: int
     drawn: list[Card]
     next_player: int
@@ -124,7 +129,7 @@ def _new_state(self) -> dict[str, Any]:
             "turn_index": 0,  # index representing which users turn it is
             "turn_count": 0,  # counter representing the current turn #
             "afk_deadline": None,  # AFK timer deadline (UTC datetime)
-            "uno_grace_until": 0.0, # timestamp when others may start catching
+            "uno_grace_until": 0.0,  # timestamp when others may start catching
             "uno_vulnerable": None,  # user_id who has 1 card and can be caught
             "direction": Direction.CLOCKWISE,
             "winner": None,
@@ -551,7 +556,9 @@ def _now(self) -> float:
         return time.monotonic()
 
     def _set_afk_deadline(self, seconds: int = 60) -> None:
-        self.state["afk_deadline"] = datetime.now(timezone.utc) + timedelta(seconds=seconds)
+        self.state["afk_deadline"] = datetime.now(timezone.utc) + timedelta(
+            seconds=seconds
+        )
 
     def _clear_afk_deadline(self) -> None:
         self.state["afk_deadline"] = None

ui/game_ui.py

@@ -116,10 +116,7 @@ async def draw_card_and_pass(
             self.game_service.draw(interaction.channel_id, interaction.user.id)
 
             # record draw as last move so the embed can show it
-            self.lobby.last_move = {
-                "type": "draw",
-                "player": interaction.user.id
-            }
+            self.lobby.last_move = {"type": "draw", "player": interaction.user.id}
 
         except GameError as e:
             embed = self._renderer.lobby_views.error_embed(