Turned on all ruff rules. Formatted all files.
This commit is contained in:
+8
-24
@@ -30,18 +30,12 @@ class setCog(commands.Cog, name="Set Commands"):
|
||||
Parent slash command for set. Never called.
|
||||
"""
|
||||
|
||||
@set.subcommand(
|
||||
description="Sets your birth month and day for the Birthday Fun. Use 0/0 to remove yourself."
|
||||
)
|
||||
@set.subcommand(description="Sets your birth month and day for the Birthday Fun. Use 0/0 to remove yourself.")
|
||||
async def birthday(
|
||||
self,
|
||||
interaction: nextcord.Interaction,
|
||||
month: int = nextcord.SlashOption(
|
||||
required=True, min_value=0, max_value=12, description="Your birth month."
|
||||
),
|
||||
day: int = nextcord.SlashOption(
|
||||
required=True, min_value=0, max_value=31, description="Your birth day."
|
||||
),
|
||||
month: int = nextcord.SlashOption(required=True, min_value=0, max_value=12, description="Your birth month."),
|
||||
day: int = nextcord.SlashOption(required=True, min_value=0, max_value=31, description="Your birth day."),
|
||||
):
|
||||
"""
|
||||
Sets a user's birthday in the database. Removes on input 0/0. If birthday is today, adds to the birthday_list.
|
||||
@@ -56,9 +50,7 @@ class setCog(commands.Cog, name="Set Commands"):
|
||||
await interaction.response.defer(ephemeral=True)
|
||||
|
||||
if month == 0 and day == 0:
|
||||
stmt = delete(UserBirthday).where(
|
||||
UserBirthday.UserId == interaction.user.id
|
||||
)
|
||||
stmt = delete(UserBirthday).where(UserBirthday.UserId == interaction.user.id)
|
||||
with Session(engine) as session:
|
||||
session.execute(stmt)
|
||||
session.commit()
|
||||
@@ -70,18 +62,14 @@ class setCog(commands.Cog, name="Set Commands"):
|
||||
try:
|
||||
birthday = datetime(today.year, month, day)
|
||||
except ValueError:
|
||||
await interaction.followup.send(
|
||||
f"Invalid date: {month}/{day}.", ephemeral=True
|
||||
)
|
||||
await interaction.followup.send(f"Invalid date: {month}/{day}.", ephemeral=True)
|
||||
return
|
||||
|
||||
# If the birthday is today, add to birthday_list
|
||||
if today.date() == birthday.date():
|
||||
birthday_list.append(interaction.user.id)
|
||||
|
||||
new_birthday = UserBirthday(
|
||||
UserId=interaction.user.id, Birthday=f"{month}/{day}"
|
||||
)
|
||||
new_birthday = UserBirthday(UserId=interaction.user.id, Birthday=f"{month}/{day}")
|
||||
with Session(engine) as session:
|
||||
try:
|
||||
session.add(new_birthday)
|
||||
@@ -89,13 +77,9 @@ class setCog(commands.Cog, name="Set Commands"):
|
||||
except IntegrityError:
|
||||
# User already has birthday, change it instead.
|
||||
session.rollback()
|
||||
stmt = select(UserBirthday).where(
|
||||
UserBirthday.UserId == interaction.user.id
|
||||
)
|
||||
stmt = select(UserBirthday).where(UserBirthday.UserId == interaction.user.id)
|
||||
new_birthday = session.scalar(stmt)
|
||||
new_birthday.Birthday = f"{month}/{day}"
|
||||
session.commit()
|
||||
|
||||
await interaction.followup.send(
|
||||
f"Birthday set to {month}/{day}.", ephemeral=True
|
||||
)
|
||||
await interaction.followup.send(f"Birthday set to {month}/{day}.", ephemeral=True)
|
||||
|
||||
Reference in New Issue
Block a user