Merge branch 'main' into main

basic_plugins/admin_bot_manage/_data_source.py

@@ -1,29 +1,29 @@
+import asyncio
+import os
+import time
+from datetime import datetime
+from pathlib import Path
 from typing import List
+
+import ujson as json
 from nonebot.adapters.onebot.v11.message import MessageSegment
-from services.log import logger
+
+from configs.config import Config
 from configs.path_config import DATA_PATH, IMAGE_PATH
+from models.group_member_info import GroupInfoUser
+from models.level_user import LevelUser
+from services.log import logger
+from utils.http_utils import AsyncHttpx
+from utils.image_utils import BuildImage
+from utils.manager import group_manager, plugins2settings_manager, plugins_manager
 from utils.message_builder import image
 from utils.utils import get_bot, get_matchers
-from pathlib import Path
-from models.group_member_info import GroupInfoUser
-from datetime import datetime
-from services.db_context import db
-from models.level_user import LevelUser
-from configs.config import Config
-from utils.manager import group_manager, plugins2settings_manager, plugins_manager
-from utils.image_utils import BuildImage
-from utils.http_utils import AsyncHttpx
-import asyncio
-import time
-import os
-import ujson as json
-
 
 custom_welcome_msg_json = (
     Path() / "data" / "custom_welcome_msg" / "custom_welcome_msg.json"
 )
 
-ICON_PATH = IMAGE_PATH / 'other'
+ICON_PATH = IMAGE_PATH / "other"
 
 
 async def group_current_status(group_id: int) -> str:
@@ -38,7 +38,9 @@ async def group_current_status(group_id: int) -> str:
     for i, task in enumerate(_data):
         name = _data[task]
         name_image = BuildImage(0, 0, plain_text=f"{i+1}.{name}", font_size=20)
-        bk = BuildImage(name_image.w + 200, name_image.h + 20, color=(103, 177, 109), font_size=15)
+        bk = BuildImage(
+            name_image.w + 200, name_image.h + 20, color=(103, 177, 109), font_size=15
+        )
         await bk.apaste(name_image, (10, 0), True, "by_height")
         a_icon = BuildImage(40, 40, background=ICON_PATH / "btn_false.png")
         if group_manager.check_group_task_status(group_id, task):
@@ -123,7 +125,7 @@ def change_global_task_status(cmd: str) -> str:
         task_data = group_manager.get_task_data()
     status = cmd[:2]
     _cmd = cmd[4:]
-    if '全部被动' in cmd:
+    if "全部被动" in cmd:
         for task in task_data:
             if status == "开启":
                 group_manager.open_global_task(task)
@@ -134,7 +136,7 @@ def change_global_task_status(cmd: str) -> str:
     else:
         modules = [x for x in task_data if task_data[x].lower() == _cmd.lower()]
         if not modules:
-            return '未查询到该被动任务'
+            return "未查询到该被动任务"
         if status == "开启":
             group_manager.open_global_task(modules[0])
         else:
@@ -301,50 +303,40 @@ async def update_member_info(group_id: int, remind_superuser: bool = False) -> b
     # try:
     for user_info in _group_user_list:
         nickname = user_info["card"] or user_info["nickname"]
-        async with db.transaction():
-            # 更新权限
-            if user_info["role"] in [
-                "owner",
-                "admin",
-            ] and not await LevelUser.is_group_flag(user_info["user_id"], group_id):
-                await LevelUser.set_level(
-                    user_info["user_id"],
-                    user_info["group_id"],
-                    Config.get_config("admin_bot_manage", "ADMIN_DEFAULT_AUTH"),
-                )
-            if str(user_info["user_id"]) in bot.config.superusers:
-                await LevelUser.set_level(
-                    user_info["user_id"], user_info["group_id"], 9
-                )
-            user = await GroupInfoUser.get_member_info(
-                user_info["user_id"], user_info["group_id"]
-            )
-            if user:
-                if user.user_name != nickname:
-                    await user.update(user_name=nickname).apply()
-                    logger.info(
-                        f"用户{user_info['user_id']} 所属{user_info['group_id']} 更新群昵称成功"
-                    )
-                _exist_member_list.append(int(user_info["user_id"]))
-                continue
-            join_time = datetime.strptime(
-                time.strftime(
-                    "%Y-%m-%d %H:%M:%S", time.localtime(user_info["join_time"])
-                ),
-                "%Y-%m-%d %H:%M:%S",
-            )
-            if await GroupInfoUser.add_member_info(
+        # 更新权限
+        if user_info["role"] in [
+            "owner",
+            "admin",
+        ] and not await LevelUser.is_group_flag(user_info["user_id"], group_id):
+            await LevelUser.set_level(
                 user_info["user_id"],
                 user_info["group_id"],
-                nickname,
-                join_time,
-            ):
-                _exist_member_list.append(int(user_info["user_id"]))
-                logger.info(f"用户{user_info['user_id']} 所属{user_info['group_id']} 更新成功")
-            else:
-                _error_member_list.append(
-                    f"用户{user_info['user_id']} 所属{user_info['group_id']} 更新失败\n"
+                Config.get_config("admin_bot_manage", "ADMIN_DEFAULT_AUTH"),
+            )
+        if str(user_info["user_id"]) in bot.config.superusers:
+            await LevelUser.set_level(user_info["user_id"], user_info["group_id"], 9)
+        user = await GroupInfoUser.filter(
+            user_qq=user_info["user_id"], group_id=user_info["group_id"]
+        ).first()
+        if user:
+            if user.user_name != nickname:
+                await user.update(user_name=nickname).apply()
+                logger.info(
+                    f"用户{user_info['user_id']} 所属{user_info['group_id']} 更新群昵称成功"
                 )
+            _exist_member_list.append(int(user_info["user_id"]))
+            continue
+        join_time = datetime.strptime(
+            time.strftime("%Y-%m-%d %H:%M:%S", time.localtime(user_info["join_time"])),
+            "%Y-%m-%d %H:%M:%S",
+        )
+        await GroupInfoUser.update_or_create(
+            user_qq=user_info["user_id"],
+            group_id=user_info["group_id"],
+            defaults={"user_name": nickname, "user_join_time": join_time},
+        )
+        _exist_member_list.append(int(user_info["user_id"]))
+        logger.info("更新成功", "更新成员信息", user_info["user_id"], user_info["group_id"])
     _del_member_list = list(
         set(_exist_member_list).difference(
             set(await GroupInfoUser.get_group_member_id_list(group_id))
@@ -352,10 +344,8 @@ async def update_member_info(group_id: int, remind_superuser: bool = False) -> b
     )
     if _del_member_list:
         for del_user in _del_member_list:
-            if await GroupInfoUser.delete_member_info(del_user, group_id):
-                logger.info(f"退群用户{del_user} 所属{group_id} 已删除")
-            else:
-                logger.info(f"退群用户{del_user} 所属{group_id} 删除失败")
+            await GroupInfoUser.filter(user_qq=del_user, group_id=group_id).delete()
+            logger.info(f"退群用户{del_user} 所属{group_id} 已删除")
     if _error_member_list and remind_superuser:
         result = ""
         for error_user in _error_member_list:

basic_plugins/admin_bot_manage/admin_config.py

@@ -1,10 +1,10 @@
 from nonebot import on_notice
-from services.log import logger
 from nonebot.adapters.onebot.v11 import GroupAdminNoticeEvent
-from models.level_user import LevelUser
-from models.group_member_info import GroupInfoUser
-from configs.config import Config
 
+from configs.config import Config
+from models.group_member_info import GroupInfoUser
+from models.level_user import LevelUser
+from services.log import logger
 
 __zx_plugin_name__ = "群管理员变动监测 [Hidden]"
 __plugin_version__ = 0.1
@@ -16,11 +16,11 @@ admin_notice = on_notice(priority=5)
 
 @admin_notice.handle()
 async def _(event: GroupAdminNoticeEvent):
-    try:
-        nickname = (
-            await GroupInfoUser.get_member_info(event.user_id, event.group_id)
-        ).user_name
-    except AttributeError:
+    if user := await GroupInfoUser.filter(
+        user_qq=event.user_id, group_id=event.group_id
+    ).first():
+        nickname = user.nickname
+    else:
         nickname = event.user_id
     if event.sub_type == "set":
         await LevelUser.set_level(

basic_plugins/admin_bot_manage/custom_welcome_message.py

@@ -1,14 +1,14 @@
 from typing import List
 
+from configs.config import Config
 from nonebot import on_command
 from nonebot.adapters.onebot.v11 import GroupMessageEvent, Message
-from nonebot.params import CommandArg
-from ._data_source import custom_group_welcome
 from nonebot.adapters.onebot.v11.permission import GROUP
-from configs.config import Config
+from nonebot.params import CommandArg
 from services.log import logger
 from utils.depends import ImageList
 
+from ._data_source import custom_group_welcome
 
 __zx_plugin_name__ = "自定义进群欢迎消息 [Admin]"
 __plugin_usage__ = """
@@ -19,12 +19,14 @@ usage：
         Note：可以通过[at]来确认是否艾特新成员
         示例：自定义进群欢迎消息 欢迎你[at]
 """.strip()
-__plugin_des__ = '简易的自定义群欢迎消息'
-__plugin_cmd__ = ['自定义群欢迎消息 ?[文本] ?[图片]']
+__plugin_des__ = "简易的自定义群欢迎消息"
+__plugin_cmd__ = ["自定义群欢迎消息 ?[文本] ?[图片]"]
 __plugin_version__ = 0.1
-__plugin_author__ = 'HibiKier'
+__plugin_author__ = "HibiKier"
 __plugin_settings__ = {
-    "admin_level": Config.get_config("admin_bot_manage", "SET_GROUP_WELCOME_MESSAGE_LEVEL"),
+    "admin_level": Config.get_config(
+        "admin_bot_manage", "SET_GROUP_WELCOME_MESSAGE_LEVEL"
+    ),
 }
 
 custom_welcome = on_command(
@@ -37,7 +39,9 @@ custom_welcome = on_command(
 
 
 @custom_welcome.handle()
-async def _(event: GroupMessageEvent, arg: Message = CommandArg(), img: List[str] = ImageList()):
+async def _(
+    event: GroupMessageEvent, arg: Message = CommandArg(), img: List[str] = ImageList()
+):
     msg = arg.extract_plain_text().strip()
     if not msg and not img:
         await custom_welcome.finish(__plugin_usage__)

basic_plugins/admin_bot_manage/timing_task.py

@@ -1,15 +1,16 @@
-from utils.utils import scheduler, get_bot
-from ._data_source import update_member_info
-from services.log import logger
-from models.group_info import GroupInfo
 from asyncpg.exceptions import ConnectionDoesNotExistError, UndefinedColumnError
 
+from models.group_info import GroupInfo
+from services.log import logger
+from utils.utils import get_bot, scheduler
 
-__zx_plugin_name__ = '管理方面定时任务 [Hidden]'
-__plugin_usage__ = '无'
-__plugin_des__ = '成员信息和管理权限的定时更新'
+from ._data_source import update_member_info
+
+__zx_plugin_name__ = "管理方面定时任务 [Hidden]"
+__plugin_usage__ = "无"
+__plugin_des__ = "成员信息和管理权限的定时更新"
 __plugin_version__ = 0.1
-__plugin_author__ = 'HibiKier'
+__plugin_author__ = "HibiKier"
 
 
 # 自动更新群员信息
@@ -42,7 +43,7 @@ async def _():
         if bot:
             gl = await bot.get_group_list()
             gl = [g["group_id"] for g in gl]
-            all_group = [x.group_id for x in await GroupInfo.get_all_group()]
+            all_group = [x.group_id for x in await GroupInfo.all()]
             for g in gl:
                 if g not in all_group:
                     await update_member_info(g, False)

basic_plugins/apscheduler/__init__.py

@@ -1,18 +1,22 @@
-from utils.message_builder import image
-from utils.utils import scheduler, get_bot
-from nonebot import on_message
-from services.log import logger
-from models.group_info import GroupInfo
-from models.friend_user import FriendUser
-from nonebot.adapters.onebot.v11 import ActionFailed
-from configs.config import NICKNAME, Config
-from pathlib import Path
 import shutil
+from pathlib import Path
+
+import nonebot
+from nonebot import on_message
+from nonebot.adapters.onebot.v11 import ActionFailed
+
+from configs.config import NICKNAME, Config
+from configs.path_config import IMAGE_PATH
+from models.friend_user import FriendUser
+from models.group_info import GroupInfo
+from services.log import logger
+from utils.message_builder import image
+from utils.utils import broadcast_group, get_bot, scheduler
 
 __zx_plugin_name__ = "定时任务相关 [Hidden]"
 __plugin_version__ = 0.1
 __plugin_author__ = "HibiKier"
-__plugin_task__ = {'zwa': '早晚安'}
+__plugin_task__ = {"zwa": "早晚安"}
 
 
 Config.add_plugin_config(
@@ -24,20 +28,23 @@ Config.add_plugin_config(
 )
 
 Config.add_plugin_config(
-    "_backup",
-    "BACKUP_FLAG",
-    True,
-    help_="是否开启文件备份",
-    default_value=True
+    "_backup", "BACKUP_FLAG", True, help_="是否开启文件备份", default_value=True
 )
 
 Config.add_plugin_config(
     "_backup",
     "BACKUP_DIR_OR_FILE",
-    ['data/black_word', 'data/configs', 'data/statistics', 'data/word_bank', 'data/manager', 'configs'],
+    [
+        "data/black_word",
+        "data/configs",
+        "data/statistics",
+        "data/word_bank",
+        "data/manager",
+        "configs",
+    ],
     name="文件备份",
     help_="备份的文件夹或文件",
-    default_value=[]
+    default_value=[],
 )
 
 
@@ -51,18 +58,9 @@ cx = on_message(priority=9999, block=False, rule=lambda: False)
     minute=1,
 )
 async def _():
-    try:
-        bot = get_bot()
-        gl = await bot.get_group_list()
-        gl = [g["group_id"] for g in gl]
-        for g in gl:
-            result = image("zao.jpg", "zhenxun")
-            try:
-                await bot.send_group_msg(group_id=g, message="[[_task|zwa]]早上好" + result)
-            except ActionFailed:
-                logger.warning(f"{g} 发送早安失败")
-    except Exception as e:
-        logger.error(f"早晚安错误 e:{e}")
+    img = image(IMAGE_PATH / "zhenxun" / "zao.jpg")
+    await broadcast_group("[[_task|zwa]]早上好" + img, log_cmd="被动早晚安")
+    logger.info("每日早安发送")
 
 
 # 睡觉了
@@ -72,20 +70,9 @@ async def _():
     minute=59,
 )
 async def _():
-    try:
-        bot = get_bot()
-        gl = await bot.get_group_list()
-        gl = [g["group_id"] for g in gl]
-        for g in gl:
-            result = image("sleep.jpg", "zhenxun")
-            try:
-                await bot.send_group_msg(
-                    group_id=g, message=f"[[_task|zwa]]{NICKNAME}要睡觉了，你们也要早点睡呀" + result
-                )
-            except ActionFailed:
-                logger.warning(f"{g} 发送晚安失败")
-    except Exception as e:
-        logger.error(f"早晚安错误 e:{e}")
+    img = image(IMAGE_PATH / "zhenxun" / "sleep.jpg")
+    await broadcast_group("[[_task|zwa]]{NICKNAME}要睡觉了，你们也要早点睡呀" + img, log_cmd="被动早晚安")
+    logger.info("每日晚安发送")
 
 
 # 自动更新群组信息
@@ -95,22 +82,27 @@ async def _():
     minute=1,
 )
 async def _():
-    try:
-        bot = get_bot()
-        gl = await bot.get_group_list()
-        gl = [g["group_id"] for g in gl]
-        for g in gl:
-            group_info = await bot.get_group_info(group_id=g)
-            await GroupInfo.add_group_info(
-                group_info["group_id"],
-                group_info["group_name"],
-                group_info["max_member_count"],
-                group_info["member_count"],
-                1
-            )
-            logger.info(f"自动更新群组 {g} 信息成功")
-    except Exception as e:
-        logger.error(f"自动更新群组信息错误 e:{e}")
+    bots = nonebot.get_bots()
+    _used_group = []
+    for bot in bots.values():
+        try:
+            group_list = await bot.get_group_list()
+            gl = [g["group_id"] for g in group_list if g["group_id"] not in _used_group]
+            for g in gl:
+                _used_group.append(g)
+                group_info = await bot.get_group_info(group_id=g)
+                await GroupInfo.update_or_create(
+                    group_id=group_info["group_id"],
+                    defaults={
+                        "group_name": group_info["group_name"],
+                        "max_member_count": group_info["max_member_count"],
+                        "member_count": group_info["member_count"],
+                        "group_flag": 1,
+                    },
+                )
+                logger.info(f"自动更新群组信息成功", group_id=g)
+        except Exception as e:
+            logger.error(f"Bot: {bot.self_id} 自动更新群组信息", e=e)
 
 
 # 自动更新好友信息
@@ -124,10 +116,10 @@ async def _():
         bot = get_bot()
         fl = await bot.get_friend_list()
         for f in fl:
-            if await FriendUser.add_friend_info(f["user_id"], f["nickname"]):
-                logger.info(f'自动更新好友 {f["user_id"]} 信息成功')
-            else:
-                logger.warning(f'自动更新好友 {f["user_id"]} 信息失败')
+            await FriendUser.create(user_id=f["user_id"], user_name=f["nickname"])
+            logger.info(f'自动更新好友 {f["user_id"]} 信息成功')
+            # else:
+            #     logger.warning(f'自动更新好友 {f["user_id"]} 信息失败')
     except Exception as e:
         logger.error(f"自动更新群组信息错误 e:{e}")
 
@@ -140,7 +132,7 @@ async def _():
 )
 async def _():
     if Config.get_config("_backup", "BACKUP_FLAG"):
-        _backup_path = Path() / 'backup'
+        _backup_path = Path() / "backup"
         _backup_path.mkdir(exist_ok=True, parents=True)
         for x in Config.get_config("_backup", "BACKUP_DIR_OR_FILE"):
             try:
@@ -155,12 +147,13 @@ async def _():
                         if _p.exists():
                             _p.unlink()
                         shutil.copy(x, _p)
-                    logger.info(f'已完成自动备份：{x}')
+                    logger.info(f"已完成自动备份：{x}")
             except Exception as e:
                 logger.error(f"自动备份文件 {x} 发生错误 {type(e)}:{e}")
 
-
     #  一次性任务
+
+
 # 固定时间触发，仅触发一次：
 #
 # from datetime import datetime

basic_plugins/ban/__init__.py

@@ -1,16 +1,22 @@
-from typing import Tuple, List
+from typing import List
+
+from nonebot import on_command
+from nonebot.adapters.onebot.v11 import (
+    Bot,
+    GroupMessageEvent,
+    Message,
+    MessageEvent,
+    PrivateMessageEvent,
+)
+from nonebot.params import CommandArg
+from nonebot.permission import SUPERUSER
 
 from configs.config import NICKNAME, Config
 from models.ban_user import BanUser
 from models.level_user import LevelUser
-from nonebot import on_command
-from nonebot.adapters.onebot.v11 import (Bot, GroupMessageEvent, Message,
-                                         MessageEvent, PrivateMessageEvent)
-from nonebot.params import Command, CommandArg
-from nonebot.permission import SUPERUSER
 from services.log import logger
-from utils.depends import AtList
-from utils.utils import get_message_at, is_number
+from utils.depends import AtList, OneCommand
+from utils.utils import is_number
 
 from .data_source import a_ban, parse_ban_time
 
@@ -68,46 +74,38 @@ super_ban = on_command("b了", permission=SUPERUSER, priority=5, block=True)
 async def _(
     bot: Bot,
     event: GroupMessageEvent,
-    cmd: Tuple[str, ...] = Command(),
+    cmd: str = OneCommand(),
     arg: Message = CommandArg(),
-    qq: List[int] = AtList()
+    at_list: List[int] = AtList(),
 ):
-    cmd = cmd[0]
     result = ""
-    if qq:
-        qq = qq[0]
-        user_name = await bot.get_group_member_info(group_id=event.group_id, user_id=qq)
-        user_name = user_name["card"] or user_name["nickname"]
+    if at_list:
+        qq = at_list[0]
+        user = await bot.get_group_member_info(group_id=event.group_id, user_id=qq)
+        user_name = user["card"] or user["nickname"]
         msg = arg.extract_plain_text().strip()
         time = parse_ban_time(msg)
         if isinstance(time, str):
             await ban.finish(time, at_sender=True)
+        user_level = await LevelUser.get_user_level(event.user_id, event.group_id)
+        is_not_superuser = str(event.user_id) not in bot.config.superusers
         if cmd in [".ban", "/ban"]:
-            if (
-                await LevelUser.get_user_level(event.user_id, event.group_id)
-                <= await LevelUser.get_user_level(qq, event.group_id)
-                and str(event.user_id) not in bot.config.superusers
-            ):
+            at_user_level = await LevelUser.get_user_level(qq, event.group_id)
+            if user_level <= at_user_level and is_not_superuser:
                 await ban.finish(
                     f"您的权限等级比对方低或相等, {NICKNAME}不能为您使用此功能!",
                     at_sender=True,
                 )
+            logger.info(f"用户封禁 时长: {time}", cmd, event.user_id, event.group_id, qq)
             result = await a_ban(qq, time, user_name, event)
         else:
-            if (
-                await BanUser.check_ban_level(
-                    qq, await LevelUser.get_user_level(event.user_id, event.group_id)
-                )
-                and str(event.user_id) not in bot.config.superusers
-            ):
+            if await BanUser.check_ban_level(qq, user_level) and is_not_superuser:
                 await ban.finish(
                     f"ban掉 {user_name} 的管理员权限比您高，无法进行unban", at_sender=True
                 )
             if await BanUser.unban(qq):
-                logger.info(
-                    f"USER {event.user_id} GROUP {event.group_id} 将 USER {qq} 解禁"
-                )
-                result = f"已经把 {user_name} 从黑名单中删除了！"
+                logger.info(f"解除用户封禁", cmd, event.user_id, event.group_id, qq)
+                result = f"已经将 {user_name} 从黑名单中删除了！"
             else:
                 result = f"{user_name} 不在黑名单！"
     else:
@@ -119,54 +117,62 @@ async def _(
 async def _(
     bot: Bot,
     event: PrivateMessageEvent,
-    cmd: Tuple[str, ...] = Command(),
+    cmd: str = OneCommand(),
     arg: Message = CommandArg(),
 ):
-    cmd = cmd[0]
     msg = arg.extract_plain_text().strip()
-    if msg:
-        if str(event.user_id) in bot.config.superusers:
-            msg_splt = msg.split()
-            if is_number(msg_splt[0]):
-                qq = int(msg_splt[0])
-                msg = msg_splt[1:]
-                if cmd in [".ban", "/ban"]:
-                    time = parse_ban_time(" ".join(msg))
-                    if isinstance(time, str):
-                        await ban.finish(time)
-                    result = await a_ban(qq, time, str(qq), event, 9)
-                else:
-                    if await BanUser.unban(qq):
-                        logger.info(f"USER {event.user_id} 将 USER {qq} 解禁")
-                        result = f"已经把 {qq} 从黑名单中删除了！"
-                    else:
-                        result = f"{qq} 不在黑名单！"
-                await ban.send(result)
+    if msg and str(event.user_id) in bot.config.superusers:
+        msg_split = msg.split()
+        if msg_split and is_number(msg_split[0]):
+            qq = int(msg_split[0])
+            param = msg_split[1:]
+            if cmd in [".ban", "/ban"]:
+                time = parse_ban_time(" ".join(param))
+                if isinstance(time, str):
+                    logger.info(time, cmd, event.user_id, target=qq)
+                    await ban.finish(time)
+                result = await a_ban(qq, time, str(qq), event, 9)
             else:
-                await ban.finish(
-                    "qq号必须是数字！\n格式：.ban [qq] [hour]? [minute]?", at_sender=True
-                )
+                if await BanUser.unban(qq):
+                    result = f"已经把 {qq} 从黑名单中删除了！"
+                else:
+                    result = f"{qq} 不在黑名单！"
+            await ban.send(result)
+            logger.info(result, cmd, event.user_id, target=qq)
+        else:
+            await ban.send("参数不正确！\n格式：.ban [qq] [hour]? [minute]?", at_sender=True)
 
 
 @super_ban.handle()
-async def _(bot: Bot, event: MessageEvent, arg: Message = CommandArg()):
+async def _(
+    bot: Bot,
+    event: MessageEvent,
+    cmd: str = OneCommand(),
+    arg: Message = CommandArg(),
+    at_list: List[int] = AtList(),
+):
     user_name = ""
+    qq = None
     if isinstance(event, GroupMessageEvent):
-        qq = get_message_at(event.json())
-        if qq:
-            qq = qq[0]
+        if at_list:
+            qq = at_list[0]
             user = await bot.get_group_member_info(group_id=event.group_id, user_id=qq)
             user_name = user["card"] or user["nickname"]
     else:
-        qq = arg.extract_plain_text().strip()
-        if not is_number(qq):
+        msg = arg.extract_plain_text().strip()
+        if not is_number(msg):
             await super_ban.finish("对象qq必须为纯数字...")
-        qq = int(qq)
-        user_name = qq
+        qq = int(msg)
+        user_name = msg
     if qq:
-        if not await BanUser.ban(qq, 10, 99999999):
-            await BanUser.unban(qq)
-            await BanUser.ban(qq, 10, 99999999)
+        await BanUser.ban(qq, 10, 99999999)
         await ban.send(f"已将 {user_name} 拉入黑名单！")
+        logger.info(
+            f"已将 {user_name} 拉入黑名单！",
+            cmd,
+            event.user_id,
+            event.group_id if isinstance(event, GroupMessageEvent) else None,
+            qq,
+        )
     else:
-        await super_ban.send("需要添加被super ban的对象，可以使用at或者指定qq..")
+        await super_ban.send("需要提供被super ban的对象，可以使用at或者指定qq...")

basic_plugins/ban/data_source.py

@@ -1,10 +1,12 @@
-from nonebot.adapters.onebot.v11 import MessageEvent, GroupMessageEvent
+from typing import Optional, Union
+
+from nonebot.adapters.onebot.v11 import GroupMessageEvent, MessageEvent
+
 from configs.config import NICKNAME
-from models.level_user import LevelUser
-from utils.utils import is_number
 from models.ban_user import BanUser
+from models.level_user import LevelUser
 from services.log import logger
-from typing import Union
+from utils.utils import is_number
 
 
 def parse_ban_time(msg: str) -> Union[int, str]:
@@ -12,21 +14,31 @@ def parse_ban_time(msg: str) -> Union[int, str]:
     解析ban时长
     :param msg: 文本消息
     """
-    if not msg:
-        return -1
-    msg = msg.split()
-    if len(msg) == 1:
-        if not is_number(msg[0].strip()):
-            return "参数必须是数字！"
-        return int(msg[0]) * 60 * 60
-    else:
-        if not is_number(msg[0].strip()) or not is_number(msg[1].strip()):
-            return "参数必须是数字！"
-        return int(msg[0]) * 60 * 60 + int(msg[1]) * 60
+    try:
+        if not msg:
+            return -1
+        msg_split = msg.split()
+        if len(msg_split) == 1:
+            if not is_number(msg_split[0].strip()):
+                return "参数必须是数字！"
+            return int(msg_split[0]) * 60 * 60
+        else:
+            if not is_number(msg_split[0].strip()) or not is_number(
+                msg_split[1].strip()
+            ):
+                return "参数必须是数字！"
+            return int(msg_split[0]) * 60 * 60 + int(msg_split[1]) * 60
+    except ValueError as e:
+        logger.error("解析ban时长错误", ".ban", e=e)
+        return "时长不可以带小数点！"
 
 
 async def a_ban(
-    qq: int, time: int, user_name: str, event: MessageEvent, ban_level: int = None
+    qq: int,
+    time: int,
+    user_name: str,
+    event: MessageEvent,
+    ban_level: Optional[int] = None,
 ) -> str:
     """
     ban
@@ -36,12 +48,15 @@ async def a_ban(
     :param event: event
     :param ban_level: ban级别
     """
+    group_id = None
     if isinstance(event, GroupMessageEvent):
+        group_id = event.group_id
         ban_level = await LevelUser.get_user_level(event.user_id, event.group_id)
+    if not ban_level:
+        return "未查询到ban级用户权限"
     if await BanUser.ban(qq, ban_level, time):
         logger.info(
-            f"USER {event.user_id} GROUP"
-            f" {event.group_id if isinstance(event, GroupMessageEvent) else ''} 将 USER {qq} 封禁 时长 {time / 60} 分钟"
+            f"将 [Target]({qq})封禁 时长 {time / 60} 分钟", ".ban", event.user_id, group_id
         )
         result = f"已经将 {user_name} 加入{NICKNAME}的黑名单了！"
         if time != -1:
@@ -49,14 +64,14 @@ async def a_ban(
         else:
             result += f"将在 ∞ 分钟后解封"
     else:
-        time = await BanUser.check_ban_time(qq)
-        if is_number(time):
-            time = abs(int(time))
-            if time < 60:
-                time = str(time) + " 秒"
+        ban_time = await BanUser.check_ban_time(qq)
+        if isinstance(ban_time, int):
+            ban_time = abs(float(ban_time))
+            if ban_time < 60:
+                ban_time = str(ban_time) + " 秒"
             else:
-                time = str(int(time / 60)) + " 分钟"
+                ban_time = str(int(ban_time / 60)) + " 分钟"
         else:
-            time += " 分钟"
-        result = f"{user_name} 已在黑名单！预计 {time}后解封"
+            ban_time += " 分钟"
+        result = f"{user_name} 已在黑名单！预计 {ban_time}后解封"
     return result

basic_plugins/chat_history/chat_message.py

@@ -1,8 +1,11 @@
-from configs.config import Config
-from models.chat_history import ChatHistory
 from nonebot import on_message
 from nonebot.adapters.onebot.v11 import GroupMessageEvent, MessageEvent
+
+from configs.config import Config
+from models.chat_history import ChatHistory
+from services.log import logger
 from utils.depends import PlaintText
+from utils.utils import scheduler
 
 from ._rule import rule
 
@@ -19,14 +22,38 @@ Config.add_plugin_config(
 chat_history = on_message(rule=rule, priority=1, block=False)
 
 
+TEMP_LIST = []
+
+
 @chat_history.handle()
 async def _(event: MessageEvent, msg: str = PlaintText()):
+    group_id = None
     if isinstance(event, GroupMessageEvent):
-        await ChatHistory.add_chat_msg(
-            event.user_id, event.group_id, str(event.get_message()), msg
-        )
-    else:
-        await ChatHistory.add_chat_msg(event.user_id, None, str(event.get_message()), msg)
+        group_id = event.group_id
+    TEMP_LIST.append(
+        {
+            "user_qq": event.user_id,
+            "group_id": group_id,
+            "text": str(event.get_message()),
+            "plain_text": msg,
+        }
+    )
+
+
+@scheduler.scheduled_job(
+    "interval",
+    minutes=1,
+)
+async def _():
+    try:
+        message_list = TEMP_LIST.copy()
+        TEMP_LIST.clear()
+        if message_list:
+            model_list = [ChatHistory(**x) for x in message_list]
+            await ChatHistory.bulk_create(model_list)
+        logger.debug(f"批量添加聊天记录 {len(message_list)} 条", "定时任务")
+    except Exception as e:
+        logger.error(f"定时批量添加聊天记录", "定时任务", e=e)
 
 
 # @test.handle()

basic_plugins/chat_history/chat_message_handle.py

@@ -1,16 +1,16 @@
 from datetime import datetime, timedelta
+from typing import Any, Tuple
 
 import pytz
-from models.chat_history import ChatHistory
-from models.group_member_info import GroupInfoUser
 from nonebot import on_regex
 from nonebot.adapters.onebot.v11 import GroupMessageEvent
 from nonebot.params import RegexGroup
-from utils.image_utils import BuildImage, text2image
-from utils.utils import is_number
-from utils.message_builder import image
-from typing import Tuple, Any
 
+from models.chat_history import ChatHistory
+from models.group_member_info import GroupInfoUser
+from utils.image_utils import BuildImage, text2image
+from utils.message_builder import image
+from utils.utils import is_number
 
 __zx_plugin_name__ = "消息统计"
 __plugin_usage__ = """
@@ -29,12 +29,7 @@ usage：
         消息统计n=15
 """.strip()
 __plugin_des__ = "发言消息排行"
-__plugin_cmd__ = [
-    "消息统计",
-    "周消息统计",
-    "月消息统计",
-    "日消息统计"
-]
+__plugin_cmd__ = ["消息统计", "周消息统计", "月消息统计", "日消息统计"]
 __plugin_type__ = ("数据统计", 1)
 __plugin_version__ = 0.1
 __plugin_author__ = "HibiKier"
@@ -44,7 +39,9 @@ __plugin_settings__ = {
 }
 
 
-msg_handler = on_regex(r"^(周|月|日)?消息统计(des|DES)?(n=[0-9]{1,2})?$", priority=5, block=True)
+msg_handler = on_regex(
+    r"^(周|月|日)?消息统计(des|DES)?(n=[0-9]{1,2})?$", priority=5, block=True
+)
 
 
 @msg_handler.handle()
@@ -56,7 +53,9 @@ async def _(event: GroupMessageEvent, reg_group: Tuple[Any, ...] = RegexGroup())
     if num and is_number(num) and 10 < int(num) < 50:
         num = int(num)
     time_now = datetime.now()
-    zero_today = time_now - timedelta(hours=time_now.hour, minutes=time_now.minute, seconds=time_now.second)
+    zero_today = time_now - timedelta(
+        hours=time_now.hour, minutes=time_now.minute, seconds=time_now.second
+    )
     if date in ["日"]:
         date_scope = (zero_today, time_now)
     elif date in ["周"]:
@@ -70,9 +69,9 @@ async def _(event: GroupMessageEvent, reg_group: Tuple[Any, ...] = RegexGroup())
         num_str = "发言次数：\n\n"
         idx = 1
         for uid, num in rank_data:
-            try:
-                user_name = (await GroupInfoUser.get_member_info(uid, gid)).user_name
-            except AttributeError:
+            if user := await GroupInfoUser.filter(user_qq=uid, group_id=gid).first():
+                user_name = user.user_name
+            else:
                 user_name = uid
             name += f"\t{idx}.{user_name} \n\n"
             num_str += f"\t{num}\n\n"

basic_plugins/group_handle/__init__.py

@@ -1,26 +1,27 @@
-from nonebot import on_notice, on_request
-from configs.path_config import IMAGE_PATH, DATA_PATH
-from models.level_user import LevelUser
-from utils.message_builder import image
-from models.group_member_info import GroupInfoUser
-from datetime import datetime
-from services.log import logger
-from nonebot.adapters.onebot.v11 import (
-    Bot,
-    ActionFailed,
-    GroupIncreaseNoticeEvent,
-    GroupDecreaseNoticeEvent,
-)
-from utils.manager import group_manager, plugins2settings_manager, requests_manager
-from configs.config import NICKNAME
-from models.group_info import GroupInfo
-from utils.utils import FreqLimiter
-from configs.config import Config
-from pathlib import Path
-import random
 import os
-import ujson as json
+import random
+from datetime import datetime
+from pathlib import Path
 
+import ujson as json
+from nonebot import on_notice, on_request
+from nonebot.adapters.onebot.v11 import (
+    ActionFailed,
+    Bot,
+    GroupDecreaseNoticeEvent,
+    GroupIncreaseNoticeEvent,
+)
+
+from configs.config import NICKNAME, Config
+from configs.path_config import DATA_PATH, IMAGE_PATH
+from models.group_info import GroupInfo
+from models.group_member_info import GroupInfoUser
+from models.level_user import LevelUser
+from services.log import logger
+from utils.depends import GetConfig
+from utils.manager import group_manager, plugins2settings_manager, requests_manager
+from utils.message_builder import image
+from utils.utils import FreqLimiter
 
 __zx_plugin_name__ = "群事件处理 [Hidden]"
 __plugin_version__ = 0.1
@@ -65,7 +66,7 @@ add_group = on_request(priority=1, block=False)
 @group_increase_handle.handle()
 async def _(bot: Bot, event: GroupIncreaseNoticeEvent):
     if event.user_id == int(bot.self_id):
-        group = await GroupInfo.get_group_info(event.group_id)
+        group = await GroupInfo.filter(group_id=event.group_id).first()
         # 群聊不存在或被强制拉群，退出该群
         if (not group or group.group_flag == 0) and Config.get_config(
             "invite_manager", "flag"
@@ -115,15 +116,12 @@ async def _(bot: Bot, event: GroupIncreaseNoticeEvent):
         user_info = await bot.get_group_member_info(
             group_id=event.group_id, user_id=event.user_id
         )
-        if await GroupInfoUser.add_member_info(
-            user_info["user_id"],
-            user_info["group_id"],
-            user_info["nickname"],
-            join_time,
-        ):
-            logger.info(f"用户{user_info['user_id']} 所属{user_info['group_id']} 更新成功")
-        else:
-            logger.info(f"用户{user_info['user_id']} 所属{user_info['group_id']} 更新失败")
+        await GroupInfoUser.update_or_create(
+            user_qq=user_info["user_id"],
+            group_id=user_info["group_id"],
+            defaults={"user_name": user_info["nickname"], "user_join_time": join_time},
+        )
+        logger.info(f"用户{user_info['user_id']} 所属{user_info['group_id']} 更新成功")
 
         # 群欢迎消息
         if _flmt.check(event.group_id):
@@ -152,7 +150,11 @@ async def _(bot: Bot, event: GroupIncreaseNoticeEvent):
             else:
                 await group_increase_handle.send(
                     "[[_task|group_welcome]]新人快跑啊！！本群现状↓（快使用自定义！）"
-                    + image(random.choice(os.listdir(IMAGE_PATH / "qxz")), "qxz")
+                    + image(
+                        IMAGE_PATH
+                        / "qxz"
+                        / random.choice(os.listdir(IMAGE_PATH / "qxz"))
+                    )
                 )
 
 
@@ -162,13 +164,13 @@ async def _(bot: Bot, event: GroupDecreaseNoticeEvent):
     if event.sub_type == "kick_me":
         group_id = event.group_id
         operator_id = event.operator_id
-        try:
-            operator_name = (
-                await GroupInfoUser.get_member_info(event.operator_id, event.group_id)
-            ).user_name
-        except AttributeError:
+        if user := await GroupInfoUser.get_or_none(
+            user_qq=event.operator_id, group_id=event.group_id
+        ):
+            operator_name = user.user_name
+        else:
             operator_name = "None"
-        group = await GroupInfo.get_group_info(group_id)
+        group = await GroupInfo.filter(group_id=group_id).first()
         group_name = group.group_name if group else ""
         coffee = int(list(bot.config.superusers)[0])
         await bot.send_private_msg(
@@ -182,16 +184,19 @@ async def _(bot: Bot, event: GroupDecreaseNoticeEvent):
     if event.user_id == int(bot.self_id):
         group_manager.delete_group(event.group_id)
         return
-    try:
-        user_name = (
-            await GroupInfoUser.get_member_info(event.user_id, event.group_id)
-        ).user_name
-    except AttributeError:
-        user_name = str(event.user_id)
-    if await GroupInfoUser.delete_member_info(event.user_id, event.group_id):
-        logger.info(f"用户{user_name}, qq={event.user_id} 所属{event.group_id} 删除成功")
+    if user := await GroupInfoUser.get_or_none(
+        user_qq=event.user_id, group_id=event.group_id
+    ):
+        user_name = user.user_name
     else:
-        logger.info(f"用户{user_name}, qq={event.user_id} 所属{event.group_id} 删除失败")
+        user_name = f"{event.user_id}"
+    await GroupInfoUser.filter(user_qq=event.user_id, group_id=event.group_id).delete()
+    logger.info(
+        f"名称: {user_name} 退出群聊",
+        "group_decrease_handle",
+        event.user_id,
+        event.group_id,
+    )
     rst = ""
     if event.sub_type == "leave":
         rst = f"{user_name}离开了我们..."

basic_plugins/hooks/_utils.py

@@ -1,39 +1,40 @@
+import time
 from typing import Optional
 
 import nonebot
 from nonebot.adapters.onebot.v11 import (
-    GroupMessageEvent,
-    PrivateMessageEvent,
     Bot,
     Event,
-    MessageEvent,
+    GroupMessageEvent,
     Message,
+    MessageEvent,
     PokeNotifyEvent,
+    PrivateMessageEvent,
 )
 from nonebot.exception import ActionFailed, IgnoredException
 from nonebot.internal.matcher import Matcher
 
+from configs.config import Config
 from models.bag_user import BagUser
 from models.ban_user import BanUser
 from models.friend_user import FriendUser
 from models.group_member_info import GroupInfoUser
 from models.level_user import LevelUser
 from models.user_shop_gold_log import UserShopGoldLog
+from services.log import logger
 from utils.decorator import Singleton
 from utils.manager import (
-    plugins2block_manager,
     StaticData,
-    plugins2settings_manager,
-    group_manager,
     admin_manager,
-    plugins_manager,
+    group_manager,
+    plugins2block_manager,
     plugins2cd_manager,
     plugins2count_manager,
+    plugins2settings_manager,
+    plugins_manager,
 )
 from utils.message_builder import at
 from utils.utils import FreqLimiter
-from configs.config import Config
-import time
 
 ignore_rst_module = ["ai", "poke", "dialogue"]
 
@@ -97,11 +98,11 @@ async def send_msg(msg: str, bot: Bot, event: MessageEvent):
         msg = msg.replace("[uname]", uname)
     if "[nickname]" in msg:
         if isinstance(event, GroupMessageEvent):
-            nickname = await GroupInfoUser.get_group_member_nickname(
+            nickname = await GroupInfoUser.get_user_nickname(
                 event.user_id, event.group_id
             )
         else:
-            nickname = await FriendUser.get_friend_nickname(event.user_id)
+            nickname = await FriendUser.get_user_nickname(event.user_id)
         msg = msg.replace("[nickname]", nickname)
     if "[at]" in msg and isinstance(event, GroupMessageEvent):
         msg = msg.replace("[at]", str(at(event.user_id)))
@@ -142,16 +143,19 @@ class AuthChecker:
             :param event: event
         """
         try:
-            plugin_name = matcher.plugin_name
-            cost_gold = await self.auth_cost(plugin_name, bot, event)
-            if hasattr(event, "user_id") and str(event.user_id) not in bot.config.superusers:
-                await self.auth_basic(plugin_name, bot, event)
-                self.auth_group(plugin_name, bot, event)
-                await self.auth_admin(plugin_name, matcher, bot, event)
-                await self.auth_plugin(plugin_name, matcher, bot, event)
-                await self.auth_limit(plugin_name, bot, event)
-                if cost_gold:
-                    await BagUser.spend_gold(event.user_id, event.group_id, cost_gold)
+            if plugin_name := matcher.plugin_name:
+                cost_gold = await self.auth_cost(plugin_name, bot, event)
+                user_id = getattr(event, "user_id", None)
+                if user_id and str(user_id) not in bot.config.superusers:
+                    await self.auth_basic(plugin_name, bot, event)
+                    self.auth_group(plugin_name, bot, event)
+                    await self.auth_admin(plugin_name, matcher, bot, event)
+                    await self.auth_plugin(plugin_name, matcher, bot, event)
+                    await self.auth_limit(plugin_name, bot, event)
+                    if cost_gold:
+                        await BagUser.spend_gold(
+                            event.user_id, event.group_id, cost_gold
+                        )
         except IsSuperuserException:
             return
 
@@ -221,7 +225,9 @@ class AuthChecker:
             else:
                 plugins2count_manager.increase(plugin_name, count_type_)
 
-    async def auth_plugin(self, plugin_name: str, matcher: Matcher, bot: Bot, event: Event):
+    async def auth_plugin(
+        self, plugin_name: str, matcher: Matcher, bot: Bot, event: Event
+    ):
         """
         说明:
             插件状态
@@ -345,6 +351,7 @@ class AuthChecker:
                             and plugin_name not in ignore_rst_module
                         ):
                             self._flmt_c.start_cd(event.group_id)
+                            logger.info(f"{event.user_id} ||XXXXXX: {matcher.module}")
                             await bot.send_group_msg(
                                 group_id=event.group_id, message="此功能正在维护..."
                             )
@@ -364,7 +371,9 @@ class AuthChecker:
                 set_block_limit_false(event, plugin_name)
                 raise IgnoredException("此功能正在维护...")
 
-    async def auth_admin(self, plugin_name: str, matcher: Matcher, bot: Bot, event: Event):
+    async def auth_admin(
+        self, plugin_name: str, matcher: Matcher, bot: Bot, event: Event
+    ):
         """
         说明:
             管理员命令 个人权限
@@ -504,8 +513,13 @@ class AuthChecker:
                     await BagUser.spend_gold(
                         event.user_id, event.group_id, psm.cost_gold
                     )
-                await UserShopGoldLog.add_shop_log(
-                    event.user_id, event.group_id, 2, plugin_name, psm.cost_gold, 1
+                await UserShopGoldLog.create(
+                    user_qq=event.user_id,
+                    group_id=event.group_id,
+                    type=2,
+                    name=plugin_name,
+                    num=1,
+                    spend_gold=psm.cost_gold,
                 )
                 cost_gold = psm.cost_gold
         return cost_gold

basic_plugins/hooks/ban_hook.py

@@ -1,20 +1,21 @@
-from nonebot.matcher import Matcher
-from nonebot.message import run_preprocessor, IgnoredException
-from nonebot.typing import T_State
 from nonebot.adapters.onebot.v11 import (
+    ActionFailed,
     Bot,
     Event,
-    MessageEvent,
-    ActionFailed,
-    PokeNotifyEvent,
     GroupMessageEvent,
+    MessageEvent,
+    PokeNotifyEvent,
 )
+from nonebot.matcher import Matcher
+from nonebot.message import IgnoredException, run_preprocessor
+from nonebot.typing import T_State
+
 from configs.config import Config
 from models.ban_user import BanUser
-from utils.utils import is_number, static_flmt, FreqLimiter
 from utils.message_builder import at
-from ._utils import ignore_rst_module, other_limit_plugins
+from utils.utils import FreqLimiter, is_number, static_flmt
 
+from ._utils import ignore_rst_module, other_limit_plugins
 
 Config.add_plugin_config(
     "hook",
@@ -49,7 +50,7 @@ async def _(matcher: Matcher, bot: Bot, event: Event, state: T_State):
             and str(event.user_id) not in bot.config.superusers
         ):
             time = await BanUser.check_ban_time(event.user_id)
-            if is_number(time):
+            if isinstance(time, int):
                 time = abs(int(time))
                 if time < 60:
                     time = str(time) + " 秒"

basic_plugins/hooks/chkdsk_hook.py

@@ -28,12 +28,12 @@ async def _(matcher: Matcher, bot: Bot, event: GroupMessageEvent, state: T_State
     if matcher.type == "message" and matcher.priority not in [1, 999]:
         if state["_prefix"]["raw_command"]:
             if _blmt.check(f'{event.user_id}{state["_prefix"]["raw_command"]}'):
-                if await BanUser.ban(
+                await BanUser.ban(
                     event.user_id,
                     9,
                     Config.get_config("hook", "MALICIOUS_BAN_TIME") * 60,
-                ):
-                    logger.info(f"USER {event.user_id} 触发了恶意触发检测")
+                )
+                logger.info(f"USER {event.user_id} 触发了恶意触发检测")
                 if isinstance(event, GroupMessageEvent):
                     try:
                         await bot.send_group_msg(

basic_plugins/init_plugin_config/__init__.py

@@ -1,23 +1,23 @@
+import nonebot
+from nonebot import Driver
+from nonebot.adapters.onebot.v11 import Bot
+
 from configs.path_config import DATA_PATH
-from .init_group_manager import init_group_manager, group_manager
+from services.log import logger
+
+from .check_plugin_status import check_plugin_status
+from .init import init
+from .init_none_plugin_count_manager import init_none_plugin_count_manager
+from .init_plugin_info import init_plugin_info
 from .init_plugins_config import init_plugins_config
 from .init_plugins_data import init_plugins_data, plugins_manager
-from .init_none_plugin_count_manager import init_none_plugin_count_manager
-from .init_plugins_resources import init_plugins_resources
-from .init_plugins_settings import init_plugins_settings
-from .init_plugin_info import init_plugin_info
 from .init_plugins_limit import (
     init_plugins_block_limit,
-    init_plugins_count_limit,
     init_plugins_cd_limit,
+    init_plugins_count_limit,
 )
-from .init import init
-from .check_plugin_status import check_plugin_status
-from nonebot.adapters.onebot.v11 import Bot
-from services.log import logger
-from nonebot import Driver
-import nonebot
-
+from .init_plugins_resources import init_plugins_resources
+from .init_plugins_settings import init_plugins_settings
 
 __zx_plugin_name__ = "初始化插件数据 [Hidden]"
 __plugin_version__ = 0.1
@@ -44,10 +44,6 @@ async def _():
     init_plugins_config()
     init_plugins_resources()
     init_none_plugin_count_manager()
-    # x = group_manager.get_super_old_data()
-    # if x:
-    #     for key in x.keys():
-    #         plugins_manager.block_plugin(key, block_type=x[key])
     if _flag:
         raise Exception("首次运行，已在configs目录下生成配置文件config.yaml，修改后重启即可...")
     logger.info("初始化数据完成...")

basic_plugins/init_plugin_config/init_group_manager.py

@@ -1,73 +0,0 @@
-from pathlib import Path
-from utils.manager import group_manager
-from services.db_context import db
-from asyncpg.exceptions import DuplicateColumnError
-from services.log import logger
-
-try:
-    import ujson as json
-except ModuleNotFoundError:
-    import json
-try:
-    from models.group_remind import GroupRemind
-except ModuleNotFoundError:
-    pass
-
-
-async def init_group_manager():
-    """
-    旧数据格式替换为新格式
-    初始化数据
-    """
-    old_group_level_file = Path() / "data" / "manager" / "group_level.json"
-    old_plugin_list_file = Path() / "data" / "manager" / "plugin_list.json"
-    if old_group_level_file.exists():
-        data = json.load(open(old_group_level_file, "r", encoding="utf8"))
-        for key in data.keys():
-            group = key
-            level = data[key]
-            group_manager.set_group_level(group, level)
-        old_group_level_file.unlink()
-        group_manager.save()
-
-    if old_plugin_list_file.exists():
-        data = json.load(open(old_plugin_list_file, "r", encoding="utf8"))
-        for plugin in data.keys():
-            for group in data[plugin].keys():
-                if group == "default" and not data[plugin]["default"]:
-                    group_manager.block_plugin(plugin)
-                elif not data[plugin][group]:
-                    group_manager.block_plugin(plugin, group)
-        old_plugin_list_file.unlink()
-    old_data_table = Path() / "models" / "group_remind.py"
-    try:
-        if old_data_table.exists():
-            b = {
-                "hy": "group_welcome",
-                "kxcz": "open_case_reset_remind",
-                "zwa": "zwa",
-                "blpar": "bilibili_parse",
-                "epic": "epic_free_game",
-                "pa": "pa",
-                "almanac": "genshin_alc",
-            }
-            for group in group_manager.get_data()["group_manager"]:
-                for remind in b:
-                    try:
-                        status = await GroupRemind.get_status(int(group), remind)
-                        if status is not None:
-                            if status:
-                                await group_manager.open_group_task(group, b[remind])
-                                logger.info(f"读取旧数据-->{group} 开启 {b[remind]}")
-                            else:
-                                await group_manager.close_group_task(group, b[remind])
-                                logger.info(f"读取旧数据-->{group} 关闭 {b[remind]}")
-                    except Exception as e:
-                        pass
-            query = db.text("DROP TABLE group_reminds;")
-            await db.first(query)
-            old_data_table.unlink()
-            logger.info("旧数据读取完毕，删除了舍弃表 group_reminds...")
-    except (ModuleNotFoundError, DuplicateColumnError):
-        pass
-    group_manager.save()

basic_plugins/init_plugin_config/init_plugins_settings.py

@@ -27,6 +27,8 @@ def init_plugins_settings():
                 else:
                     if plugin_data := plugin_data_manager.get(matcher.plugin_name):
                         if plugin_settings := plugin_data.plugin_setting:
+                            if (name := _module.__getattribute__("__zx_plugin_name__")) not in plugin_settings.cmd:
+                                plugin_settings.cmd.append(name)
                             # 管理员命令
                             if plugin_data.plugin_type == PluginType.ADMIN:
                                 admin_manager.add_admin_plugin_settings(

basic_plugins/invite_manager/__init__.py

@@ -1,20 +1,25 @@
-from nonebot import on_request, on_message
+import asyncio
+import re
+import time
+from datetime import datetime
+
+from nonebot import on_message, on_request
 from nonebot.adapters.onebot.v11 import (
-    Bot,
     ActionFailed,
+    Bot,
     FriendRequestEvent,
     GroupRequestEvent,
     MessageEvent,
 )
-from models.friend_user import FriendUser
-from datetime import datetime
+
 from configs.config import NICKNAME, Config
-from utils.manager import requests_manager
+from models.friend_user import FriendUser
 from models.group_info import GroupInfo
+from services.log import logger
+from utils.manager import requests_manager
 from utils.utils import scheduler
-import asyncio
-import time
-import re
+
+from .utils import time_manager
 
 __zx_plugin_name__ = "好友群聊处理请求 [Hidden]"
 __plugin_version__ = 0.1
@@ -27,101 +32,109 @@ friend_req = on_request(priority=5, block=True)
 group_req = on_request(priority=5, block=True)
 x = on_message(priority=999, block=False, rule=lambda: False)
 
-exists_data = {"private": {}, "group": {}}
-
 
 @friend_req.handle()
 async def _(bot: Bot, event: FriendRequestEvent):
-    global exists_data
-    if exists_data["private"].get(event.user_id):
-        if time.time() - exists_data["private"][event.user_id] < 60 * 5:
-            return
-    exists_data["private"][event.user_id] = time.time()
-    user = await bot.get_stranger_info(user_id=event.user_id)
-    nickname = user["nickname"]
-    sex = user["sex"]
-    age = str(user["age"])
-    comment = event.comment
-    await bot.send_private_msg(
-        user_id=int(list(bot.config.superusers)[0]),
-        message=f"*****一份好友申请*****\n"
-        f"昵称：{nickname}({event.user_id})\n"
-        f"自动同意：{'√' if Config.get_config('invite_manager', 'AUTO_ADD_FRIEND') else '×'}\n"
-        f"日期：{str(datetime.now()).split('.')[0]}\n"
-        f"备注：{event.comment}",
-    )
-    if Config.get_config("invite_manager", "AUTO_ADD_FRIEND"):
-        await bot.set_friend_add_request(flag=event.flag, approve=True)
-        await FriendUser.add_friend_info(user["user_id"], user["nickname"])
-    else:
-        requests_manager.add_request(
-            event.user_id,
-            "private",
-            event.flag,
-            nickname=nickname,
-            sex=sex,
-            age=age,
-            comment=comment,
+    if time_manager.add_user_request(event.user_id):
+        logger.debug(f"收录 用户[{event.user_id}] 好友请求", "好友请求")
+        user = await bot.get_stranger_info(user_id=event.user_id)
+        nickname = user["nickname"]
+        sex = user["sex"]
+        age = str(user["age"])
+        comment = event.comment
+        await bot.send_private_msg(
+            user_id=int(list(bot.config.superusers)[0]),
+            message=f"*****一份好友申请*****\n"
+            f"昵称：{nickname}({event.user_id})\n"
+            f"自动同意：{'√' if Config.get_config('invite_manager', 'AUTO_ADD_FRIEND') else '×'}\n"
+            f"日期：{str(datetime.now()).split('.')[0]}\n"
+            f"备注：{event.comment}",
         )
+        if Config.get_config("invite_manager", "AUTO_ADD_FRIEND"):
+            logger.debug(f"已开启好友请求自动同意，成功通过该请求", "好友请求", target=event.user_id)
+            await bot.set_friend_add_request(flag=event.flag, approve=True)
+            await FriendUser.create(user_id=user["user_id"], user_name=user["nickname"])
+        else:
+            requests_manager.add_request(
+                event.user_id,
+                "private",
+                event.flag,
+                nickname=nickname,
+                sex=sex,
+                age=age,
+                comment=comment,
+            )
+    else:
+        logger.debug(f"好友请求五分钟内重复, 已忽略", "好友请求", target=event.user_id)
 
 
 @group_req.handle()
 async def _(bot: Bot, event: GroupRequestEvent):
-    global exists_data
+    # 邀请
     if event.sub_type == "invite":
         if str(event.user_id) in bot.config.superusers:
             try:
-                if await GroupInfo.get_group_info(event.group_id):
-                    await GroupInfo.set_group_flag(event.group_id, 1)
-                else:
-                    group_info = await bot.get_group_info(group_id=event.group_id)
-                    await GroupInfo.add_group_info(
-                        group_info["group_id"],
-                        group_info["group_name"],
-                        group_info["max_member_count"],
-                        group_info["member_count"],
-                        1,
-                    )
+                logger.debug(
+                    f"超级用户自动同意加入群聊", "群聊请求", event.user_id, target=event.group_id
+                )
                 await bot.set_group_add_request(
                     flag=event.flag, sub_type="invite", approve=True
                 )
-            except ActionFailed:
-                pass
+                group_info = await bot.get_group_info(group_id=event.group_id)
+                await GroupInfo.update_or_create(
+                    group_id=group_info["group_id"],
+                    defaults={
+                        "group_name": group_info["group_name"],
+                        "max_member_count": group_info["max_member_count"],
+                        "member_count": group_info["member_count"],
+                        "group_flag": 1,
+                    },
+                )
+            except ActionFailed as e:
+                logger.error(
+                    "超级用户自动同意加入群聊发生错误",
+                    "群聊请求",
+                    event.user_id,
+                    target=event.group_id,
+                    e=e,
+                )
         else:
-            user = await bot.get_stranger_info(user_id=event.user_id)
-            sex = user["sex"]
-            age = str(user["age"])
-            if exists_data["group"].get(f"{event.user_id}:{event.group_id}"):
-                if (
-                    time.time()
-                    - exists_data["group"][f"{event.user_id}:{event.group_id}"]
-                    < 60 * 5
-                ):
-                    return
-            exists_data["group"][f"{event.user_id}:{event.group_id}"] = time.time()
-            nickname = await FriendUser.get_user_name(event.user_id)
-            await bot.send_private_msg(
-                user_id=int(list(bot.config.superusers)[0]),
-                message=f"*****一份入群申请*****\n"
-                f"申请人：{nickname}({event.user_id})\n"
-                f"群聊：{event.group_id}\n"
-                f"邀请日期：{str(datetime.now()).split('.')[0]}",
-            )
-            await bot.send_private_msg(
-                user_id=event.user_id,
-                message=f"想要邀请我偷偷入群嘛~已经提醒{NICKNAME}的管理员大人了\n"
-                "请确保已经群主或群管理沟通过！\n"
-                "等待管理员处理吧！",
-            )
-            requests_manager.add_request(
-                event.user_id,
-                "group",
-                event.flag,
-                invite_group=event.group_id,
-                nickname=nickname,
-                sex=sex,
-                age=age,
-            )
+            if time_manager.add_group_request(event.user_id, event.group_id):
+                logger.debug(
+                    f"收录 用户[{event.user_id}] 群聊[{event.group_id}] 群聊请求", "群聊请求"
+                )
+                user = await bot.get_stranger_info(user_id=event.user_id)
+                sex = user["sex"]
+                age = str(user["age"])
+                nickname = await FriendUser.get_user_name(event.user_id)
+                await bot.send_private_msg(
+                    user_id=int(list(bot.config.superusers)[0]),
+                    message=f"*****一份入群申请*****\n"
+                    f"申请人：{nickname}({event.user_id})\n"
+                    f"群聊：{event.group_id}\n"
+                    f"邀请日期：{datetime.now().replace(microsecond=0)}",
+                )
+                await bot.send_private_msg(
+                    user_id=event.user_id,
+                    message=f"想要邀请我偷偷入群嘛~已经提醒{NICKNAME}的管理员大人了\n"
+                    "请确保已经群主或群管理沟通过！\n"
+                    "等待管理员处理吧！",
+                )
+                requests_manager.add_request(
+                    event.user_id,
+                    "group",
+                    event.flag,
+                    invite_group=event.group_id,
+                    nickname=nickname,
+                    sex=sex,
+                    age=age,
+                )
+            else:
+                logger.debug(
+                    f"群聊请求五分钟内重复, 已忽略",
+                    "群聊请求",
+                    target=f"{event.user_id}:{event.group_id}",
+                )
 
 
 @x.handle()
@@ -145,5 +158,4 @@ async def _(event: MessageEvent):
     minutes=5,
 )
 async def _():
-    global exists_data
-    exists_data = {"private": {}, "group": {}}
+    time_manager.clear()

basic_plugins/invite_manager/utils.py

@@ -0,0 +1,87 @@
+import time
+from dataclasses import dataclass
+from typing import Dict
+
+
+@dataclass
+class PrivateRequest:
+
+    """
+    好友请求
+    """
+
+    user_id: int
+    time: float = time.time()
+
+
+@dataclass
+class GroupRequest:
+
+    """
+    群聊请求
+    """
+
+    user_id: int
+    group_id: int
+    time: float = time.time()
+
+
+class RequestTimeManage:
+
+    """
+    过滤五分钟以内的重复请求
+    """
+
+    def __init__(self):
+
+        self._group: Dict[str, GroupRequest] = {}
+        self._user: Dict[int, PrivateRequest] = {}
+
+    def add_user_request(self, user_id: int) -> bool:
+        """
+        添加请求时间
+
+        Args:
+            user_id (int): 用户id
+
+        Returns:
+            bool: 是否满足时间
+        """
+        if user := self._user.get(user_id):
+            if time.time() - user.time < 60 * 5:
+                return False
+        self._user[user_id] = PrivateRequest(user_id)
+        return True
+
+    def add_group_request(self, user_id: int, group_id: int) -> bool:
+        """
+        添加请求时间
+
+        Args:
+            user_id (int): 用户id
+            group_id (int): 邀请群聊
+
+        Returns:
+            bool: 是否满足时间
+        """
+        key = f"{user_id}:{group_id}"
+        if group := self._group.get(key):
+            if time.time() - group.time < 60 * 5:
+                return False
+        self._group[key] = GroupRequest(user_id=user_id, group_id=group_id)
+        return True
+
+    def clear(self):
+        """
+        清理过期五分钟请求
+        """
+        now = time.time()
+        for user_id in self._user:
+            if now - self._user[user_id].time < 60 * 5:
+                del self._user[user_id]
+        for key in self._group:
+            if now - self._group[key].time < 60 * 5:
+                del self._group[key]
+
+
+time_manager = RequestTimeManage()

basic_plugins/nickname.py

@@ -1,121 +1,162 @@
-from nonebot.adapters.onebot.v11 import Bot, GroupMessageEvent, PrivateMessageEvent, Message, MessageEvent
-from nonebot import on_command
-from nonebot.typing import T_State
-from nonebot.rule import to_me
-from models.group_member_info import GroupInfoUser
-from models.friend_user import FriendUser
-from models.ban_user import BanUser
-from services.log import logger
-from configs.config import NICKNAME, Config
-from nonebot.params import CommandArg
 import random
+from typing import Any, Tuple
+
+from nonebot import on_command, on_regex
+from nonebot.adapters.onebot.v11 import Bot, GroupMessageEvent, Message, MessageEvent
+from nonebot.internal.matcher import Matcher
+from nonebot.internal.params import Depends
+from nonebot.params import CommandArg, RegexGroup
+from nonebot.rule import to_me
+
+from configs.config import NICKNAME
+from models.ban_user import BanUser
+from models.friend_user import FriendUser
+from models.group_member_info import GroupInfoUser
+from services.log import logger
+from utils.depends import GetConfig
 
 __zx_plugin_name__ = "昵称系统"
 __plugin_usage__ = f"""
 usage：
-    个人昵称系统，群聊 与 私聊 昵称相互独立
+    个人昵称，将替换真寻称呼你的名称，群聊 与 私聊 昵称相互独立，全局昵称设置将更改您目前所有群聊中及私聊的昵称
     指令：
-        以后叫我 [昵称]
+        以后叫我 [昵称]: 设置当前群聊/私聊的昵称
+        全局昵称设置 [昵称]: 设置当前所有群聊和私聊的昵称
         {NICKNAME}我是谁
 """.strip()
 __plugin_des__ = "区区昵称，才不想叫呢！"
-__plugin_cmd__ = ["以后叫我 [昵称]", f"{NICKNAME}我是谁"]
+__plugin_cmd__ = ["以后叫我 [昵称]", f"{NICKNAME}我是谁", "全局昵称设置 [昵称]"]
 __plugin_version__ = 0.1
 __plugin_author__ = "HibiKier"
 __plugin_settings__ = {
     "level": 5,
     "default_status": True,
     "limit_superuser": False,
-    "cmd": ["昵称", "昵称系统"],
+    "cmd": ["昵称"],
 }
 __plugin_configs__ = {
     "BLACK_WORD": {
-        "value": ["爸", "爹", "爷", "父亲"],
-        "help": "昵称所屏蔽的关键词，会被替换为 *",
-        "default_value": None
+        "value": ["爸", "爹", "爷", "父"],
+        "help": "昵称所屏蔽的关键词，已设置的昵称会被替换为 *，未设置的昵称会在设置时提示",
+        "default_value": None,
     }
 }
 
-nickname = on_command(
-    "nickname",
-    aliases={"以后叫我", "以后请叫我", "称呼我", "以后请称呼我", "以后称呼我", "叫我", "请叫我"},
+nickname = on_regex(
+    "(?:以后)?(?:叫我|请叫我|称呼我)(.*)",
     rule=to_me(),
     priority=5,
     block=True,
 )
 
 my_nickname = on_command(
-    "my_name", aliases={"我叫什么", "我是谁", "我的名字"}, rule=to_me(), priority=5, block=True
+    "我叫什么", aliases={"我是谁", "我的名字"}, rule=to_me(), priority=5, block=True
 )
 
+global_nickname = on_regex("设置全局昵称(.*)", rule=to_me(), priority=5, block=True)
+
 
 cancel_nickname = on_command("取消昵称", rule=to_me(), priority=5, block=True)
 
 
-@nickname.handle()
-async def _(bot: Bot, event: MessageEvent, arg: Message = CommandArg()):
-    msg = arg.extract_plain_text().strip()
-    if not msg:
-        await nickname.finish("叫你空白？叫你虚空？叫你无名？？", at_sender=True)
-    if len(msg) > 10:
-        await nickname.finish("昵称可不能超过10个字！", at_sender=True)
-    if msg in bot.config.superusers:
-        await nickname.finish("笨蛋！休想占用我的名字！#", at_sender=True)
-    _tmp = ""
-    black_word = Config.get_config("nickname", "BLACK_WORD")
-    if black_word:
-        for x in msg:
-            _tmp += "*" if x in black_word else x
-    msg = _tmp
+def CheckNickname():
+    """
+    说明:
+        检查名称是否合法
+    """
+
+    async def dependency(
+        bot: Bot,
+        matcher: Matcher,
+        event: MessageEvent,
+        reg_group: Tuple[Any, ...] = RegexGroup(),
+        black_word: Any = GetConfig(config="BLACK_WORD"),
+    ):
+        (msg,) = reg_group
+        logger.debug(f"昵称检查: {msg}", "昵称设置", event.user_id)
+        if not msg:
+            await matcher.finish("叫你空白？叫你虚空？叫你无名？？", at_sender=True)
+        if str(event.user_id) in bot.config.superusers:
+            logger.debug(f"超级用户设置昵称, 跳过合法检测: {msg}", "昵称设置", event.user_id)
+            return
+        if len(msg) > 20:
+            await nickname.finish("昵称可不能超过20个字！", at_sender=True)
+        if msg in bot.config.nickname:
+            await nickname.finish("笨蛋！休想占用我的名字！#", at_sender=True)
+        if black_word:
+            for x in msg:
+                if x in black_word:
+                    logger.debug("昵称设置禁止字符: [{x}]", "昵称设置", event.user_id)
+                    await nickname.finish(f"字符 [{x}] 为禁止字符！", at_sender=True)
+            for word in black_word:
+                if word in msg:
+                    logger.debug("昵称设置禁止字符: [{word}]", "昵称设置", event.user_id)
+                    await nickname.finish(f"字符 [{word}] 为禁止字符！", at_sender=True)
+
+    return Depends(dependency)
+
+
+@global_nickname.handle(parameterless=[CheckNickname()])
+async def _(
+    event: MessageEvent,
+    reg_group: Tuple[Any, ...] = RegexGroup(),
+):
+    (msg,) = reg_group
+    await FriendUser.set_user_nickname(event.user_id, msg)
+    await GroupInfoUser.filter(user_qq=event.user_id).update(nickname=msg)
+    logger.info(f"设置全局昵称成功: {msg}", "设置全局昵称", event.user_id)
+    await global_nickname.send(f"设置全局昵称成功！亲爱的{msg}")
+
+
+@nickname.handle(parameterless=[CheckNickname()])
+async def _(
+    event: MessageEvent,
+    reg_group: Tuple[Any, ...] = RegexGroup(),
+):
+    (msg,) = reg_group
     if isinstance(event, GroupMessageEvent):
-        if await GroupInfoUser.set_group_member_nickname(
-            event.user_id, event.group_id, msg
-        ):
-            if len(msg) < 5:
-                if random.random() < 0.3:
-                    msg = "~".join(msg)
-            await nickname.send(
-                random.choice(
-                    [
-                        f"好啦好啦，我知道啦，{msg}，以后就这么叫你吧",
-                        f"嗯嗯，{NICKNAME}记住你的昵称了哦，{msg}",
-                        f"好突然，突然要叫你昵称什么的...{msg}..",
-                        f"{NICKNAME}会好好记住{msg}的，放心吧",
-                        f"好..好.，那窝以后就叫你{msg}了.",
-                    ]
-                )
+        await GroupInfoUser.set_user_nickname(event.user_id, event.group_id, msg)
+        if len(msg) < 5:
+            if random.random() < 0.3:
+                msg = "~".join(msg)
+        await nickname.send(
+            random.choice(
+                [
+                    f"好啦好啦，我知道啦，{msg}，以后就这么叫你吧",
+                    f"嗯嗯，{NICKNAME}记住你的昵称了哦，{msg}",
+                    f"好突然，突然要叫你昵称什么的...{msg}..",
+                    f"{NICKNAME}会好好记住{msg}的，放心吧",
+                    f"好..好.，那窝以后就叫你{msg}了.",
+                ]
             )
-            logger.info(f"USER {event.user_id} GROUP {event.group_id} 设置群昵称 {msg}")
-        else:
-            await nickname.send("设置昵称失败，请更新群组成员信息！", at_sender=True)
-            logger.warning(f"USER {event.user_id} GROUP {event.group_id} 设置群昵称 {msg} 失败")
+        )
+        logger.info(f"设置群昵称成功: {msg}", "昵称设置", event.user_id, event.group_id)
     else:
-        if await FriendUser.set_friend_nickname(event.user_id, msg):
-            await nickname.send(
-                random.choice(
-                    [
-                        f"好啦好啦，我知道啦，{msg}，以后就这么叫你吧",
-                        f"嗯嗯，{NICKNAME}记住你的昵称了哦，{msg}",
-                        f"好突然，突然要叫你昵称什么的...{msg}..",
-                        f"{NICKNAME}会好好记住{msg}的，放心吧",
-                        f"好..好.，那窝以后就叫你{msg}了.",
-                    ]
-                )
+        await FriendUser.set_user_nickname(event.user_id, msg)
+        await nickname.send(
+            random.choice(
+                [
+                    f"好啦好啦，我知道啦，{msg}，以后就这么叫你吧",
+                    f"嗯嗯，{NICKNAME}记住你的昵称了哦，{msg}",
+                    f"好突然，突然要叫你昵称什么的...{msg}..",
+                    f"{NICKNAME}会好好记住{msg}的，放心吧",
+                    f"好..好.，那窝以后就叫你{msg}了.",
+                ]
             )
-            logger.info(f"USER {event.user_id} 设置昵称 {msg}")
-        else:
-            await nickname.send("设置昵称失败了，明天再来试一试！或联系管理员更新好友！", at_sender=True)
-            logger.warning(f"USER {event.user_id} 设置昵称 {msg} 失败")
+        )
+        logger.info(f"设置私聊昵称成功: {msg}", "昵称设置", event.user_id)
 
 
 @my_nickname.handle()
-async def _(event: GroupMessageEvent):
-    try:
-        nickname_ = await GroupInfoUser.get_group_member_nickname(
-            event.user_id, event.group_id
-        )
-    except AttributeError:
-        nickname_ = ""
+async def _(event: MessageEvent):
+    nickname_ = None
+    card = None
+    if isinstance(event, GroupMessageEvent):
+        nickname_ = await GroupInfoUser.get_user_nickname(event.user_id, event.group_id)
+        card = event.sender.card or event.sender.nickname
+    else:
+        nickname_ = await FriendUser.get_user_nickname(event.user_id)
+        card = event.sender.nickname
     if nickname_:
         await my_nickname.send(
             random.choice(
@@ -130,44 +171,20 @@ async def _(event: GroupMessageEvent):
             )
         )
     else:
-        nickname_ = event.sender.card or event.sender.nickname
         await my_nickname.send(
             random.choice(
                 ["没..没有昵称嘛，{}", "啊，你是{}啊，我想叫你的昵称！", "是{}啊，有什么事吗？", "你是{}？"]
-            ).format(nickname_)
-        )
-
-
-@my_nickname.handle()
-async def _(bot: Bot, event: PrivateMessageEvent, state: T_State):
-    nickname_ = await FriendUser.get_friend_nickname(event.user_id)
-    if nickname_:
-        await my_nickname.send(
-            random.choice(
-                [
-                    f"我肯定记得你啊，你是{nickname_}啊",
-                    f"我不会忘记你的，你也不要忘记我！{nickname_}",
-                    f"哼哼，{NICKNAME}记忆力可是很好的，{nickname_}",
-                    f"嗯？你是失忆了嘛...{nickname_}..",
-                    f"不要小看{NICKNAME}的记忆力啊！笨蛋{nickname_}！QAQ",
-                    f"哎？{nickname_}..怎么了吗..突然这样问..",
-                ]
-            )
-        )
-    else:
-        nickname_ = (await bot.get_stranger_info(user_id=event.user_id))["nickname"]
-        await my_nickname.send(
-            random.choice(
-                ["没..没有昵称嘛，{}", "啊，你是{}啊，我想叫你的昵称！", "是{}啊，有什么事吗？", "你是{}？"]
-            ).format(nickname_)
+            ).format(card)
         )
 
 
 @cancel_nickname.handle()
-async def _(event: GroupMessageEvent):
-    nickname_ = await GroupInfoUser.get_group_member_nickname(
-        event.user_id, event.group_id
-    )
+async def _(event: MessageEvent):
+    nickname_ = None
+    if isinstance(event, GroupMessageEvent):
+        nickname_ = await GroupInfoUser.get_user_nickname(event.user_id, event.group_id)
+    else:
+        nickname_ = await FriendUser.get_user_nickname(event.user_id)
     if nickname_:
         await cancel_nickname.send(
             random.choice(
@@ -180,28 +197,10 @@ async def _(event: GroupMessageEvent):
                 ]
             )
         )
-        await GroupInfoUser.set_group_member_nickname(event.user_id, event.group_id, "")
-        await BanUser.ban(event.user_id, 9, 60)
-    else:
-        await cancel_nickname.send("你在做梦吗？你没有昵称啊", at_sender=True)
-
-
-@cancel_nickname.handle()
-async def _(event: PrivateMessageEvent):
-    nickname_ = await FriendUser.get_friend_nickname(event.user_id)
-    if nickname_:
-        await cancel_nickname.send(
-            random.choice(
-                [
-                    f"呜..{NICKNAME}睡一觉就会忘记的..和梦一样..{nickname_}",
-                    f"窝知道了..{nickname_}..",
-                    f"是{NICKNAME}哪里做的不好嘛..好吧..晚安{nickname_}",
-                    f"呃，{nickname_}，下次我绝对绝对绝对不会再忘记你！",
-                    f"可..可恶！{nickname_}！太可恶了！呜",
-                ]
-            )
-        )
-        await FriendUser.get_user_name(event.user_id)
+        if isinstance(event, GroupMessageEvent):
+            await GroupInfoUser.set_user_nickname(event.user_id, event.group_id, "")
+        else:
+            await FriendUser.set_user_nickname(event.user_id, "")
         await BanUser.ban(event.user_id, 9, 60)
     else:
         await cancel_nickname.send("你在做梦吗？你没有昵称啊", at_sender=True)

basic_plugins/plugin_shop/__init__.py

@@ -1,13 +1,17 @@
 from nonebot import on_command, on_regex
-
-from .data_source import show_plugin_repo, install_plugin, uninstall_plugin, download_json
-from services.log import logger
 from nonebot.adapters.onebot.v11 import Bot, GroupMessageEvent, Message, MessageEvent
 from nonebot.params import CommandArg
-
-from utils.message_builder import image
 from nonebot.permission import SUPERUSER
 
+from services.log import logger
+from utils.message_builder import image
+
+from .data_source import (
+    download_json,
+    install_plugin,
+    show_plugin_repo,
+    uninstall_plugin,
+)
 
 __zx_plugin_name__ = "插件商店 [Superuser]"
 __plugin_usage__ = """
@@ -28,23 +32,29 @@ show_repo = on_regex("^查看插件仓库$", priority=1, block=True, permission=
 
 update_repo = on_regex("^更新插件仓库$", priority=1, block=True, permission=SUPERUSER)
 
-install_plugin_matcher = on_command("安装插件", priority=1, block=True, permission=SUPERUSER)
+install_plugin_matcher = on_command(
+    "安装插件", priority=1, block=True, permission=SUPERUSER
+)
 
-uninstall_plugin_matcher = on_command("卸载插件", priority=1, block=True, permission=SUPERUSER)
+uninstall_plugin_matcher = on_command(
+    "卸载插件", priority=1, block=True, permission=SUPERUSER
+)
 
 
 @install_plugin_matcher.handle()
 async def _(bot: Bot, event: MessageEvent, arg: Message = CommandArg()):
-    arg = arg.extract_plain_text().strip()
-    msg = await install_plugin(arg)
+    name = arg.extract_plain_text().strip()
+    msg = await install_plugin(name)
     await install_plugin_matcher.send(msg)
+    logger.info(f"安装插件: {name}", "安装插件", event.user_id)
 
 
 @uninstall_plugin_matcher.handle()
 async def _(bot: Bot, event: MessageEvent, arg: Message = CommandArg()):
-    arg = arg.extract_plain_text().strip()
-    msg = await uninstall_plugin(arg)
+    name = arg.extract_plain_text().strip()
+    msg = await uninstall_plugin(name)
     await install_plugin_matcher.send(msg)
+    logger.info(f"卸载插件: {name}", "卸载插件", event.user_id)
 
 
 @update_repo.handle()
@@ -53,16 +63,13 @@ async def _(bot: Bot, event: MessageEvent):
     if code == 200:
         await update_repo.finish("更新插件仓库信息成功！")
     await update_repo.send("更新插件仓库信息失败！")
-    
+    logger.info("更新插件仓库信息", "更新插件仓库信息", event.user_id)
+
 
 @show_repo.handle()
 async def _(bot: Bot, event: MessageEvent):
     msg = await show_plugin_repo()
     if isinstance(msg, int):
         await show_repo.finish("文件下载失败或解压失败..")
-    await show_repo.send(image(b64=msg))
-    logger.info(
-        f"(USER {event.user_id}, GROUP {event.group_id if isinstance(event, GroupMessageEvent) else 'private'})"
-        f" 查看插件仓库"
-    )
-
+    await show_repo.send(image(msg))
+    logger.info("查看插件仓库", "查看插件仓库", event.user_id)

basic_plugins/plugin_shop/data_source.py

@@ -2,15 +2,15 @@ import os
 import shutil
 import zipfile
 from pathlib import Path
-from typing import Union, Tuple
-from utils.manager import plugins_manager
+from typing import Tuple, Union
 
 import ujson as json
 
+from configs.path_config import DATA_PATH, TEMP_PATH
 from services import logger
 from utils.http_utils import AsyncHttpx
-from configs.path_config import TEMP_PATH, DATA_PATH
-from utils.image_utils import text2image, BuildImage
+from utils.image_utils import BuildImage, text2image
+from utils.manager import plugins_manager
 from utils.utils import is_number
 
 path = DATA_PATH / "plugin_shop"
@@ -48,7 +48,7 @@ async def install_plugin(name: str) -> str:
         if zip_file.exists():
             zip_file.unlink()
         if await AsyncHttpx.download_file(url, zip_file):
-            logger.debug("开始解压插件压缩包...")
+            logger.debug("开始解压插件压缩包...", "安装插件", target=name)
             # 解压
             zf = zipfile.ZipFile(zip_file, "r")
             extract_path = TEMP_PATH / f"{name}"
@@ -58,32 +58,34 @@ async def install_plugin(name: str) -> str:
             for file in zf.namelist():
                 zf.extract(file, extract_path)
             zf.close()
-            logger.debug("解压插件压缩包完成...")
-            logger.debug("开始移动插件文件夹...")
+            logger.debug("解压插件压缩包完成...", "安装插件", target=name)
+            logger.debug("开始移动插件文件夹...", "安装插件", target=name)
             if (extensive_plugin_path / f"{name}").exists():
-                logger.debug("extensive_plugin目录下文件夹已存在，删除该目录插件文件夹...")
+                logger.debug(
+                    "extensive_plugin目录下文件夹已存在，删除该目录插件文件夹...", "安装插件", target=name
+                )
                 shutil.rmtree(
                     (extensive_plugin_path / f"{name}").absolute(), ignore_errors=True
                 )
             extract_path.rename(extensive_plugin_path / f"{name}")
-            tmp = ""
+            prompt = ""
             if "pyproject.toml" in os.listdir(extensive_plugin_path / f"{name}"):
-                tmp = "检测到该插件含有额外依赖，当前安装无法保证依赖完全安装成功。"
+                prompt = "检测到该插件含有额外依赖，当前安装无法保证依赖完全安装成功。"
                 os.system(
                     f"poetry run pip install -r {(extensive_plugin_path / f'{name}' / 'pyproject.toml').absolute()}"
                 )
             elif "requirements.txt" in os.listdir(extensive_plugin_path / f"{name}"):
-                tmp = "检测到该插件含有额外依赖，当前安装无法保证依赖完全安装成功。"
+                prompt = "检测到该插件含有额外依赖，当前安装无法保证依赖完全安装成功。"
                 os.system(
                     f"poetry run pip install -r {(extensive_plugin_path / f'{name}' / 'requirements.txt').absolute()}"
                 )
             with open(extensive_plugin_path / f"{name}" / "plugin_info.json", "w") as f:
                 json.dump(data[name], f, ensure_ascii=False, indent=4)
-            logger.debug("移动插件文件夹完成...")
-            logger.info(f"成功安装插件 {name} 成功！\n{tmp}")
+            logger.debug("移动插件文件夹完成...", "安装插件", target=name)
+            logger.info(f"成功安装插件 {name} 成功！\n{prompt}", "安装插件", target=name)
         return f"成功安装插件 {name}，请重启真寻！"
     except Exception as e:
-        logger.error(f"安装插件 {name} 失败 {type(e)}：{e}")
+        logger.error(f"安装插失败", "安装插件", target=name, e=e)
         return f"安装插件 {name} 失败 {type(e)}：{e}"
 
 
@@ -138,7 +140,7 @@ async def show_plugin_repo() -> Union[int, str]:
             version = f"<f font_color=#1a7e30>[{plugins_data[key].version}]</f>"
         s = (
             f'id：{i+1}\n名称：{plugin_info[key]["plugin_name"]}'
-            f' \t\t{status}\n'
+            f" \t\t{status}\n"
             f"模块：{key}\n"
             f'作者：{plugin_info[key]["author"]}\n'
             f'版本：{plugin_info[key]["version"]} \t\t{version}\n'

basic_plugins/scripts.py

@@ -1,23 +1,16 @@
 import random
-
-from asyncpg.exceptions import (
-    DuplicateColumnError,
-    UndefinedColumnError,
-    PostgresSyntaxError,
-)
-from nonebot import Driver
-from services.db_context import db
-from models.group_info import GroupInfo
-from models.bag_user import BagUser
-from nonebot.adapters.onebot.v11 import Bot
-from services.log import logger
-from configs.path_config import TEXT_PATH
 from asyncio.exceptions import TimeoutError
-from typing import List
-from utils.http_utils import AsyncHttpx
-from utils.utils import GDict
-from utils.utils import scheduler
+
 import nonebot
+from nonebot.adapters.onebot.v11 import Bot
+from nonebot.drivers import Driver
+
+from configs.path_config import TEXT_PATH
+from models.bag_user import BagUser
+from models.group_info import GroupInfo
+from services.log import logger
+from utils.http_utils import AsyncHttpx
+from utils.utils import GDict, scheduler
 
 try:
     import ujson as json
@@ -38,6 +31,7 @@ async def update_city():
     data = {}
     if not china_city.exists():
         try:
+            logger.debug("开始更新城市列表...")
             res = await AsyncHttpx.get(
                 "http://www.weather.com.cn/data/city3jdata/china.html", timeout=5
             )
@@ -56,103 +50,97 @@ async def update_city():
             with open(china_city, "w", encoding="utf8") as f:
                 json.dump(data, f, indent=4, ensure_ascii=False)
             logger.info("自动更新城市列表完成.....")
-        except TimeoutError:
-            logger.warning("自动更新城市列表超时.....")
-        except ValueError:
-            logger.warning("自动城市列表失败.....")
+        except TimeoutError as e:
+            logger.warning("自动更新城市列表超时...", e=e)
+        except ValueError as e:
+            logger.warning("自动城市列表失败.....", e=e)
         except Exception as e:
-            logger.error(f"自动城市列表未知错误 {type(e)}：{e}")
+            logger.error(f"自动城市列表未知错误", e=e)
 
 
-@driver.on_startup
-async def _():
-    """
-    数据库表结构变换
-    """
-    _flag = []
-    sql_str = [
-        (
-            "ALTER TABLE group_info ADD group_flag Integer NOT NULL DEFAULT 0;",
-            "group_info",
-        ),  # group_info表添加一个group_flag
-        (
-            "ALTER TABLE bag_users rename belonging_group To group_id;",
-            "bag_users",
-        ),  # 将 bag_users 的 belonging_group 改为 group_id
-        (
-            "ALTER TABLE group_info_users rename belonging_group To group_id;",
-            "group_info_users",
-        ),
-        (
-            "ALTER TABLE sign_group_users rename belonging_group To group_id;",
-            "sign_group_users",
-        ),
-        (
-            "ALTER TABLE open_cases_users rename belonging_group To group_id;",
-            "open_cases_users",
-        ),
-        (
-            "ALTER TABLE bag_users ADD property json NOT NULL DEFAULT '{}';",
-            "bag_users",
-        ),  # bag_users 新增字段 property 替代 props
-        (
-            "ALTER TABLE genshin ADD auto_sign_time timestamp with time zone;",
-            "genshin"
-        ),  # 新增原神自动签到字段
-        (
-            "ALTER TABLE genshin ADD resin_remind boolean DEFAULT False;",
-            "genshin"
-        ),  # 新增原神自动签到字段
-        (
-            "ALTER TABLE genshin ADD resin_recovery_time timestamp with time zone;",
-            "genshin"
-        ),  # 新增原神自动签到字段
-        (
-            "ALTER TABLE genshin ADD bind_group Integer;",
-            "genshin"
-        ),  # 新增原神群号绑定字段
-        (
-            "ALTER TABLE genshin ADD login_ticket VARCHAR(255) DEFAULT '';",
-            "genshin"
-        ),  # 新增米游社login_ticket绑定字段
-        (
-            "ALTER TABLE genshin ADD stuid VARCHAR(255) DEFAULT '';",
-            "genshin"
-        ),  # 新增米游社stuid绑定字段
-        (
-            "ALTER TABLE genshin ADD stoken VARCHAR(255) DEFAULT '';",
-            "genshin"
-        ),  # 新增米游社stoken绑定字段
-        (
-            "ALTER TABLE chat_history ADD plain_text Text;",
-            "chat_history"
-        ),  # 新增纯文本
-        (
-            "ALTER TABLE goods_info ADD daily_limit Integer DEFAULT 0;",
-            "goods_info"
-        ),  # 新增纯文本
-        (
-            "ALTER TABLE goods_info ADD daily_purchase_limit Json DEFAULT '{}';",
-            "goods_info"
-        ),  # 新增纯文本
-    ]
-    for sql in sql_str + GDict.get('run_sql', []):
-        try:
-            if isinstance(sql, str):
-                flag = f'{random.randint(1, 10000)}'
-            else:
-                flag = sql[1]
-                sql = sql[0]
-            query = db.text(sql)
-            await db.first(query)
-            logger.info(f"完成sql操作：{sql}")
-            _flag.append(flag)
-        except (DuplicateColumnError, UndefinedColumnError):
-            pass
-        except PostgresSyntaxError:
-            logger.error(f"语法错误：执行sql失败：{sql}")
-    # bag_user 将文本转为字典格式
-    await __database_script(_flag)
+# @driver.on_startup
+# async def _():
+#     """
+#     数据库表结构变换
+#     """
+#     _flag = []
+#     sql_str = [
+#         (
+#             "ALTER TABLE group_info ADD group_flag Integer NOT NULL DEFAULT 0;",
+#             "group_info",
+#         ),  # group_info表添加一个group_flag
+#         (
+#             "ALTER TABLE bag_users rename belonging_group To group_id;",
+#             "bag_users",
+#         ),  # 将 bag_users 的 belonging_group 改为 group_id
+#         (
+#             "ALTER TABLE group_info_users rename belonging_group To group_id;",
+#             "group_info_users",
+#         ),
+#         (
+#             "ALTER TABLE sign_group_users rename belonging_group To group_id;",
+#             "sign_group_users",
+#         ),
+#         (
+#             "ALTER TABLE open_cases_users rename belonging_group To group_id;",
+#             "open_cases_users",
+#         ),
+#         (
+#             "ALTER TABLE bag_users ADD property json NOT NULL DEFAULT '{}';",
+#             "bag_users",
+#         ),  # bag_users 新增字段 property 替代 props
+#         (
+#             "ALTER TABLE genshin ADD auto_sign_time timestamp with time zone;",
+#             "genshin",
+#         ),  # 新增原神自动签到字段
+#         (
+#             "ALTER TABLE genshin ADD resin_remind boolean DEFAULT False;",
+#             "genshin",
+#         ),  # 新增原神自动签到字段
+#         (
+#             "ALTER TABLE genshin ADD resin_recovery_time timestamp with time zone;",
+#             "genshin",
+#         ),  # 新增原神自动签到字段
+#         ("ALTER TABLE genshin ADD bind_group Integer;", "genshin"),  # 新增原神群号绑定字段
+#         (
+#             "ALTER TABLE genshin ADD login_ticket VARCHAR(255) DEFAULT '';",
+#             "genshin",
+#         ),  # 新增米游社login_ticket绑定字段
+#         (
+#             "ALTER TABLE genshin ADD stuid VARCHAR(255) DEFAULT '';",
+#             "genshin",
+#         ),  # 新增米游社stuid绑定字段
+#         (
+#             "ALTER TABLE genshin ADD stoken VARCHAR(255) DEFAULT '';",
+#             "genshin",
+#         ),  # 新增米游社stoken绑定字段
+#         ("ALTER TABLE chat_history ADD plain_text Text;", "chat_history"),  # 新增纯文本
+#         (
+#             "ALTER TABLE goods_info ADD daily_limit Integer DEFAULT 0;",
+#             "goods_info",
+#         ),  # 新增纯文本
+#         (
+#             "ALTER TABLE goods_info ADD daily_purchase_limit Json DEFAULT '{}';",
+#             "goods_info",
+#         ),  # 新增纯文本
+#     ]
+#     for sql in sql_str + GDict.get("run_sql", []):
+#         try:
+#             if isinstance(sql, str):
+#                 flag = f"{random.randint(1, 10000)}"
+#             else:
+#                 flag = sql[1]
+#                 sql = sql[0]
+#             query = db.text(sql)
+#             await db.first(query)
+#             logger.info(f"完成sql操作：{sql}")
+#             _flag.append(flag)
+#         except (DuplicateColumnError, UndefinedColumnError):
+#             pass
+#         except PostgresSyntaxError:
+#             logger.error(f"语法错误：执行sql失败：{sql}")
+# bag_user 将文本转为字典格式
+# await __database_script(_flag)
 
 
 @driver.on_bot_connect
@@ -161,51 +149,57 @@ async def _(bot: Bot):
     版本某些需要的变换
     """
     # 清空不存在的群聊信息，并将已所有已存在的群聊group_flag设置为1（认证所有已存在的群）
-    if not await GroupInfo.get_group_info(114514):
+    if not await GroupInfo.get_or_none(group_id=114514):
         # 标识符，该功能只需执行一次
-        await GroupInfo.add_group_info(114514, "114514", 114514, 114514, 1)
+        await GroupInfo.create(
+            group_id=114514,
+            group_name="114514",
+            max_member_count=114514,
+            member_count=114514,
+            group_flag=1,
+        )
         group_list = await bot.get_group_list()
         group_list = [g["group_id"] for g in group_list]
-        _gl = [x.group_id for x in await GroupInfo.get_all_group()]
+        _gl = [x.group_id for x in await GroupInfo.all()]
         if 114514 in _gl:
             _gl.remove(114514)
         for group_id in _gl:
             if group_id in group_list:
-                if await GroupInfo.get_group_info(group_id):
-                    await GroupInfo.set_group_flag(group_id, 1)
+                if group := await GroupInfo.get_or_none(group_id=group_id):
+                    await group.update_or_create(group_flag=1)
                 else:
                     group_info = await bot.get_group_info(group_id=group_id)
-                    await GroupInfo.add_group_info(
-                        group_info["group_id"],
-                        group_info["group_name"],
-                        group_info["max_member_count"],
-                        group_info["member_count"],
-                        1,
+                    await GroupInfo.create(
+                        group_id=group_info["group_id"],
+                        group_name=group_info["group_name"],
+                        max_member_count=group_info["max_member_count"],
+                        member_count=group_info["member_count"],
+                        group_flag=1,
                     )
-                logger.info(f"已将群聊 {group_id} 添加认证...")
+                logger.info(f"已添加群认证...", group_id=group_id)
             else:
-                await GroupInfo.delete_group_info(group_id)
-                logger.info(f"移除不存在的群聊信息：{group_id}")
+                await GroupInfo.filter(group_id=group_id).delete()
+                logger.info(f"移除不存在的群聊信息", group_id=group_id)
 
 
-async def __database_script(_flag: List[str]):
-    # bag_user 将文本转为字典格式
-    if "bag_users" in _flag:
-        for x in await BagUser.get_all_users():
-            props = {}
-            if x.props:
-                for prop in [p for p in x.props.split(",") if p]:
-                    if props.get(prop):
-                        props[prop] += 1
-                    else:
-                        props[prop] = 1
-                logger.info(
-                    f"__database_script USER {x.user_qq} GROUP {x.group_id} 更新数据 {props}"
-                )
-            await x.update(
-                property=props,
-                props="",
-            ).apply()
+# async def __database_script(_flag: List[str]):
+#     # bag_user 将文本转为字典格式
+#     if "bag_users" in _flag:
+#         for x in await BagUser.get_all_users():
+#             props = {}
+#             if x.props:
+#                 for prop in [p for p in x.props.split(",") if p]:
+#                     if props.get(prop):
+#                         props[prop] += 1
+#                     else:
+#                         props[prop] = 1
+#                 logger.info(
+#                     f"__database_script USER {x.user_qq} GROUP {x.group_id} 更新数据 {props}"
+#                 )
+#             await x.update(
+#                 property=props,
+#                 props="",
+#             ).apply()
 
 
 # 自动更新城市列表

basic_plugins/shop/__init__.py

@@ -1,21 +1,40 @@
-from configs.config import Config
-from nonebot import Driver
-from utils.decorator.shop import shop_register
+from pathlib import Path
+
 import nonebot
+from nonebot.drivers import Driver
+
+from configs.config import Config
+from utils.decorator.shop import shop_register
 
 driver: Driver = nonebot.get_driver()
 
 
 Config.add_plugin_config(
-    "shop",
-    "IMPORT_DEFAULT_SHOP_GOODS",
-    True,
-    help_="导入商店自带的三个商品",
-    default_value=True
+    "shop", "IMPORT_DEFAULT_SHOP_GOODS", True, help_="导入商店自带的三个商品", default_value=True
 )
 
 
-nonebot.load_plugins("basic_plugins/shop")
+nonebot.load_plugins(str(Path(__file__).parent.resolve()))
+
+
+@shop_register(
+    name=("好感度双倍加持卡Ⅰ", "好感度双倍加持卡Ⅱ", "好感度双倍加持卡Ⅲ"),
+    price=(30, 150, 250),
+    des=(
+        "下次签到双倍好感度概率 + 10%（谁才是真命天子？）（同类商品将覆盖）",
+        "下次签到双倍好感度概率 + 20%（平平庸庸）（同类商品将覆盖）",
+        "下次签到双倍好感度概率 + 30%（金币才是真命天子！）（同类商品将覆盖）",
+    ),
+    load_status=bool(Config.get_config("shop", "IMPORT_DEFAULT_SHOP_GOODS")),
+    icon=(
+        "favorability_card_1.png",
+        "favorability_card_2.png",
+        "favorability_card_3.png",
+    ),
+    **{"好感度双倍加持卡Ⅰ_prob": 0.1, "好感度双倍加持卡Ⅱ_prob": 0.2, "好感度双倍加持卡Ⅲ_prob": 0.3},
+)
+async def sign_card(user_id: int, group_id: int):
+    pass
 
 
 @driver.on_bot_connect

basic_plugins/shop/buy.py

@@ -1,16 +1,15 @@
-from nonebot import on_command
-
-from models.user_shop_gold_log import UserShopGoldLog
-from services.log import logger
-from nonebot.adapters.onebot.v11 import GroupMessageEvent, Message
-from nonebot.params import CommandArg
-from utils.utils import is_number
-from models.bag_user import BagUser
-from services.db_context import db
-from nonebot.adapters.onebot.v11.permission import GROUP
-from models.goods_info import GoodsInfo
 import time
 
+from nonebot import on_command
+from nonebot.adapters.onebot.v11 import GroupMessageEvent, Message
+from nonebot.adapters.onebot.v11.permission import GROUP
+from nonebot.params import CommandArg
+
+from models.bag_user import BagUser
+from models.goods_info import GoodsInfo
+from models.user_shop_gold_log import UserShopGoldLog
+from services.log import logger
+from utils.utils import is_number
 
 __zx_plugin_name__ = "商店 - 购买道具"
 __plugin_usage__ = """
@@ -71,39 +70,40 @@ async def _(event: GroupMessageEvent, arg: Message = CommandArg()):
                 await buy.finish("请输入正确的商品名称！")
         else:
             await buy.finish("请输入正确的商品名称！", at_sender=True)
-    async with db.transaction():
-        if (
-            await BagUser.get_gold(event.user_id, event.group_id)
-        ) < goods.goods_price * num * goods.goods_discount:
-            await buy.finish("您的金币好像不太够哦", at_sender=True)
-        flag, n = await GoodsInfo.check_user_daily_purchase(
-            goods, event.user_id, event.group_id, num
-        )
-        if flag:
-            await buy.finish(f"该次购买将超过每日次数限制，目前该道具还可以购买{n}次哦", at_sender=True)
-        if await BagUser.buy_property(event.user_id, event.group_id, goods, num):
-            await GoodsInfo.add_user_daily_purchase(
-                goods, event.user_id, event.group_id, num
-            )
-            await buy.send(
-                f"花费 {goods.goods_price * num * goods.goods_discount} 金币购买 {goods.goods_name} ×{num} 成功！",
-                at_sender=True,
-            )
-            logger.info(
-                f"USER {event.user_id} GROUP {event.group_id} "
-                f"花费 {goods.goods_price*num} 金币购买 {goods.goods_name} ×{num} 成功！"
-            )
-            await UserShopGoldLog.add_shop_log(
-                event.user_id,
-                event.group_id,
-                0,
-                goods.goods_name,
-                num,
-                goods.goods_price * num * goods.goods_discount,
-            )
-        else:
-            await buy.send(f"{goods.goods_name} 购买失败！", at_sender=True)
-            logger.info(
-                f"USER {event.user_id} GROUP {event.group_id} "
-                f"花费 {goods.goods_price * num * goods.goods_discount} 金币购买 {goods.goods_name} ×{num} 失败！"
-            )
+    if (
+        await BagUser.get_gold(event.user_id, event.group_id)
+    ) < goods.goods_price * num * goods.goods_discount:
+        await buy.finish("您的金币好像不太够哦", at_sender=True)
+    flag, n = await GoodsInfo.check_user_daily_purchase(
+        goods, event.user_id, event.group_id, num
+    )
+    if flag:
+        await buy.finish(f"该次购买将超过每日次数限制，目前该道具还可以购买{n}次哦", at_sender=True)
+    spend_gold = int(goods.goods_discount * goods.goods_price * num)
+    await BagUser.spend_gold(event.user_id, event.group_id, spend_gold)
+    await BagUser.add_property(event.user_id, event.group_id, goods.goods_name, num)
+    await GoodsInfo.add_user_daily_purchase(goods, event.user_id, event.group_id, num)
+    await buy.send(
+        f"花费 {goods.goods_price * num * goods.goods_discount} 金币购买 {goods.goods_name} ×{num} 成功！",
+        at_sender=True,
+    )
+    logger.info(
+        f"花费 {goods.goods_price*num} 金币购买 {goods.goods_name} ×{num} 成功！",
+        "购买道具",
+        event.user_id,
+        event.group_id,
+    )
+    await UserShopGoldLog.create(
+        user_qq=event.user_id,
+        group_id=event.group_id,
+        type=0,
+        name=goods.goods_name,
+        num=num,
+        spend_gold=goods.goods_price * num * goods.goods_discount,
+    )
+    # else:
+    #     await buy.send(f"{goods.goods_name} 购买失败！", at_sender=True)
+    #     logger.info(
+    #         f"USER {event.user_id} GROUP {event.group_id} "
+    #         f"花费 {goods.goods_price * num * goods.goods_discount} 金币购买 {goods.goods_name} ×{num} 失败！"
+    #     )

basic_plugins/shop/gold.py

@@ -1,9 +1,10 @@
 from nonebot import on_command
-from nonebot.adapters.onebot.v11 import GroupMessageEvent, Message, ActionFailed
-from nonebot.params import CommandArg
+from nonebot.adapters.onebot.v11 import ActionFailed, GroupMessageEvent, Message
 from nonebot.adapters.onebot.v11.permission import GROUP
-from utils.data_utils import init_rank
+from nonebot.params import CommandArg
+
 from models.bag_user import BagUser
+from utils.data_utils import init_rank
 from utils.image_utils import text2image
 from utils.message_builder import image
 from utils.utils import is_number
@@ -39,7 +40,9 @@ async def _(event: GroupMessageEvent):
     try:
         await my_gold.send(msg)
     except ActionFailed:
-        await my_gold.send(image(b64=(await text2image(msg, color="#f9f6f2", padding=10)).pic2bs4()))
+        await my_gold.send(
+            image(b64=(await text2image(msg, color="#f9f6f2", padding=10)).pic2bs4())
+        )
 
 
 @gold_rank.handle()
@@ -49,9 +52,11 @@ async def _(event: GroupMessageEvent, arg: Message = CommandArg()):
         num = int(num)
     else:
         num = 10
-    all_users = await BagUser.get_all_users(event.group_id)
+    all_users = await BagUser.filter(group_id=event.group_id)
     all_user_id = [user.user_qq for user in all_users]
     all_user_data = [user.gold for user in all_users]
-    rank_image = await init_rank("金币排行", all_user_id, all_user_data, event.group_id, num)
+    rank_image = await init_rank(
+        "金币排行", all_user_id, all_user_data, event.group_id, num
+    )
     if rank_image:
         await gold_rank.finish(image(b64=rank_image.pic2bs4()))

basic_plugins/shop/my_props/__init__.py

@@ -1,12 +1,12 @@
 from nonebot import on_command
-
-from utils.message_builder import image
-from ._data_source import create_bag_image
-from services.log import logger
 from nonebot.adapters.onebot.v11 import GroupMessageEvent
-from models.bag_user import BagUser
 from nonebot.adapters.onebot.v11.permission import GROUP
 
+from models.bag_user import BagUser
+from services.log import logger
+from utils.message_builder import image
+
+from ._data_source import create_bag_image
 
 __zx_plugin_name__ = "商店 - 我的道具"
 __plugin_usage__ = """
@@ -17,7 +17,7 @@ usage：
 """.strip()
 __plugin_des__ = "商店 - 我的道具"
 __plugin_cmd__ = ["我的道具"]
-__plugin_type__ = ('商店',)
+__plugin_type__ = ("商店",)
 __plugin_version__ = 0.1
 __plugin_author__ = "HibiKier"
 __plugin_settings__ = {
@@ -36,10 +36,6 @@ async def _(event: GroupMessageEvent):
     props = await BagUser.get_property(event.user_id, event.group_id)
     if props:
         await my_props.send(image(b64=await create_bag_image(props)))
-        # rst = ""
-        # for i, p in enumerate(props.keys()):
-        #     rst += f"{i+1}.{p}\t×{props[p]}\n"
-        # await my_props.send("\n" + rst[:-1], at_sender=True)
         logger.info(f"USER {event.user_id} GROUP {event.group_id} 查看我的道具")
     else:
         await my_props.finish("您的背包里没有任何的道具噢~", at_sender=True)

basic_plugins/shop/reset_today_gold.py

@@ -1,26 +0,0 @@
-from utils.utils import scheduler
-from models.bag_user import BagUser
-from services.log import logger
-
-
-__zx_plugin_name__ = "每日金币重置 [Hidden]"
-__plugin_version__ = 0.1
-__plugin_author__ = "HibiKier"
-
-
-# 重置每日金币
-@scheduler.scheduled_job(
-    "cron",
-    hour=0,
-    minute=1,
-)
-async def _():
-    try:
-        user_list = await BagUser.get_all_users()
-        for user in user_list:
-            await user.update(
-                get_today_gold=0,
-                spend_today_gold=0,
-            ).apply()
-    except Exception as e:
-        logger.error(f"重置每日金币错误 e:{e}")

basic_plugins/shop/shop_handle/__init__.py

@@ -1,14 +1,24 @@
-from .data_source import create_shop_help, delete_goods, update_goods, register_goods, parse_goods_info, GoodsInfo
-from nonebot.adapters.onebot.v11 import MessageEvent, Message
-from nonebot import on_command
-from configs.path_config import IMAGE_PATH
-from utils.message_builder import image
-from nonebot.permission import SUPERUSER
-from utils.utils import is_number, scheduler
-from nonebot.params import CommandArg
-from services.log import logger
 import os
 
+from nonebot import on_command
+from nonebot.adapters.onebot.v11 import Message, MessageEvent
+from nonebot.params import CommandArg
+from nonebot.permission import SUPERUSER
+
+from configs.path_config import IMAGE_PATH
+from models.bag_user import BagUser
+from services.log import logger
+from utils.message_builder import image
+from utils.utils import is_number, scheduler
+
+from .data_source import (
+    GoodsInfo,
+    create_shop_help,
+    delete_goods,
+    parse_goods_info,
+    register_goods,
+    update_goods,
+)
 
 __zx_plugin_name__ = "商店"
 __plugin_usage__ = """
@@ -37,7 +47,7 @@ __plugin_cmd__ = [
     "删除商品 [名称或序号] [_superuser]",
     "修改商品 name:[名称或序号] price:[价格] des:[描述] discount:[折扣] limit_time:[限时] [_superuser]",
 ]
-__plugin_type__ = ('商店',)
+__plugin_type__ = ("商店",)
 __plugin_version__ = 0.1
 __plugin_author__ = "HibiKier"
 __plugin_settings__ = {
@@ -46,9 +56,7 @@ __plugin_settings__ = {
     "limit_superuser": False,
     "cmd": ["商店"],
 }
-__plugin_block_limit__ = {
-    "limit_type": "group"
-}
+__plugin_block_limit__ = {"limit_type": "group"}
 
 
 shop_help = on_command("商店", priority=5, block=True)
@@ -75,12 +83,15 @@ async def _(event: MessageEvent, arg: Message = CommandArg()):
         if not data.get("name") or not data.get("price") or not data.get("des"):
             await shop_add_goods.finish("name:price:des 参数不可缺少！")
         if await register_goods(**data):
-            await shop_add_goods.send(f"添加商品 {data['name']} 成功！\n"
-                                      f"名称：{data['name']}\n"
-                                      f"价格：{data['price']}金币\n"
-                                      f"简介：{data['des']}\n"
-                                      f"折扣：{data.get('discount')}\n"
-                                      f"限时：{data.get('limit_time')}", at_sender=True)
+            await shop_add_goods.send(
+                f"添加商品 {data['name']} 成功！\n"
+                f"名称：{data['name']}\n"
+                f"价格：{data['price']}金币\n"
+                f"简介：{data['des']}\n"
+                f"折扣：{data.get('discount')}\n"
+                f"限时：{data.get('limit_time')}",
+                at_sender=True,
+            )
             logger.info(f"USER {event.user_id} 添加商品 {msg} 成功")
         else:
             await shop_add_goods.send(f"添加商品 {msg} 失败了...", at_sender=True)
@@ -133,7 +144,19 @@ async def _(event: MessageEvent, arg: Message = CommandArg()):
 )
 async def _():
     try:
-        await GoodsInfo.reset_daily_purchase()
+        await GoodsInfo.all().update(daily_purchase_limit={})
         logger.info("商品每日限购次数重置成功...")
     except Exception as e:
-        logger.error(f"商品每日限购次数重置发生错误 {type(e)}：{e}")
+        logger.error(f"商品每日限购次数重置出错 {type(e)}：{e}")
+
+
+@scheduler.scheduled_job(
+    "cron",
+    hour=0,
+    minute=1,
+)
+async def _():
+    try:
+        await BagUser.all().update(get_today_gold=0, spend_today_gold=0)
+    except Exception as e:
+        logger.error(f"重置每日金币", "定时任务", e=e)

basic_plugins/shop/shop_handle/data_source.py

@@ -1,18 +1,18 @@
+import time
+from typing import Optional, Tuple, Union
+
 from PIL import Image
 
+from configs.path_config import IMAGE_PATH
 from models.goods_info import GoodsInfo
 from utils.image_utils import BuildImage, text2image
-from utils.utils import is_number
-from configs.path_config import IMAGE_PATH
-from typing import Optional, Union, Tuple
-from utils.utils import GDict
-import time
+from utils.utils import GDict, is_number
 
-icon_path = IMAGE_PATH / 'shop_icon'
+icon_path = IMAGE_PATH / "shop_icon"
 
 
-GDict['run_sql'].append("ALTER TABLE goods_info ADD is_passive boolean DEFAULT False;")
-GDict['run_sql'].append("ALTER TABLE goods_info ADD icon VARCHAR(255);")
+GDict["run_sql"].append("ALTER TABLE goods_info ADD is_passive boolean DEFAULT False;")
+GDict["run_sql"].append("ALTER TABLE goods_info ADD icon VARCHAR(255);")
 
 
 # 创建商店界面
@@ -43,17 +43,31 @@ async def create_shop_help() -> str:
         await name_image.atext((390, 0), "售价：", center_type="by_height")
         if goods.goods_discount != 1:
             discount_price = int(goods.goods_discount * goods.goods_price)
-            old_price_image = BuildImage(0, 0, plain_text=str(goods.goods_price), font_color=(194, 194, 194), font="CJGaoDeGuo.otf", font_size=15)
-            await old_price_image.aline((0, int(old_price_image.h / 2), old_price_image.w + 1, int(old_price_image.h / 2)), (0, 0, 0))
-            await name_image.apaste(
-                old_price_image, (440, 0), True
+            old_price_image = BuildImage(
+                0,
+                0,
+                plain_text=str(goods.goods_price),
+                font_color=(194, 194, 194),
+                font="CJGaoDeGuo.otf",
+                font_size=15,
             )
-            await name_image.atext(
-                (440, 15), str(discount_price), (255, 255, 255)
+            await old_price_image.aline(
+                (
+                    0,
+                    int(old_price_image.h / 2),
+                    old_price_image.w + 1,
+                    int(old_price_image.h / 2),
+                ),
+                (0, 0, 0),
             )
+            await name_image.apaste(old_price_image, (440, 0), True)
+            await name_image.atext((440, 15), str(discount_price), (255, 255, 255))
         else:
             await name_image.atext(
-                (440, 0), str(goods.goods_price), (255, 255, 255), center_type="by_height"
+                (440, 0),
+                str(goods.goods_price),
+                (255, 255, 255),
+                center_type="by_height",
             )
         await name_image.atext(
             (
@@ -68,38 +82,48 @@ async def create_shop_help() -> str:
         font_img = BuildImage(
             600, 80, font_size=20, color="#a29ad6", font="CJGaoDeGuo.otf"
         )
-        p = font_img.getsize('简介：')[0] + 20
+        p = font_img.getsize("简介：")[0] + 20
         if goods.goods_description:
-            des_list = goods.goods_description.split('\n')
-            desc = ''
+            des_list = goods.goods_description.split("\n")
+            desc = ""
             for des in des_list:
                 if font_img.getsize(des)[0] > font_img.w - p - 20:
-                    msg = ''
-                    tmp = ''
+                    msg = ""
+                    tmp = ""
                     for i in range(len(des)):
                         if font_img.getsize(tmp)[0] < font_img.w - p - 20:
                             tmp += des[i]
                         else:
-                            msg += tmp + '\n'
+                            msg += tmp + "\n"
                             tmp = des[i]
                     desc += msg
                     if tmp:
                         desc += tmp
                 else:
-                    desc += des + '\n'
-            if desc[-1] == '\n':
+                    desc += des + "\n"
+            if desc[-1] == "\n":
                 desc = desc[:-1]
             des_image = await text2image(desc, color="#a29ad6")
         goods_image = BuildImage(
-            600, (50 + des_image.h) if des_image else 50, font_size=20, color="#a29ad6", font="CJGaoDeGuo.otf"
+            600,
+            (50 + des_image.h) if des_image else 50,
+            font_size=20,
+            color="#a29ad6",
+            font="CJGaoDeGuo.otf",
         )
         if des_image:
-            await goods_image.atext((15, 50), '简介：')
+            await goods_image.atext((15, 50), "简介：")
             await goods_image.apaste(des_image, (p, 50))
         await name_image.acircle_corner(5)
         await goods_image.apaste(name_image, (0, 5), True, center_type="by_width")
         await goods_image.acircle_corner(20)
-        bk = BuildImage(1180, (50 + des_image.h) if des_image else 50, font_size=15, color="#f9f6f2", font="CJGaoDeGuo.otf")
+        bk = BuildImage(
+            1180,
+            (50 + des_image.h) if des_image else 50,
+            font_size=15,
+            color="#f9f6f2",
+            font="CJGaoDeGuo.otf",
+        )
         if goods.icon and (icon_path / goods.icon).exists():
             icon = BuildImage(70, 70, background=icon_path / goods.icon)
             await bk.apaste(icon)
@@ -129,7 +153,9 @@ async def create_shop_help() -> str:
             _w += 140
         if goods.goods_discount != 1:
             n += 140
-            _discount_logo = BuildImage(30, 30, background=f"{IMAGE_PATH}/other/discount.png")
+            _discount_logo = BuildImage(
+                30, 30, background=f"{IMAGE_PATH}/other/discount.png"
+            )
             await bk.apaste(_discount_logo, (_w + 50, 10), True)
             await bk.apaste(
                 BuildImage(0, 0, plain_text="折扣！", font_size=23, font="CJGaoDeGuo.otf"),
@@ -137,14 +163,23 @@ async def create_shop_help() -> str:
                 True,
             )
             await bk.apaste(
-                BuildImage(0, 0, plain_text=f"{10 * goods.goods_discount:.1f} 折", font_size=30, font="CJGaoDeGuo.otf", font_color=(85, 156, 75)),
+                BuildImage(
+                    0,
+                    0,
+                    plain_text=f"{10 * goods.goods_discount:.1f} 折",
+                    font_size=30,
+                    font="CJGaoDeGuo.otf",
+                    font_color=(85, 156, 75),
+                ),
                 (_w + 50, 44),
                 True,
             )
             _w += 140
         if goods.daily_limit != 0:
             n += 140
-            _daily_limit_logo = BuildImage(35, 35, background=f"{IMAGE_PATH}/other/daily_limit.png")
+            _daily_limit_logo = BuildImage(
+                35, 35, background=f"{IMAGE_PATH}/other/daily_limit.png"
+            )
             await bk.apaste(_daily_limit_logo, (_w + 50, 10), True)
             await bk.apaste(
                 BuildImage(0, 0, plain_text="限购！", font_size=23, font="CJGaoDeGuo.otf"),
@@ -152,7 +187,13 @@ async def create_shop_help() -> str:
                 True,
             )
             await bk.apaste(
-                BuildImage(0, 0, plain_text=f"{goods.daily_limit}", font_size=30, font="CJGaoDeGuo.otf"),
+                BuildImage(
+                    0,
+                    0,
+                    plain_text=f"{goods.daily_limit}",
+                    font_size=30,
+                    font="CJGaoDeGuo.otf",
+                ),
                 (_w + 72, 45),
                 True,
             )
@@ -220,22 +261,30 @@ async def register_goods(
     :param icon: 图标
     :return: 是否添加成功
     """
-    if not await GoodsInfo.get_goods_info(name):
-        limit_time = float(limit_time) if limit_time else limit_time
+    if not await GoodsInfo.get_or_none(goods_name=name):
+        limit_time_ = float(limit_time) if limit_time else limit_time
         discount = discount if discount is not None else 1
-        limit_time = (
-            int(time.time() + limit_time * 60 * 60)
-            if limit_time is not None and limit_time != 0
+        limit_time_ = (
+            int(time.time() + limit_time_ * 60 * 60)
+            if limit_time_ is not None and limit_time_ != 0
             else 0
         )
-        return await GoodsInfo.add_goods(
-            name, int(price), des, float(discount), limit_time, daily_limit, is_passive, icon
+        await GoodsInfo.create(
+            goods_name=name,
+            goods_price=int(price),
+            goods_description=des,
+            goods_discount=float(discount),
+            goods_limit_time=limit_time_,
+            daily_limit=daily_limit,
+            is_passive=is_passive,
+            icon=icon,
         )
+        return True
     return False
 
 
 # 删除商品
-async def delete_goods(name: str, id_: int) -> "str, str, int":
+async def delete_goods(name: str, id_: int) -> Tuple[str, str, int]:
     """
     删除商品
     :param name: 商品名称
@@ -256,6 +305,7 @@ async def delete_goods(name: str, id_: int) -> "str, str, int":
             return f"删除商品 {name} 成功！", name, 200
         else:
             return f"删除商品 {name} 失败！", name, 999
+    return "获取商品失败", "", 999
 
 
 # 更新商品信息
@@ -272,7 +322,7 @@ async def update_goods(**kwargs) -> Tuple[bool, str, str]:
                 return False, "序号错误，没有该序号的商品...", ""
             goods = goods_lst[int(kwargs["name"]) - 1]
         else:
-            goods = await GoodsInfo.get_goods_info(kwargs["name"])
+            goods = await GoodsInfo.filter(goods_name=kwargs["name"]).first()
             if not goods:
                 return False, "名称错误，没有该名称的商品...", ""
         name: str = goods.goods_name
@@ -295,14 +345,22 @@ async def update_goods(**kwargs) -> Tuple[bool, str, str]:
             discount = kwargs["discount"]
         if kwargs.get("limit_time"):
             kwargs["limit_time"] = float(kwargs["limit_time"])
-            new_time = time.strftime(
-                "%Y-%m-%d %H:%M:%S",
-                time.localtime(time.time() + kwargs["limit_time"] * 60 * 60),
-            ) if kwargs["limit_time"] != 0 else 0
+            new_time = (
+                time.strftime(
+                    "%Y-%m-%d %H:%M:%S",
+                    time.localtime(time.time() + kwargs["limit_time"] * 60 * 60),
+                )
+                if kwargs["limit_time"] != 0
+                else 0
+            )
             tmp += f"限时至： {new_time}\n" if new_time else "取消了限时\n"
             limit_time = kwargs["limit_time"]
         if kwargs.get("daily_limit"):
-            tmp += f'每日购买限制：{daily_limit} --> {kwargs["daily_limit"]}\n' if daily_limit else "取消了购买限制\n"
+            tmp += (
+                f'每日购买限制：{daily_limit} --> {kwargs["daily_limit"]}\n'
+                if daily_limit
+                else "取消了购买限制\n"
+            )
             daily_limit = int(kwargs["daily_limit"])
         if kwargs.get("is_passive"):
             tmp += f'被动道具：{is_passive} --> {kwargs["is_passive"]}\n'
@@ -318,9 +376,13 @@ async def update_goods(**kwargs) -> Tuple[bool, str, str]:
                 else 0
             ),
             daily_limit,
-            is_passive
+            is_passive,
+        )
+        return (
+            True,
+            name,
+            tmp[:-1],
         )
-        return True, name, tmp[:-1],
 
 
 def parse_goods_info(msg: str) -> Union[dict, str]:

basic_plugins/shop/use/__init__.py

@@ -1,19 +1,17 @@
 from typing import Any, Tuple
 
 from nonebot import on_command, on_regex
-
-from models.user_shop_gold_log import UserShopGoldLog
-from services.log import logger
 from nonebot.adapters.onebot.v11 import Bot, GroupMessageEvent, Message
+from nonebot.adapters.onebot.v11.permission import GROUP
 from nonebot.params import CommandArg, RegexGroup
 
+from models.bag_user import BagUser
+from models.user_shop_gold_log import UserShopGoldLog
+from services.log import logger
 from utils.decorator.shop import NotMeetUseConditionsException
 from utils.utils import is_number
-from models.bag_user import BagUser
-from nonebot.adapters.onebot.v11.permission import GROUP
-from services.db_context import db
-from .data_source import effect, register_use, func_manager, build_params
 
+from .data_source import build_params, effect, func_manager, register_use
 
 __zx_plugin_name__ = "商店 - 使用道具"
 __plugin_usage__ = """
@@ -75,17 +73,25 @@ async def _(bot: Bot, event: GroupMessageEvent, arg: Message = CommandArg()):
             if prop_n not in property_.keys():
                 await use_props.finish("道具名称错误！", at_sender=True)
             name = prop_n
+        if not name:
+            await use_props.finish("未获取到道具名称", at_sender=True)
         _user_prop_count = property_[name]
         if num > _user_prop_count:
             await use_props.finish(f"道具数量不足，无法使用{num}次！")
         if num > (n := func_manager.get_max_num_limit(name)):
             await use_props.finish(f"该道具单次只能使用 {n} 个！")
-        model, kwargs = build_params(bot, event, name, num, text)
         try:
-            await func_manager.run_handle(type_="before_handle", param=model, **kwargs)
-        except NotMeetUseConditionsException as e:
-            await use_props.finish(e.get_info(), at_sender=True)
-        async with db.transaction():
+            model, kwargs = build_params(bot, event, name, num, text)
+        except KeyError:
+            logger.warning(f"{name} 未注册使用函数")
+            await use_props.finish(f"{name} 未注册使用方法")
+        else:
+            try:
+                await func_manager.run_handle(
+                    type_="before_handle", param=model, **kwargs
+                )
+            except NotMeetUseConditionsException as e:
+                await use_props.finish(e.get_info(), at_sender=True)
             if await BagUser.delete_property(event.user_id, event.group_id, name, num):
                 if func_manager.check_send_success_message(name):
                     await use_props.send(f"使用道具 {name} {num} 次成功！", at_sender=True)
@@ -94,14 +100,18 @@ async def _(bot: Bot, event: GroupMessageEvent, arg: Message = CommandArg()):
                 logger.info(
                     f"USER {event.user_id} GROUP {event.group_id} 使用道具 {name} {num} 次成功"
                 )
-                await UserShopGoldLog.add_shop_log(
-                    event.user_id, event.group_id, 1, name, num
+                await UserShopGoldLog.create(
+                    user_qq=event.user_id,
+                    group_id=event.group_id,
+                    type=1,
+                    name=name,
+                    num=num,
                 )
             else:
                 await use_props.send(f"使用道具 {name} {num} 次失败！", at_sender=True)
                 logger.info(
                     f"USER {event.user_id} GROUP {event.group_id} 使用道具 {name} {num} 次失败"
                 )
-        await func_manager.run_handle(type_="after_handle", param=model, **kwargs)
+            await func_manager.run_handle(type_="after_handle", param=model, **kwargs)
     else:
         await use_props.send("您的背包里没有任何的道具噢", at_sender=True)

basic_plugins/shop/use/data_source.py

@@ -108,7 +108,7 @@ class GoodsUseFuncManager:
                     )
 
     async def run_handle(self, goods_name: str, type_: str, param: ShopParam, **kwargs):
-        if self._data[goods_name].get(type_):
+        if self._data.get(goods_name) and self._data[goods_name].get(type_):
             for func in self._data[goods_name].get(type_):
                 args = inspect.signature(func).parameters
                 if args and list(args.keys())[0] != "kwargs":
@@ -170,7 +170,6 @@ def build_params(
         :param goods_name: 商品名称
         :param num: 数量
         :param text: 其他信息
-    :return:
     """
     _kwargs = func_manager.get_kwargs(goods_name)
     return (

basic_plugins/super_cmd/__init__.py

@@ -1,11 +1,5 @@
-import nonebot
 from pathlib import Path
 
+import nonebot
 
 nonebot.load_plugins(str(Path(__file__).parent.resolve()))
-
-
-
-
-
-

basic_plugins/super_cmd/bot_friend_group.py

@@ -1,14 +1,17 @@
-from nonebot import on_command
-from nonebot.permission import SUPERUSER
-from nonebot.adapters.onebot.v11 import Bot, Message
-from nonebot.params import Command, CommandArg
 from typing import Tuple
+
+from nonebot import on_command
+from nonebot.adapters.onebot.v11 import Bot, Message, MessageEvent
+from nonebot.params import Command, CommandArg
+from nonebot.permission import SUPERUSER
 from nonebot.rule import to_me
-from utils.utils import is_number
+
+from models.group_info import GroupInfo
+from services.log import logger
+from utils.depends import OneCommand
 from utils.manager import requests_manager
 from utils.message_builder import image
-from models.group_info import GroupInfo
-
+from utils.utils import is_number
 
 __zx_plugin_name__ = "显示所有好友群组 [Superuser]"
 __plugin_usage__ = """
@@ -76,8 +79,7 @@ async def _(bot: Bot):
 
 
 @friend_handle.handle()
-async def _(bot: Bot, cmd: Tuple[str, ...] = Command(), arg: Message = CommandArg()):
-    cmd = cmd[0]
+async def _(bot: Bot, cmd: str = OneCommand(), arg: Message = CommandArg()):
     id_ = arg.extract_plain_text().strip()
     if is_number(id_):
         id_ = int(id_)
@@ -97,8 +99,9 @@ async def _(bot: Bot, cmd: Tuple[str, ...] = Command(), arg: Message = CommandAr
 
 
 @group_handle.handle()
-async def _(bot: Bot, cmd: Tuple[str, ...] = Command(), arg: Message = CommandArg()):
-    cmd = cmd[0]
+async def _(
+    bot: Bot, event: MessageEvent, cmd: str = OneCommand(), arg: Message = CommandArg()
+):
     id_ = arg.extract_plain_text().strip()
     flag = None
     if is_number(id_):
@@ -106,20 +109,21 @@ async def _(bot: Bot, cmd: Tuple[str, ...] = Command(), arg: Message = CommandAr
         if cmd[:2] == "同意":
             rid = requests_manager.get_group_id(id_)
             if rid:
-                if await GroupInfo.get_group_info(rid):
-                    await GroupInfo.set_group_flag(rid, 1)
+                if group := await GroupInfo.filter(group_id=rid).first():
+                    await group.update_or_create(group_flag=1)
                 else:
                     group_info = await bot.get_group_info(group_id=rid)
-                    await GroupInfo.add_group_info(
-                        rid,
-                        group_info["group_name"],
-                        group_info["max_member_count"],
-                        group_info["member_count"],
-                        1
+                    await GroupInfo.create(
+                        group_id=rid,
+                        group_name=group_info["group_name"],
+                        max_member_count=group_info["max_member_count"],
+                        member_count=group_info["member_count"],
+                        group_flag=1,
                     )
                 flag = await requests_manager.approve(bot, id_, "group")
             else:
                 await group_handle.send("同意群聊请求失败，未找到此id的请求..")
+                logger.info("同意群聊请求失败，未找到此id的请求..", cmd, event.user_id)
         else:
             flag = await requests_manager.refused(bot, id_, "group")
         if flag == 1:
@@ -139,15 +143,15 @@ async def _():
     for type_ in ["private", "group"]:
         msg = await requests_manager.show(type_)
         if msg:
-            _str += image(b64=msg)
+            _str += image(msg)
         else:
             _str += "没有任何好友请求.." if type_ == "private" else "没有任何群聊请求.."
         if type_ == "private":
-            _str += '\n--------------------\n'
+            _str += "\n--------------------\n"
     await cls_request.send(Message(_str))
 
 
 @clear_request.handle()
 async def _():
     requests_manager.clear()
-    await clear_request.send("已清空所有好友/群聊请求..")
+    await clear_request.send("已清空所有好友/群聊请求..")

basic_plugins/super_cmd/clear_data.py

@@ -1,13 +1,15 @@
+import asyncio
+import os
+import time
+
 from nonebot import on_command
 from nonebot.permission import SUPERUSER
-from configs.path_config import TEMP_PATH
 from nonebot.rule import to_me
-from utils.utils import scheduler
+
+from configs.path_config import TEMP_PATH
 from services.log import logger
 from utils.manager import resources_manager
-import asyncio
-import time
-import os
+from utils.utils import scheduler
 
 __zx_plugin_name__ = "清理临时数据 [Superuser]"
 __plugin_usage__ = """
@@ -37,22 +39,29 @@ async def _():
     await clear_data.send("开始清理临时数据....")
     size = await asyncio.get_event_loop().run_in_executor(None, _clear_data)
     await clear_data.send("共清理了 {:.2f}MB 的数据...".format(size / 1024 / 1024))
+    logger.info("清理临时数据完成，" + "共清理了 {:.2f}MB 的数据...".format(size / 1024 / 1024))
 
 
 def _clear_data() -> float:
+    logger.debug("开始清理临时文件...")
     size = 0
-    for dir_ in resources_manager.get_temp_data_dir():
-        if dir_.exists():
-            for file in os.listdir(dir_):
-                file = dir_ / file
-                if file.is_file():
-                    try:
-                        if time.time() - os.path.getatime(file) > 300:
-                            file_size = os.path.getsize(file)
-                            file.unlink()
-                            size += file_size
-                    except Exception as e:
-                        logger.error(f"清理临时数据错误...{type(e)}：{e}")
+    dir_list = [dir_ for dir_ in resources_manager.get_temp_data_dir() if dir_.exists()]
+    for dir_ in dir_list:
+        logger.debug(f"尝试清理文件夹: {dir_.absolute()}", "清理临时数据")
+        dir_size = 0
+        for file in os.listdir(dir_):
+            file = dir_ / file
+            if file.is_file():
+                try:
+                    if time.time() - os.path.getatime(file) > 10:
+                        file_size = os.path.getsize(file)
+                        file.unlink()
+                        size += file_size
+                        dir_size += file_size
+                        logger.debug(f"移除临时文件: {file.absolute()}", "清理临时数据")
+                except Exception as e:
+                    logger.error(f"清理临时数据错误，临时文件夹: {dir_.absolute()}...", "清理临时数据", e=e)
+        logger.debug("清理临时文件夹大小: {:.2f}MB".format(size / 1024 / 1024), "清理临时数据")
     return float(size)
 
 

basic_plugins/super_cmd/exec_sql.py

@@ -1,13 +1,15 @@
-from nonebot.adapters.onebot.v11 import Message, Bot, MessageEvent
+import asyncio
+
 from nonebot import on_command
+from nonebot.adapters.onebot.v11 import Bot, GroupMessageEvent, Message, MessageEvent
+from nonebot.params import CommandArg
 from nonebot.permission import SUPERUSER
 from nonebot.rule import to_me
-from utils.message_builder import custom_forward_msg
-from services.db_context import db
-from nonebot.params import CommandArg
-from services.log import logger
+from tortoise import Tortoise
 
-import asyncio
+from services.db_context import TestSQL
+from services.log import logger
+from utils.message_builder import custom_forward_msg
 
 __zx_plugin_name__ = "执行sql [Superuser]"
 __plugin_usage__ = """
@@ -18,9 +20,7 @@ usage：
         查看所有表
 """.strip()
 __plugin_des__ = "执行一段sql语句"
-__plugin_cmd__ = [
-    "exec [sql语句]",
-]
+__plugin_cmd__ = ["exec [sql语句]", "查看所有表"]
 __plugin_version__ = 0.2
 __plugin_author__ = "HibiKier"
 
@@ -32,55 +32,61 @@ tables = on_command("查看所有表", rule=to_me(), permission=SUPERUSER, prior
 @exec_.handle()
 async def _(bot: Bot, event: MessageEvent, arg: Message = CommandArg()):
     sql = arg.extract_plain_text().strip()
-    async with db.transaction():
+    if not sql:
+        await exec_.finish("未接受到sql语句")
+    db = Tortoise.get_connection("default")
+    # try:
+    # 判断是否为SELECT语句
+    if sql.lower().startswith("select"):
+        pass
+        #     # 分割语句
         try:
-            # 判断是否为SELECT语句
-            if sql.lower().startswith("select"):
-                # 分割语句
-                try:
-                    page = int(sql.split(" ")[-1]) - 1
-                    sql_list = sql.split(" ")[:-1]
-                except ValueError:
-                    page = 0
-                    sql_list = sql.split(" ")
-                # 拼接语句
-                sql = " ".join(sql_list)
-                query = db.text(sql)
-                res = await db.all(query)
-                msg_list = [f"第{page+1}页查询结果："]
-                # logger.info(res)
-                # 获取所有字段
-                keys = res[0].keys()
-                # 每页10条
-                for i in res[page * 10 : (page + 1) * 10]:
-                    msg = ""
-                    for key in keys:
-                        msg += f"{key}: {i[key]}\n"
-                    msg += f"第{page+1}页第{res.index(i)+1}条"
-                    msg_list.append(msg)
-                # 检查是私聊还是群聊
-                try:
-                    forward_msg_list = custom_forward_msg(msg_list, bot.self_id)
-                    await bot.send_group_forward_msg(group_id=event.group_id, messages=forward_msg_list)
-                except:
-                    for msg in msg_list:
-                        await exec_.send(msg)
-                        await asyncio.sleep(0.2)
-                return
-            query = db.text(sql)
-            await db.first(query)
-            await exec_.send("执行 sql 语句成功.")
-        except Exception as e:
-            await exec_.send(f"执行 sql 语句失败 {type(e)}：{e}")
-            logger.error(f"执行 sql 语句失败 {type(e)}：{e}")
+            page = int(sql.split(" ")[-1]) - 1
+            sql_list = sql.split(" ")[:-1]
+        except ValueError:
+            page = 0
+            sql_list = sql.split(" ")
+        # 拼接语句
+        sql = " ".join(sql_list)
+        res = await db.execute_query_dict(sql)
+        msg_list = [f"第{page+1}页查询结果："]
+        # logger.info(res)
+        # 获取所有字段
+        keys = res[0].keys()
+        # 每页10条
+        for i in res[page * 10 : (page + 1) * 10]:
+            msg = ""
+            for key in keys:
+                msg += f"{key}: {i[key]}\n"
+            msg += f"第{page+1}页第{res.index(i)+1}条"
+            msg_list.append(msg)
+        # 检查是私聊还是群聊
+        if isinstance(event, GroupMessageEvent):
+            forward_msg_list = custom_forward_msg(msg_list, bot.self_id)
+            await bot.send_group_forward_msg(
+                group_id=event.group_id, messages=forward_msg_list
+            )
+        else:
+            for msg in msg_list:
+                await exec_.send(msg)
+                await asyncio.sleep(0.2)
+        return
+    else:
+        await TestSQL.raw(sql)
+        await exec_.send("执行 sql 语句成功.")
+    # except Exception as e:
+    #     await exec_.send(f"执行 sql 语句失败 {type(e)}：{e}")
+    #     logger.error(f"执行 sql 语句失败 {type(e)}：{e}")
 
 
 @tables.handle()
 async def _(bot: Bot, event: MessageEvent):
     # 获取所有表
-    query = db.text("select tablename from pg_tables where schemaname = 'public'")
-    res = await db.all(query)
+    db = Tortoise.get_connection("default")
+    query = await db.execute_query_dict(
+        "select tablename from pg_tables where schemaname = 'public'"
+    )
     msg = "数据库中的所有表名：\n"
-    for tablename in res:
+    for tablename in query:
         msg += str(tablename["tablename"]) + "\n"
     await tables.finish(msg)

basic_plugins/super_cmd/manager_group.py

@@ -1,35 +1,39 @@
-from nonebot.adapters.onebot.v11 import (
-    Bot,
-    MessageEvent,
-    GROUP,
-    GroupMessageEvent,
-    Message,
-    ActionFailed,
-)
-from nonebot import on_command, on_regex
-from nonebot.permission import SUPERUSER
-from nonebot.typing import T_State
-from nonebot.rule import to_me
-from utils.utils import is_number
-from utils.manager import group_manager, plugins2settings_manager
-from models.group_info import GroupInfo
-from services.log import logger
-from configs.config import NICKNAME
-from nonebot.params import Command, CommandArg
 from typing import Tuple
 
+from nonebot import on_command, on_regex
+from nonebot.adapters.onebot.v11 import (
+    GROUP,
+    Bot,
+    GroupMessageEvent,
+    Message,
+    MessageEvent,
+)
+from nonebot.params import Command, CommandArg
+from nonebot.permission import SUPERUSER
+from nonebot.rule import to_me
+
+from configs.config import NICKNAME
+from models.group_info import GroupInfo
+from services.log import logger
+from utils.depends import OneCommand
+from utils.image_utils import text2image
+from utils.manager import group_manager, plugins2settings_manager
+from utils.message_builder import image
+from utils.utils import is_number
 
 __zx_plugin_name__ = "管理群操作 [Superuser]"
 __plugin_usage__ = """
 usage：
     群权限 | 群白名单 | 退出群 操作
-    指令：
-        退群 [group_id]
+    退群，添加/删除群白名单，添加/删除群认证，当在群聊中这五个命令且没有指定群号时，默认指定当前群聊
+    指令:
+        退群 ?[group_id]
         修改群权限 [group_id] [等级]
-        添加群白名单 *[group_id]
-        删除群白名单 *[group_id]
-        添加群认证 *[group_id]
-        删除群认证 *[group_id]
+        修改群权限 [等级]: 该命令仅在群聊时生效，默认修改当前群聊
+        添加群白名单 ?*[group_id]
+        删除群白名单 ?*[group_id]
+        添加群认证 ?*[group_id]
+        删除群认证 ?*[group_id]
         查看群白名单
 """.strip()
 __plugin_des__ = "管理群操作"
@@ -53,7 +57,7 @@ my_group_level = on_command(
     "查看群权限", aliases={"群权限"}, priority=5, permission=GROUP, block=True
 )
 what_up_group_level = on_regex(
-    ".*?(提高|提升|升高|增加|加上)(.*?)群权限.*?",
+    "(:?提高|提升|升高|增加|加上).*?群权限",
     rule=to_me(),
     priority=5,
     permission=GROUP,
@@ -73,47 +77,57 @@ group_auth = on_command(
 
 
 @del_group.handle()
-async def _(bot: Bot, arg: Message = CommandArg()):
+async def _(bot: Bot, event: MessageEvent, arg: Message = CommandArg()):
     group_id = arg.extract_plain_text().strip()
+    if not group_id and isinstance(event, GroupMessageEvent):
+        group_id = event.group_id
     if group_id:
         if is_number(group_id):
+            group_list = [x["group_id"] for x in await bot.get_group_list()]
+            group_id = int(group_id)
+            if group_id not in group_list:
+                logger.debug("群聊不存在", "退群", event.user_id, target=group_id)
+                await del_group.finish(f"{NICKNAME}未在该群聊中...")
             try:
-                await bot.set_group_leave(group_id=int(group_id))
-                logger.info(f"退出群聊 {group_id} 成功")
+                await bot.set_group_leave(group_id=group_id)
+                logger.info(f"{NICKNAME}退出群聊成功", "退群", event.user_id, target=group_id)
                 await del_group.send(f"退出群聊 {group_id} 成功", at_sender=True)
-                group_manager.delete_group(int(group_id))
-                await GroupInfo.delete_group_info(int(group_id))
+                group_manager.delete_group(group_id)
+                await GroupInfo.filter(group_id=group_id).delete()
             except Exception as e:
-                logger.info(f"退出群聊 {group_id} 失败 e:{e}")
+                logger.error(f"退出群聊失败", "退群", event.user_id, target=group_id, e=e)
+                await del_group.send(f"退出群聊 {group_id} 失败", at_sender=True)
         else:
-            await del_group.finish(f"请输入正确的群号", at_sender=True)
+            await del_group.send(f"请输入正确的群号", at_sender=True)
     else:
-        await del_group.finish(f"请输入群号", at_sender=True)
+        await del_group.send(f"请输入群号", at_sender=True)
 
 
 @add_group_level.handle()
 async def _(bot: Bot, event: MessageEvent, arg: Message = CommandArg()):
     msg = arg.extract_plain_text().strip()
+    msg = msg.split()
     group_id = 0
     level = 0
+    if isinstance(event, GroupMessageEvent) and len(msg) == 1:
+        msg = [event.group_id, msg[0]]
     if not msg:
-        await add_group_level.finish("用法：修改群权限 [group] [level]")
-    msg = msg.split()
+        await add_group_level.finish("缺失参数...")
     if len(msg) < 2:
-        await add_group_level.finish("参数不完全..[group] [level]")
+        await add_group_level.finish("缺失参数...")
     if is_number(msg[0]) and is_number(msg[1]):
-        group_id = msg[0]
+        group_id = int(msg[0])
         level = int(msg[1])
     else:
-        await add_group_level.finish("参数错误...group和level必须是数字..")
+        await add_group_level.finish("参数错误...群号和等级必须是数字..")
     old_level = group_manager.get_group_level(group_id)
     group_manager.set_group_level(group_id, level)
     await add_group_level.send("修改成功...", at_sender=True)
     if level > -1:
         await bot.send_group_msg(
-            group_id=int(group_id), message=f"管理员修改了此群权限：{old_level} -> {level}"
+            group_id=group_id, message=f"管理员修改了此群权限：{old_level} -> {level}"
         )
-    logger.info(f"{event.user_id} 修改了 {group_id} 的权限：{level}")
+    logger.info(f"修改群权限：{level}", "修改群权限", event.user_id, target=group_id)
 
 
 @my_group_level.handle()
@@ -127,78 +141,104 @@ async def _(event: GroupMessageEvent):
             if plugin_name == "pixiv":
                 plugin_name = "搜图 p站排行"
             tmp += f"{plugin_name}\n"
-    if tmp:
-        tmp = "\n目前无法使用的功能：\n" + tmp
-    await my_group_level.finish(f"当前群权限：{level}{tmp}")
+    if not tmp:
+        await my_group_level.finish(f"当前群权限：{level}")
+    await my_group_level.finish(
+        f"当前群权限：{level}\n目前无法使用的功能:\n"
+        + image(await text2image(tmp, padding=10, color="#f9f6f2"))
+    )
 
 
 @what_up_group_level.handle()
 async def _():
     await what_up_group_level.finish(
-        f"[此功能用于防止内鬼，如果引起不便那真是抱歉了]\n" f"目前提高群权限的方法：\n" f"\t1.管理员修改权限"
+        f"[此功能用于防止内鬼，如果引起不便那真是抱歉了]\n" f"目前提高群权限的方法：\n" f"\t1.超级管理员修改权限"
     )
 
 
 @manager_group_whitelist.handle()
-async def _(bot: Bot, cmd: Tuple[str, ...] = Command(), arg: Message = CommandArg()):
-    cmd = cmd[0]
+async def _(
+    bot: Bot, event: MessageEvent, cmd: str = OneCommand(), arg: Message = CommandArg()
+):
     msg = arg.extract_plain_text().strip().split()
+    if not msg and isinstance(event, GroupMessageEvent):
+        msg = [event.group_id]
+    if not msg:
+        await manager_group_whitelist.finish("请输入群号")
     all_group = [g["group_id"] for g in await bot.get_group_list()]
+    error_group = []
     group_list = []
-    for group in msg:
-        if is_number(group) and int(group) in all_group:
-            group_list.append(int(group))
+    for group_id in msg:
+        if is_number(group_id) and int(group_id) in all_group:
+            group_list.append(int(group_id))
+        else:
+            logger.debug(f"群号不合法或不存在", cmd, target=group_id)
+            error_group.append(group_id)
     if group_list:
-        for group in group_list:
+        for group_id in group_list:
             if cmd in ["添加群白名单"]:
-                group_manager.add_group_white_list(group)
+                group_manager.add_group_white_list(group_id)
             else:
-                group_manager.delete_group_white_list(group)
+                group_manager.delete_group_white_list(group_id)
         group_list = [str(x) for x in group_list]
         await manager_group_whitelist.send("已成功将 " + "\n".join(group_list) + " " + cmd)
-    else:
-        await manager_group_whitelist.send(f"添加失败，请检查{NICKNAME}是否已加入这些群聊或重复添加/删除群白单名")
+        group_manager.save()
+    if error_group:
+        await manager_group_whitelist.send("以下群聊不合法或不存在:\n" + "\n".join(error_group))
 
 
 @show_group_whitelist.handle()
 async def _():
-    x = group_manager.get_group_white_list()
-    x = [str(g) for g in x]
-    if x:
-        await show_group_whitelist.send("目前的群白名单：\n" + "\n".join(x))
-    else:
-        await show_group_whitelist.send("没有任何群在群白名单...")
+    group = [str(g) for g in group_manager.get_group_white_list()]
+    if not group:
+        await show_group_whitelist.finish("没有任何群在群白名单...")
+    await show_group_whitelist.send("目前的群白名单:\n" + "\n".join(group))
 
 
 @group_auth.handle()
-async def _(bot: Bot, cmd: Tuple[str, ...] = Command(), arg: Message = CommandArg()):
-    cmd = cmd[0]
+async def _(
+    bot: Bot, event: MessageEvent, cmd: str = OneCommand(), arg: Message = CommandArg()
+):
     msg = arg.extract_plain_text().strip().split()
+    if isinstance(event, GroupMessageEvent) and not msg:
+        msg = [event.group_id]
+    if not msg:
+        await manager_group_whitelist.finish("请输入群号")
+    error_group = []
+    all_group = [g["group_id"] for g in await bot.get_group_list()]
     for group_id in msg:
-        if not is_number(group_id):
-            await group_auth.send(f"{group_id}非纯数字，已跳过该项..")
         group_id = int(group_id)
-        if cmd[:2] == "添加":
-            if await GroupInfo.get_group_info(group_id):
-                await GroupInfo.set_group_flag(group_id, 1)
-            else:
+        if is_number(group_id) and group_id in all_group:
+            if cmd[:2] == "添加":
                 try:
                     group_info = await bot.get_group_info(group_id=group_id)
-                except ActionFailed:
-                    group_info = {
-                        "group_id": group_id,
-                        "group_name": "_",
-                        "max_member_count": -1,
-                        "member_count": -1,
-                    }
-                await GroupInfo.add_group_info(
-                    group_info["group_id"],
-                    group_info["group_name"],
-                    group_info["max_member_count"],
-                    group_info["member_count"],
-                    1,
-                )
+                    await GroupInfo.update_or_create(
+                        group_id=group_info["group_id"],
+                        defaults={
+                            "group_flag": 1,
+                            "group_name": group_info["group_name"],
+                            "max_member_count": group_info["max_member_count"],
+                            "member_count": group_info["member_count"],
+                        },
+                    )
+                except Exception as e:
+                    await group_auth.send(f"添加群认证 {group_id} 发生错误！")
+                    logger.error(f"添加群认证发生错误", cmd, target=group_id, e=e)
+                else:
+                    await group_auth.send(f"已为 {group_id} {cmd[:2]}群认证..")
+                    logger.info(f"添加群认证成功", cmd, target=group_id)
+            else:
+                if group := await GroupInfo.filter(group_id=group_id).first():
+                    await group.update_or_create(
+                        group_id=group_id, defaults={"group_flag": 0}
+                    )
+                    await group_auth.send(f"已删除 {group_id} 群认证..")
+                    logger.info(f"删除群认证成功", cmd, target=group_id)
+                else:
+                    await group_auth.send(f"未查找到群聊: {group_id}")
+                    logger.info(f"未找到群聊", cmd, target=group_id)
         else:
-            if await GroupInfo.get_group_info(group_id):
-                await GroupInfo.set_group_flag(group_id, 0)
-        await group_auth.send(f"已为 {group_id} {cmd[:2]}群认证..")
+            logger.debug(f"群号不合法或不存在", cmd, target=group_id)
+            error_group.append(str(group_id))
+    if error_group:
+        await manager_group_whitelist.send("以下群聊不合法或不存在:\n" + "\n".join(error_group))

basic_plugins/super_cmd/reload_setting.py

@@ -1,21 +1,21 @@
 from nonebot import on_command
 from nonebot.permission import SUPERUSER
 from nonebot.rule import to_me
-from utils.manager import (
-    plugins2cd_manager,
-    plugins2settings_manager,
-    plugins2block_manager,
-    group_manager,
-)
+
 from configs.config import Config
 from services.log import logger
+from utils.manager import (
+    group_manager,
+    plugins2block_manager,
+    plugins2cd_manager,
+    plugins2settings_manager,
+)
 from utils.utils import scheduler
 
-
-__zx_plugin_name__ = "重载插件配置 [Superuser]"
+__zx_plugin_name__ = "重载配置 [Superuser]"
 __plugin_usage__ = """
 usage：
-    重载插件配置
+    重载配置
     plugins2settings,
     plugins2cd
     plugins2block
@@ -23,23 +23,15 @@ usage：
     指令：
         重载插件配置
 """.strip()
-__plugin_des__ = "重载插件配置"
+__plugin_des__ = "重载配置"
 __plugin_cmd__ = [
-    "重载插件配置",
+    "重载配置",
 ]
-__plugin_version__ = 0.1
+__plugin_version__ = 0.2
 __plugin_author__ = "HibiKier"
 __plugin_configs__ = {
-    "AUTO_RELOAD": {
-        "value": False,
-        "help": "自动重载配置文件",
-        "default_value": False
-    },
-    "AUTO_RELOAD_TIME": {
-        "value": 180,
-        "help": "控制自动重载配置文件时长",
-        "default_value": 180
-    }
+    "AUTO_RELOAD": {"value": False, "help": "自动重载配置文件", "default_value": False},
+    "AUTO_RELOAD_TIME": {"value": 180, "help": "控制自动重载配置文件时长", "default_value": 180},
 }
 
 
@@ -59,7 +51,7 @@ async def _():
 
 
 @scheduler.scheduled_job(
-    'interval',
+    "interval",
     seconds=Config.get_config("reload_setting", "AUTO_RELOAD_TIME", 180),
 )
 async def _():

basic_plugins/super_cmd/set_admin_permissions.py

@@ -1,12 +1,16 @@
+from typing import List, Tuple
+
 from nonebot import on_command
+from nonebot.adapters.onebot.v11 import Bot, GroupMessageEvent, Message, MessageEvent
+from nonebot.exception import ActionFailed
+from nonebot.params import CommandArg
 from nonebot.permission import SUPERUSER
+
 from models.level_user import LevelUser
-from nonebot.adapters.onebot.v11 import Bot, MessageEvent, Message, GroupMessageEvent
-from utils.utils import get_message_at, is_number
 from services.log import logger
+from utils.depends import AtList, OneCommand
 from utils.message_builder import at
-from nonebot.params import Command, CommandArg
-from typing import Tuple
+from utils.utils import is_number
 
 __zx_plugin_name__ = "用户权限管理 [Superuser]"
 __plugin_usage__ = """
@@ -16,12 +20,14 @@ usage：
         添加权限 [at] [权限]
         添加权限 [qq] [group_id] [权限]
         删除权限 [at]
+        删除权限 [qq] [group_id]
 """.strip()
 __plugin_des__ = "增删改用户的权限"
 __plugin_cmd__ = [
     "添加权限 [at] [权限]",
     "添加权限 [qq] [group_id] [权限]",
     "删除权限 [at]",
+    "删除权限 [qq] [group_id]",
 ]
 __plugin_version__ = 0.1
 __plugin_author__ = "HibiKier"
@@ -40,21 +46,22 @@ super_cmd = on_command(
 async def _(
     bot: Bot,
     event: MessageEvent,
-    cmd: Tuple[str, ...] = Command(),
+    cmd: str = OneCommand(),
     arg: Message = CommandArg(),
+    at_list: List[int] = AtList(),
 ):
     group_id = event.group_id if isinstance(event, GroupMessageEvent) else -1
     level = None
     args = arg.extract_plain_text().strip().split()
-    qq = get_message_at(event.json())
     flag = 2
+    qq = None
     try:
-        if qq:
-            qq = qq[0]
-            if cmd[0][:2] == "添加" and args and is_number(args[0]):
+        if at_list:
+            qq = at_list[0]
+            if cmd[:2] == "添加" and args and is_number(args[0]):
                 level = int(args[0])
         else:
-            if cmd[0][:2] == "添加":
+            if cmd[:2] == "添加":
                 if (
                     len(args) > 2
                     and is_number(args[0])
@@ -69,33 +76,39 @@ async def _(
                     qq = int(args[0])
                     group_id = int(args[1])
             flag = 1
-        level = -1 if cmd[0][:2] == "删除" else level
+        level = -1 if cmd[:2] == "删除" else level
         if group_id == -1 or not level or not qq:
             raise IndexError()
     except IndexError:
         await super_cmd.finish(__plugin_usage__)
+    if not qq:
+        await super_cmd.finish("未指定对象...")
     try:
-        if cmd[0][:2] == "添加":
-            if await LevelUser.set_level(qq, group_id, level, 1):
-                result = f"添加管理成功, 权限: {level}"
-            else:
-                result = f"管理已存在, 更新权限: {level}"
+        if cmd[:2] == "添加":
+            await LevelUser.set_level(qq, group_id, level, 1)
+            result = f"设置权限成功, 权限: {level}"
         else:
-            if await LevelUser.delete_level(qq, event.group_id):
+            if await LevelUser.delete_level(qq, group_id):
                 result = "删除管理成功!"
             else:
                 result = "该账号无管理权限!"
         if flag == 2:
             await super_cmd.send(result)
         elif flag == 1:
-            await bot.send_group_msg(
-                group_id=group_id,
-                message=Message(
-                    f"{at(qq)}管理员修改了你的权限"
-                    f"\n--------\n你当前的权限等级：{level if level != -1 else 0}"
-                ),
-            )
+            try:
+                await bot.send_group_msg(
+                    group_id=group_id,
+                    message=Message(
+                        f"{at(qq)}管理员修改了你的权限"
+                        f"\n--------\n你当前的权限等级：{level if level != -1 else 0}"
+                    ),
+                )
+            except ActionFailed:
+                pass
             await super_cmd.send("修改成功")
+            logger.info(
+                f"修改权限: {level if level != -1 else 0}", cmd, event.user_id, group_id, qq
+            )
     except Exception as e:
         await super_cmd.send("执行指令失败!")
-        logger.error(f"执行指令失败 e：{e}")
+        logger.error(f"执行指令失败", cmd, event.user_id, group_id, qq, e=e)

basic_plugins/super_cmd/super_task_switch.py

@@ -1,58 +0,0 @@
-from nonebot import on_command
-from nonebot.permission import SUPERUSER
-from nonebot.adapters.onebot.v11 import Bot, MessageEvent, Message
-from nonebot.rule import to_me
-from utils.utils import is_number
-from services.log import logger
-from utils.manager import group_manager
-from nonebot.params import Command, CommandArg
-from typing import Tuple
-
-
-__zx_plugin_name__ = "超级用户被动开关 [Superuser]"
-__plugin_usage__ = """
-usage：
-    超级用户被动开关
-    指令：
-        开启/关闭广播通知
-""".strip()
-__plugin_des__ = "超级用户被动开关"
-__plugin_cmd__ = [
-    "开启/关闭广播通知",
-]
-__plugin_version__ = 0.1
-__plugin_author__ = "HibiKier"
-
-
-oc_gb = on_command(
-    "开启广播通知",
-    aliases={"关闭广播通知"},
-    rule=to_me(),
-    permission=SUPERUSER,
-    priority=1,
-    block=True,
-)
-
-
-@oc_gb.handle()
-async def _(bot: Bot, event: MessageEvent, cmd: Tuple[str, ...] = Command(), arg: Message = CommandArg()):
-    cmd = cmd[0]
-    group = arg.extract_plain_text().strip()
-    if group:
-        if is_number(group):
-            group = int(group)
-            for g in await bot.get_group_list():
-                if g["group_id"] == group:
-                    break
-            else:
-                await oc_gb.finish("没有加入这个群...", at_sender=True)
-            if cmd == "开启广播通知":
-                logger.info(f"USER {event.user_id} 开启了 GROUP {group} 的广播")
-                await oc_gb.finish(await group_manager.open_group_task(group, "broadcast",), at_sender=True)
-            else:
-                logger.info(f"USER {event.user_id} 关闭了 GROUP {group} 的广播")
-                await oc_gb.finish(await group_manager.close_group_task(group, "broadcast"), at_sender=True)
-        else:
-            await oc_gb.finish("请输入正确的群号", at_sender=True)
-    else:
-        await oc_gb.finish("请输入要关闭广播的群号", at_sender=True)

basic_plugins/super_cmd/update_friend_group_info.py

@@ -1,11 +1,11 @@
 from nonebot import on_command
+from nonebot.adapters.onebot.v11 import Bot, MessageEvent
 from nonebot.permission import SUPERUSER
 from nonebot.rule import to_me
-from utils.utils import get_bot
-from services.log import logger
-from models.group_info import GroupInfo
-from models.friend_user import FriendUser
 
+from models.friend_user import FriendUser
+from models.group_info import GroupInfo
+from services.log import logger
 
 __zx_plugin_name__ = "更新群/好友信息 [Superuser]"
 __plugin_usage__ = """
@@ -32,39 +32,46 @@ update_friend_info = on_command(
 
 
 @update_group_info.handle()
-async def _():
-    bot = get_bot()
+async def _(bot: Bot, event: MessageEvent):
     gl = await bot.get_group_list()
     gl = [g["group_id"] for g in gl]
     num = 0
-    rst = ""
     for g in gl:
-        group_info = await bot.get_group_info(group_id=g)
-        if await GroupInfo.add_group_info(
-            group_info["group_id"],
-            group_info["group_name"],
-            group_info["max_member_count"],
-            group_info["member_count"],
-            1
-        ):
+        try:
+            group_info = await bot.get_group_info(group_id=g)
+            await GroupInfo.update_or_create(
+                group_id=group_info["group_id"],
+                defaults={
+                    "group_name": group_info["group_name"],
+                    "max_member_count": group_info["max_member_count"],
+                    "member_count": group_info["member_count"],
+                },
+            )
             num += 1
-            logger.info(f"自动更新群组 {g} 信息成功")
-        else:
-            logger.info(f"自动更新群组 {g} 信息失败")
-            rst += f"{g} 更新失败\n"
-    await update_group_info.send(f"成功更新了 {num} 个群的信息\n{rst[:-1]}")
+            logger.debug(
+                "群聊信息更新成功", "更新群信息", event.user_id, target=group_info["group_id"]
+            )
+        except Exception as e:
+            logger.error(f"更新群聊信息失败", "更新群信息", event.user_id, target=g, e=e)
+    await update_group_info.send(f"成功更新了 {len(gl)} 个群的信息")
+    logger.info(f"更新群聊信息完成，共更新了 {len(gl)} 个群的信息", "更新群信息", event.user_id)
 
 
 @update_friend_info.handle()
-async def _():
+async def _(bot: Bot, event: MessageEvent):
     num = 0
-    rst = ""
-    fl = await get_bot().get_friend_list()
+    error_list = []
+    fl = await bot.get_friend_list()
     for f in fl:
-        if await FriendUser.add_friend_info(f["user_id"], f["nickname"]):
-            logger.info(f'自动更新好友 {f["user_id"]} 信息成功')
+        try:
+            await FriendUser.update_or_create(
+                user_id=f["user_id"], defaults={"nickname": f["nickname"]}
+            )
+            logger.debug(f"更新好友信息成功", "更新好友信息", event.user_id, target=f["user_id"])
             num += 1
-        else:
-            logger.warning(f'自动更新好友 {f["user_id"]} 信息失败')
-            rst += f'{f["user_id"]} 更新失败\n'
-    await update_friend_info.send(f"成功更新了 {num} 个好友的信息\n{rst[:-1]}")
+        except Exception as e:
+            logger.error(f"更新好友信息失败", "更新好友信息", event.user_id, target=f["user_id"], e=e)
+    await update_friend_info.send(f"成功更新了 {num} 个好友的信息")
+    if error_list:
+        await update_friend_info.send(f"以下好友更新失败:\n" + "\n".join(error_list))
+    logger.info(f"更新好友信息完成，共更新了 {num} 个群的信息", "更新好友信息", event.user_id)

basic_plugins/super_help/__init__.py

@@ -1,11 +1,12 @@
 from nonebot import on_command
 from nonebot.permission import SUPERUSER
 from nonebot.rule import to_me
+
 from utils.message_builder import image
-from .data_source import create_help_image, SUPERUSER_HELP_IMAGE
 
+from .data_source import SUPERUSER_HELP_IMAGE, create_help_image
 
-__zx_plugin_name__ = '超级用户帮助 [Superuser]'
+__zx_plugin_name__ = "超级用户帮助 [Superuser]"
 
 
 if SUPERUSER_HELP_IMAGE.exists():
@@ -20,5 +21,4 @@ super_help = on_command(
 async def _():
     if not SUPERUSER_HELP_IMAGE.exists():
         await create_help_image()
-    x = image(SUPERUSER_HELP_IMAGE)
-    await super_help.finish(x)
+    await super_help.finish(image(SUPERUSER_HELP_IMAGE))

basic_plugins/update_info.py

@@ -1,6 +1,6 @@
 from nonebot import on_command
-from utils.message_builder import image
 
+from utils.message_builder import image
 
 __zx_plugin_name__ = "更新信息"
 __plugin_usage__ = """
@@ -26,8 +26,7 @@ update_info = on_command("更新信息", aliases={"更新日志"}, priority=5, b
 
 @update_info.handle()
 async def _():
-    img = image("update_info.png")
-    if img:
+    if img := image("update_info.png"):
         await update_info.finish(image("update_info.png"))
     else:
         await update_info.finish("目前没有更新信息哦")