Compare commits
6
Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
c1b327ca05 | ||
|
|
fa39949b1a | ||
|
|
f1290af45b | ||
|
|
10954ef117 | ||
|
|
0540f7a9eb | ||
|
|
a4aab09360 |
@@ -99,7 +99,7 @@ class CreateCog(commands.Cog, name="Create Cog"):
|
||||
min_value=1,
|
||||
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.",
|
||||
required=False,
|
||||
default=None,
|
||||
|
||||
@@ -37,7 +37,7 @@ class DeleteCog(commands.Cog, name="Delete Cog"):
|
||||
async def channel_messages(
|
||||
self,
|
||||
interaction: nextcord.Interaction,
|
||||
channel: nextcord.TextChannel | None = nextcord.SlashOption(
|
||||
channel: nextcord.TextChannel | nextcord.Thread | None = nextcord.SlashOption(
|
||||
description="Channel to clear of messages.",
|
||||
required=False,
|
||||
default=None,
|
||||
@@ -54,7 +54,7 @@ class DeleteCog(commands.Cog, name="Delete Cog"):
|
||||
Is a SlashOption. Limited to text channels. Defaults to None.
|
||||
"""
|
||||
if not channel:
|
||||
if isinstance(interaction.channel, nextcord.TextChannel):
|
||||
if isinstance(interaction.channel, nextcord.TextChannel | nextcord.Thread):
|
||||
channel = interaction.channel
|
||||
else:
|
||||
# This should never happen.
|
||||
|
||||
@@ -80,9 +80,7 @@ class SubmissionCog(commands.Cog):
|
||||
if (
|
||||
verified_score := await self.verify_score(interaction, score, is_time_record=category.is_time_record)
|
||||
) is None:
|
||||
# This response message will be filled out better once command is split up to
|
||||
# know which type it expects...
|
||||
await interaction.response.send_message("Format was incorrect.", ephemeral=True)
|
||||
# Verify score handles responding. Might change when submit is split up.
|
||||
return
|
||||
|
||||
# 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)
|
||||
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.")
|
||||
agon_logger.error(
|
||||
"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):
|
||||
# need to add 0 in seconds and leading colon and 0
|
||||
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
|
||||
score = score.lstrip("0")
|
||||
score = score[1:]
|
||||
|
||||
return score
|
||||
|
||||
|
||||
@@ -43,7 +43,7 @@ class DeleteConfirmView(nextcord.ui.Modal):
|
||||
session.delete(group)
|
||||
# delete the message related to group
|
||||
channel = interaction.guild.get_channel(group.channel_id)
|
||||
if not isinstance(channel, nextcord.TextChannel):
|
||||
if not isinstance(channel, nextcord.TextChannel | nextcord.Thread):
|
||||
return
|
||||
message: nextcord.Message = await channel.fetch_message(group.message_id)
|
||||
await message.delete()
|
||||
|
||||
+1
-1
@@ -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)
|
||||
return
|
||||
|
||||
if not isinstance(channel, nextcord.TextChannel) or not isinstance(channel, nextcord.Thread):
|
||||
if not isinstance(channel, nextcord.TextChannel | nextcord.Thread):
|
||||
agon_logger.error(
|
||||
"Channel id %s in guild %s is does not correspond to a TextChannel or Thread.", channel.id, channel.guild.id
|
||||
)
|
||||
|
||||
Reference in New Issue
Block a user