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

Merge branch 'dev' into dev

Browse Source
This commit is contained in:
HibiKier
2024-08-24 20:05:28 +08:00
committed by GitHub
parent c089395597 45c6dbd2ce
commit 77673f6bed
40 changed files with 242 additions and 227 deletions
Download Patch File Download Diff File Expand all files Collapse all files
zhenxun/builtin_plugins/admin/group_member_update/__init__.py
+2 -2
View File
@@ -7,7 +7,7 @@ from nonebot_plugin_alconna import Alconna, Arparma, on_alconna
from nonebot_plugin_apscheduler import scheduler
from nonebot_plugin_session import EventSession
from zhenxun.configs.config import NICKNAME
from zhenxun.configs.config import BotConfig
from zhenxun.configs.utils import PluginExtraData
from zhenxun.services.log import logger
from zhenxun.utils.enum import PluginType
@@ -62,7 +62,7 @@ async def _(bot: Bot, event: GroupIncreaseNoticeEvent):
if str(event.user_id) == bot.self_id:
await MemberUpdateManage.update(bot, str(event.group_id))
logger.info(
f"{NICKNAME}加入群聊更新群组信息",
f"{BotConfig.self_nickname}加入群聊更新群组信息",
"更新群组成员列表",
session=event.user_id,
group_id=event.group_id,
zhenxun/builtin_plugins/auto_update/_data_source.py
+17 -6
View File
@@ -1,8 +1,8 @@
import os
import shutil
import subprocess
import tarfile
import zipfile
import subprocess
from pathlib import Path
from nonebot.adapters import Bot
@@ -21,24 +21,34 @@ from .config import (
MAIN_URL,
PYPROJECT_FILE,
PYPROJECT_LOCK_FILE,
REQ_TXT_FILE,
RELEASE_URL,
REPLACE_FOLDERS,
REQ_TXT_FILE,
TMP_PATH,
VERSION_FILE,
)
def install_requirement():
requirement_path = (Path() / "requirements.txt").absolute()
if not requirement_path.exists():
logger.debug(f"没有找到zhenxun的requirement.txt,目标路径为{requirement_path}", "插件管理")
logger.debug(
f"没有找到zhenxun的requirement.txt,目标路径为{requirement_path}", "插件管理"
)
return
try:
result = subprocess.run(["pip", "install", "-r", str(requirement_path)], check=True, stdout=subprocess.PIPE, stderr=subprocess.PIPE, text=True)
result = subprocess.run(
["pip", "install", "-r", str(requirement_path)],
check=True,
stdout=subprocess.PIPE,
stderr=subprocess.PIPE,
text=True,
)
logger.debug(f"成功安装真寻依赖，日志:\n{result.stdout}", "插件管理")
except subprocess.CalledProcessError as e:
logger.error(f"安装真寻依赖失败，错误:\n{e.stderr}")
logger.error(f"安装真寻依赖失败，错误:\n{e.stderr}", "插件管理", e=e)
@run_sync
def _file_handle(latest_version: str | None):
@@ -120,6 +130,7 @@ def _file_handle(latest_version: str | None):
f.write(f"__version__: {latest_version}")
install_requirement()
class UpdateManage:
@classmethod
zhenxun/builtin_plugins/auto_update/config.py
+8 -1
View File
@@ -22,4 +22,11 @@ BACKUP_PATH = Path() / "backup"
DOWNLOAD_GZ_FILE = TMP_PATH / "download_latest_file.tar.gz"
DOWNLOAD_ZIP_FILE = TMP_PATH / "download_latest_file.zip"
REPLACE_FOLDERS = ["builtin_plugins", "plugins", "services", "utils", "models"]
REPLACE_FOLDERS = [
"builtin_plugins",
"plugins",
"services",
"utils",
"models",
"configs",
]
zhenxun/builtin_plugins/nickname.py
+12 -12
View File
@@ -10,7 +10,7 @@ from nonebot_plugin_alconna import Alconna, Option, on_alconna, store_true
from nonebot_plugin_session import EventSession
from nonebot_plugin_userinfo import EventUserInfo, UserInfo
from zhenxun.configs.config import NICKNAME, Config
from zhenxun.configs.config import BotConfig, Config
from zhenxun.configs.utils import PluginExtraData, RegisterConfig
from zhenxun.models.ban_console import BanConsole
from zhenxun.models.friend_user import FriendUser
@@ -24,11 +24,11 @@ __plugin_meta__ = PluginMetadata(
name="昵称系统",
description="区区昵称，才不想叫呢！",
usage=f"""
个人昵称，将替换{NICKNAME}称呼你的名称，群聊 与 私聊 昵称相互独立，全局昵称设置将更改您目前所有群聊中及私聊的昵称
个人昵称，将替换{BotConfig.self_nickname}称呼你的名称，群聊 与 私聊 昵称相互独立，全局昵称设置将更改您目前所有群聊中及私聊的昵称
指令：
以后叫我 [昵称]: 设置当前群聊/私聊的昵称
全局昵称设置 [昵称]: 设置当前所有群聊和私聊的昵称
{NICKNAME}我是谁
{BotConfig.self_nickname}我是谁
""".strip(),
extra=PluginExtraData(
author="HibiKier",
@@ -86,25 +86,25 @@ _matcher.shortcut(
CALL_NAME = [
"好啦好啦，我知道啦，{}，以后就这么叫你吧",
f"嗯嗯，{NICKNAME}" + "记住你的昵称了哦，{}",
f"嗯嗯，{BotConfig.self_nickname}" + "记住你的昵称了哦，{}",
"好突然，突然要叫你昵称什么的...{}..",
f"{NICKNAME}" + "会好好记住{}的，放心吧",
f"{BotConfig.self_nickname}" + "会好好记住{}的，放心吧",
"好..好.，那窝以后就叫你{}了.",
]
REMIND = [
"我肯定记得你啊，你是{}啊",
"我不会忘记你的，你也不要忘记我！{}",
f"哼哼，{NICKNAME}" + "记忆力可是很好的，{}",
f"哼哼，{BotConfig.self_nickname}" + "记忆力可是很好的，{}",
"嗯？你是失忆了嘛...{}..",
f"不要小看{NICKNAME}" + "的记忆力啊！笨蛋{}！QAQ",
f"不要小看{BotConfig.self_nickname}" + "的记忆力啊！笨蛋{}！QAQ",
"哎？{}..怎么了吗..突然这样问..",
]
CANCEL = [
f"呜..{NICKNAME}" + "睡一觉就会忘记的..和梦一样..{}",
f"呜..{BotConfig.self_nickname}" + "睡一觉就会忘记的..和梦一样..{}",
"窝知道了..{}..",
f"是{NICKNAME}" + "哪里做的不好嘛..好吧..晚安{}",
f"是{BotConfig.self_nickname}" + "哪里做的不好嘛..好吧..晚安{}",
"呃，{}，下次我绝对绝对绝对不会再忘记你！",
"可..可恶！{}！太可恶了！呜",
]
@@ -152,9 +152,9 @@ def CheckNickname():
logger.debug(
"昵称设置禁止字符: [{word}]", "昵称设置", session=session
)
await MessageUtils.build_message(f"字符 [{x}] 为禁止字符!").finish(
at_sender=True
)
await MessageUtils.build_message(
f"字符 [{word}] 为禁止字符!"
).finish(at_sender=True)
return Depends(dependency)
zhenxun/builtin_plugins/platform/qq/group_handle.py
+3 -4
View File
@@ -18,7 +18,7 @@ from nonebot.adapters.onebot.v12 import (
from nonebot.plugin import PluginMetadata
from nonebot_plugin_alconna import At
from zhenxun.configs.config import NICKNAME, Config
from zhenxun.configs.config import BotConfig, Config
from zhenxun.configs.path_config import DATA_PATH, IMAGE_PATH
from zhenxun.configs.utils import PluginExtraData, RegisterConfig, Task
from zhenxun.models.fg_request import FgRequest
@@ -44,7 +44,7 @@ __plugin_meta__ = PluginMetadata(
RegisterConfig(
module="invite_manager",
key="message",
value=f"请不要未经同意就拉{NICKNAME}入群！告辞！",
value=f"请不要未经同意就拉{BotConfig.self_nickname}入群！告辞！",
help="强制拉群后进群回复的内容",
),
RegisterConfig(
@@ -88,8 +88,6 @@ __plugin_meta__ = PluginMetadata(
)
superuser = nonebot.get_driver().config.platform_superusers["qq"][0]
base_config = Config.get("invite_manager")
@@ -108,6 +106,7 @@ add_group = on_request(priority=1, block=False)
@group_increase_handle.handle()
async def _(bot: Bot, event: GroupIncreaseNoticeEvent | GroupMemberIncreaseEvent):
superuser = BotConfig.get_superuser("qq")
user_id = str(event.user_id)
group_id = str(event.group_id)
if user_id == bot.self_id:
zhenxun/builtin_plugins/plugin_store/data_source.py
+19 -6
View File
@@ -1,6 +1,7 @@
import os
import shutil
from pathlib import Path
import subprocess
from pathlib import Path
import nonebot
import ujson as json
@@ -89,15 +90,27 @@ def install_requirement(plugin_path: Path):
requirement_path = plugin_path / "requirement.txt"
if not requirement_path.exists():
logger.debug(f"No requirement.txt found for plugin: {plugin_path.name}", "插件管理")
logger.debug(
f"No requirement.txt found for plugin: {plugin_path.name}", "插件管理"
)
return
try:
result = subprocess.run(["pip", "install", "-r", str(requirement_path)],
check=True, stdout=subprocess.PIPE, stderr=subprocess.PIPE, text=True)
logger.debug(f"Successfully installed dependencies for plugin: {plugin_path.name}. Output:\n{result.stdout}", "插件管理")
result = subprocess.run(
["pip", "install", "-r", str(requirement_path)],
check=True,
stdout=subprocess.PIPE,
stderr=subprocess.PIPE,
text=True,
)
logger.debug(
f"Successfully installed dependencies for plugin: {plugin_path.name}. Output:\n{result.stdout}",
"插件管理",
)
except subprocess.CalledProcessError as e:
logger.error(f"Failed to install dependencies for plugin: {plugin_path.name}. Error:\n{e.stderr}")
logger.error(
f"Failed to install dependencies for plugin: {plugin_path.name}. Error:\n{e.stderr}"
)
class ShopManage:
zhenxun/builtin_plugins/record_request.py
+9 -11
View File
@@ -11,7 +11,7 @@ from nonebot.plugin import PluginMetadata
from nonebot_plugin_apscheduler import scheduler
from nonebot_plugin_session import EventSession
from zhenxun.configs.config import NICKNAME, Config
from zhenxun.configs.config import BotConfig, Config
from zhenxun.configs.utils import PluginExtraData, RegisterConfig
from zhenxun.models.fg_request import FgRequest
from zhenxun.models.friend_user import FriendUser
@@ -69,7 +69,7 @@ _t = on_message(priority=999, block=False, rule=lambda: False)
@friend_req.handle()
async def _(bot: v12Bot | v11Bot, event: FriendRequestEvent, session: EventSession):
superuser = nonebot.get_driver().config.platform_superusers["qq"][0]
superuser = BotConfig.get_superuser("qq")
if event.user_id and Timer.check(event.user_id):
logger.debug(f"收录好友请求...", "好友请求", target=event.user_id)
user = await bot.get_stranger_info(user_id=event.user_id)
@@ -78,7 +78,6 @@ async def _(bot: v12Bot | v11Bot, event: FriendRequestEvent, session: EventSessi
# age = str(user["age"])
comment = event.comment
if superuser:
superuser = int(superuser)
await MessageUtils.build_message(
f"*****一份好友申请*****\n"
f"昵称：{nickname}({event.user_id})\n"
@@ -118,7 +117,7 @@ async def _(bot: v12Bot | v11Bot, event: FriendRequestEvent, session: EventSessi
@group_req.handle()
async def _(bot: v12Bot | v11Bot, event: GroupRequestEvent, session: EventSession):
superuser = nonebot.get_driver().config.platform_superusers["qq"][0]
superuser = BotConfig.get_superuser("qq")
# 邀请
if event.sub_type == "invite":
if str(event.user_id) in bot.config.superusers:
@@ -165,15 +164,14 @@ async def _(bot: v12Bot | v11Bot, event: GroupRequestEvent, session: EventSessio
target=event.group_id,
)
nickname = await FriendUser.get_user_name(str(event.user_id))
await Text(
f"*****一份入群申请*****\n"
f"申请人：{nickname}({event.user_id})\n"
f"群聊：{event.group_id}\n"
f"邀请日期：{datetime.now().replace(microsecond=0)}"
).send_to(target=TargetQQPrivate(user_id=superuser), bot=bot)
await PlatformUtils.send_superuser(
bot,
f"*****一份入群申请*****\n申请人：{nickname}({event.user_id})\n群聊：{event.group_id}\n邀请日期：{datetime.now().replace(microsecond=0)}",
superuser,
)
await bot.send_private_msg(
user_id=event.user_id,
message=f"想要邀请我偷偷入群嘛~已经提醒{NICKNAME}的管理员大人了\n"
message=f"想要邀请我偷偷入群嘛~已经提醒{BotConfig.self_nickname}的管理员大人了\n"
"请确保已经群主或群管理沟通过！\n"
"等待管理员处理吧！",
)
zhenxun/builtin_plugins/restart/__init__.py
+8 -6
View File
@@ -11,7 +11,7 @@ from nonebot.plugin import PluginMetadata
from nonebot.rule import to_me
from nonebot_plugin_session import EventSession
from zhenxun.configs.config import NICKNAME
from zhenxun.configs.config import BotConfig
from zhenxun.configs.utils import PluginExtraData
from zhenxun.services.log import logger
from zhenxun.utils.enum import PluginType
@@ -48,11 +48,13 @@ RESTART_FILE = Path() / "restart.sh"
@_matcher.got(
"flag",
prompt=f"确定是否重启{NICKNAME}？确定请回复[是|好|确定]（重启失败咱们将失去联系，请谨慎！）",
prompt=f"确定是否重启{BotConfig.self_nickname}？确定请回复[是|好|确定]（重启失败咱们将失去联系，请谨慎！）",
)
async def _(bot: Bot, session: EventSession, flag: str = ArgStr("flag")):
if flag.lower() in ["true", "是", "好", "确定", "确定是"]:
await MessageUtils.build_message(f"开始重启{NICKNAME}..请稍等...").send()
await MessageUtils.build_message(
f"开始重启{BotConfig.self_nickname}..请稍等..."
).send()
with open(RESTART_MARK, "w", encoding="utf8") as f:
f.write(f"{bot.self_id} {session.id1}")
logger.info("开始重启真寻...", "重启", session=session)
@@ -90,7 +92,7 @@ async def _(bot: Bot):
bot_id, session_id = f.read().split()
if bot := nonebot.get_bot(bot_id):
if target := PlatformUtils.get_target(bot, session_id):
await MessageUtils.build_message(f"{NICKNAME}已成功重启！").send(
target, bot=bot
)
await MessageUtils.build_message(
f"{BotConfig.self_nickname}已成功重启！"
).send(target, bot=bot)
RESTART_MARK.unlink()
zhenxun/builtin_plugins/scheduler/morning.py
+5 -2
View File
@@ -2,7 +2,7 @@ import nonebot
from nonebot.plugin import PluginMetadata
from nonebot_plugin_apscheduler import scheduler
from zhenxun.configs.config import NICKNAME
from zhenxun.configs.config import BotConfig
from zhenxun.configs.path_config import IMAGE_PATH
from zhenxun.configs.utils import PluginExtraData, Task
from zhenxun.models.task_info import TaskInfo
@@ -60,7 +60,10 @@ async def _():
)
async def _():
message = MessageUtils.build_message(
[f"{NICKNAME}要睡觉了，你们也要早点睡呀", IMAGE_PATH / "zhenxun" / "sleep.jpg"]
[
f"{BotConfig.self_nickname}要睡觉了，你们也要早点睡呀",
IMAGE_PATH / "zhenxun" / "sleep.jpg",
]
)
await broadcast_group(
message,
zhenxun/builtin_plugins/sign_in/utils.py
+15 -8
View File
@@ -9,7 +9,7 @@ import pytz
from nonebot.drivers import Driver
from nonebot_plugin_htmlrender import template_to_pic
from zhenxun.configs.config import NICKNAME, Config
from zhenxun.configs.config import BotConfig, Config
from zhenxun.configs.path_config import IMAGE_PATH, TEMPLATE_PATH
from zhenxun.models.sign_log import SignLog
from zhenxun.models.sign_user import SignUser
@@ -150,7 +150,9 @@ async def _generate_card(
level = "8"
interpolation = 0
await info_img.text((0, 0), f"· 好感度等级：{level} [{lik2relation[level]}]")
await info_img.text((0, 20), f"· {NICKNAME}对你的态度：{level2attitude[level]}")
await info_img.text(
(0, 20), f"· {BotConfig.self_nickname}对你的态度：{level2attitude[level]}"
)
await info_img.text((0, 40), f"· 距离升级还差 {interpolation:.2f} 好感度")
bar_bk = BuildImage(220, 20, background=SIGN_RESOURCE_PATH / "bar_white.png")
@@ -214,7 +216,9 @@ async def _generate_card(
f"好感度：{user.impression:.2f}", size=30
)
watermark = await BuildImage.build_text_image(
f"{NICKNAME}@{datetime.now().year}", size=15, font_color=(155, 155, 155)
f"{BotConfig.self_nickname}@{datetime.now().year}",
size=15,
font_color=(155, 155, 155),
)
today_data = BuildImage(300, 300, color=(255, 255, 255, 0), font_size=20)
if is_card_view:
@@ -390,13 +394,13 @@ async def _generate_html_card(
else:
uid = "XXXX XXXX XXXX"
level, next_impression, previous_impression = get_level_and_next_impression(
impression
float(user.impression)
)
interpolation = next_impression - impression
if level == "9":
level = "8"
interpolation = 0
message = f"{NICKNAME}希望你天天开心！"
message = f"{BotConfig.self_nickname}希望你开心！"
hour = datetime.now().hour
if hour > 6 and hour < 10:
message = random.choice(MORNING_MESSAGE)
@@ -416,19 +420,22 @@ async def _generate_html_card(
"name": nickname,
"uid": uid,
"sign_count": f"{user.sign_count}",
"message": message,
"message": f"{BotConfig.self_nickname}说: {message}",
"cur_impression": f"{user.impression:.2f}",
"impression": f"好感度+{_impression}",
"gold": f"金币+{gold}",
"gift": gift,
"level": f"{level} [{lik2relation[level]}]",
"attitude": level2attitude[level],
"attitude": f"{BotConfig.self_nickname}对你的态度: {level2attitude[level]}",
"interpolation": f"{interpolation:.2f}",
"heart2": [1 for _ in range(int(level))],
"heart1": [1 for _ in range(9 - int(level))],
"process": process,
"process": process * 100,
"date": str(now.replace(microsecond=0)),
"font_size": 45,
}
if len(nickname) > 6:
data["font_size"] = 27
_type = "sign"
if is_card_view:
_type = "view"
zhenxun/builtin_plugins/superuser/group_manage.py
+8 -3
View File
@@ -16,7 +16,7 @@ from nonebot_plugin_alconna import (
)
from nonebot_plugin_session import EventSession
from zhenxun.configs.config import NICKNAME
from zhenxun.configs.config import BotConfig
from zhenxun.configs.utils import PluginExtraData
from zhenxun.models.group_console import GroupConsole
from zhenxun.services.log import logger
@@ -191,11 +191,16 @@ async def _(bot: Bot, session: EventSession, arparma: Arparma, group_id: int):
group_list = [g["group_id"] for g in await bot.get_group_list()]
if group_id not in group_list:
logger.debug("群组不存在", "退群", session=session, target=group_id)
await MessageUtils.build_message(f"{NICKNAME}未在该群组中...").finish()
await MessageUtils.build_message(
f"{BotConfig.self_nickname}未在该群组中..."
).finish()
try:
await bot.set_group_leave(group_id=group_id)
logger.info(
f"{NICKNAME}退出群组成功", "退群", session=session, target=group_id
f"{BotConfig.self_nickname}退出群组成功",
"退群",
session=session,
target=group_id,
)
await MessageUtils.build_message(f"退出群组 {group_id} 成功!").send()
await GroupConsole.filter(group_id=group_id).delete()
zhenxun/builtin_plugins/web_ui/api/tabs/manage/__init__.py
+4 -6
View File
@@ -3,7 +3,7 @@ from fastapi import APIRouter
from nonebot.adapters.onebot.v11 import ActionFailed
from tortoise.functions import Count
from zhenxun.configs.config import NICKNAME
from zhenxun.configs.config import BotConfig
from zhenxun.models.ban_console import BanConsole
from zhenxun.models.chat_history import ChatHistory
from zhenxun.models.fg_request import FgRequest
@@ -133,7 +133,7 @@ async def _() -> Result:
"friend_count": f_count,
"group_count": g_count,
}
return Result.ok(data, f"{NICKNAME}带来了最新的数据!")
return Result.ok(data, f"{BotConfig.self_nickname}带来了最新的数据!")
@router.get(
@@ -177,7 +177,7 @@ async def _() -> Result:
except Exception as e:
logger.error("调用API错误", "/get_request", e=e)
return Result.fail(f"{type(e)}: {e}")
return Result.ok(req_result, f"{NICKNAME}带来了最新的数据!")
return Result.ok(req_result, f"{BotConfig.self_nickname}带来了最新的数据!")
@router.post(
@@ -234,9 +234,7 @@ async def _(parma: HandleRequest) -> Result:
else:
await GroupConsole.update_or_create(
group_id=req.group_id,
defaults={
"group_flag": 1,
},
defaults={"group_flag": 1},
)
else:
return Result.warning_("未找到此Id请求...")
zhenxun/builtin_plugins/web_ui/public/__init__.py
+2 -2
View File
@@ -1,6 +1,6 @@
from fastapi import APIRouter, FastAPI
from fastapi.responses import FileResponse
from fastapi.staticfiles import StaticFiles
from fastapi import APIRouter, FastAPI
from zhenxun.services.log import logger
@@ -32,4 +32,4 @@ async def init_public(app: FastAPI):
name=f"public_{pathname}",
)
except Exception as e:
logger.error(f"初始化 web ui assets 失败 e: {e}", "Web UI assets")
logger.error(f"初始化 web ui assets 失败", "Web UI assets", e=e)
zhenxun/builtin_plugins/web_ui/public/data_source.py
+6 -17
View File
@@ -1,19 +1,14 @@
import os
import shutil
import zipfile
from pathlib import Path
from nonebot.utils import run_sync
from zhenxun.services.log import logger
from zhenxun.utils.http_utils import AsyncHttpx
from .config import (
WEBUI_ASSETS_DOWNLOAD_URL,
WEBUI_DATA_PATH,
TMP_PATH,
COMMAND_NAME,
PUBLIC_PATH,
)
from .config import COMMAND_NAME, PUBLIC_PATH, TMP_PATH, WEBUI_ASSETS_DOWNLOAD_URL
async def update_webui_assets():
@@ -22,13 +17,8 @@ async def update_webui_assets():
WEBUI_ASSETS_DOWNLOAD_URL, webui_assets_path, follow_redirects=True
):
logger.info("下载 webui_assets 成功...", COMMAND_NAME)
else:
logger.error("下载 webui_assets 失败...", COMMAND_NAME)
await _file_handle(webui_assets_path)
logger.info("更新 webui_assets 成功...", COMMAND_NAME)
return True
return await _file_handle(webui_assets_path)
raise Exception("下载 webui_assets 失败", COMMAND_NAME)
@run_sync
@@ -39,8 +29,7 @@ def _file_handle(webui_assets_path: Path):
tf.extractall(TMP_PATH)
logger.debug("解压 webui_assets 成功...", COMMAND_NAME)
else:
logger.error("解压 webui_assets 失败...", COMMAND_NAME)
return
raise Exception("解压 webui_assets 失败，文件不存在...", COMMAND_NAME)
download_file_path = (
TMP_PATH / [x for x in os.listdir(TMP_PATH) if (TMP_PATH / x).is_dir()][0]
)