Update code style for new ruff rules

bot/bot.py

@@ -39,7 +39,7 @@ async def on_command_error(self, context: commands.Context, exception: DiscordEx
         else:
             await super().on_command_error(context, exception)
 
-    async def log_to_dev_log(self, title: str, details: str = None, *, icon: str = None) -> None:
+    async def log_to_dev_log(self, title: str, details: str | None = None, *, icon: str | None = None) -> None:
         """Send an embed message to the dev-log channel."""
         devlog = self.get_channel(constants.Channels.devlog)
 

bot/exts/core/internal_eval/_helpers.py

@@ -227,7 +227,7 @@ def visit_Expr(self, node: ast.Expr) -> ast.Expr | ast.Assign:  # noqa: N802
         log.trace("Found a trailing last expression in the evaluation code")
 
         log.trace("Creating assignment statement with trailing expression as the right-hand side")
-        right_hand_side = list(ast.iter_child_nodes(node))[0]
+        right_hand_side = next(iter(ast.iter_child_nodes(node)))
 
         assignment = ast.Assign(
             targets=[ast.Name(id="_value_last_expression", ctx=ast.Store())],

bot/exts/events/hacktoberfest/hacktoberstats.py

@@ -43,7 +43,7 @@ def __init__(self, bot: Bot):
 
     @in_month(Month.SEPTEMBER, Month.OCTOBER, Month.NOVEMBER)
     @commands.group(name="hacktoberstats", aliases=("hackstats",), invoke_without_command=True)
-    async def hacktoberstats_group(self, ctx: commands.Context, github_username: str = None) -> None:
+    async def hacktoberstats_group(self, ctx: commands.Context, github_username: str | None = None) -> None:
         """
         Display an embed for a user's Hacktoberfest contributions.
 
@@ -70,7 +70,7 @@ async def hacktoberstats_group(self, ctx: commands.Context, github_username: str
 
     @in_month(Month.SEPTEMBER, Month.OCTOBER, Month.NOVEMBER)
     @hacktoberstats_group.command(name="link")
-    async def link_user(self, ctx: commands.Context, github_username: str = None) -> None:
+    async def link_user(self, ctx: commands.Context, github_username: str | None = None) -> None:
         """
         Link the invoking user's Github github_username to their Discord ID.
 

bot/exts/events/trivianight/_game.py

@@ -134,7 +134,7 @@ def __init__(self, data: list[QuestionData]) -> None:
     def __iter__(self) -> Iterable[Question]:
         return iter(self._questions)
 
-    def next_question(self, number: str = None) -> Question:
+    def next_question(self, number: str | None = None) -> Question:
         """
         Consume one random question from the trivia night game.
 
@@ -145,7 +145,7 @@ def next_question(self, number: str = None) -> Question:
 
         if number is not None:
             try:
-                question = [q for q in self._all_questions if q.number == int(number)][0]
+                question = next(q for q in self._all_questions if q.number == int(number))
             except IndexError:
                 raise ValueError(f"Question number {number} does not exist.")
         elif len(self._questions) == 0:

bot/exts/events/trivianight/_scoreboard.py

@@ -155,7 +155,7 @@ def __init__(self, bot: Bot):
         self._points = {}
         self._speed = {}
 
-    def assign_points(self, user_id: int, *, points: int = None, speed: float = None) -> None:
+    def assign_points(self, user_id: int, *, points: int | None = None, speed: float | None = None) -> None:
         """
         Assign points or deduct points to/from a certain user.
 

bot/exts/events/trivianight/trivianight.py

@@ -107,7 +107,7 @@ async def load(self, ctx: commands.Context, *, to_load: str | None) -> None:
 
     @trivianight.command(aliases=("next",))
     @commands.has_any_role(*TRIVIA_NIGHT_ROLES)
-    async def question(self, ctx: commands.Context, question_number: str = None) -> None:
+    async def question(self, ctx: commands.Context, question_number: str | None = None) -> None:
         """
         Gets a random question from the unanswered question list and lets the user(s) choose the answer.
 

bot/exts/fun/snakes/_snakes_cog.py

@@ -279,9 +279,8 @@ async def _fetch(self, url: str, params: dict | None = None) -> dict:
         if params is None:
             params = {}
 
-        async with async_timeout.timeout(10):
-            async with self.bot.http_session.get(url, params=params) as response:
-                return await response.json()
+        async with async_timeout.timeout(10), self.bot.http_session.get(url, params=params) as response:
+            return await response.json()
 
     def _get_random_long_message(self, messages: list[str], retries: int = 10) -> str:
         """
@@ -846,7 +845,7 @@ async def quiz_command(self, ctx: Context) -> None:
         await self._validate_answer(ctx, quiz, answer, options)
 
     @snakes_group.command(name="name", aliases=("name_gen",))
-    async def name_command(self, ctx: Context, *, name: str = None) -> None:
+    async def name_command(self, ctx: Context, *, name: str | None = None) -> None:
         """
         Snakifies a username.
 
@@ -1001,9 +1000,8 @@ async def card_command(self, ctx: Context, *, name: Snake = None) -> None:
         async with ctx.typing():
 
             stream = BytesIO()
-            async with async_timeout.timeout(10):
-                async with self.bot.http_session.get(content["image_list"][0]) as response:
-                    stream.write(await response.read())
+            async with async_timeout.timeout(10), self.bot.http_session.get(content["image_list"][0]) as response:
+                stream.write(await response.read())
 
             stream.seek(0)
 
@@ -1033,7 +1031,7 @@ async def fact_command(self, ctx: Context) -> None:
         await ctx.send(embed=embed)
 
     @snakes_group.command(name="snakify")
-    async def snakify_command(self, ctx: Context, *, message: str = None) -> None:
+    async def snakify_command(self, ctx: Context, *, message: str | None = None) -> None:
         """
         How would I talk if I were a snake?
 
@@ -1068,7 +1066,7 @@ async def snakify_command(self, ctx: Context, *, message: str = None) -> None:
             await ctx.send(embed=embed)
 
     @snakes_group.command(name="video", aliases=("get_video",))
-    async def video_command(self, ctx: Context, *, search: str = None) -> None:
+    async def video_command(self, ctx: Context, *, search: str | None = None) -> None:
         """
         Gets a YouTube video about snakes.
 

bot/exts/holidays/halloween/monstersurvey.py

@@ -90,7 +90,7 @@ async def monster_group(self, ctx: Context) -> None:
     @monster_group.command(
         name="vote"
     )
-    async def monster_vote(self, ctx: Context, name: str = None) -> None:
+    async def monster_vote(self, ctx: Context, name: str | None = None) -> None:
         """
         Cast a vote for a particular monster.
 
@@ -141,7 +141,7 @@ async def monster_vote(self, ctx: Context, name: str = None) -> None:
     @monster_group.command(
         name="show"
     )
-    async def monster_show(self, ctx: Context, name: str = None) -> None:
+    async def monster_show(self, ctx: Context, name: str | None = None) -> None:
         """Shows the named monster. If one is not named, it sends the default voting embed instead."""
         if name is None:
             await ctx.invoke(self.monster_leaderboard)

bot/exts/holidays/pride/pride_anthem.py

@@ -32,7 +32,7 @@ def get_video(self, genre: str | None = None) -> dict:
             log.info("No videos for that genre.")
 
     @commands.command(name="prideanthem", aliases=("anthem", "pridesong"))
-    async def prideanthem(self, ctx: commands.Context, genre: str = None) -> None:
+    async def prideanthem(self, ctx: commands.Context, genre: str | None = None) -> None:
         """
         Sends a message with a video of a random pride anthem.
 

bot/exts/holidays/pride/pride_facts.py

@@ -38,7 +38,7 @@ async def send_select_fact(self, target: discord.abc.Messageable, day_num: int)
             return
 
     @commands.command(name="pridefact", aliases=("pridefacts",))
-    async def pridefact(self, ctx: commands.Context, option: int | str = None) -> None:
+    async def pridefact(self, ctx: commands.Context, option: int | str | None = None) -> None:
         """
         Sends a message with a pride fact of the day.
 

bot/exts/holidays/pride/pride_leader.py

@@ -57,7 +57,7 @@ def invalid_embed_generate(self, pride_leader: str) -> discord.Embed:
 
     def embed_builder(self, pride_leader: dict) -> discord.Embed:
         """Generate an Embed with information about a pride leader."""
-        name = [name for name, info in PRIDE_RESOURCE.items() if info == pride_leader][0]
+        name = next(name for name, info in PRIDE_RESOURCE.items() if info == pride_leader)
 
         embed = discord.Embed(
             title=name,

bot/exts/holidays/valentines/be_my_valentine.py

@@ -44,7 +44,7 @@ async def lovefest_role(self, ctx: commands.Context) -> None:
     @commands.cooldown(1, 1800, commands.BucketType.user)
     @commands.group(name="bemyvalentine", invoke_without_command=True)
     async def send_valentine(
-        self, ctx: commands.Context, user: discord.Member, *, valentine_type: str = None
+        self, ctx: commands.Context, user: discord.Member, *, valentine_type: str | None = None
     ) -> None:
         """
         Send a valentine to a specified user with the lovefest role.
@@ -83,7 +83,7 @@ async def send_valentine(
     @commands.cooldown(1, 1800, commands.BucketType.user)
     @send_valentine.command(name="secret")
     async def anonymous(
-        self, ctx: commands.Context, user: discord.Member, *, valentine_type: str = None
+        self, ctx: commands.Context, user: discord.Member, *, valentine_type: str | None = None
     ) -> None:
         """
         Send an anonymous Valentine via DM to to a specified user with the lovefest role.

bot/exts/holidays/valentines/myvalenstate.py

@@ -39,7 +39,7 @@ def levenshtein(self, source: str, goal: str) -> int:
         return pre_row[-1]
 
     @commands.command()
-    async def myvalenstate(self, ctx: commands.Context, *, name: str = None) -> None:
+    async def myvalenstate(self, ctx: commands.Context, *, name: str | None = None) -> None:
         """Find the vacation spot(s) with the most matching characters to the invoking user."""
         eq_chars = collections.defaultdict(int)
         if name is None:

bot/exts/utilities/challenges.py

@@ -258,7 +258,7 @@ def create_view(dropdown: InformationDropdown, link: str) -> ui.View:
 
     @commands.command(aliases=["kata"])
     @commands.cooldown(1, 5, commands.BucketType.user)
-    async def challenge(self, ctx: commands.Context, language: str = "python", *, query: str = None) -> None:
+    async def challenge(self, ctx: commands.Context, language: str = "python", *, query: str | None = None) -> None:
         """
         The challenge command pulls a random kata (challenge) from codewars.com.
 

bot/exts/utilities/colour.py

@@ -241,7 +241,7 @@ def _rgb_to_name(self, rgb: tuple[int, int, int]) -> str | None:
                 choices=self.colour_mapping.values(),
                 score_cutoff=80
             )
-            colour_name = [name for name, hex_code in self.colour_mapping.items() if hex_code == match][0]
+            colour_name = next(name for name, hex_code in self.colour_mapping.items() if hex_code == match)
         except TypeError:
             colour_name = None
         return colour_name

bot/exts/utilities/emoji.py

@@ -78,7 +78,7 @@ async def emoji_group(self, ctx: commands.Context, emoji: Emoji | None) -> None:
             await self.bot.invoke_help_command(ctx)
 
     @emoji_group.command(name="count", aliases=("c",))
-    async def count_command(self, ctx: commands.Context, *, category_query: str = None) -> None:
+    async def count_command(self, ctx: commands.Context, *, category_query: str | None = None) -> None:
         """Returns embed with emoji category and info given by the user."""
         emoji_dict = defaultdict(list)
 

bot/exts/utilities/reddit.py

@@ -172,7 +172,7 @@ async def revoke_access_token(self) -> None:
         else:
             log.warning(f"Unable to revoke access token: status {response.status}.")
 
-    async def fetch_posts(self, route: str, *, amount: int = 25, params: dict = None) -> list[dict]:
+    async def fetch_posts(self, route: str, *, amount: int = 25, params: dict | None = None) -> list[dict]:
         """A helper method to fetch a certain amount of Reddit posts at a given route."""
         # Reddit's JSON responses only provide 25 posts at most.
         if not 25 >= amount > 0:

bot/exts/utilities/wolfram.py

@@ -33,8 +33,8 @@ async def send_embed(
         ctx: Context,
         message_txt: str,
         colour: int = Colours.soft_red,
-        footer: str = None,
-        img_url: str = None,
+        footer: str | None = None,
+        img_url: str | None = None,
         f: discord.File = None
 ) -> None:
     """Generate & send a response embed with Wolfram as the author."""

bot/utils/__init__.py

@@ -76,7 +76,7 @@ def check(message: discord.Message) -> bool:
         done, pending = await asyncio.wait(futures, return_when=asyncio.FIRST_COMPLETED, loop=ctx.bot.loop)
 
         # :yert:
-        result = list(done)[0].result()
+        result = next(iter(done)).result()
 
         # Pagination was canceled - result is None
         if result is None:
@@ -87,7 +87,7 @@ def check(message: discord.Message) -> bool:
         # Pagination was not initiated, only one page
         if result.author == ctx.bot.user:
             # Continue the wait_for
-            result = await list(pending)[0]
+            result = await next(iter(pending))
 
         # Love that duplicate code
         for coro in pending:

bot/utils/pagination.py

@@ -90,8 +90,8 @@ async def paginate(
         cls, lines: Iterable[str], ctx: Context,
         embed: Embed, prefix: str = "", suffix: str = "",
         max_lines: int | None = None, max_size: int = 500, empty: bool = True,
-        restrict_to_user: User = None, timeout: int = 300, footer_text: str = None,
-        url: str = None, exception_on_empty_embed: bool = False
+        restrict_to_user: User = None, timeout: int = 300, footer_text: str | None = None,
+        url: str | None = None, exception_on_empty_embed: bool = False
     ) -> None:
         """
         Use a paginator and set of reactions to provide pagination over a set of lines.
@@ -302,7 +302,7 @@ def add_line(self, line: str = "", *, empty: bool = False) -> None:
         self._current_page.append(line)
         self.close_page()
 
-    def add_image(self, image: str = None) -> None:
+    def add_image(self, image: str | None = None) -> None:
         """Adds an image to a page given the url."""
         self.images.append(image)