Diuse/zhenxun_bot
1
0
Fork 0
mirror of https://github.com/zhenxun-org/zhenxun_bot.git synced 2026-10-15 09:10:00 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

✨ 部分功能适配QQ BOT (#1701)

Browse Source
This commit is contained in:
HibiKier
2024-10-18 18:57:55 +08:00
committed by GitHub
parent 7567bfb732
commit 3d3a2a5f7f
29 changed files with 528 additions and 310 deletions
Download Patch File Download Diff File Expand all files Collapse all files
zhenxun/services/__init__.py
-2
View File
@@ -1,2 +0,0 @@
from .db_context import *
from .log import *
zhenxun/services/db_context.py
-2
View File
@@ -4,13 +4,11 @@ from tortoise.models import Model as Model_
from nonebot.utils import is_coroutine_callable
from zhenxun.configs.config import BotConfig
from zhenxun.configs.path_config import DATA_PATH
from .log import logger
SCRIPT_METHOD = []
MODELS: list[str] = []
DATABASE_SETTING_FILE = DATA_PATH / "database.json"
class Model(Model_):
zhenxun/services/log.py
+81 -4
View File
@@ -7,6 +7,7 @@ require("nonebot_plugin_session")
from loguru import logger as logger_
from nonebot_plugin_session import Session
from nonebot.log import default_filter, default_format
from nonebot_plugin_uninfo import Session as uninfoSession
from zhenxun.configs.path_config import LOG_PATH
@@ -77,13 +78,25 @@ class logger:
platform: str | None = None,
): ...
@overload
@classmethod
def info(
cls,
info: str,
command: str | None = None,
*,
session: int | str | Session | None = None,
session: uninfoSession | None = None,
target: Any = None,
platform: str | None = None,
): ...
@classmethod
def info(
cls,
info: str,
command: str | None = None,
*,
session: int | str | Session | uninfoSession | None = None,
group_id: int | str | None = None,
adapter: str | None = None,
target: Any = None,
@@ -98,6 +111,12 @@ class logger:
elif session.id2:
group_id = f"{session.id2}"
platform = platform or session.platform
elif isinstance(session, uninfoSession):
user_id = session.user.id
adapter = session.adapter
if session.group:
group_id = session.group.id
platform = session.basic["scope"]
template = cls.__parser_template(
info, command, user_id, group_id, adapter, target, platform
)
@@ -150,13 +169,27 @@ class logger:
e: Exception | None = None,
): ...
@overload
@classmethod
def warning(
cls,
info: str,
command: str | None = None,
*,
session: int | str | Session | None = None,
session: uninfoSession | None = None,
adapter: str | None = None,
target: Any = None,
platform: str | None = None,
e: Exception | None = None,
): ...
@classmethod
def warning(
cls,
info: str,
command: str | None = None,
*,
session: int | str | Session | uninfoSession | None = None,
group_id: int | str | None = None,
adapter: str | None = None,
target: Any = None,
@@ -172,6 +205,12 @@ class logger:
elif session.id2:
group_id = f"{session.id2}"
platform = platform or session.platform
elif isinstance(session, uninfoSession):
user_id = session.user.id
adapter = session.adapter
if session.group:
group_id = session.group.id
platform = session.basic["scope"]
template = cls.__parser_template(
info, command, user_id, group_id, adapter, target, platform
)
@@ -210,13 +249,26 @@ class logger:
e: Exception | None = None,
): ...
@overload
@classmethod
def error(
cls,
info: str,
command: str | None = None,
*,
session: int | str | Session | None = None,
session: uninfoSession | None = None,
target: Any = None,
platform: str | None = None,
e: Exception | None = None,
): ...
@classmethod
def error(
cls,
info: str,
command: str | None = None,
*,
session: int | str | Session | uninfoSession | None = None,
group_id: int | str | None = None,
adapter: str | None = None,
target: Any = None,
@@ -232,6 +284,12 @@ class logger:
elif session.id2:
group_id = f"{session.id2}"
platform = platform or session.platform
elif isinstance(session, uninfoSession):
user_id = session.user.id
adapter = session.adapter
if session.group:
group_id = session.group.id
platform = session.basic["scope"]
template = cls.__parser_template(
info, command, user_id, group_id, adapter, target, platform
)
@@ -270,13 +328,26 @@ class logger:
e: Exception | None = None,
): ...
@overload
@classmethod
def debug(
cls,
info: str,
command: str | None = None,
*,
session: int | str | Session | None = None,
session: uninfoSession | None = None,
target: Any = None,
platform: str | None = None,
e: Exception | None = None,
): ...
@classmethod
def debug(
cls,
info: str,
command: str | None = None,
*,
session: int | str | Session | uninfoSession | None = None,
group_id: int | str | None = None,
adapter: str | None = None,
target: Any = None,
@@ -292,6 +363,12 @@ class logger:
elif session.id2:
group_id = f"{session.id2}"
platform = platform or session.platform
elif isinstance(session, uninfoSession):
user_id = session.user.id
adapter = session.adapter
if session.group:
group_id = session.group.id
platform = session.basic["scope"]
template = cls.__parser_template(
info, command, user_id, group_id, adapter, target, platform
)