Compare commits
3
Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
af7518c1a2 | ||
|
|
5be029fb57 | ||
|
|
d82999b141 |
@@ -251,6 +251,10 @@ class SetCog(commands.Cog, name="Set command."):
|
||||
channel (nextcord.abc.GuildChannel, optional): Channel to register.
|
||||
Is a SlashOption. Limited to text channels, Defaults to None.
|
||||
"""
|
||||
if interaction.guild is None or interaction.channel is None:
|
||||
agon_logger.warning("Set command was called with an interaction that had no guild or channel.")
|
||||
return
|
||||
|
||||
channel_id = interaction.channel.id if not channel else channel.id
|
||||
|
||||
with Session(engine) as session:
|
||||
@@ -262,11 +266,14 @@ class SetCog(commands.Cog, name="Set command."):
|
||||
if (group := session.scalar(stmt)) is None:
|
||||
await interaction.response.send_message("Group or Category was not found.", ephemeral=True)
|
||||
return
|
||||
old_channel_id = group.channel_id
|
||||
group.channel_id = channel_id
|
||||
session.commit()
|
||||
# TODO(imcompiling): delete the message and call send_highscore_message to send a new one. Bug needs fixed
|
||||
# first.
|
||||
# 082
|
||||
|
||||
old_channel = interaction.guild.get_channel(old_channel_id)
|
||||
if old_channel and isinstance(old_channel, nextcord.TextChannel | nextcord.Thread) and group.message_id:
|
||||
await old_channel.get_partial_message(group.message_id).delete()
|
||||
|
||||
await interaction.send(f"Registered <#{channel_id}>.", ephemeral=True)
|
||||
|
||||
@group.subcommand(
|
||||
|
||||
+11
-5
@@ -342,11 +342,13 @@ async def send_highscore_message(session: Session, guild: nextcord.Guild, group:
|
||||
group (CategoryGroup): group to post to the message.
|
||||
"""
|
||||
highscore_string = format_highscore_message(session, group)
|
||||
channel = guild.get_channel(group.channel_id)
|
||||
if (channel := guild.get_channel(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) or not isinstance(channel, nextcord.Thread):
|
||||
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
|
||||
|
||||
@@ -356,10 +358,14 @@ async def send_highscore_message(session: Session, guild: nextcord.Guild, group:
|
||||
group.message_id = message.id
|
||||
session.commit()
|
||||
else:
|
||||
# TODO(imcompiling): check what happens when message is deleted.
|
||||
# https://gitea.cheezers.org/imcompiling/agon/issues/83
|
||||
try:
|
||||
message: nextcord.Message = await channel.fetch_message(group.message_id)
|
||||
await message.edit(content=highscore_string)
|
||||
except nextcord.NotFound:
|
||||
# Message was deleted on discord's side.
|
||||
message: nextcord.Message = await channel.send(highscore_string)
|
||||
group.message_id = message.id
|
||||
session.commit()
|
||||
|
||||
return
|
||||
|
||||
|
||||
Reference in New Issue
Block a user