fix: 简单的适配下消息段 & 优化下发语音的代码

src/common/utils/array2cqcode/__init__.py

@@ -0,0 +1,23 @@
+import json
+
+from .message_segment import BaseMessageSegment
+from typing import Any
+
+
+def try_convert_to_cqcode(data: Any) -> str | Any:
+    try:
+        msg = json.loads(data)
+        if not isinstance(msg, list):
+            return msg
+    except TypeError:
+        if not isinstance(data, list):
+            return data
+        msg = data
+    except json.JSONDecodeError:
+        return data
+    except:
+        return data
+    cqmessage = ''
+    for seg in msg:
+        cqmessage += BaseMessageSegment(**seg).cqcode
+    return cqmessage

src/common/utils/array2cqcode/message_segment.py

@@ -0,0 +1,23 @@
+class BaseMessageSegment:
+    def __init__(self, **kwargs):
+        for key, value in kwargs.items():
+            setattr(self, key, value)
+
+    @property
+    def cqcode(self):
+        if self.type == "text":
+            return self.data.get("text")
+        message = f"[CQ:{self.type}"
+        for k, v in self.__dict__.get("data").items():
+            message += f",{k}={self.escape(v)}"
+        message += "]"
+        return message
+
+    @staticmethod
+    def escape(data: str) -> str:
+        return (
+            data.replace("&", "&")
+            .replace("[", "[")
+            .replace("]", "]")
+            .replace(",", ",")
+        )

src/plugins/greeting/__init__.py

@@ -66,11 +66,11 @@ async def handle_first_receive(bot: Bot, event: GroupMessageEvent, state: T_Stat
         return
     config.refresh_cooldown('call_me')
 
-    with open(Path(wiki.get_random_voice(operator, greeting_voices)), 'rb') as f:
-        data = f.read()
-    msg: Message = MessageSegment.record(file=data)
+    msg: Message = MessageSegment.record(
+        file=Path(wiki.get_random_voice(operator, greeting_voices)).read_bytes())
     await call_me_cmd.finish(msg)
 
+
 to_me_cmd = on_message(
     rule=to_me(),
     priority=14,
@@ -87,9 +87,10 @@ async def handle_first_receive(bot: Bot, event: GroupMessageEvent, state: T_Stat
 
     if len(event.get_plaintext().strip()) == 0 and not event.reply:
         msg: Message = MessageSegment.record(
-            file=Path(wiki.get_random_voice(operator, greeting_voices)))
+            file=Path(wiki.get_random_voice(operator, greeting_voices)).read_bytes())
         await to_me_cmd.finish(msg)
 
+
 all_notice = on_notice(
     priority=14,
     block=False)
@@ -122,12 +123,12 @@ async def handle_first_receive(bot: Bot, event: Event, state: T_State):
 
     elif event.notice_type == 'group_admin' and event.sub_type == 'set' and event.user_id == event.self_id:
         msg: Message = MessageSegment.record(
-            file=Path(wiki.get_voice_filename(operator, '任命助理')))
+            file=Path(wiki.get_voice_filename(operator, '任命助理')).read_bytes())
         await all_notice.finish(msg)
 
     elif event.notice_type == 'friend_add':
         msg: Message = MessageSegment.record(
-            file=Path(wiki.get_voice_filename(operator, '精英化晋升2')))
+            file=Path(wiki.get_voice_filename(operator, '精英化晋升2')).read_bytes())
         await all_notice.finish(msg)
 
     # 被禁言自动退群

src/plugins/repeater/__init__.py

@@ -15,6 +15,7 @@
 from nonebot.permission import SUPERUSER
 from src.common.config import BotConfig
 from src.common.utils.media_cache import insert_image, get_image
+from src.common.utils.array2cqcode import try_convert_to_cqcode
 
 from .model import Chat
 
@@ -155,7 +156,7 @@ async def is_reply(bot: Bot, event: GroupMessageEvent, state: T_State) -> bool:
 
 @ban_msg.handle()
 async def _(bot: Bot, event: GroupMessageEvent, state: T_State):
-    if '[CQ:reply,' not in event.raw_message:
+    if '[CQ:reply,' not in try_convert_to_cqcode(event.raw_message):
         return False
 
     raw_message = ''
@@ -219,7 +220,7 @@ async def _(bot: Bot, event: GroupRecallNoticeEvent, state: T_State):
 
     raw_message = ''
     # 使用get_msg得到的消息不是消息序列，使用正则生成一个迭代对象
-    for item in re.compile(r'\[[^\]]*\]|\w+').findall(msg['message']):
+    for item in re.compile(r'\[[^\]]*\]|\w+').findall(try_convert_to_cqcode(msg['message'])):
         raw_reply = str(item)
         # 去掉图片消息中的 url, subType 等字段
         raw_message += re.sub(r'(\[CQ\:.+)(?:,url=*)(\])',