Skip to content

fix: resolve Discord/Misskey hot reload issue by fixing client_self_id misuse #7331

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

Merged
Soulter merged 2 commits into from
Apr 3, 2026
Merged

fix: resolve Discord/Misskey hot reload issue by fixing client_self_id misuse #7331

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
12039fe
fix: resolve Discord/Misskey hot reload issue by fixing client_self_i…
Soulter Apr 3, 2026
d612c9e
fix: english logging
Soulter Apr 3, 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
10 changes: 5 additions & 5 deletions astrbot/core/platform/sources/discord/client.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,19 +35,19 @@ def __init__(self, token: str, proxy: str | None = None) -> None:
async def on_ready(self) -> None:
"""当机器人成功连接并准备就绪时触发"""
if self.user is None:
logger.error("[Discord] 客户端未正确加载用户信息 (self.user is None)")
logger.error("[Discord] Bot user not loaded correctly (self.user is None)")
return

logger.info(f"[Discord] 已作为 {self.user} (ID: {self.user.id}) 登录")
logger.info("[Discord] 客户端已准备就绪。")
logger.info(f"[Discord] Logged in as {self.user} (ID: {self.user.id})")
logger.info("[Discord] Client is ready.")

if self.on_ready_once_callback and not self._ready_once_fired:
self._ready_once_fired = True
try:
await self.on_ready_once_callback()
except Exception as e:
logger.error(
f"[Discord] on_ready_once_callback 执行失败: {e}",
f"[Discord] Failed to execute on_ready_once_callback: {e}",
exc_info=True,
)

Expand Down Expand Up @@ -99,7 +99,7 @@ async def on_message(self, message: discord.Message) -> None:
return

logger.debug(
f"[Discord] 收到原始消息 from {message.author.name}: {message.content}",
f"[Discord] Received raw message from {message.author.name}: {message.content}",
)

if self.on_message_received:
Expand Down
120 changes: 67 additions & 53 deletions astrbot/core/platform/sources/discord/discord_platform_adapter.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ def __init__(
) -> None:
super().__init__(platform_config, event_queue)
self.settings = platform_settings
self.client_self_id: str | None = None
self.bot_self_id: str | None = None
self.registered_handlers = []
# 指令注册相关
self.enable_command_register = self.config.get("discord_command_register", True)
Expand All @@ -64,7 +64,7 @@ async def send_by_session(
"""通过会话发送消息"""
if self.client.user is None:
logger.error(
"[Discord] 客户端未就绪 (self.client.user is None)，无法发送消息"
"[Discord] Client is not ready (self.client.user is None); message send skipped"
)
return

Expand Down Expand Up @@ -92,10 +92,10 @@ async def send_by_session(

message_obj.message_str = message_chain.get_plain_text()
message_obj.sender = MessageMember(
user_id=str(self.client_self_id),
user_id=str(self.bot_self_id),
nickname=self.client.user.display_name,
)
message_obj.self_id = cast(str, self.client_self_id)
message_obj.self_id = cast(str, self.bot_self_id)
message_obj.session_id = session.session_id
message_obj.message = message_chain.chain

Expand All @@ -115,7 +115,7 @@ def meta(self) -> PlatformMetadata:
"""返回平台元数据"""
return PlatformMetadata(
"discord",
"Discord 适配器",
"Discord Adapter",
id=cast(str, self.config.get("id")),
default_config_tmpl=self.config,
support_streaming_message=False,
Expand All @@ -127,29 +127,36 @@ async def run(self) -> None:

# 初始化回调函数
async def on_received(message_data) -> None:
logger.debug(f"[Discord] 收到消息: {message_data}")
if self.client_self_id is None:
self.client_self_id = message_data.get("bot_id")
logger.debug(f"[Discord] Message received: {message_data}")
if self.bot_self_id is None:
self.bot_self_id = message_data.get("bot_id")
abm = await self.convert_message(data=message_data)
await self.handle_msg(abm)

# 初始化 Discord 客户端
token = str(self.config.get("discord_token"))
if not token:
logger.error("[Discord] Bot Token 未配置。请在配置文件中正确设置 token。")
logger.error(
"[Discord] Bot token is not configured. Please set a valid token in the config file."
)
return

proxy = self.config.get("discord_proxy") or None
self.client = DiscordBotClient(token, proxy)
self.client.on_message_received = on_received

async def callback() -> None:
if self.enable_command_register:
await self._collect_and_register_commands()
if self.activity_name:
await self.client.change_presence(
status=discord.Status.online,
activity=discord.CustomActivity(name=self.activity_name),
try:
if self.enable_command_register:
await self._collect_and_register_commands()
if self.activity_name:
await self.client.change_presence(
status=discord.Status.online,
activity=discord.CustomActivity(name=self.activity_name),
)
except Exception as e:
logger.error(
f"[Discord] on_ready_once_callback err: {e}", exc_info=True
)

self.client.on_ready_once_callback = callback
Expand All @@ -158,11 +165,16 @@ async def callback() -> None:
self._polling_task = asyncio.create_task(self.client.start_polling())
await self.shutdown_event.wait()
except discord.errors.LoginFailure:
logger.error("[Discord] 登录失败。请检查你的 Bot Token 是否正确。")
logger.error(
"[Discord] Login failed. Please check whether the bot token is correct."
)
except discord.errors.ConnectionClosed:
logger.warning("[Discord] 与 Discord 的连接已关闭。")
logger.warning("[Discord] Connection with Discord has been closed.")
except Exception as e:
logger.error(f"[Discord] 适配器运行时发生意外错误: {e}", exc_info=True)
logger.error(
f"[Discord] Unexpected error while adapter is running: {e}",
exc_info=True,
)

def _get_message_type(
self,
Expand Down Expand Up @@ -241,7 +253,7 @@ def _convert_message_to_abm(self, data: dict) -> AstrBotMessage:
)
abm.message = message_chain
abm.raw_message = message
abm.self_id = cast(str, self.client_self_id)
abm.self_id = cast(str, self.bot_self_id)
abm.session_id = str(message.channel.id)
abm.message_id = str(message.id)
return abm
Expand All @@ -264,7 +276,7 @@ async def handle_msg(self, message: AstrBotMessage, followup_webhook=None) -> No

if self.client.user is None:
logger.error(
"[Discord] 客户端未就绪 (self.client.user is None)，无法处理消息"
"[Discord] Client is not ready (self.client.user is None); message handling skipped"
)
return

Expand All @@ -283,7 +295,7 @@ async def handle_msg(self, message: AstrBotMessage, followup_webhook=None) -> No
raw_message = message.raw_message
if not isinstance(raw_message, discord.Message):
logger.warning(
f"[Discord] 收到非 Message 类型的消息: {type(raw_message)}，已忽略。"
f"[Discord] Non-Message type received and ignored: {type(raw_message)}"
)
return

Expand Down Expand Up @@ -324,20 +336,9 @@ async def handle_msg(self, message: AstrBotMessage, followup_webhook=None) -> No

@override
async def terminate(self) -> None:
"""终止适配器"""
logger.info("[Discord] 正在终止适配器... (step 1: cancel polling task)")
logger.info("[Discord] Shutting down adapter...")
self.shutdown_event.set()
# 优先 cancel polling_task
if self._polling_task:
self._polling_task.cancel()
try:
await asyncio.wait_for(self._polling_task, timeout=10)
except asyncio.CancelledError:
logger.info("[Discord] polling_task 已取消。")
except Exception as e:
logger.warning(f"[Discord] polling_task 取消异常: {e}")
logger.info("[Discord] 正在清理已注册的斜杠指令... (step 2)")
# 清理指令
logger.info("[Discord] Cleaning up commands...")
if self.enable_command_register and self.client:
try:
await asyncio.wait_for(
Expand All @@ -347,24 +348,37 @@ async def terminate(self) -> None:
),
timeout=10,
)
logger.info("[Discord] 指令清理完成。")
logger.info("[Discord] Commands cleaned up successfully.")
except Exception as e:
logger.warning(
f"[Discord] Error occurred while cleaning up commands: {e}"
)

if self._polling_task:
self._polling_task.cancel()
try:
await asyncio.wait_for(self._polling_task, timeout=10)
except asyncio.CancelledError:
logger.info("[Discord] Polling task cancelled successfully.")
except Exception as e:
logger.error(f"[Discord] 清理指令时发生错误: {e}", exc_info=True)
logger.info("[Discord] 正在关闭 Discord 客户端... (step 3)")
logger.warning(
f"[Discord] Error occurred while cancelling polling task: {e}"
)
logger.info("[Discord] Closing client connection...")
if self.client and hasattr(self.client, "close"):
try:
await asyncio.wait_for(self.client.close(), timeout=10)
except Exception as e:
logger.warning(f"[Discord] 客户端关闭异常: {e}")
logger.info("[Discord] 适配器已终止。")
logger.warning(f"[Discord] Error occurred while closing client: {e}")
logger.info("[Discord] Adapter shutdown complete.")

def register_handler(self, handler_info) -> None:
"""注册处理器信息"""
self.registered_handlers.append(handler_info)

async def _collect_and_register_commands(self) -> None:
"""收集所有指令并注册到Discord"""
logger.info("[Discord] 开始收集并注册斜杠指令...")
logger.info("[Discord] Collecting and registering slash commands...")
registered_commands = []

for handler_md in star_handlers_registry:
Expand Down Expand Up @@ -405,15 +419,15 @@ async def _collect_and_register_commands(self) -> None:

if registered_commands:
logger.info(
f"[Discord] 准备同步 {len(registered_commands)} 个指令: {', '.join(registered_commands)}",
f"[Discord] Ready to sync {len(registered_commands)} commands: {', '.join(registered_commands)}",
)
else:
logger.info("[Discord] 没有发现可注册的指令。")
logger.info("[Discord] No commands found for registration.")

# 使用 Pycord 的方法同步指令
# 注意：这可能需要一些时间，并且有频率限制
await self.client.sync_commands()
logger.info("[Discord] 指令同步完成。")
logger.info("[Discord] Command synchronization completed.")

def _create_dynamic_callback(self, cmd_name: str):
"""为每个指令动态创建一个异步回调函数"""
Expand All @@ -422,17 +436,17 @@ async def dynamic_callback(
ctx: discord.ApplicationContext, params: str | None = None
) -> None:
# 将平台特定的前缀'/'剥离，以适配通用的CommandFilter
logger.debug(f"[Discord] 回调函数触发: {cmd_name}")
logger.debug(f"[Discord] 回调函数参数: {ctx}")
logger.debug(f"[Discord] 回调函数参数: {params}")
logger.debug(f"[Discord] Callback triggered: {cmd_name}")
logger.debug(f"[Discord] Callback context: {ctx}")
logger.debug(f"[Discord] Callback params: {params}")
message_str_for_filter = cmd_name
if params:
message_str_for_filter += f" {params}"

logger.debug(
f"[Discord] 斜杠指令 '{cmd_name}' 被触发。 "
f"原始参数: '{params}'. "
f"构建的指令字符串: '{message_str_for_filter}'",
f"[Discord] Slash command '{cmd_name}' triggered. "
f"Raw params: '{params}'. "
f"Built command string: '{message_str_for_filter}'",
)

# 尝试立即响应，防止超时
Expand All @@ -441,7 +455,7 @@ async def dynamic_callback(
await ctx.defer()
followup_webhook = ctx.followup
except Exception as e:
logger.warning(f"[Discord] 指令 '{cmd_name}' defer 失败: {e}")
logger.warning(f"[Discord] Failed to defer command '{cmd_name}': {e}")

# 2. 构建 AstrBotMessage
channel = ctx.channel
Expand All @@ -465,7 +479,7 @@ async def dynamic_callback(
)
abm.message = [Plain(text=message_str_for_filter)]
abm.raw_message = ctx.interaction
abm.self_id = cast(str, self.client_self_id)
abm.self_id = cast(str, self.bot_self_id)
abm.session_id = str(ctx.channel_id)
abm.message_id = str(ctx.interaction.id)

Expand Down Expand Up @@ -503,10 +517,10 @@ def _extract_command_info(

# Discord 斜杠指令名称规范
if not re.match(r"^[a-z0-9_-]{1,32}$", cmd_name):
logger.debug(f"[Discord] 跳过不符合规范的指令: {cmd_name}")
logger.debug(f"[Discord] Skipping invalid slash command format: {cmd_name}")
return None

description = handler_metadata.desc or f"指令: {cmd_name}"
description = handler_metadata.desc or f"Command: {cmd_name}"
if len(description) > 100:
description = f"{description[:97]}..."

Expand Down
Loading
Loading