Skip to content

fix: breaking threadmenu fixes. #3425

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
lorenzo132 wants to merge 19 commits into
base: development
Choose a base branch
from
Open

fix: breaking threadmenu fixes. #3425

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
19 commits
Select commit Hold shift + click to select a range
7322e99
Update gitignore
Taaku18 Dec 10, 2025
c3edf86
fix: breaking threadmenu fixes.
lorenzo132 Dec 21, 2025
78aec10
fix: thread_auto_close bug.
lorenzo132 Dec 24, 2025
589ba50
Merge branch 'development' into users/lorenzo/breaking-threadmenu-fix
lorenzo132 Feb 14, 2026
ab863db
Replace claim plugin (#3437)
martinbndr Mar 9, 2026
fdbef3d
Feat: Renaming of snippets and aliases (#3383)
martinbndr Nov 30, 2025
cea1800
Fixes config_help notes (#3407)
martinbndr Dec 5, 2025
0aae3f6
Git Repository check for bot update (#3406)
martinbndr Dec 5, 2025
16f2ba6
Fix Plugin Help (#3322)
martinbndr Dec 7, 2025
ea29d8f
Added submenu functionality to threadmenu. Fixes #3403 (#3404)
sebkuip Dec 8, 2025
2fbd7e5
Fix: Blackformatting, workflows. Add snooze/unsnooze events. (#3412)
lorenzo132 Dec 8, 2025
9833766
Add threadmenu toggle notice (#3411)
martinbndr Dec 13, 2025
367bb3d
Improvements for alias creation/editing (#3422)
martinbndr Dec 20, 2025
cb86a02
Fixes thread_auto_close execution when disabled. (#3423)
martinbndr Dec 20, 2025
6e656ca
fix: breaking threadmenu fixes.
lorenzo132 Dec 21, 2025
f089ba3
fix: thread_auto_close bug.
lorenzo132 Dec 24, 2025
b68d82a
fix: plain replies deletion and edits (#3416)
lorenzo132 Jan 16, 2026
90371cc
Merge branch 'users/lorenzo/breaking-threadmenu-fix' of https://githu…
lorenzo132 May 12, 2026
dff4a62
Merge branch 'development' into users/lorenzo/breaking-threadmenu-fix
lorenzo132 May 12, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
72 changes: 46 additions & 26 deletions core/clients.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -661,32 +661,52 @@ async def append_log(
channel_id: str = "",
type_: str = "thread_message",
) -> dict:
channel_id = str(channel_id) or str(message.channel.id)
message_id = str(message_id) or str(message.id)

data = {
"timestamp": str(message.created_at),
"message_id": message_id,
"author": {
"id": str(message.author.id),
"name": message.author.name,
"discriminator": message.author.discriminator,
"avatar_url": message.author.display_avatar.url if message.author.display_avatar else None,
"mod": not isinstance(message.channel, DMChannel),
},
"content": message.content,
"type": type_,
"attachments": [
{
"id": a.id,
"filename": a.filename,
"is_image": a.width is not None,
"size": a.size,
"url": a.url,
}
for a in message.attachments
],
}
channel_id = str(channel_id) or (str(message.channel.id) if message else "")
message_id = str(message_id) or (str(message.id) if message else "")

if message:
data = {
"timestamp": str(message.created_at),
"message_id": message_id,
"author": {
"id": str(message.author.id),
"name": message.author.name,
"discriminator": message.author.discriminator,
"avatar_url": (
message.author.display_avatar.url if message.author.display_avatar else None
),
"mod": not isinstance(message.channel, DMChannel),
},
"content": message.content,
Copy link
Copy Markdown
Member

@sebkuip sebkuip May 13, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

In the old code, the bot would extract forwarded content. Now it's falling back to regular message.content, which would break if the message is a forward.

"type": type_,
"attachments": [
{
"id": a.id,
"filename": a.filename,
"is_image": a.width is not None,
"size": a.size,
"url": a.url,
}
for a in message.attachments
],
}
else:
# Fallback for when message is None but we still want to log something (e.g. system note)
# This requires at least some manual data to be useful.
data = {
"timestamp": str(discord.utils.utcnow()),
"message_id": message_id or "0",
"author": {
"id": "0",
"name": "System",
"discriminator": "0000",
"avatar_url": None,
"mod": True,
},
"content": "System Message (No Content)",
"type": type_,
"attachments": [],
}

return await self.logs.find_one_and_update(
{"channel_id": channel_id},
Expand Down
4 changes: 4 additions & 0 deletions core/models.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -438,6 +438,10 @@ def __init__(self, message):
self._message = message

def __getattr__(self, name: str):
if self._message is None:
# If we're wrapping None, we can't delegate attributes.
# This mimics behavior where the attribute doesn't exist.
raise AttributeError(f"'DummyMessage' object has no attribute '{name}' (wrapped message is None)")
return getattr(self._message, name)

def __bool__(self):
Expand Down
103 changes: 72 additions & 31 deletions core/thread.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -145,6 +145,7 @@ def cancelled(self) -> bool:
def cancelled(self, flag: bool):
self._cancelled = flag
if flag:
self._ready_event.set()
for i in self.wait_tasks:
i.cancel()

Expand Down Expand Up @@ -1781,6 +1782,13 @@ async def send(
reply commands to avoid mutating the original message object.
"""
# Handle notes with Discord-like system message format - return early
if message is None:
# Safeguard against None messages (e.g. from menu interactions without a source message)
if not note and not from_mod and not thread_creation:
# If we're just trying to log/relay a user message and there is none, existing behavior
# suggests we might skip or error. Logging a warning and returning is safer than crashing.
return

if note:
destination = destination or self.channel
content = message.content or "[No content]"
Expand Down Expand Up @@ -1835,7 +1843,8 @@ async def send(
await self.wait_until_ready()

if not from_mod and not note:
self.bot.loop.create_task(self.bot.api.append_log(message, channel_id=self.channel.id))
if self.channel:
self.bot.loop.create_task(self.bot.api.append_log(message, channel_id=self.channel.id))

destination = destination or self.channel

Expand Down Expand Up @@ -2558,6 +2567,10 @@ async def create(
# checks for existing thread in cache
thread = self.cache.get(recipient.id)
if thread:
# If there's a pending menu, return the existing thread to avoid creating duplicates
if getattr(thread, "_pending_menu", False):
logger.debug("Thread for %s has pending menu, returning existing thread.", recipient)
return thread
try:
await thread.wait_until_ready()
except asyncio.CancelledError:
Expand All @@ -2566,8 +2579,8 @@ async def create(
label = f"{recipient} ({recipient.id})"
except Exception:
label = f"User ({getattr(recipient, 'id', 'unknown')})"
logger.warning("Thread for %s cancelled, abort creating.", label)
return thread
self.cache.pop(recipient.id, None)
thread = None
else:
if thread.channel and self.bot.get_channel(thread.channel.id):
logger.warning("Found an existing thread for %s, abort creating.", recipient)
Expand Down Expand Up @@ -2915,35 +2928,36 @@ async def callback(self, interaction: discord.Interaction):
setattr(self.outer_thread, "_pending_menu", False)
return
# Forward the user's initial DM to the thread channel
try:
await self.outer_thread.send(message)
except Exception:
logger.error(
"Failed to relay initial message after menu selection",
exc_info=True,
)
else:
# React to the user's DM with the 'sent' emoji
if message:
try:
(
sent_emoji,
_,
) = await self.outer_thread.bot.retrieve_emoji()
await self.outer_thread.bot.add_reaction(message, sent_emoji)
except Exception as e:
logger.debug(
"Failed to add sent reaction to user's DM: %s",
e,
await self.outer_thread.send(message)
except Exception:
logger.error(
"Failed to relay initial message after menu selection",
exc_info=True,
)
else:
# React to the user's DM with the 'sent' emoji
try:
(
sent_emoji,
_,
) = await self.outer_thread.bot.retrieve_emoji()
await self.outer_thread.bot.add_reaction(message, sent_emoji)
except Exception as e:
logger.debug(
"Failed to add sent reaction to user's DM: %s",
e,
)
# Dispatch thread_reply event for parity
self.outer_thread.bot.dispatch(
"thread_reply",
self.outer_thread,
False,
message,
False,
False,
)
# Dispatch thread_reply event for parity
self.outer_thread.bot.dispatch(
"thread_reply",
self.outer_thread,
False,
message,
False,
False,
)
# Clear pending flag
setattr(self.outer_thread, "_pending_menu", False)
except Exception:
Expand All @@ -2964,7 +2978,34 @@ async def callback(self, interaction: discord.Interaction):
# Create a synthetic message object that makes the bot appear
# as the author for menu-invoked command replies so the user
# selecting the option is not shown as a "mod" sender.
synthetic = DummyMessage(copy.copy(message))
if message:
synthetic = DummyMessage(copy.copy(message))
else:
# Fallback if no message exists (e.g. self-created thread via menu)
# We use the interaction's message or construct a minimal dummy
base_msg = getattr(interaction, "message", None) or self.menu_msg
synthetic = (
DummyMessage(copy.copy(base_msg)) if base_msg else DummyMessage(None)
)
# Ensure minimal attributes for Context if still missing (DummyMessage handles some, but we need more for commands)
if not synthetic._message:
# Identify a valid channel
ch = self.outer_thread.channel
if not ch:
# If channel isn't ready, we can't really invoke a command in it.
continue

from unittest.mock import MagicMock
Copy link
Copy Markdown
Member

@sebkuip sebkuip May 13, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please don't make imports halfway into the file. Also is a unittest class really the only way to do this? This isn't the intended way to use this class.


# Create a mock message strictly for command invocation context
mock_msg = MagicMock(spec=discord.Message)
mock_msg.id = 0
mock_msg.channel = ch
mock_msg.guild = self.outer_thread.bot.modmail_guild
mock_msg.content = self.outer_thread.bot.prefix + al
mock_msg.author = self.outer_thread.bot.user
synthetic = DummyMessage(mock_msg)

try:
synthetic.author = (
self.outer_thread.bot.modmail_guild.me or self.outer_thread.bot.user
Expand Down
Loading