Skip to content

fix(session_waiter): bind empty-mention waiter to the initiating sender (#9377) #9422

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
Qixuan112 wants to merge 2 commits into
base: master
Choose a base branch
from
+18 −1
Open

fix(session_waiter): bind empty-mention waiter to the initiating sender (#9377) #9422

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6a2a871
fix(session_waiter): bind empty-mention waiter to the initiating send…
Qixuan112 Jul 28, 2026
dfd6c00
refactor: move _SenderSessionFilter to module scope and guard against…
Qixuan112 Jul 28, 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
19 changes: 18 additions & 1 deletion astrbot/builtin_stars/astrbot/main.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@
FILTERS,
USER_SESSIONS,
SessionController,
SessionFilter,
SessionWaiter,
session_waiter,
)
Expand All @@ -27,6 +28,22 @@ def _iter_message_components(event: AstrMessageEvent):
return tuple(messages)


class _SenderSessionFilter(SessionFilter):
"""Session filter scoped to a specific (conversation, sender) pair.

Used by the empty-mention waiter so that only the user who initiated the
empty mention (not every member of the group) can satisfy the waiter.
"""

def filter(self, ev: AstrMessageEvent) -> str:
sender_id = ev.get_sender_id() or ""
if not sender_id:
# Fall back to a value that will not accidentally collide with a
# legitimate session key from another member.
sender_id = "__unknown_sender__"
return f"{ev.unified_msg_origin}:{sender_id}"


class Main(star.Star):
def __init__(self, context: star.Context) -> None:
self.context = context
Expand Down Expand Up @@ -126,7 +143,7 @@ async def empty_mention_waiter(
controller.stop()

try:
await empty_mention_waiter(event)
await empty_mention_waiter(event, session_filter=_SenderSessionFilter())
except TimeoutError:
pass
except Exception as e:
Expand Down