update

plugins/ai/__init__.py

@@ -3,8 +3,8 @@ from services.log import logger
 from nonebot import on_message
 from nonebot.rule import to_me
 from nonebot.typing import T_State
-from nonebot.adapters.cqhttp import Bot, GroupMessageEvent, PrivateMessageEvent
-from util.utils import get_message_text, get_message_imgs
+from nonebot.adapters.cqhttp import Bot, GroupMessageEvent, PrivateMessageEvent, Message
+from utils.utils import get_message_text, get_message_imgs
 from models.friend_user import FriendUser
 from models.group_member_info import GroupInfoUser
 
@@ -32,7 +32,7 @@ async def _(bot: Bot, event: PrivateMessageEvent, state: T_State):
     result = await get_qqbot_chat_result(msg, img, event.user_id, nickname)
     logger.info(f"USER {event.user_id} 问题：{msg}\n回答：{result}")
     if result:
-        await ai.finish(result)
+        await ai.finish(Message(result))
     else:
         await ai.finish(no_result())
 
@@ -55,7 +55,7 @@ async def _(bot: Bot, event: GroupMessageEvent, state: T_State):
     result = await get_qqbot_chat_result(msg, img, event.user_id, nickname)
     logger.info(f"问题：{msg}\n回答：{result}")
     if result:
-        await ai.finish(result)
+        await ai.finish(Message(result))
     else:
         await ai.finish(no_result())
 

plugins/ai/data_source.py

@@ -4,8 +4,9 @@ import random
 import os
 from configs.path_config import IMAGE_PATH, DATA_PATH
 from services.log import logger
-from util.init_result import image
-from util.utils import get_bot
+from utils.init_result import image, face
+from utils.utils import get_bot
+import re
 
 try:
     import ujson as json
@@ -100,7 +101,13 @@ async def get_qqbot_chat_result(text: str, img_url: str, user_id: int, user_name
                                 content = content.replace('{br}', '\n')
                             if content.find('提示') != -1:
                                 content = content[:content.find('提示')]
-
+                            while True:
+                                r = re.search('{face:(.*)}', content)
+                                if r:
+                                    id_ = r.group(1)
+                                    content = content.replace('{' + f'face:{id_}' + '}', str(face(id_)))
+                                else:
+                                    break
                             return content
             if resp_payload['results']:
                 for result in resp_payload['results']:
@@ -111,7 +118,7 @@ async def get_qqbot_chat_result(text: str, img_url: str, user_id: int, user_name
                             if len(user_name) < 5:
                                 if random.random() < 0.5:
                                     user_name = "~".join(user_name) + '~'
-                                    if random.random() < 0.5:
+                                    if random.random() < 0.2:
                                         if user_name.find('大人') == -1:
                                             user_name += '大~人~'
                             text = text.replace('小主人', user_name)