modified: basic_plugins/admin_bot_manage/_data_source.py

modified: basic_plugins/admin_bot_manage/admin_config.py modified: basic_plugins/admin_bot_manage/custom_welcome_message.py modified: basic_plugins/admin_bot_manage/timing_task.py modified: basic_plugins/apscheduler/__init__.py modified: basic_plugins/ban/__init__.py modified: basic_plugins/ban/data_source.py modified: basic_plugins/chat_history/chat_message.py modified: basic_plugins/chat_history/chat_message_handle.py modified: basic_plugins/group_handle/__init__.py modified: basic_plugins/hooks/_utils.py modified: basic_plugins/hooks/ban_hook.py modified: basic_plugins/hooks/chkdsk_hook.py modified: basic_plugins/init_plugin_config/__init__.py deleted: basic_plugins/init_plugin_config/init_group_manager.py modified: basic_plugins/invite_manager/__init__.py new file: basic_plugins/invite_manager/utils.py modified: basic_plugins/nickname.py modified: basic_plugins/plugin_shop/__init__.py modified: basic_plugins/plugin_shop/data_source.py modified: basic_plugins/scripts.py modified: basic_plugins/shop/__init__.py modified: basic_plugins/shop/buy.py modified: basic_plugins/shop/gold.py modified: basic_plugins/shop/my_props/__init__.py deleted: basic_plugins/shop/reset_today_gold.py modified: basic_plugins/shop/shop_handle/__init__.py modified: basic_plugins/shop/shop_handle/data_source.py modified: basic_plugins/shop/use/__init__.py modified: basic_plugins/shop/use/data_source.py modified: basic_plugins/super_cmd/__init__.py modified: basic_plugins/super_cmd/bot_friend_group.py modified: basic_plugins/super_cmd/clear_data.py modified: basic_plugins/super_cmd/exec_sql.py modified: basic_plugins/super_cmd/manager_group.py modified: basic_plugins/super_cmd/reload_setting.py modified: basic_plugins/super_cmd/set_admin_permissions.py deleted: basic_plugins/super_cmd/super_task_switch.py modified: basic_plugins/super_cmd/update_friend_group_info.py modified: basic_plugins/super_help/__init__.py modified: basic_plugins/update_info.py modified: configs/config.py modified: configs/utils/__init__.py modified: models/bag_user.py modified: models/ban_user.py modified: models/chat_history.py modified: models/friend_user.py modified: models/goods_info.py modified: models/group_info.py modified: models/group_member_info.py modified: models/level_user.py modified: models/sign_group_user.py modified: models/user_shop_gold_log.py modified: plugins/aconfig/__init__.py modified: plugins/ai/__init__.py modified: plugins/ai/data_source.py modified: plugins/bilibili_sub/__init__.py modified: plugins/bilibili_sub/data_source.py modified: plugins/bilibili_sub/model.py modified: plugins/black_word/__init__.py modified: plugins/black_word/model.py modified: plugins/black_word/utils.py modified: plugins/bt/data_source.py modified: plugins/genshin/almanac/__init__.py modified: plugins/genshin/material_remind/__init__.py modified: plugins/genshin/query_user/_models/__init__.py modified: plugins/genshin/query_user/_utils/__init__.py modified: plugins/genshin/query_user/bind/__init__.py modified: plugins/genshin/query_user/genshin_sign/__init__.py modified: plugins/genshin/query_user/genshin_sign/data_source.py modified: plugins/genshin/query_user/genshin_sign/init_task.py modified: plugins/genshin/query_user/mihoyobbs_sign/__init__.py modified: plugins/genshin/query_user/query_memo/__init__.py modified: plugins/genshin/query_user/query_memo/data_source.py modified: plugins/genshin/query_user/query_role/__init__.py modified: plugins/genshin/query_user/query_role/data_source.py modified: plugins/genshin/query_user/reset_today_query_user_data/__init__.py modified: plugins/genshin/query_user/resin_remind/__init__.py modified: plugins/genshin/query_user/resin_remind/init_task.py modified: plugins/gold_redbag/model.py modified: plugins/image_management/send_image/__init__.py modified: plugins/my_info/__init__.py modified: plugins/open_cases/models/buff_prices.py modified: plugins/open_cases/models/open_cases_user.py modified: plugins/open_cases/open_cases_c.py modified: plugins/open_cases/utils.py modified: plugins/parse_bilibili_json.py modified: plugins/pid_search.py modified: plugins/pix_gallery/__init__.py modified: plugins/pix_gallery/_data_source.py modified: plugins/pix_gallery/_model/omega_pixiv_illusts.py modified: plugins/pix_gallery/_model/pixiv.py modified: plugins/pix_gallery/_model/pixiv_keyword_user.py modified: plugins/pix_gallery/pix_add_keyword.py modified: plugins/pix_gallery/pix_pass_del_keyword.py modified: plugins/pix_gallery/pix_show_info.py modified: plugins/pix_gallery/pix_update.py modified: plugins/pixiv_rank_search/data_source.py modified: plugins/poke/__init__.py modified: plugins/russian/__init__.py modified: plugins/russian/data_source.py modified: plugins/russian/model.py modified: plugins/send_dinggong_voice/__init__.py modified: plugins/send_setu_/_model.py modified: plugins/send_setu_/send_setu/__init__.py modified: plugins/send_setu_/send_setu/data_source.py modified: plugins/send_setu_/update_setu/data_source.py modified: plugins/sign_in/goods_register.py modified: plugins/sign_in/group_user_checkin.py modified: plugins/sign_in/random_event.py modified: plugins/sign_in/utils.py modified: plugins/statistics/_model.py modified: plugins/statistics/statistics_handle.py modified: plugins/statistics/statistics_hook.py modified: plugins/update_picture.py modified: plugins/web_ui/api/request.py modified: plugins/word_bank/_model.py deleted: plugins/word_bank/_old_model.py modified: plugins/word_bank/_rule.py modified: plugins/word_bank/word_handle.py modified: plugins/word_clouds/data_source.py modified: resources/image/sign/sign_res/bar.png modified: resources/image/sign/sign_res/bar_white.png modified: services/db_context.py modified: services/log.py modified: utils/browser.py modified: utils/data_utils.py modified: utils/depends/__init__.py modified: utils/http_utils.py modified: utils/image_utils.py modified: utils/manager/admin_manager.py modified: utils/message_builder.py modified: utils/utils.py
2026-09-29 08:39:59 +08:00 · 2023-02-18 18:46:54 +08:00
parent a6105e8a1b
commit 7685b95031
134 changed files with 5402 additions and 6033 deletions
@@ -1,11 +1,5 @@
-import nonebot
 from pathlib import Path

+import nonebot

 nonebot.load_plugins(str(Path(__file__).parent.resolve()))
-
-
-
-
-
-
@@ -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("已清空所有好友/群聊请求..")
@@ -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)


@@ -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)
@@ -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))
@@ -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 _():
@@ -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)
@@ -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)
@@ -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)