maim_message logger传入,版本显示

dev-from070-to080
UnCLAS-Prommer 2025-06-28 12:23:50 +08:00
parent 5c57ba9c85
commit ed9ecae9dc
4 changed files with 16 additions and 8 deletions

View File

@ -5,6 +5,5 @@ requests
maim_message
loguru
pillow
tomli
tomlkit
rich

View File

@ -1,4 +1,7 @@
from enum import Enum
import tomlkit
import os
from .logger import logger
class CommandType(Enum):
@ -11,3 +14,9 @@ class CommandType(Enum):
def __str__(self) -> str:
return self.value
pyproject_path = os.path.join(os.path.dirname(os.path.dirname(__file__)), "pyproject.toml")
toml_data = tomlkit.parse(open(pyproject_path, "r", encoding="utf-8").read())
version = toml_data["project"]["version"]
logger.info(f"版本\n\nMaiBot-Napcat-Adapter 版本: {version}\n")

View File

@ -11,7 +11,7 @@ route_config = RouteConfig(
)
}
)
router = Router(route_config)
router = Router(route_config, logger)
async def mmc_start_com():

View File

@ -23,7 +23,7 @@ class SSLAdapter(urllib3.PoolManager):
super().__init__(*args, **kwargs)
async def get_group_info(websocket: Server.ServerConnection, group_id: int) -> dict:
async def get_group_info(websocket: Server.ServerConnection, group_id: int) -> dict | None:
"""
获取群相关信息
@ -45,7 +45,7 @@ async def get_group_info(websocket: Server.ServerConnection, group_id: int) -> d
return socket_response.get("data")
async def get_group_detail_info(websocket: Server.ServerConnection, group_id: int) -> dict:
async def get_group_detail_info(websocket: Server.ServerConnection, group_id: int) -> dict | None:
"""
获取群详细信息
@ -67,7 +67,7 @@ async def get_group_detail_info(websocket: Server.ServerConnection, group_id: in
return socket_response.get("data")
async def get_member_info(websocket: Server.ServerConnection, group_id: int, user_id: int) -> dict:
async def get_member_info(websocket: Server.ServerConnection, group_id: int, user_id: int) -> dict | None:
"""
获取群成员信息
@ -133,7 +133,7 @@ def convert_image_to_gif(image_base64: str) -> str:
return image_base64
async def get_self_info(websocket: Server.ServerConnection) -> dict:
async def get_self_info(websocket: Server.ServerConnection) -> dict | None:
"""
获取自身信息
Parameters:
@ -169,7 +169,7 @@ def get_image_format(raw_data: str) -> str:
return Image.open(io.BytesIO(image_bytes)).format.lower()
async def get_stranger_info(websocket: Server.ServerConnection, user_id: int) -> dict:
async def get_stranger_info(websocket: Server.ServerConnection, user_id: int) -> dict | None:
"""
获取陌生人信息
Parameters:
@ -194,7 +194,7 @@ async def get_stranger_info(websocket: Server.ServerConnection, user_id: int) ->
return response.get("data")
async def get_message_detail(websocket: Server.ServerConnection, message_id: Union[str, int]) -> dict:
async def get_message_detail(websocket: Server.ServerConnection, message_id: Union[str, int]) -> dict | None:
"""
获取消息详情可能为空
Parameters: