Compare commits
6
Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
12893288f8 | ||
|
|
0540f7a9eb | ||
|
|
a4aab09360 | ||
|
|
d82999b141 | ||
|
|
1ffb7fa9a7 | ||
|
|
2566bee0ce |
+1
-1
@@ -135,4 +135,4 @@ deleted_backups/
|
|||||||
highscores_data/
|
highscores_data/
|
||||||
TODO.txt
|
TODO.txt
|
||||||
sql_tester.py
|
sql_tester.py
|
||||||
database
|
/database
|
||||||
|
|||||||
+2
-2
@@ -6,10 +6,10 @@ COPY --from=ghcr.io/astral-sh/uv:0.6.6 /uv /uvx /bin/
|
|||||||
RUN apt-get update && apt-get -y upgrade && apt-get -y install sqlite3
|
RUN apt-get update && apt-get -y upgrade && apt-get -y install sqlite3
|
||||||
|
|
||||||
# Copy project to image
|
# Copy project to image
|
||||||
ADD . /agon
|
ADD . /home
|
||||||
|
|
||||||
# Sync the project into a new environment, using the frozen lockfile
|
# Sync the project into a new environment, using the frozen lockfile
|
||||||
WORKDIR /agon
|
WORKDIR /home
|
||||||
RUN uv sync --frozen --no-dev
|
RUN uv sync --frozen --no-dev
|
||||||
|
|
||||||
CMD ["uv", "run", "--frozen", "--no-dev", "-m", "agon"]
|
CMD ["uv", "run", "--frozen", "--no-dev", "-m", "agon"]
|
||||||
|
|||||||
@@ -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,
|
||||||
|
|||||||
@@ -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.
|
||||||
|
|||||||
@@ -103,7 +103,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
|
||||||
|
|||||||
@@ -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()
|
||||||
|
|||||||
+5
-3
@@ -342,11 +342,13 @@ async def send_highscore_message(session: Session, guild: nextcord.Guild, group:
|
|||||||
group (CategoryGroup): group to post to the message.
|
group (CategoryGroup): group to post to the message.
|
||||||
"""
|
"""
|
||||||
highscore_string = format_highscore_message(session, group)
|
highscore_string = format_highscore_message(session, group)
|
||||||
channel = guild.get_channel(group.channel_id)
|
if (channel := guild.get_channel_or_thread(group.channel_id)) is None:
|
||||||
|
agon_logger.error("Channel id %s in guild %s does not exist.", group.channel_id, guild.id)
|
||||||
|
return
|
||||||
|
|
||||||
if not isinstance(channel, nextcord.TextChannel):
|
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.", 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
|
||||||
)
|
)
|
||||||
return
|
return
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user