小修复

This commit is contained in:
雅诺狐
2025-08-12 22:38:26 +08:00
parent b393ec8d92
commit 4da66f39c9
5 changed files with 37 additions and 32 deletions

View File

@@ -1,4 +1,4 @@
from typing import List, Tuple, Type, Any
from typing import Dict, List, Optional, Tuple, Type, Any
from src.plugin_system import (
BasePlugin,
register_plugin,
@@ -15,6 +15,10 @@ from src.plugin_system import (
from src.plugin_system.base.base_command import BaseCommand
from src.plugin_system.apis import send_api
from typing import Tuple
from src.common.logger import get_logger
logger = get_logger(__name__)
class GetGroupListCommand(BaseCommand):
"""获取群列表命令"""
@@ -26,40 +30,28 @@ class GetGroupListCommand(BaseCommand):
command_examples = ["/get_groups"]
intercept_message = True
async def execute(self) -> Tuple[bool, str, bool]:
try:
# 获取聊天流ID
stream_id = self.message.chat_stream.stream_id
# 调用适配器命令API
domain = "user.qzone.qq.com"
response = await send_api.adapter_command_to_stream(
action="get_group_list",
params={},
stream_id=stream_id
action="get_cookies",
platform="qq",
params={"domain": domain},
timeout=40.0,
storage_message=False
)
if response["status"] == "ok":
group_list = response.get("data", [])
if group_list:
# 格式化群列表信息
group_info = "\\n".join([
f"群号: {group['group_id']}, 群名: {group['group_name']}"
for group in group_list
])
await self.send_text(f"机器人加入的群列表:\\n{group_info}")
else:
await self.send_text("机器人未加入任何群")
return True, "获取群列表成功", True
else:
await self.send_text(f"获取群列表失败: {response['message']}")
return False, "获取群列表失败", True
text = str(response)
await self.send_text(text)
return True, "获取群列表成功", True
except Exception as e:
logger.error(f"执行获取群列表命令时出错: {e}")
await self.send_text("命令执行失败")
return False, "命令执行失败", True
await self.send_text(f"获取群列表失败: {str(e)}")
return False, "获取群列表失败", True
class CompareNumbersTool(BaseTool):
"""比较两个数大小的工具"""

View File

@@ -157,6 +157,10 @@ class ChatBot:
if message.message_segment.type == "adapter_response":
await self.handle_adapter_response(message)
return True
elif message.message_segment.type == "adapter_command":
# 适配器命令消息不需要进一步处理
logger.debug("收到适配器命令消息,跳过后续处理")
return True
return False

View File

@@ -116,6 +116,8 @@ class MessageStorage:
"""更新消息ID"""
try:
mmc_message_id = message.message_info.message_id # 修复正确访问message_id
qq_message_id = None # 初始化变量
if message.message_segment.type == "notify":
qq_message_id = message.message_segment.data.get("id")
elif message.message_segment.type == "text":
@@ -125,9 +127,14 @@ class MessageStorage:
logger.info(f"更新消息ID完成,消息ID为{qq_message_id}")
elif message.message_segment.type == "adapter_response":
logger.debug("适配器响应消息不需要更新ID")
return
elif message.message_segment.type == "adapter_command":
logger.debug("适配器命令消息不需要更新ID")
return
else:
logger.info(f"更新消息ID错误seg类型为{message.message_segment.type}")
return
if not qq_message_id:
logger.info("消息不存在message_id无法更新")
return

View File

@@ -411,6 +411,7 @@ async def custom_to_stream(
async def adapter_command_to_stream(
action: str,
params: dict,
platform: str,
stream_id: Optional[str] = None,
timeout: float = 30.0,
storage_message: bool = False
@@ -452,12 +453,12 @@ async def adapter_command_to_stream(
temp_user_info = UserInfo(
user_id="system",
user_nickname="System",
platform="adapter_command"
platform=platform
)
temp_chat_stream = ChatStream(
stream_id=stream_id,
platform="adapter_command",
platform=platform,
user_info=temp_user_info,
group_info=None
)

View File

@@ -1,3 +1,4 @@
import asyncio
import os
import traceback
import sys
@@ -513,7 +514,7 @@ class PluginManager:
plugin_instance.on_unload()
# 从组件注册表中移除插件的所有组件
component_registry.unregister_plugin(plugin_name)
asyncio.run(component_registry.unregister_plugin(plugin_name))
# 从已加载插件中移除
del self.loaded_plugins[plugin_name]