1
0
forked from bot/app

snowy 进行的更改

This commit is contained in:
2024-03-22 12:41:38 +08:00
parent 367b8a5e5d
commit 0bd415961c
15 changed files with 207 additions and 85 deletions

View File

@ -12,7 +12,7 @@ plugin_db = DB(os.path.join(DATA_PATH, 'plugins.ldb'))
class User(LiteModel):
user_id: str
username: str = ""
lang: str = "en"
profile: dict = {}
enabled_plugins: list[str] = []
disabled_plugins: list[str] = []

View File

@ -136,9 +136,10 @@ def get_user_lang(user_id: str) -> Language:
"""
user = user_db.first(User, "user_id = ?", user_id, default=User(
user_id=user_id,
username="Unknown",
lang=config.get("default_language", get_system_lang_code())))
return Language(user.lang)
username="Unknown"
))
return Language(user.profile.get('lang',config.get("default_language", get_system_lang_code()) ))
def get_system_lang_code() -> str:

View File

@ -6,7 +6,7 @@ from .tools import de_escape, encode_url
from .typing import T_Bot, T_MessageEvent
async def send_markdown(markdown: str, bot: T_Bot, *, message_type: str = None, session_id: str | int = None, event: T_MessageEvent = None) -> dict[str, Any]:
async def send_markdown(markdown: str, bot: T_Bot, *, message_type: str = None, session_id: str | int = None, event: T_MessageEvent = None, **kwargs) -> dict[str, Any]:
formatted_md = de_escape(markdown).replace("\n", r"\n").replace("\"", r'\\\"')
if event is not None and message_type is None:
message_type = event.message_type
@ -45,6 +45,7 @@ async def send_markdown(markdown: str, bot: T_Bot, *, message_type: str = None,
}
),
],
**kwargs
)
except Exception as e:
@ -54,7 +55,8 @@ async def send_markdown(markdown: str, bot: T_Bot, *, message_type: str = None,
message_type=message_type,
message=markdown,
user_id=int(session_id),
group_id=int(session_id)
group_id=int(session_id),
**kwargs
)
elif isinstance(bot, v12.Bot):
data = await bot.send_message(
@ -65,7 +67,8 @@ async def send_markdown(markdown: str, bot: T_Bot, *, message_type: str = None,
)
),
user_id=str(session_id),
group_id=str(session_id)
group_id=str(session_id),
**kwargs
)
else:
nonebot.logger.error("send_markdown: bot type not supported")