✨ 增强缓存功能，优化请求管理逻辑 (#2012)

- 在 `record_request.py` 和 `group_handle/__init__.py` 中引入了 `CacheRoot`，实现请求缓存，避免重复处理相同请求。
- 在 `exception.py` 中更新 `ForceAddGroupError` 类，新增 `group_id` 属性以便于错误处理。
- 在 `data_source.py` 中修改 `ForceAddGroupError` 的抛出逻辑，包含 `group_id` 信息。
- 更新 `cache` 类，支持类型化缓存字典和列表，增强缓存的类型安全性。

此更新提升了请求处理的效率和准确性，同时增强了错误信息的可追溯性。

zhenxun/builtin_plugins/hooks/auth_checker.py

@@ -150,6 +150,10 @@ async def get_plugin_and_user(
         )
     except IntegrityError:
         await asyncio.sleep(0.5)
+        plugin_task = plugin_dao.safe_get_or_none(module=module)
+        user_task = user_dao.get_by_func_or_none(
+            UserConsole.get_user, False, user_id=user_id
+        )
         plugin, user = await with_timeout(
             asyncio.gather(plugin_task, user_task), name="get_plugin_and_user"
         )

zhenxun/builtin_plugins/platform/qq/exception.py

@@ -3,9 +3,13 @@ class ForceAddGroupError(Exception):
     强制拉群
     """
 
-    def __init__(self, info: str):
+    def __init__(self, info: str, group_id: str):
         super().__init__(self)
         self._info = info
+        self._group_id = group_id
 
     def get_info(self) -> str:
         return self._info
+
+    def get_group_id(self) -> str:
+        return self._group_id

zhenxun/builtin_plugins/platform/qq/group_handle/__init__.py

@@ -16,6 +16,7 @@ from zhenxun.configs.config import BotConfig, Config
 from zhenxun.configs.utils import PluginExtraData, RegisterConfig, Task
 from zhenxun.models.event_log import EventLog
 from zhenxun.models.group_console import GroupConsole
+from zhenxun.services.cache import CacheRoot
 from zhenxun.utils.common_utils import CommonUtils
 from zhenxun.utils.enum import EventLogType, PluginType
 from zhenxun.utils.platform import PlatformUtils
@@ -92,6 +93,10 @@ group_decrease_handle = on_notice(
 )
 """群员减少处理"""
 
+cache = CacheRoot.cache_dict(
+    "REQUEST_CACHE", (base_config.get("TIP_MESSAGE_LIMIT") or 360) * 60, str
+)
+
 
 @group_increase_handle.handle()
 async def _(
@@ -109,7 +114,9 @@ async def _(
                 bot, str(event.operator_id), str(event.group_id), group
             )
         except ForceAddGroupError as e:
-            await PlatformUtils.send_superuser(bot, e.get_info())
+            if not cache.get(e.get_group_id()):
+                cache.set(e.get_group_id(), "1")
+                await PlatformUtils.send_superuser(bot, e.get_info())
     else:
         await GroupManager.add_user(session, bot)
 

zhenxun/builtin_plugins/platform/qq/group_handle/data_source.py

@@ -147,9 +147,13 @@ class GroupManager:
                     group_id=group_id,
                     e=e,
                 )
-                raise ForceAddGroupError("强制拉群或未有群信息，退出群聊失败...") from e
+                raise ForceAddGroupError(
+                    "强制拉群或未有群信息，退出群聊失败...", group_id
+                ) from e
             # await GroupConsole.filter(group_id=group_id).delete()
-            raise ForceAddGroupError(f"触发强制入群保护，已成功退出群聊 {group_id}...")
+            raise ForceAddGroupError(
+                f"触发强制入群保护，已成功退出群聊 {group_id}...", group_id
+            )
         else:
             await cls.__handle_add_group(bot, group_id, group)
             """刷新群管理员权限"""

zhenxun/builtin_plugins/record_request.py

@@ -21,6 +21,7 @@ from zhenxun.models.event_log import EventLog
 from zhenxun.models.fg_request import FgRequest
 from zhenxun.models.friend_user import FriendUser
 from zhenxun.models.group_console import GroupConsole
+from zhenxun.services.cache import CacheRoot
 from zhenxun.services.log import logger
 from zhenxun.utils.enum import EventLogType, PluginType, RequestHandleType, RequestType
 from zhenxun.utils.platform import PlatformUtils
@@ -52,6 +53,14 @@ __plugin_meta__ = PluginMetadata(
                 type=bool,
                 default_value=False,
             ),
+            RegisterConfig(
+                module="invite_manager",
+                key="TIP_MESSAGE_LIMIT",
+                value=360,
+                help="重复申请与退群提醒过滤时间（分钟）",
+                type=int,
+                default_value=360,
+            ),
         ],
     ).to_dict(),
 )
@@ -77,6 +86,11 @@ group_req = on_request(priority=5, block=True)
 _t = on_message(priority=999, block=False, rule=lambda: False)
 
 
+cache = CacheRoot.cache_dict(
+    "REQUEST_CACHE", (base_config.get("TIP_MESSAGE_LIMIT") or 360) * 60, str
+)
+
+
 @friend_req.handle()
 async def _(bot: v12Bot | v11Bot, event: FriendRequestEvent, session: EventSession):
     if event.user_id and Timer.check(event.user_id):
@@ -113,22 +127,25 @@ async def _(bot: v12Bot | v11Bot, event: FriendRequestEvent, session: EventSessi
                 nickname=nickname,
                 comment=comment,
             )
-            results = await PlatformUtils.send_superuser(
-                bot,
-                f"*****一份好友申请*****\n"
-                f"ID: {f.id}\n"
-                f"昵称：{nickname}({event.user_id})\n"
-                f"自动同意：{'√' if base_config.get('AUTO_ADD_FRIEND') else '×'}\n"
-                f"日期：{datetime.now().replace(microsecond=0)}\n"
-                f"备注：{event.comment}",
-            )
-            if message_ids := [
-                str(r[1].msg_ids[0]["message_id"])
-                for r in results
-                if r[1] and r[1].msg_ids
-            ]:
-                f.message_ids = ",".join(message_ids)
-                await f.save(update_fields=["message_ids"])
+            cache_key = str(event.user_id)
+            if not cache.get(cache_key):
+                cache.set(cache_key, "1")
+                results = await PlatformUtils.send_superuser(
+                    bot,
+                    f"*****一份好友申请*****\n"
+                    f"ID: {f.id}\n"
+                    f"昵称：{nickname}({event.user_id})\n"
+                    f"自动同意：{'√' if base_config.get('AUTO_ADD_FRIEND') else '×'}\n"
+                    f"日期：{datetime.now().replace(microsecond=0)}\n"
+                    f"备注：{event.comment}",
+                )
+                if message_ids := [
+                    str(r[1].msg_ids[0]["message_id"])
+                    for r in results
+                    if r[1] and r[1].msg_ids
+                ]:
+                    f.message_ids = ",".join(message_ids)
+                    await f.save(update_fields=["message_ids"])
     else:
         logger.debug("好友请求五分钟内重复, 已忽略", "好友请求", target=event.user_id)
 
@@ -210,7 +227,8 @@ async def _(bot: v12Bot | v11Bot, event: GroupRequestEvent, session: EventSessio
                 "\n在群组中 群组管理员与群主 允许使用管理员帮助"
                 "（包括ban与功能开关等）\n请在群组中发送 '管理员帮助'",
             )
-    elif Timer.check(f"{event.user_id}:{event.group_id}"):
+    elif cache.get(f"{event.group_id}"):
+        cache.set(f"{event.group_id}", "1")
         logger.debug(
             f"收录 用户[{event.user_id}] 群聊[{event.group_id}] 群聊请求",
             "群聊请求",