Skip to content

fix: preserve inbound qqofficial msg anchor for proactive sends #6856

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

fix: preserve inbound qqofficial msg anchor for proactive sends #6856

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
23 changes: 18 additions & 5 deletions astrbot/core/platform/sources/qqofficial/qqofficial_platform_adapter.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -131,7 +131,8 @@ def __init__(

self.client.set_platform(self)

self._session_last_message_id: dict[str, str] = {}
self._session_last_inbound_message_id: dict[str, str] = {}
self._session_last_outbound_message_id: dict[str, str] = {}
self._session_scene: dict[str, str] = {}

self.test_mode = os.environ.get("TEST_MODE", "off") == "on"
Expand Down Expand Up @@ -167,10 +168,10 @@ async def _send_by_session_common(
):
return

msg_id = self._session_last_message_id.get(session.session_id)
msg_id = self._session_last_inbound_message_id.get(session.session_id)
if not msg_id:
logger.warning(
"[QQOfficial] No cached msg_id for session: %s, skip send_by_session",
"[QQOfficial] No cached inbound msg_id for session: %s, skip send_by_session",
session.session_id,
)
return
Expand Down Expand Up @@ -298,13 +299,25 @@ async def _send_by_session_common(

sent_message_id = self._extract_message_id(ret)
if sent_message_id:
self.remember_session_message_id(session.session_id, sent_message_id)
self.remember_session_sent_message_id(session.session_id, sent_message_id)
await super().send_by_session(session, message_chain)

def remember_session_inbound_message_id(
self, session_id: str, message_id: str
) -> None:
if not session_id or not message_id:
return
self._session_last_inbound_message_id[session_id] = message_id

def remember_session_message_id(self, session_id: str, message_id: str) -> None:
self.remember_session_inbound_message_id(session_id, message_id)

def remember_session_sent_message_id(
self, session_id: str, message_id: str
) -> None:
if not session_id or not message_id:
return
self._session_last_message_id[session_id] = message_id
self._session_last_outbound_message_id[session_id] = message_id

def remember_session_scene(self, session_id: str, scene: str) -> None:
if not session_id or not scene:
Expand Down