Compare commits

..
Author SHA1 Message Date
imcompiling c1b327ca05 Change regex to strip a 10th place 0 only.
build_develop / build (push) Successful in 36s
2025-03-21 13:56:28 -04:00
imcompiling fa39949b1a Merge branch 'main' of https://gitea.cheezers.org/imcompiling/agon
build_latest / build (push) Successful in 37s
2025-03-21 10:45:04 -04:00
imcompiling f1290af45b Remove a double respond. 2025-03-21 10:44:57 -04:00
imcompiling 10954ef117 Merge branch '82-group-message-after-deletion'
build_latest / build (push) Successful in 36s
build_release / build (push) Successful in 18s
2025-03-20 11:04:26 -04:00
imcompiling 0540f7a9eb Add thread as an option everywhere a textchannel is used.
build_develop / build (push) Successful in 35s
2025-03-20 11:04:00 -04:00
imcompiling a4aab09360 Use or instead of two isinstance calls. 2025-03-20 10:56:59 -04:00
5 changed files with 9 additions and 11 deletions
+1 -1
View File
@@ -99,7 +99,7 @@ class CreateCog(commands.Cog, name="Create Cog"):
min_value=1, min_value=1,
max_value=30, max_value=30,
), ),
channel: nextcord.TextChannel | None = nextcord.SlashOption( channel: nextcord.TextChannel | nextcord.Thread | None = nextcord.SlashOption(
description="Channel to post Group in. If left empty, defaults to current channel.", description="Channel to post Group in. If left empty, defaults to current channel.",
required=False, required=False,
default=None, default=None,
+2 -2
View File
@@ -37,7 +37,7 @@ class DeleteCog(commands.Cog, name="Delete Cog"):
async def channel_messages( async def channel_messages(
self, self,
interaction: nextcord.Interaction, interaction: nextcord.Interaction,
channel: nextcord.TextChannel | None = nextcord.SlashOption( channel: nextcord.TextChannel | nextcord.Thread | None = nextcord.SlashOption(
description="Channel to clear of messages.", description="Channel to clear of messages.",
required=False, required=False,
default=None, default=None,
@@ -54,7 +54,7 @@ class DeleteCog(commands.Cog, name="Delete Cog"):
Is a SlashOption. Limited to text channels. Defaults to None. Is a SlashOption. Limited to text channels. Defaults to None.
""" """
if not channel: if not channel:
if isinstance(interaction.channel, nextcord.TextChannel): if isinstance(interaction.channel, nextcord.TextChannel | nextcord.Thread):
channel = interaction.channel channel = interaction.channel
else: else:
# This should never happen. # This should never happen.
+4 -6
View File
@@ -80,9 +80,7 @@ class SubmissionCog(commands.Cog):
if ( if (
verified_score := await self.verify_score(interaction, score, is_time_record=category.is_time_record) verified_score := await self.verify_score(interaction, score, is_time_record=category.is_time_record)
) is None: ) is None:
# This response message will be filled out better once command is split up to # Verify score handles responding. Might change when submit is split up.
# know which type it expects...
await interaction.response.send_message("Format was incorrect.", ephemeral=True)
return return
# Create submission verification request or submit score if verification not needed. # Create submission verification request or submit score if verification not needed.
@@ -103,7 +101,7 @@ class SubmissionCog(commands.Cog):
await interaction.response.send_message(error_response, ephemeral=True) await interaction.response.send_message(error_response, ephemeral=True)
return return
if not isinstance(channel, nextcord.TextChannel): if not isinstance(channel, nextcord.TextChannel | nextcord.Thread):
await interaction.response.send_message("An error happened with submission.") await interaction.response.send_message("An error happened with submission.")
agon_logger.error( agon_logger.error(
"Channel id %s in guild %s is does not correspond to a TextChannel.", channel.id, channel.guild.id "Channel id %s in guild %s is does not correspond to a TextChannel.", channel.id, channel.guild.id
@@ -210,9 +208,9 @@ class SubmissionCog(commands.Cog):
elif re.search("^[0-9](\\.[0-9])?$", score): elif re.search("^[0-9](\\.[0-9])?$", score):
# need to add 0 in seconds and leading colon and 0 # need to add 0 in seconds and leading colon and 0
score = "0:0" + score score = "0:0" + score
elif re.search("^[0]?[0-9]:[0-9]{2}(\\.[0-9])?$", score): elif re.search("^[0][0-9]:[0-9]{2}(\\.[0-9])?$", score):
# if there is a minute 10ths place 0, remove # if there is a minute 10ths place 0, remove
score = score.lstrip("0") score = score[1:]
return score return score
+1 -1
View File
@@ -43,7 +43,7 @@ class DeleteConfirmView(nextcord.ui.Modal):
session.delete(group) session.delete(group)
# delete the message related to group # delete the message related to group
channel = interaction.guild.get_channel(group.channel_id) channel = interaction.guild.get_channel(group.channel_id)
if not isinstance(channel, nextcord.TextChannel): if not isinstance(channel, nextcord.TextChannel | nextcord.Thread):
return return
message: nextcord.Message = await channel.fetch_message(group.message_id) message: nextcord.Message = await channel.fetch_message(group.message_id)
await message.delete() await message.delete()
+1 -1
View File
@@ -346,7 +346,7 @@ async def send_highscore_message(session: Session, guild: nextcord.Guild, group:
agon_logger.error("Channel id %s in guild %s does not exist.", group.channel_id, guild.id) agon_logger.error("Channel id %s in guild %s does not exist.", group.channel_id, guild.id)
return return
if not isinstance(channel, nextcord.TextChannel) or not isinstance(channel, nextcord.Thread): if not isinstance(channel, nextcord.TextChannel | nextcord.Thread):
agon_logger.error( agon_logger.error(
"Channel id %s in guild %s is does not correspond to a TextChannel or Thread.", channel.id, channel.guild.id "Channel id %s in guild %s is does not correspond to a TextChannel or Thread.", channel.id, channel.guild.id
) )