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-10-21 20:20:05 +08:00 · 2023-02-18 18:46:54 +08:00
parent a6105e8a1b
commit 7685b95031
134 changed files with 5402 additions and 6033 deletions
@@ -1,15 +1,17 @@
-from nonebot import on_command
-from utils.utils import is_number
-from utils.message_builder import at
-from services.log import logger
-from nonebot.adapters.onebot.v11 import Bot, MessageEvent, GroupMessageEvent, Message
-from nonebot.params import CommandArg, Command
-from nonebot.permission import SUPERUSER
-from ._data_source import remove_image
-from ._model.pixiv_keyword_user import PixivKeywordUser
-from ._model.pixiv import Pixiv
 from typing import Tuple

+from nonebot import on_command
+from nonebot.adapters.onebot.v11 import Bot, GroupMessageEvent, Message, MessageEvent
+from nonebot.params import Command, CommandArg
+from nonebot.permission import SUPERUSER
+
+from services.log import logger
+from utils.message_builder import at
+from utils.utils import is_number
+
+from ._data_source import remove_image
+from ._model.pixiv import Pixiv
+from ._model.pixiv_keyword_user import PixivKeywordUser

 __zx_plugin_name__ = "PIX关键词/UID/PID删除管理 [Superuser]"
 __plugin_usage__ = """
@@ -60,7 +62,8 @@ async def _(event: MessageEvent, arg: Message = CommandArg()):
        msg = f"uid:{msg}"
    if msg.lower().startswith("pid"):
        msg = "pid:" + msg.replace("pid", "").replace(":", "")
-    if await PixivKeywordUser.delete_keyword(msg):
+    if data := await PixivKeywordUser.get_or_none(keyword=msg):
+        await data.delete()
        await del_keyword.send(f"删除搜图关键词/UID：{msg} 成功...")
        logger.info(
            f"(USER {event.user_id}, GROUP {event.group_id if isinstance(event, GroupMessageEvent) else 'private'})"
@@ -97,22 +100,31 @@ async def _(bot: Bot, event: MessageEvent, arg: Message = CommandArg()):
                    if await remove_image(int(pid), img_p):
                        msg += f'{pid}{f"_p{img_p}" if img_p else ""}，'
                        if flag:
-                            if await PixivKeywordUser.add_keyword(
-                                114514,
-                                114514,
-                                f"black:{pid}{f'_p{img_p}' if img_p else ''}",
-                                bot.config.superusers,
+                            # if await PixivKeywordUser.add_keyword(
+                            #     114514,
+                            #     114514,
+                            #     f"black:{pid}{f'_p{img_p}' if img_p else ''}",
+                            #     bot.config.superusers,
+                            # ):
+                            if await PixivKeywordUser.exists(
+                                keyword=f"black:{pid}{f'_p{img_p}' if img_p else ''}"
                            ):
+                                await PixivKeywordUser.create(
+                                    user_qq=114514,
+                                    group_id=114514,
+                                    keyword=f"black:{pid}{f'_p{img_p}' if img_p else ''}",
+                                    is_pass=False,
+                                )
                                black_pid += f'{pid}{f"_p{img_p}" if img_p else ""}，'
                        logger.info(
                            f"(USER {event.user_id}, GROUP "
                            f"{event.group_id if isinstance(event, GroupMessageEvent) else 'private'})"
                            f" 删除了PIX图片 PID:{pid}{f'_p{img_p}' if img_p else ''}"
                        )
-                    else:
-                        await del_pic.send(
-                            f"PIX:删除pid：{pid}{f'_p{img_p}' if img_p else ''} 失败.."
-                        )
+                    # else:
+                    #     await del_pic.send(
+                    #         f"PIX:删除pid：{pid}{f'_p{img_p}' if img_p else ''} 失败.."
+                    #     )
                else:
                    await del_pic.send(
                        f"PIX:图片pix：{pid}{f'_p{img_p}' if img_p else ''} 不存在...无法删除.."
@@ -127,7 +139,12 @@ async def _(bot: Bot, event: MessageEvent, arg: Message = CommandArg()):


@pass_keyword.handle()
-async def _(bot: Bot, event: MessageEvent, cmd: Tuple[str, ...] = Command(), arg: Message = CommandArg()):
+async def _(
+    bot: Bot,
+    event: MessageEvent,
+    cmd: Tuple[str, ...] = Command(),
+    arg: Message = CommandArg(),
+):
    tmp = {"group": {}, "private": {}}
    msg = arg.extract_plain_text().strip()
    if not msg:
@@ -145,7 +162,13 @@ async def _(bot: Bot, event: MessageEvent, cmd: Tuple[str, ...] = Command(), arg
            if not is_number(x[4:]):
                await pass_keyword.send(f"UID/PID：{x} 非全数字，跳过该关键词...")
                continue
-        user_id, group_id = await PixivKeywordUser.set_keyword_pass(x, flag)
+        data = await PixivKeywordUser.get_or_none(keyword=x)
+        user_id = 0
+        group_id = 0
+        if data:
+            data.is_pass = flag
+            await data.save(update_fields=["is_pass"])
+            user_id, group_id = data.user_qq, data.group_id
        if not user_id:
            await pass_keyword.send(f"未找到关键词/UID：{x}，请检查关键词/UID是否存在...")
            continue
@@ -163,7 +186,7 @@ async def _(bot: Bot, event: MessageEvent, cmd: Tuple[str, ...] = Command(), arg
                else:
                    tmp["group"][group_id][user_id]["keyword"].append(x)
    msg = " ".join(msg)
-    await pass_keyword.send(f'已成功{cmd[0][:2]}搜图关键词：{msg}....')
+    await pass_keyword.send(f"已成功{cmd[0][:2]}搜图关键词：{msg}....")
    for user in tmp["private"]:
        x = "，".join(tmp["private"][user]["keyword"])
        await bot.send_private_msg(