diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index bc6faa4d..406bd4d6 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -4,20 +4,20 @@ ci: autoupdate_commit_msg: 'chore(pre-commit): pre-commit autoupdate' repos: - repo: https://github.com/asottile/pyupgrade - rev: v3.3.2 + rev: v3.15.0 hooks: - id: pyupgrade args: [--py38-plus] - repo: https://github.com/pycqa/isort - rev: 5.12.0 + rev: 5.13.2 hooks: - id: isort - repo: https://github.com/psf/black - rev: 23.3.0 + rev: 24.2.0 hooks: - id: black - repo: https://github.com/PyCQA/flake8 - rev: 6.0.0 + rev: 7.0.0 hooks: - id: flake8 additional_dependencies: ['flake8-bugbear==22.9.23'] diff --git a/bot/database.py b/bot/database.py index 8187f87a..7035a361 100644 --- a/bot/database.py +++ b/bot/database.py @@ -920,8 +920,8 @@ async def update_reward_milestones(self, guild_id: int, reward_milestones: list[ store = Store( - database_url=settings.TEST_DATABASE_URL - if settings.TESTING - else settings.DATABASE_URL, + database_url=( + settings.TEST_DATABASE_URL if settings.TESTING else settings.DATABASE_URL + ), force_rollback=settings.TESTING, ) diff --git a/bot/exts/meetings/meetings.py b/bot/exts/meetings/meetings.py index 16e7028a..01404122 100644 --- a/bot/exts/meetings/meetings.py +++ b/bot/exts/meetings/meetings.py @@ -268,7 +268,9 @@ async def zoom_setup_start( for message in messages ) await inter.send( - embed=disnake.Embed(title="🚀 Meeting Details Revealed", description=links) + embed=disnake.Embed( + title="🚀 Meeting Details Revealed", description=links + ) ) else: channel_message = next( @@ -349,7 +351,8 @@ async def zoom_users(self, inter: ApplicationCommandInteraction): } description = "\n".join( tuple( - ("👑 " if email.lower() in licensed_user_emails else "") + f"<@!{user_id}>" + ("👑 " if email.lower() in licensed_user_emails else "") + + f"<@!{user_id}>" for user_id, email in settings.ZOOM_USERS.items() ) ) diff --git a/bot/exts/practices/practice.py b/bot/exts/practices/practice.py index 25383914..17eb566e 100644 --- a/bot/exts/practices/practice.py +++ b/bot/exts/practices/practice.py @@ -294,7 +294,9 @@ async def practice_command(self, ctx: Context, *, start_time: str): assert guild is not None dm_response += f"*{guild.name}*\n" else: - dm_response = "⚠️ You are not a member of any servers that have a practice schedule." + dm_response = ( + "⚠️ You are not a member of any servers that have a practice schedule." + ) else: if str(old_timezone) != str(new_timezone): assert new_timezone is not None diff --git a/bot/utils/ui.py b/bot/utils/ui.py index 91df1d51..5cfff9d7 100644 --- a/bot/utils/ui.py +++ b/bot/utils/ui.py @@ -42,9 +42,7 @@ async def callback( assert inter.user is not None # Ignore clicks by other users if inter.user.id != self.creator_id: - await inter.send( - "⚠️ You can't interact with this UI.", ephemeral=True - ) + await inter.send("⚠️ You can't interact with this UI.", ephemeral=True) return self.value = value self.stop() diff --git a/lib/holiday_emojis/__init__.py b/lib/holiday_emojis/__init__.py index 403ff1f9..15ba6ccf 100644 --- a/lib/holiday_emojis/__init__.py +++ b/lib/holiday_emojis/__init__.py @@ -27,9 +27,9 @@ def _populate(self, year): self[dt.date(year, holidays.constants.JAN, 24)] = "National Peanut Butter Day" self[dt.date(year, holidays.constants.JAN, 26)] = "Australia Day" self[dt.date(year, holidays.constants.JAN, 29)] = "Puzzle Day" - self[ - dt.date(year, holidays.constants.FEB, 1) - ] = "First Day of Black History Month" + self[dt.date(year, holidays.constants.FEB, 1)] = ( + "First Day of Black History Month" + ) self[dt.date(year, holidays.constants.FEB, 2)] = "Groundhog Day" self[dt.date(year, holidays.constants.FEB, 5)] = "World Nutella Day" self[dt.date(year, holidays.constants.FEB, 9)] = "Pizza Day" @@ -43,51 +43,51 @@ def _populate(self, year): self[easter(year)] = "Easter" self[dt.date(year, holidays.constants.MAR, 20)] = "Earth Day" self[dt.date(year, holidays.constants.MAR, 26)] = "Purple Day" - self[ - dt.date(year, holidays.constants.MAR, 31) - ] = "International Transgender Day of Visibility" + self[dt.date(year, holidays.constants.MAR, 31)] = ( + "International Transgender Day of Visibility" + ) self[dt.date(year, holidays.constants.APR, 23)] = "National Picnic Day" self[dt.date(year, holidays.constants.APR, 26)] = "Pretzel Day" self[dt.date(year, holidays.constants.MAY, 1) + rd(weekday=FR(+1))] = "Space Day" self[dt.date(year, holidays.constants.MAY, 4)] = "Star Wars Day" - self[ - dt.date(year, holidays.constants.MAY, 1) + rd(weekday=SU(+2)) - ] = "Mother's Day" + self[dt.date(year, holidays.constants.MAY, 1) + rd(weekday=SU(+2))] = ( + "Mother's Day" + ) self[dt.date(year, holidays.constants.MAY, 22)] = "World Turtle Day" self[dt.date(year, holidays.constants.MAY, 28)] = "National Hamburger Day" - self[ - dt.date(year, holidays.constants.JUN, 1) + rd(weekday=SU(+3)) - ] = "Father's Day" + self[dt.date(year, holidays.constants.JUN, 1) + rd(weekday=SU(+3))] = ( + "Father's Day" + ) self[dt.date(year, holidays.constants.JUN, 5)] = "National Donut Day" self[dt.date(year, holidays.constants.JUN, 14)] = "Flag Day" self[dt.date(year, holidays.constants.JUN, 19)] = "Juneteenth" self[dt.date(year, holidays.constants.JUN, 28)] = "Pride Day" - self[ - dt.date(year, holidays.constants.JUL, 1) + rd(weekday=SU(+3)) - ] = "Ice Cream Day" + self[dt.date(year, holidays.constants.JUL, 1) + rd(weekday=SU(+3))] = ( + "Ice Cream Day" + ) self[dt.date(year, holidays.constants.JUL, 14)] = "Bastille Day" self[dt.date(year, holidays.constants.JUL, 17)] = "National Tattoo Day" self[dt.date(year, holidays.constants.JUL, 20)] = "National Lollipop Day" self[dt.date(year, holidays.constants.JUL, 23)] = "National Hot Dog Day" self[dt.date(year, holidays.constants.JUL, 24)] = "National Cousins Day" self[dt.date(year, holidays.constants.JUL, 31)] = "National Avocado Day" - self[ - dt.date(year, holidays.constants.AUG, 1) + rd(weekday=FR(+1)) - ] = "International Beer Day" + self[dt.date(year, holidays.constants.AUG, 1) + rd(weekday=FR(+1))] = ( + "International Beer Day" + ) self[dt.date(year, holidays.constants.AUG, 8)] = "National Bowling Day" self[dt.date(year, holidays.constants.AUG, 24)] = "National Waffle Day" - self[ - dt.date(year, holidays.constants.SEP, 19) - ] = "International Talk Like A Pirate Day" + self[dt.date(year, holidays.constants.SEP, 19)] = ( + "International Talk Like A Pirate Day" + ) self[dt.date(year, holidays.constants.SEP, 29)] = "National Coffee Day" self[dt.date(2021, holidays.constants.SEP, 27)] = "Yom Kippur" self[dt.date(2022, holidays.constants.OCT, 4)] = "Yom Kippur" self[dt.date(2023, holidays.constants.SEP, 24)] = "Yom Kippur" self[dt.date(year, holidays.constants.OCT, 4)] = "National Taco Day" self[dt.date(year, holidays.constants.OCT, 31)] = "Halloween" - self[ - dt.date(year, holidays.constants.NOV, 1) + rd(weekday=FR(+4)) - ] = "Native American Heritage Day" + self[dt.date(year, holidays.constants.NOV, 1) + rd(weekday=FR(+4))] = ( + "Native American Heritage Day" + ) self[dt.date(year, holidays.constants.NOV, 28)] = "National French Toast Day" self[dt.date(year, holidays.constants.DEC, 4)] = "National Cookie Day" self[dt.date(year, holidays.constants.DEC, 8)] = "National Brownie Day"