Merge remote-tracking branch 'upstream/debug' into debug

bot.py

@@ -102,7 +102,7 @@ def load_logger():
     if not os.path.exists(log_path):
         os.makedirs(log_path)
 
-    current_env = os.getenv("ENV", "dev")
+    current_env = os.getenv("ENVIRONMENT", "dev")
 
     # 公共配置参数
     log_level = os.getenv("LOG_LEVEL", "INFO" if current_env == "prod" else "DEBUG")

docs/avatars/run.bat

@@ -0,0 +1 @@
+gource gource.log --user-image-dir docs/avatars/ --default-user-image docs/avatars/default.png

src/plugins/chat/__init__.py

@@ -3,8 +3,9 @@ import time
 import os
 
 from loguru import logger
-from nonebot import get_driver, on_message, require
-from nonebot.adapters.onebot.v11 import Bot, GroupMessageEvent, Message, MessageSegment, MessageEvent
+from nonebot import get_driver, on_message, on_notice, require
+from nonebot.rule import to_me
+from nonebot.adapters.onebot.v11 import Bot, GroupMessageEvent, Message, MessageSegment, MessageEvent, NoticeEvent
 from nonebot.typing import T_State
 
 from ..moods.moods import MoodManager  # 导入情绪管理器
@@ -39,6 +40,8 @@ logger.debug(f"正在唤醒{global_config.BOT_NICKNAME}......")
 chat_bot = ChatBot()
 # 注册消息处理器
 msg_in = on_message(priority=5)
+# 注册和bot相关的通知处理器
+notice_matcher = on_notice(priority=1)
 # 创建定时任务
 scheduler = require("nonebot_plugin_apscheduler").scheduler
 
@@ -95,6 +98,12 @@ async def _(bot: Bot, event: MessageEvent, state: T_State):
     await chat_bot.handle_message(event, bot)
 
 
+@notice_matcher.handle()
+async def _(bot: Bot, event: NoticeEvent, state: T_State):
+    logger.debug(f"收到通知：{event}")
+    await chat_bot.handle_notice(event, bot)
+
+
 # 添加build_memory定时任务
 @scheduler.scheduled_job("interval", seconds=global_config.build_memory_interval, id="build_memory")
 async def build_memory_task():

src/plugins/chat/bot.py

@@ -7,6 +7,8 @@ from nonebot.adapters.onebot.v11 import (
     GroupMessageEvent,
     MessageEvent,
     PrivateMessageEvent,
+    NoticeEvent,
+    PokeNotifyEvent,
 )
 
 from ..memory_system.memory import hippocampus
@@ -25,6 +27,7 @@ from .relationship_manager import relationship_manager
 from .storage import MessageStorage
 from .utils import calculate_typing_time, is_mentioned_bot_in_message
 from .utils_image import image_path_to_base64
+from .utils_user import get_user_nickname, get_user_cardname, get_groupname
 from .willing_manager import willing_manager  # 导入意愿管理器
 from .message_base import UserInfo, GroupInfo, Seg
 
@@ -46,6 +49,69 @@ class ChatBot:
         if not self._started:
             self._started = True
 
+    async def handle_notice(self, event: NoticeEvent, bot: Bot) -> None:
+        """处理收到的通知"""
+        # 戳一戳通知
+        if isinstance(event, PokeNotifyEvent):
+            # 用户屏蔽,不区分私聊/群聊
+            if event.user_id in global_config.ban_user_id:
+                return
+            reply_poke_probability = 1  # 回复戳一戳的概率
+
+            if random() < reply_poke_probability:
+                user_info = UserInfo(
+                    user_id=event.user_id,
+                    user_nickname=get_user_nickname(event.user_id) or None,
+                    user_cardname=get_user_cardname(event.user_id) or None,
+                    platform="qq",
+                )
+                group_info = GroupInfo(group_id=event.group_id, group_name=None, platform="qq")
+                message_cq = MessageRecvCQ(
+                    message_id=None,
+                    user_info=user_info,
+                    raw_message=str("[戳了戳]你"),
+                    group_info=group_info,
+                    reply_message=None,
+                    platform="qq",
+                )
+                message_json = message_cq.to_dict()
+
+                # 进入maimbot
+                message = MessageRecv(message_json)
+                groupinfo = message.message_info.group_info
+                userinfo = message.message_info.user_info
+                messageinfo = message.message_info
+
+                chat = await chat_manager.get_or_create_stream(
+                    platform=messageinfo.platform, user_info=userinfo, group_info=groupinfo
+                )
+                message.update_chat_stream(chat)
+                await message.process()
+
+                bot_user_info = UserInfo(
+                    user_id=global_config.BOT_QQ,
+                    user_nickname=global_config.BOT_NICKNAME,
+                    platform=messageinfo.platform,
+                )
+
+                response, raw_content = await self.gpt.generate_response(message)
+
+                if response:
+                    for msg in response:
+                        message_segment = Seg(type="text", data=msg)
+
+                        bot_message = MessageSending(
+                            message_id=None,
+                            chat_stream=chat,
+                            bot_user_info=bot_user_info,
+                            sender_info=userinfo,
+                            message_segment=message_segment,
+                            reply=None,
+                            is_head=False,
+                            is_emoji=False,
+                        )
+                        message_manager.add_message(bot_message)
+
     async def handle_message(self, event: MessageEvent, bot: Bot) -> None:
         """处理收到的消息"""
 
@@ -54,7 +120,10 @@ class ChatBot:
         # 用户屏蔽,不区分私聊/群聊
         if event.user_id in global_config.ban_user_id:
             return
-
+        
+        if event.reply and hasattr(event.reply, 'sender') and hasattr(event.reply.sender, 'user_id') and event.reply.sender.user_id in global_config.ban_user_id:
+            logger.debug(f"跳过处理回复来自被ban用户 {event.reply.sender.user_id} 的消息")
+            return
         # 处理私聊消息
         if isinstance(event, PrivateMessageEvent):
             if not global_config.enable_friend_chat:  # 私聊过滤