🎨 修复bug，移除plugins文件夹

zhenxun/builtin_plugins/record_request.py

@@ -1,25 +1,27 @@
 import time
 from datetime import datetime
 
-import nonebot
-from nonebot import on_message, on_request
-from nonebot.adapters.onebot.v11 import ActionFailed
-from nonebot.adapters.onebot.v11 import Bot as v11Bot
-from nonebot.adapters.onebot.v11 import FriendRequestEvent, GroupRequestEvent
-from nonebot.adapters.onebot.v12 import Bot as v12Bot
 from nonebot.plugin import PluginMetadata
-from nonebot_plugin_apscheduler import scheduler
+from nonebot import on_message, on_request
 from nonebot_plugin_session import EventSession
+from nonebot_plugin_apscheduler import scheduler
+from nonebot.adapters.onebot.v11 import Bot as v11Bot
+from nonebot.adapters.onebot.v12 import Bot as v12Bot
+from nonebot.adapters.onebot.v11 import (
+    ActionFailed,
+    GroupRequestEvent,
+    FriendRequestEvent,
+)
 
-from zhenxun.configs.config import BotConfig, Config
-from zhenxun.configs.utils import PluginExtraData, RegisterConfig
-from zhenxun.models.fg_request import FgRequest
-from zhenxun.models.friend_user import FriendUser
-from zhenxun.models.group_console import GroupConsole
 from zhenxun.services.log import logger
-from zhenxun.utils.enum import PluginType, RequestHandleType, RequestType
 from zhenxun.utils.message import MessageUtils
+from zhenxun.models.fg_request import FgRequest
 from zhenxun.utils.platform import PlatformUtils
+from zhenxun.models.friend_user import FriendUser
+from zhenxun.configs.config import Config, BotConfig
+from zhenxun.models.group_console import GroupConsole
+from zhenxun.configs.utils import RegisterConfig, PluginExtraData
+from zhenxun.utils.enum import PluginType, RequestType, RequestHandleType
 
 base_config = Config.get("invite_manager")
 
@@ -46,13 +48,11 @@ __plugin_meta__ = PluginMetadata(
 
 
 class Timer:
-    data: dict[str, float] = {}
+    data: dict[str, float] = {}  # noqa: RUF012
 
     @classmethod
     def check(cls, uid: int | str):
-        if uid not in cls.data:
-            return True
-        return time.time() - cls.data[uid] > 5 * 60
+        return True if uid not in cls.data else time.time() - cls.data[uid] > 5 * 60
 
     @classmethod
     def clear(cls):
@@ -71,7 +71,7 @@ _t = on_message(priority=999, block=False, rule=lambda: False)
 async def _(bot: v12Bot | v11Bot, event: FriendRequestEvent, session: EventSession):
     superuser = BotConfig.get_superuser("qq")
     if event.user_id and Timer.check(event.user_id):
-        logger.debug(f"收录好友请求...", "好友请求", target=event.user_id)
+        logger.debug("收录好友请求...", "好友请求", target=event.user_id)
         user = await bot.get_stranger_info(user_id=event.user_id)
         nickname = user["nickname"]
         # sex = user["sex"]
@@ -87,7 +87,7 @@ async def _(bot: v12Bot | v11Bot, event: FriendRequestEvent, session: EventSessi
             ).send(target=PlatformUtils.get_target(bot, superuser))
         if base_config.get("AUTO_ADD_FRIEND"):
             logger.debug(
-                f"已开启好友请求自动同意，成功通过该请求",
+                "已开启好友请求自动同意，成功通过该请求",
                 "好友请求",
                 target=event.user_id,
             )
@@ -112,22 +112,33 @@ async def _(bot: v12Bot | v11Bot, event: FriendRequestEvent, session: EventSessi
                 comment=comment,
             )
     else:
-        logger.debug(f"好友请求五分钟内重复, 已忽略", "好友请求", target=event.user_id)
+        logger.debug("好友请求五分钟内重复, 已忽略", "好友请求", target=event.user_id)
 
 
 @group_req.handle()
 async def _(bot: v12Bot | v11Bot, event: GroupRequestEvent, session: EventSession):
     superuser = BotConfig.get_superuser("qq")
-    # 邀请
     if event.sub_type == "invite":
         if str(event.user_id) in bot.config.superusers:
             try:
                 logger.debug(
-                    f"超级用户自动同意加入群聊",
+                    "超级用户自动同意加入群聊",
                     "群聊请求",
                     session=event.user_id,
                     target=event.group_id,
                 )
+                group, _ = await GroupConsole.update_or_create(
+                    group_id=str(event.group_id),
+                    defaults={
+                        "group_name": "",
+                        "max_member_count": 0,
+                        "member_count": 0,
+                        "group_flag": 1,
+                    },
+                )
+                await bot.set_group_add_request(
+                    flag=event.flag, sub_type="invite", approve=True
+                )
                 if isinstance(bot, v11Bot):
                     group_info = await bot.get_group_info(group_id=event.group_id)
                     max_member_count = group_info["max_member_count"]
@@ -136,17 +147,11 @@ async def _(bot: v12Bot | v11Bot, event: GroupRequestEvent, session: EventSessio
                     group_info = await bot.get_group_info(group_id=str(event.group_id))
                     max_member_count = 0
                     member_count = 0
-                await GroupConsole.update_or_create(
-                    group_id=str(event.group_id),
-                    defaults={
-                        "group_name": group_info["group_name"],
-                        "max_member_count": max_member_count,
-                        "member_count": member_count,
-                        "group_flag": 1,
-                    },
-                )
-                await bot.set_group_add_request(
-                    flag=event.flag, sub_type="invite", approve=True
+                group.max_member_count = max_member_count
+                group.member_count = member_count
+                group.group_name = group_info["group_name"]
+                await group.save(
+                    update_fields=["group_name", "max_member_count", "member_count"]
                 )
             except ActionFailed as e:
                 logger.error(
@@ -156,47 +161,47 @@ async def _(bot: v12Bot | v11Bot, event: GroupRequestEvent, session: EventSessio
                     target=event.group_id,
                     e=e,
                 )
+        elif Timer.check(f"{event.user_id}:{event.group_id}"):
+            logger.debug(
+                f"收录 用户[{event.user_id}] 群聊[{event.group_id}] 群聊请求",
+                "群聊请求",
+                target=event.group_id,
+            )
+            nickname = await FriendUser.get_user_name(str(event.user_id))
+            await PlatformUtils.send_superuser(
+                bot,
+                f"*****一份入群申请*****\n申请人：{nickname}({event.user_id})\n群聊："
+                f"{event.group_id}\n邀请日期：{datetime.now().replace(microsecond=0)}",
+                superuser,
+            )
+            await bot.send_private_msg(
+                user_id=event.user_id,
+                message=f"想要邀请我偷偷入群嘛~已经提醒{BotConfig.self_nickname}的管理员大人了\n"
+                "请确保已经群主或群管理沟通过！\n"
+                "等待管理员处理吧！",
+            )
+            # 旧请求全部设置为过期
+            await FgRequest.filter(
+                request_type=RequestType.GROUP,
+                user_id=str(event.user_id),
+                group_id=str(event.group_id),
+                handle_type__isnull=True,
+            ).update(handle_type=RequestHandleType.EXPIRE)
+            await FgRequest.create(
+                request_type=RequestType.GROUP,
+                platform=session.platform,
+                bot_id=bot.self_id,
+                flag=event.flag,
+                user_id=str(event.user_id),
+                nickname=nickname,
+                group_id=str(event.group_id),
+            )
         else:
-            if Timer.check(f"{event.user_id}:{event.group_id}"):
-                logger.debug(
-                    f"收录 用户[{event.user_id}] 群聊[{event.group_id}] 群聊请求",
-                    "群聊请求",
-                    target=event.group_id,
-                )
-                nickname = await FriendUser.get_user_name(str(event.user_id))
-                await PlatformUtils.send_superuser(
-                    bot,
-                    f"*****一份入群申请*****\n申请人：{nickname}({event.user_id})\n群聊：{event.group_id}\n邀请日期：{datetime.now().replace(microsecond=0)}",
-                    superuser,
-                )
-                await bot.send_private_msg(
-                    user_id=event.user_id,
-                    message=f"想要邀请我偷偷入群嘛~已经提醒{BotConfig.self_nickname}的管理员大人了\n"
-                    "请确保已经群主或群管理沟通过！\n"
-                    "等待管理员处理吧！",
-                )
-                # 旧请求全部设置为过期
-                await FgRequest.filter(
-                    request_type=RequestType.GROUP,
-                    user_id=str(event.user_id),
-                    group_id=str(event.group_id),
-                    handle_type__isnull=True,
-                ).update(handle_type=RequestHandleType.EXPIRE)
-                await FgRequest.create(
-                    request_type=RequestType.GROUP,
-                    platform=session.platform,
-                    bot_id=bot.self_id,
-                    flag=event.flag,
-                    user_id=str(event.user_id),
-                    nickname=nickname,
-                    group_id=str(event.group_id),
-                )
-            else:
-                logger.debug(
-                    f"群聊请求五分钟内重复, 已忽略",
-                    "群聊请求",
-                    target=f"{event.user_id}:{event.group_id}",
-                )
+            logger.debug(
+                "群聊请求五分钟内重复, 已忽略",
+                "群聊请求",
+                target=f"{event.user_id}:{event.group_id}",
+            )
 
 
 @scheduler.scheduled_job(
@@ -205,3 +210,7 @@ async def _(bot: v12Bot | v11Bot, event: GroupRequestEvent, session: EventSessio
 )
 async def _():
     Timer.clear()
+
+
+async def _():
+    Timer.clear()