TheLovinator/ANewDawn
1
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Refactor ask command to improve response handling and authorization checks

Browse source
This commit is contained in:
Joakim Hellsén 2025-09-22 01:44:34 +02:00
commit 32febd53dc
1 changed files with 19 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

26
main.py
View file

@ -154,8 +154,7 @@ async def ask(interaction: discord.Interaction, text: str) -> None:
# Only allow certain users to interact with the bot # Only allow certain users to interact with the bot
allowed_users: list[str] = get_allowed_users() allowed_users: list[str] = get_allowed_users()
if user_name_lowercase not in allowed_users: if user_name_lowercase not in allowed_users:
logger.info("Ignoring message from: %s", user_name_lowercase) await send_response(interaction=interaction, text=text, response="You are not authorized to use this command.")
await interaction.followup.send("You are not allowed to use this command.")
return return
try: try:
@ -168,7 +167,7 @@ async def ask(interaction: discord.Interaction, text: str) -> None:
) )
except openai.OpenAIError as e: except openai.OpenAIError as e:
logger.exception("An error occurred while chatting with the AI model.") logger.exception("An error occurred while chatting with the AI model.")
await interaction.followup.send(f"An error occurred: {e}") await send_response(interaction=interaction, text=text, response=f"An error occurred: {e}")
return return
truncated_text: str = truncate_user_input(text) truncated_text: str = truncate_user_input(text)
@ -180,13 +179,26 @@ async def ask(interaction: discord.Interaction, text: str) -> None:
logger.warning("No response from the AI model. Message: %s", text) logger.warning("No response from the AI model. Message: %s", text)
response = "I forgor how to think 💀" response = "I forgor how to think 💀"
# If response is longer than 2000 characters, send as a file # If response is longer than 2000 characters, split it into multiple messages
max_discord_message_length: int = 2000 max_discord_message_length: int = 2000
if len(response) > max_discord_message_length: if len(response) > max_discord_message_length:
file_content = response.encode("utf-8") for i in range(0, len(response), max_discord_message_length):
discord_file = discord.File(io.BytesIO(file_content), filename="response.txt") await send_response(interaction=interaction, text=text, response=response[i : i + max_discord_message_length])
await interaction.followup.send(f"{text}", file=discord_file)
return
await send_response(interaction=interaction, text=text, response=response)
async def send_response(interaction: discord.Interaction, text: str, response: str) -> None:
"""Send a response to the interaction, handling potential errors.
Args:
interaction (discord.Interaction): The interaction to respond to.
text (str): The original user input text.
response (str): The response to send.
"""
logger.info("Sending response to interaction in channel %s", interaction.channel)
try: try:
await interaction.followup.send(response) await interaction.followup.send(response)
except discord.HTTPException as e: except discord.HTTPException as e: