From c25d354fc09f8d5099bcd450789049b64450fbd5 Mon Sep 17 00:00:00 2001 From: imcompiling Date: Fri, 14 Mar 2025 16:09:52 -0400 Subject: [PATCH] Correct some parameter usage, handle errors if searches return nothing. --- .vscode/settings.json | 4 ++-- cogs/commands/set.py | 28 ++++++++++++++++++++-------- 2 files changed, 22 insertions(+), 10 deletions(-) diff --git a/.vscode/settings.json b/.vscode/settings.json index 47e3829..1dc3b48 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -10,8 +10,8 @@ "ondelete" ], "python.analysis.diagnosticSeverityOverrides": { - "reportOptionalMemberAccess": false, + "reportOptionalMemberAccess": "warning", "reportArgumentType": "information", "reportAttributeAccessIssue": "warning" } -} +} \ No newline at end of file diff --git a/cogs/commands/set.py b/cogs/commands/set.py index 7b4bdd5..47e8d26 100644 --- a/cogs/commands/set.py +++ b/cogs/commands/set.py @@ -52,8 +52,10 @@ class SetCog(commands.Cog, name="Set command."): .where(col(CategoryGroup.guild_id) == interaction.guild_id) .where(col(CategoryGroup.id) == int(group_id)) ) - group = session.scalar(stmt) - group.ChannelId = channel_id + if (group := session.scalar(stmt)) is None: + await interaction.response.send_message("Group or Category was not found.", ephemeral=True) + return + group.channel_id = channel_id session.commit() await interaction.send(f"Registered <#{channel_id}>.", ephemeral=True) @@ -88,8 +90,11 @@ class SetCog(commands.Cog, name="Set command."): .where(col(CategoryGroup.guild_id) == interaction.guild_id) .where(col(CategoryGroup.id) == int(group_id)) ) - group = session.scalar(stmt) - group.PadLength = length + if (group := session.scalar(stmt)) is None: + await interaction.response.send_message("Group or Category was not found.", ephemeral=True) + return + + group.pad_length = length session.commit() await interaction.response.send_message( f"Category pad length set to {length} for {group.name}", ephemeral=True @@ -120,7 +125,9 @@ class SetCog(commands.Cog, name="Set command."): with Session(engine) as session: stmt = select(Guild).where(col(Guild.id) == interaction.guild_id) - guild = session.scalar(stmt) + if (guild := session.scalar(stmt)) is None: + await interaction.response.send_message("Guild was not found.", ephemeral=True) + return guild.submission_channel = channel_id session.commit() await interaction.send(f"Registered <#{channel_id}>.", ephemeral=True) @@ -150,8 +157,11 @@ class SetCog(commands.Cog, name="Set command."): .where(col(CategoryGroup.guild_id) == interaction.guild_id) .where(col(CategoryGroup.id) == int(group_id)) ) - group = session.scalar(stmt) - group.UsernameLength = length + if (group := session.scalar(stmt)) is None: + await interaction.response.send_message("Group or Category was not found.", ephemeral=True) + return + + group.username_length = length session.commit() await interaction.response.send_message(f"Username length set to {length}.", ephemeral=True) @@ -178,7 +188,9 @@ class SetCog(commands.Cog, name="Set command."): with Session(engine) as session: stmt = select(Guild).where(col(Guild.id) == interaction.guild_id) - guild = session.scalar(stmt) + if (guild := session.scalar(stmt)) is None: + await interaction.response.send_message("Guild was not found.", ephemeral=True) + return guild.verification_channel = channel_id session.commit() await interaction.send(f"Registered <#{channel_id}>.", ephemeral=True)