✨ 添加自动同意群组请求 (#1848)

* ✨ 添加自动同意群组请求

* ➕ Add nonebot-plugin-waiter

---------

Co-authored-by: BalconyJH <balconyjh@gmail.com>

zhenxun/builtin_plugins/help_help.py

@@ -48,7 +48,11 @@ async def _(matcher: Matcher, message: UniMsg, session: EventSession):
                 return
     if text := message.extract_plain_text().strip():
         if plugin := await PluginInfo.get_or_none(
-            name=text, load_status=True, plugin_type=PluginType.NORMAL
+            name=text,
+            load_status=True,
+            plugin_type=PluginType.NORMAL,
+            block_type__isnull=True,
+            status=True,
         ):
             image = None
             if _path.exists():

zhenxun/builtin_plugins/record_request.py

@@ -1,4 +1,6 @@
+import asyncio
 from datetime import datetime
+import random
 import time
 
 from nonebot import on_message, on_request
@@ -40,7 +42,15 @@ __plugin_meta__ = PluginMetadata(
                 help="是否自动同意好友添加",
                 type=bool,
                 default_value=False,
-            )
+            ),
+            RegisterConfig(
+                module="invite_manager",
+                key="AUTO_ADD_GROUP",
+                value=False,
+                help="是否自动同意邀请入群",
+                type=bool,
+                default_value=False,
+            ),
         ],
     ).to_dict(),
 )
@@ -81,6 +91,7 @@ async def _(bot: v12Bot | v11Bot, event: FriendRequestEvent, session: EventSessi
                 "好友请求",
                 target=event.user_id,
             )
+            await asyncio.sleep(random.randint(1, 10))
             await bot.set_friend_add_request(flag=event.flag, approve=True)
             await FriendUser.create(
                 user_id=str(user["user_id"]), user_name=user["nickname"]
@@ -104,7 +115,7 @@ async def _(bot: v12Bot | v11Bot, event: FriendRequestEvent, session: EventSessi
             await PlatformUtils.send_superuser(
                 bot,
                 f"*****一份好友申请*****\n"
-                f"ID: {f.id}"
+                f"ID: {f.id}\n"
                 f"昵称：{nickname}({event.user_id})\n"
                 f"自动同意：{'√' if base_config.get('AUTO_ADD_FRIEND') else '×'}\n"
                 f"日期：{str(datetime.now()).split('.')[0]}\n"
@@ -118,10 +129,10 @@ async def _(bot: v12Bot | v11Bot, event: FriendRequestEvent, session: EventSessi
 async def _(bot: v12Bot | v11Bot, event: GroupRequestEvent, session: EventSession):
     if event.sub_type != "invite":
         return
-    if str(event.user_id) in bot.config.superusers:
+    if str(event.user_id) in bot.config.superusers or base_config.get("AUTO_ADD_GROUP"):
         try:
             logger.debug(
-                "超级用户自动同意加入群聊",
+                "超级用户自动同意加入群聊或开启自动同意入群",
                 "群聊请求",
                 session=event.user_id,
                 target=event.group_id,
@@ -154,12 +165,42 @@ async def _(bot: v12Bot | v11Bot, event: GroupRequestEvent, session: EventSessio
             )
         except ActionFailed as e:
             logger.error(
-                "超级用户自动同意加入群聊发生错误",
+                "超超级用户自动同意加入群聊或开启自动同意入群，加入群组发生错误",
                 "群聊请求",
                 session=event.user_id,
                 target=event.group_id,
                 e=e,
             )
+        if str(event.user_id) not in bot.config.superusers and base_config.get(
+            "AUTO_ADD_GROUP"
+        ):
+            # 非超级用户邀请自动加入群组
+            nickname = await FriendUser.get_user_name(str(event.user_id))
+            f = 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),
+                handle_type=RequestHandleType.APPROVE,
+            )
+            await PlatformUtils.send_superuser(
+                bot,
+                f"*****一份入群申请*****\n"
+                f"ID：{f.id}\n"
+                f"申请人：{nickname}({event.user_id})\n群聊："
+                f"{event.group_id}\n邀请日期：{datetime.now().replace(microsecond=0)}\n"
+                "注: 该请求已自动同意",
+            )
+            await asyncio.sleep(random.randint(1, 5))
+            await bot.send_private_msg(
+                user_id=event.user_id,
+                message=f"管理员已开启自动同意群组邀请，请不要让{BotConfig.self_nickname}受委屈哦（狠狠监控）"
+                "\n在群组中 群组管理员与群主 允许使用管理员帮助"
+                "（包括ban与功能开关等）\n请在群组中发送 '管理员帮助'",
+            )
     elif Timer.check(f"{event.user_id}:{event.group_id}"):
         logger.debug(
             f"收录 用户[{event.user_id}] 群聊[{event.group_id}] 群聊请求",

zhenxun/builtin_plugins/sign_in/_data_source.py

@@ -83,7 +83,7 @@ class SignManage:
             )
             data_list.append(
                 [
-                    f"{i+1}",
+                    f"{i + 1}",
                     (bytes, 30, 30) if user[3] == "qq" else "",
                     uid2name.get(user[0]),
                     user[1],

zhenxun/builtin_plugins/superuser/request_manage.py

@@ -16,6 +16,7 @@ from nonebot_plugin_alconna import (
 )
 from nonebot_plugin_session import EventSession
 
+from zhenxun.configs.config import BotConfig
 from zhenxun.configs.path_config import IMAGE_PATH
 from zhenxun.configs.utils import PluginExtraData
 from zhenxun.models.fg_request import FgRequest
@@ -134,14 +135,15 @@ async def _(
         "r": RequestHandleType.REFUSED,
         "i": RequestHandleType.IGNORE,
     }
+    req = None
     handle_type = type_dict[handle[-1]]
     try:
         if handle_type == RequestHandleType.APPROVE:
-            await FgRequest.approve(bot, id)
+            req = await FgRequest.approve(bot, id)
         if handle_type == RequestHandleType.REFUSED:
-            await FgRequest.refused(bot, id)
+            req = await FgRequest.refused(bot, id)
         if handle_type == RequestHandleType.IGNORE:
-            await FgRequest.ignore(id)
+            req = await FgRequest.ignore(id)
     except NotFoundError:
         await MessageUtils.build_message("未发现此id的请求...").finish(reply_to=True)
     except Exception:
@@ -149,7 +151,14 @@ async def _(
             reply_to=True
         )
     logger.info("处理请求", arparma.header_result, session=session)
-    await MessageUtils.build_message("成功处理请求!").finish(reply_to=True)
+    await MessageUtils.build_message("成功处理请求!").send(reply_to=True)
+    if req and handle_type == RequestHandleType.APPROVE:
+        await bot.send_private_msg(
+            user_id=req.user_id,
+            message=f"管理员已同意此次群组邀请，请不要让{BotConfig.self_nickname}受委屈哦（狠狠监控）"
+            "\n在群组中 群组管理员与群主 允许使用管理员帮助"
+            "（包括ban与功能开关等）\n请在群组中发送 '管理员帮助'",
+        )
 
 
 @_read_matcher.handle()

zhenxun/builtin_plugins/web_ui/api/tabs/dashboard/data_source.py

@@ -1,3 +1,4 @@
+import asyncio
 from datetime import datetime, timedelta
 import time
 
@@ -11,6 +12,7 @@ from zhenxun.configs.config import BotConfig
 from zhenxun.models.bot_connect_log import BotConnectLog
 from zhenxun.models.chat_history import ChatHistory
 from zhenxun.models.statistics import Statistics
+from zhenxun.services.log import logger
 from zhenxun.utils.platform import PlatformUtils
 
 from ....base_model import BaseResultModel, QueryModel
@@ -63,10 +65,17 @@ class ApiDataSource:
         bot_info = BotInfo(
             self_id=bot.self_id, nickname=nickname, ava_url=ava_url, platform=platform
         )
-        group_list, _ = await PlatformUtils.get_group_list(bot, True)
-        friend_list, _ = await PlatformUtils.get_friend_list(bot)
-        bot_info.group_count = len(group_list)
-        bot_info.friend_count = len(friend_list)
+        try:
+            group, friend = await asyncio.gather(
+                PlatformUtils.get_group_list(bot, True),
+                PlatformUtils.get_friend_list(bot),
+            )
+            bot_info.group_count = len(group[0])
+            bot_info.friend_count = len(friend[0])
+        except Exception as e:
+            logger.warning("获取bot好友/群组信息失败...", "WebUi", e=e)
+            bot_info.group_count = 0
+            bot_info.friend_count = 0
         bot_info.day_call = await Statistics.filter(
             create_time__gte=now - timedelta(hours=now.hour, minutes=now.minute),
             bot_id=bot.self_id,

zhenxun/builtin_plugins/web_ui/api/tabs/main/data_source.py

@@ -110,11 +110,18 @@ class ApiDataSource:
             create_time__gte=now - timedelta(hours=now.hour),
         ).count()
         # 群聊数量
-        select_bot.group_count = len(await PlatformUtils.get_group_list(select_bot.bot))
-        # 好友数量
-        select_bot.friend_count = len(
-            await PlatformUtils.get_friend_list(select_bot.bot)
-        )
+        try:
+            select_bot.group_count = len(
+                (await PlatformUtils.get_group_list(select_bot.bot, True))[0]
+            )
+            # 好友数量
+            select_bot.friend_count = len(
+                (await PlatformUtils.get_friend_list(select_bot.bot))[0]
+            )
+        except Exception as e:
+            logger.warning("获取bot好友/群组信息失败...", "WebUi", e=e)
+            select_bot.group_count = 0
+            select_bot.friend_count = 0
         select_bot.status = await BotConsole.get_bot_status(select_bot.self_id)
         # 连接时间
         select_bot.connect_time = bot_live.get(select_bot.self_id) or 0