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-30 01:00:02 +08:00 · 2023-02-18 18:46:54 +08:00
parent a6105e8a1b
commit 7685b95031
134 changed files with 5402 additions and 6033 deletions
@@ -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:
@@ -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(
@@ -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__)
@@ -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)