✨擴展event字段

src/liteyuki_plugins/hello_liteyuki.py

@@ -10,7 +10,7 @@ Copyright (C) 2020-2024 LiteyukiStudio. All Rights Reserved
 """
 from liteyuki.plugin import PluginMetadata, PluginType
 from liteyuki.message.on import on_message
-from liteyuki.message.event import Event
+from liteyuki.message.event import MessageEvent
 
 __plugin_meta__ = PluginMetadata(
     name="你好轻雪",
@@ -19,6 +19,6 @@ __plugin_meta__ = PluginMetadata(
 
 
 @on_message().handle
-async def _(event: Event):
-    if str(event.data["raw_message"]) == "你好轻雪":
+async def _(event: MessageEvent):
+    if str(event.raw_message) == "你好轻雪":
         event.reply("你好呀")

src/nonebot_plugins/liteyuki_satori_user_info/auto_update.py

@@ -1,7 +1,6 @@
 import nonebot
 
 from nonebot.message import event_preprocessor
-# from nonebot_plugin_alconna.typings import Event
 from src.utils.base.ly_typing import T_MessageEvent
 from src.utils import satori_utils
 from nonebot.adapters import satori

src/nonebot_plugins/to_liteyuki.py

@@ -12,7 +12,7 @@ from nonebot import Bot, get_bot, on_message
 from nonebot.plugin import PluginMetadata
 from nonebot.adapters.onebot.v11 import MessageEvent, Bot
 from liteyuki.comm.storage import shared_memory
-from liteyuki.message.event import Event
+from liteyuki.message.event import MessageEvent as LiteyukiMessageEvent
 
 __plugin_meta__ = PluginMetadata(
     name="轻雪物流",
@@ -23,8 +23,10 @@ __plugin_meta__ = PluginMetadata(
 
 @on_message().handle()
 async def _(bot: Bot, event: MessageEvent):
-    liteyuki_event = Event(
-        type=event.message_type,
+    liteyuki_event = LiteyukiMessageEvent(
+        message_type=event.message_type,
+        message=event.dict()["message"],
+        raw_message=event.raw_message,
         data=event.dict(),
         bot_id=bot.self_id,
         session_id=str(event.user_id if event.message_type == "private" else event.group_id),
@@ -35,6 +37,6 @@ async def _(bot: Bot, event: MessageEvent):
 
 
 @shared_memory.on_subscriber_receive("event_to_nonebot")
-async def _(event: Event):
+async def _(event: MessageEvent):
     bot: Bot = get_bot(event.bot_id)
-    await bot.send_msg(message_type=event.type, user_id=int(event.session_id), group_id=int(event.session_id), message=event.data["message"])
+    await bot.send_msg(message_type=event.message_type, user_id=int(event.session_id), group_id=int(event.session_id), message=event.data["message"])

src/utils/message/message.py

@@ -1,18 +1,15 @@
 import base64
 import io
+from typing import Any
 from urllib.parse import quote
 
 import aiofiles
-from PIL import Image
 import aiohttp
 import nonebot
+from PIL import Image
 from nonebot import require
 from nonebot.adapters import satori
 from nonebot.adapters.onebot import v11
-from typing import Any, Type
-
-from nonebot.internal.adapter import MessageSegment
-from nonebot.internal.adapter.message import TM
 
 from .. import load_from_yaml
 from ..base.ly_typing import T_Bot, T_Message, T_MessageEvent
@@ -65,81 +62,18 @@ class MarkdownMessage:
 
         """
         formatted_md = v11.unescape(markdown).replace("\n", r"\n").replace('"', r'\\\"')
-        if event is not None and message_type is None:
-            if isinstance(event, satori.event.Event):
-                message_type = "private" if event.guild is None else "group"
-                group_id = event.guild.id if event.guild is not None else None
-            else:
-                assert event is not None
-                message_type = event.message_type
-                group_id = event.group_id if message_type == "group" else None
-            user_id = event.user.id if isinstance(event, satori.event.Event) else event.user_id
-            session_id = user_id if message_type == "private" else group_id
-        else:
-            pass
-        try:
-            raise TencentBannedMarkdownError("Tencent banned markdown")
-            forward_id = await bot.call_api(
-                "send_private_forward_msg",
-                messages=[
-                    {
-                        "type": "node",
-                        "data": {
-                            "content": [
-                                {
-                                    "data": {
-                                        "content": "{\"content\":\"%s\"}" % formatted_md,
-                                    },
-                                    "type": "markdown"
-                                }
-                            ],
-                            "name": "[]",
-                            "uin": bot.self_id
-                        }
-                    }
-                ],
-                user_id=bot.self_id
-
-            )
-            data = await bot.send_msg(
-                user_id=session_id,
-                group_id=session_id,
-                message_type=message_type,
-                message=[
-                    {
-                        "type": "longmsg",
-                        "data": {
-                            "id": forward_id
-                        }
-                    },
-                ],
-                **kwargs
-            )
-        except BaseException as e:
-            nonebot.logger.error(f"send markdown error, retry as image: {e}")
-            # 发送失败，渲染为图片发送
-            # if not retry_as_image:
-            #     return None
-
-            plain_markdown = markdown.replace("[🔗", "[")
-            md_image_bytes = await md_to_pic(
-                md=plain_markdown,
-                width=540,
-                device_scale_factor=4
-            )
-            if isinstance(bot, satori.Bot):
-                msg_seg = satori.MessageSegment.image(raw=md_image_bytes,mime="image/png")
-                data = await bot.send(
-                    event=event,
-                    message=msg_seg
-                )
-            else:
-                data = await bot.send_msg(
-                    message_type=message_type,
-                    group_id=session_id,
-                    user_id=session_id,
-                    message=v11.MessageSegment.image(md_image_bytes),
-                )
+        plain_markdown = formatted_md.replace("[🔗", "[")
+        md_image_bytes = await md_to_pic(
+            md=plain_markdown,
+            width=540,
+            device_scale_factor=4
+        )
+        data = await bot.send_msg(
+            message_type=message_type,
+            group_id=session_id,
+            user_id=session_id,
+            message=v11.MessageSegment.image(md_image_bytes),
+        )
         return data
 
     @staticmethod
@@ -156,28 +90,17 @@ class MarkdownMessage:
         Args:
             image: 图片字节流或图片本地路径，链接请使用Markdown.image_async方法获取后通过send_md发送
             bot: bot instance
-            message_type: message type
+            message_type: message message_type
             session_id: session id
             event: event
             kwargs: other arguments
         Returns:
             dict: response data
-
         """
         if isinstance(image, str):
             async with aiofiles.open(image, "rb") as f:
                 image = await f.read()
         method = 2
-        # 1.轻雪图床方案
-        # if method == 1:
-        #     image_url = await liteyuki_api.upload_image(image)
-        #     image_size = Image.open(io.BytesIO(image)).size
-        #     image_md = Markdown.image(image_url, image_size)
-        #     data = await Markdown.send_md(image_md, bot, message_type=message_type, session_id=session_id, event=event,
-        #                                   retry_as_image=False,
-        #                                   **kwargs)
-
-        # Lagrange.OneBot方案
         if method == 2:
             base64_string = base64.b64encode(image).decode("utf-8")
             data = await bot.call_api("upload_image", file=f"base64://{base64_string}")
@@ -190,7 +113,7 @@ class MarkdownMessage:
             image_message_id = (await bot.send_private_msg(
                 user_id=bot.self_id,
                 message=[
-                    v11.MessageSegment.image(file=image)
+                        v11.MessageSegment.image(file=image)
                 ]
             ))["message_id"]
             image_url = (await bot.get_msg(message_id=image_message_id))["message"][0]["data"]["url"]