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

Refactor ask command to improve message handling and add chunked response sending

Browse source
This commit is contained in:
Joakim Hellsén 2025-09-23 05:00:14 +02:00
commit d3ee8903c6
1 changed files with 50 additions and 41 deletions
Download patch file Download diff file Expand all files Collapse all files

37
main.py
View file

@ -20,6 +20,8 @@ from misc import add_message_to_memory, chat, get_allowed_users, get_raw_images_
if TYPE_CHECKING: if TYPE_CHECKING:
from collections.abc import Callable from collections.abc import Callable
from discord.abc import Messageable as DiscordMessageable
sentry_sdk.init( sentry_sdk.init(
dsn="https://ebbd2cdfbd08dba008d628dad7941091@o4505228040339456.ingest.us.sentry.io/4507630719401984", dsn="https://ebbd2cdfbd08dba008d628dad7941091@o4505228040339456.ingest.us.sentry.io/4507630719401984",
send_default_pii=True, send_default_pii=True,
@ -35,6 +37,15 @@ load_dotenv(verbose=True)
discord_token: str = os.getenv("DISCORD_TOKEN", "") discord_token: str = os.getenv("DISCORD_TOKEN", "")
async def send_chunked_message(channel: DiscordMessageable, text: str, max_len: int = 2000) -> None:
"""Send a message to a channel, splitting into chunks if it exceeds Discord's limit."""
if len(text) <= max_len:
await channel.send(text)
return
for i in range(0, len(text), max_len):
await channel.send(text[i : i + max_len])
class LoviBotClient(discord.Client): class LoviBotClient(discord.Client):
"""The main bot client.""" """The main bot client."""
@ -76,12 +87,14 @@ class LoviBotClient(discord.Client):
# Add the message to memory # Add the message to memory
add_message_to_memory(str(message.channel.id), message.author.name, incoming_message) add_message_to_memory(str(message.channel.id), message.author.name, incoming_message)
lowercase_message: str = incoming_message.lower() if incoming_message else "" lowercase_message: str = incoming_message.lower()
trigger_keywords: list[str] = ["lovibot", "@lovibot", "<@345000831499894795>", "grok", "@grok"] trigger_keywords: list[str] = ["lovibot", "@lovibot", "<@345000831499894795>", "grok", "@grok"]
has_trigger_keyword: bool = any(trigger in lowercase_message for trigger in trigger_keywords) has_trigger_keyword: bool = any(trigger in lowercase_message for trigger in trigger_keywords)
should_respond: bool = has_trigger_keyword or should_respond_without_trigger(str(message.channel.id), message.author.name) should_respond_flag: bool = has_trigger_keyword or should_respond_without_trigger(str(message.channel.id), message.author.name)
if not should_respond_flag:
return
if should_respond:
# Update trigger time if they used a trigger keyword # Update trigger time if they used a trigger keyword
if has_trigger_keyword: if has_trigger_keyword:
update_trigger_time(str(message.channel.id), message.author.name) update_trigger_time(str(message.channel.id), message.author.name)
@ -105,23 +118,19 @@ class LoviBotClient(discord.Client):
await message.channel.send(f"An error occurred while chatting with the AI model. {e}") await message.channel.send(f"An error occurred while chatting with the AI model. {e}")
return return
reply: str = response or "I forgor how to think 💀"
if response: if response:
logger.info("Responding to message: %s with: %s", incoming_message, response) logger.info("Responding to message: %s with: %s", incoming_message, reply)
else:
logger.warning("No response from the AI model. Message: %s", incoming_message)
# Record the bot's reply in memory # Record the bot's reply in memory
try: try:
add_message_to_memory(str(message.channel.id), "LoviBot", response) add_message_to_memory(str(message.channel.id), "LoviBot", reply)
except Exception: except Exception:
logger.exception("Failed to add bot reply to memory for on_message") logger.exception("Failed to add bot reply to memory for on_message")
await message.channel.send(response) await send_chunked_message(message.channel, reply)
else:
logger.warning("No response from the AI model. Message: %s", incoming_message)
fallback = "I forgor how to think 💀"
try:
add_message_to_memory(str(message.channel.id), "LoviBot", fallback)
except Exception:
logger.exception("Failed to add fallback bot reply to memory for on_message")
await message.channel.send(fallback)
async def on_error(self, event_method: str, /, *args: Any, **kwargs: Any) -> None: # noqa: ANN401, PLR6301 async def on_error(self, event_method: str, /, *args: Any, **kwargs: Any) -> None: # noqa: ANN401, PLR6301
"""Log errors that occur in the bot.""" """Log errors that occur in the bot."""