ErisPulse-OneBot11Adapter 3.0.0__tar.gz → 3.0.2__tar.gz

{erispulse_onebot11adapter-3.0.0 → erispulse_onebot11adapter-3.0.2}/ErisPulse_OneBot11Adapter.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: ErisPulse-OneBot11Adapter
-Version: 3.0.0
+Version: 3.0.2
 Summary: ErisPulse的OneBotV11协议适配模块，异步的OneBot触发器
 Author-email: wsu2059q <wsu2059@qq.com>
 License: MIT License

{erispulse_onebot11adapter-3.0.0 → erispulse_onebot11adapter-3.0.2}/OneBotAdapter/Converter.py

@@ -78,6 +78,10 @@ class OneBot11Converter:
             "user_id": str(raw_event.get("user_id", "")),
             "onebot11_message": raw_event["message"]
         })
+        
+        # 添加非标准字段
+        if "user_nickname" in raw_event:
+            base_event["user_nickname"] = raw_event["user_nickname"]
 
         if detail_type == "group":
             base_event["group_id"] = str(raw_event.get("group_id", ""))

{erispulse_onebot11adapter-3.0.0 → erispulse_onebot11adapter-3.0.2}/OneBotAdapter/Core.py

@@ -2,7 +2,7 @@ import asyncio
 import json
 import aiohttp
 from fastapi import WebSocket, WebSocketDisconnect
-from typing import Dict, List, Optional, Any, Type
+from typing import Dict, List, Optional, Any, Type, Union
 from ErisPulse import sdk
 from ErisPulse.Core import adapter_server
 
@@ -18,15 +18,50 @@ class OneBotAdapter(sdk.BaseAdapter):
                     message=text
                 )
             )
+        
+        def Image(self, file: Union[str, bytes], filename: str = "image.png"):
+            return self._send_media("image", file, filename)
 
-        def Image(self, file: str):
-            return self._send("image", {"file": file})
+        def Voice(self, file: Union[str, bytes], filename: str = "voice.amr"):
+            return self._send_media("voice", file, filename)
 
-        def Voice(self, file: str):
-            return self._send("voice", {"file": file})
+        def Video(self, file: Union[str, bytes], filename: str = "video.mp4"):
+            return self._send_media("video", file, filename)
 
-        def Video(self, file: str):
-            return self._send("video", {"file": file})
+        def _send_media(self, msg_type: str, file: Union[str, bytes], filename: str):
+            if isinstance(file, bytes):
+                return self._send_bytes(msg_type, file, filename)
+            else:
+                return self._send(msg_type, {"file": file})
+
+        def _send_bytes(self, msg_type: str, data: bytes, filename: str):
+            if msg_type in ["image", "voice"]:
+                try:
+                    import base64
+                    b64_data = base64.b64encode(data).decode('utf-8')
+                    return self._send(msg_type, {"file": f"base64://{b64_data}"})
+                except Exception as e:
+                    self._adapter.logger.warning(f"Base64发送失败，回退到临时文件方式: {str(e)}")
+            
+            import tempfile
+            import os
+            import uuid
+            
+            temp_dir = os.path.join(tempfile.gettempdir(), "onebot_media")
+            os.makedirs(temp_dir, exist_ok=True)
+            unique_filename = f"{uuid.uuid4().hex}_{filename}"
+            filepath = os.path.join(temp_dir, unique_filename)
+            
+            with open(filepath, "wb") as f:
+                f.write(data)
+            
+            try:
+                return self._send(msg_type, {"file": filepath})
+            finally:
+                try:
+                    os.remove(filepath)
+                except:
+                    pass
 
         def Raw(self, message_list):
             """

{erispulse_onebot11adapter-3.0.0 → erispulse_onebot11adapter-3.0.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: ErisPulse-OneBot11Adapter
-Version: 3.0.0
+Version: 3.0.2
 Summary: ErisPulse的OneBotV11协议适配模块，异步的OneBot触发器
 Author-email: wsu2059q <wsu2059@qq.com>
 License: MIT License

{erispulse_onebot11adapter-3.0.0 → erispulse_onebot11adapter-3.0.2}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "ErisPulse-OneBot11Adapter"
-version = "3.0.0"
+version = "3.0.2"
 description = "ErisPulse的OneBotV11协议适配模块，异步的OneBot触发器"
 readme = "README.md"
 requires-python = ">=3.9"