✨ 引用消息同意好友/群组请求 (#1902)

* ✨ 提供event日志表， 新增引用消息同意好友/群组请求

* ⚡ 移除城市列表更新

* ✨ 新增申请入群功能

* 💬 文本修改

zhenxun/builtin_plugins/help_help.py

@@ -21,7 +21,7 @@ from zhenxun.utils.message import MessageUtils
 __plugin_meta__ = PluginMetadata(
     name="笨蛋检测",
     description="功能名称当命令检测",
-    usage="""被动""".strip(),
+    usage="""当一些笨蛋直接输入功能名称时，提示笨蛋使用帮助指令查看功能帮助""".strip(),
     extra=PluginExtraData(
         author="HibiKier",
         version="0.1",

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

@@ -1,4 +1,4 @@
-from nonebot import on_notice, on_request
+from nonebot import on_notice
 from nonebot.adapters import Bot
 from nonebot.adapters.onebot.v11 import (
     GroupDecreaseNoticeEvent,
@@ -14,9 +14,10 @@ from nonebot_plugin_uninfo import Uninfo
 from zhenxun.builtin_plugins.platform.qq.exception import ForceAddGroupError
 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.utils.common_utils import CommonUtils
-from zhenxun.utils.enum import PluginType
+from zhenxun.utils.enum import EventLogType, PluginType
 from zhenxun.utils.platform import PlatformUtils
 from zhenxun.utils.rules import notice_rule
 
@@ -106,8 +107,6 @@ group_decrease_handle = on_notice(
     rule=notice_rule([GroupMemberDecreaseEvent, GroupDecreaseNoticeEvent]),
 )
 """群员减少处理"""
-add_group = on_request(priority=1, block=False)
-"""加群同意请求"""
 
 
 @group_increase_handle.handle()
@@ -142,7 +141,20 @@ async def _(
     if event.sub_type == "kick_me":
         """踢出Bot"""
         await GroupManager.kick_bot(bot, group_id, str(event.operator_id))
+        await EventLog.create(
+            user_id=user_id, group_id=group_id, event_type=EventLogType.KICK_BOT
+        )
     elif event.sub_type in ["leave", "kick"]:
+        if event.sub_type == "leave":
+            """主动退群"""
+            await EventLog.create(
+                user_id=user_id, group_id=group_id, event_type=EventLogType.LEAVE_MEMBER
+            )
+        else:
+            """被踢出群"""
+            await EventLog.create(
+                user_id=user_id, group_id=group_id, event_type=EventLogType.KICK_MEMBER
+            )
         result = await GroupManager.run_user(
             bot, user_id, group_id, str(event.operator_id), event.sub_type
         )

zhenxun/builtin_plugins/platform/qq/user_group_request.py

@@ -0,0 +1,100 @@
+import asyncio
+from datetime import datetime
+import random
+
+from nonebot.adapters import Bot
+from nonebot.plugin import PluginMetadata
+from nonebot.rule import to_me
+from nonebot_plugin_alconna import Alconna, Args, Arparma, Field, on_alconna
+from nonebot_plugin_uninfo import Uninfo
+
+from zhenxun.configs.utils import PluginCdBlock, PluginExtraData
+from zhenxun.models.fg_request import FgRequest
+from zhenxun.services.log import logger
+from zhenxun.utils.depends import UserName
+from zhenxun.utils.enum import RequestHandleType, RequestType
+from zhenxun.utils.platform import PlatformUtils
+
+__plugin_meta__ = PluginMetadata(
+    name="群组申请",
+    description="""
+    一些小群直接邀请入群导致无法正常生成审核请求，需要用该方法手动生成审核请求。
+    当管理员同意同意时会发送消息进行提示，之后再进行拉群不会退出。
+    该消息会发送至管理员，多次发送不存在的群组id或相同群组id可能导致ban。
+    """.strip(),
+    usage="""
+    指令：
+        申请入群 [群号]
+        示例: 申请入群 123123123
+    """.strip(),
+    extra=PluginExtraData(
+        author="HibiKier",
+        version="0.1",
+        menu_type="其他",
+        limits=[PluginCdBlock(cd=300, result="每5分钟只能申请一次哦~")],
+    ).to_dict(),
+)
+
+
+_matcher = on_alconna(
+    Alconna(
+        "申请入群",
+        Args[
+            "group_id",
+            int,
+            Field(
+                missing_tips=lambda: "请在命令后跟随群组id！",
+                unmatch_tips=lambda _: "群组id必须为数字！",
+            ),
+        ],
+    ),
+    skip_for_unmatch=False,
+    priority=5,
+    block=True,
+    rule=to_me(),
+)
+
+
+@_matcher.handle()
+async def _(
+    bot: Bot, session: Uninfo, arparma: Arparma, group_id: int, uname: str = UserName()
+):
+    # 旧请求全部设置为过期
+    await FgRequest.filter(
+        request_type=RequestType.GROUP,
+        user_id=session.user.id,
+        group_id=str(group_id),
+        handle_type__isnull=True,
+    ).update(handle_type=RequestHandleType.EXPIRE)
+    f = await FgRequest.create(
+        request_type=RequestType.GROUP,
+        platform=PlatformUtils.get_platform(session),
+        bot_id=bot.self_id,
+        flag="0",
+        user_id=session.user.id,
+        nickname=uname,
+        group_id=str(group_id),
+    )
+    results = await PlatformUtils.send_superuser(
+        bot,
+        f"*****一份入群申请*****\n"
+        f"ID：{f.id}\n"
+        f"申请人：{uname}({session.user.id})\n群聊："
+        f"{group_id}\n邀请日期：{datetime.now().replace(microsecond=0)}\n"
+        "注：该请求为手动申请入群",
+    )
+    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"])
+    await asyncio.sleep(random.randint(1, 5))
+    await bot.send_private_msg(
+        user_id=int(session.user.id),
+        message=f"已发送申请，请等待管理员审核，ID：{f.id}。",
+    )
+    logger.info(
+        f"用户 {uname}({session.user.id}) 申请入群 {group_id}，ID：{f.id}。",
+        arparma.header_result,
+        session=session,
+    )

zhenxun/builtin_plugins/record_request.py

@@ -17,11 +17,12 @@ from nonebot_plugin_session import EventSession
 
 from zhenxun.configs.config import BotConfig, Config
 from zhenxun.configs.utils import PluginExtraData, RegisterConfig
+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.log import logger
-from zhenxun.utils.enum import PluginType, RequestHandleType, RequestType
+from zhenxun.utils.enum import EventLogType, PluginType, RequestHandleType, RequestType
 from zhenxun.utils.platform import PlatformUtils
 
 base_config = Config.get("invite_manager")
@@ -112,21 +113,29 @@ async def _(bot: v12Bot | v11Bot, event: FriendRequestEvent, session: EventSessi
                 nickname=nickname,
                 comment=comment,
             )
-            await PlatformUtils.send_superuser(
+            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"日期：{str(datetime.now()).split('.')[0]}\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)
 
 
 @group_req.handle()
 async def _(bot: v12Bot | v11Bot, event: GroupRequestEvent, session: EventSession):
+    # sourcery skip: low-code-quality
     if event.sub_type != "invite":
         return
     if str(event.user_id) in bot.config.superusers or base_config.get("AUTO_ADD_GROUP"):
@@ -186,7 +195,7 @@ async def _(bot: v12Bot | v11Bot, event: GroupRequestEvent, session: EventSessio
                 group_id=str(event.group_id),
                 handle_type=RequestHandleType.APPROVE,
             )
-            await PlatformUtils.send_superuser(
+            results = await PlatformUtils.send_superuser(
                 bot,
                 f"*****一份入群申请*****\n"
                 f"ID：{f.id}\n"
@@ -230,13 +239,27 @@ async def _(bot: v12Bot | v11Bot, event: GroupRequestEvent, session: EventSessio
             nickname=nickname,
             group_id=str(event.group_id),
         )
-        await PlatformUtils.send_superuser(
+        kick_count = await EventLog.filter(
+            group_id=str(event.group_id), event_type=EventLogType.KICK_BOT
+        ).count()
+        kick_message = (
+            f"\n该群累计踢出{BotConfig.self_nickname} <{kick_count}>次"
+            if kick_count
+            else ""
+        )
+        results = 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)}",
+            f"{event.group_id}\n邀请日期：{datetime.now().replace(microsecond=0)}"
+            f"{kick_message}",
         )
+        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(
             "群聊请求五分钟内重复, 已忽略",

zhenxun/builtin_plugins/scripts.py

@@ -1,66 +1,11 @@
-from asyncio.exceptions import TimeoutError
-
-import aiofiles
 import nonebot
 from nonebot.drivers import Driver
-from nonebot_plugin_apscheduler import scheduler
-import ujson as json
 
-from zhenxun.configs.path_config import TEXT_PATH
 from zhenxun.models.group_console import GroupConsole
-from zhenxun.services.log import logger
-from zhenxun.utils.http_utils import AsyncHttpx
 
 driver: Driver = nonebot.get_driver()
 
 
-@driver.on_startup
-async def update_city():
-    """
-    部分插件需要中国省份城市
-    这里直接更新，避免插件内代码重复
-    """
-    china_city = TEXT_PATH / "china_city.json"
-    if not china_city.exists():
-        data = {}
-        try:
-            logger.debug("开始更新城市列表...")
-            res = await AsyncHttpx.get(
-                "http://www.weather.com.cn/data/city3jdata/china.html", timeout=5
-            )
-            res.encoding = "utf8"
-            provinces_data = json.loads(res.text)
-            for province in provinces_data.keys():
-                data[provinces_data[province]] = []
-                res = await AsyncHttpx.get(
-                    f"http://www.weather.com.cn/data/city3jdata/provshi/{province}.html",
-                    timeout=5,
-                )
-                res.encoding = "utf8"
-                city_data = json.loads(res.text)
-                for city in city_data.keys():
-                    data[provinces_data[province]].append(city_data[city])
-            async with aiofiles.open(china_city, "w", encoding="utf8") as f:
-                json.dump(data, f, indent=4, ensure_ascii=False)
-            logger.info("自动更新城市列表完成.....")
-        except TimeoutError as e:
-            logger.warning("自动更新城市列表超时...", e=e)
-        except ValueError as e:
-            logger.warning("自动城市列表失败.....", e=e)
-        except Exception as e:
-            logger.error("自动城市列表未知错误", e=e)
-
-
-# 自动更新城市列表
-@scheduler.scheduled_job(
-    "cron",
-    hour=6,
-    minute=1,
-)
-async def _():
-    await update_city()
-
-
 @driver.on_startup
 async def _():
     """开启/禁用插件格式修改"""

zhenxun/builtin_plugins/shop/__init__.py

@@ -33,6 +33,7 @@ __plugin_meta__ = PluginMetadata(
     usage="""
     商品操作
     指令：
+        商店
         我的金币
         我的道具
         使用道具 [名称/Id]

zhenxun/builtin_plugins/superuser/request_manage.py

@@ -2,7 +2,7 @@ from io import BytesIO
 
 from arclet.alconna import Args, Option
 from arclet.alconna.typing import CommandMeta
-from nonebot.adapters import Bot
+from nonebot.adapters import Bot, Event
 from nonebot.permission import SUPERUSER
 from nonebot.plugin import PluginMetadata
 from nonebot.rule import to_me
@@ -10,10 +10,13 @@ from nonebot_plugin_alconna import (
     Alconna,
     AlconnaQuery,
     Arparma,
+    Match,
     Query,
+    Reply,
     on_alconna,
     store_true,
 )
+from nonebot_plugin_alconna.uniseg.tools import reply_fetch
 from nonebot_plugin_session import EventSession
 
 from zhenxun.configs.config import BotConfig
@@ -54,7 +57,7 @@ __plugin_meta__ = PluginMetadata(
 _req_matcher = on_alconna(
     Alconna(
         "请求处理",
-        Args["handle", ["-fa", "-fr", "-fi", "-ga", "-gr", "-gi"]]["id", int],
+        Args["handle", ["-fa", "-fr", "-fi", "-ga", "-gr", "-gi"]]["id?", int],
         meta=CommandMeta(
             description="好友/群组请求处理",
             usage=usage,
@@ -105,12 +108,12 @@ _clear_matcher = on_alconna(
 )
 
 reg_arg_list = [
-    (r"同意好友请求", ["-fa", "{%0}"]),
-    (r"拒绝好友请求", ["-fr", "{%0}"]),
-    (r"忽略好友请求", ["-fi", "{%0}"]),
-    (r"同意群组请求", ["-ga", "{%0}"]),
-    (r"拒绝群组请求", ["-gr", "{%0}"]),
-    (r"忽略群组请求", ["-gi", "{%0}"]),
+    (r"同意好友请求\s*(?P<id>\d*)", ["-fa", "{id}"]),
+    (r"拒绝好友请求\s*(?P<id>\d*)", ["-fr", "{id}"]),
+    (r"忽略好友请求\s*(?P<id>\d*)", ["-fi", "{id}"]),
+    (r"同意群组请求\s*(?P<id>\d*)", ["-ga", "{id}"]),
+    (r"拒绝群组请求\s*(?P<id>\d*)", ["-gr", "{id}"]),
+    (r"忽略群组请求\s*(?P<id>\d*)", ["-gi", "{id}"]),
 ]
 
 for r in reg_arg_list:
@@ -125,32 +128,48 @@ for r in reg_arg_list:
 @_req_matcher.handle()
 async def _(
     bot: Bot,
+    event: Event,
     session: EventSession,
     handle: str,
-    id: int,
+    id: Match[int],
     arparma: Arparma,
 ):
+    reply: Reply | None = None
     type_dict = {
         "a": RequestHandleType.APPROVE,
         "r": RequestHandleType.REFUSED,
         "i": RequestHandleType.IGNORE,
     }
+    if not id.available:
+        reply = await reply_fetch(event, bot)
+        if not reply:
+            await MessageUtils.build_message("请引用消息处理或添加处理Id.").finish()
+    handle_id = id.result
+    if reply:
+        db_data = await FgRequest.get_or_none(message_ids__contains=reply.id)
+        if not db_data:
+            await MessageUtils.build_message(
+                "未发现此消息的Id，请使用Id进行处理..."
+            ).finish(reply_to=True)
+        handle_id = db_data.id
     req = None
     handle_type = type_dict[handle[-1]]
     try:
         if handle_type == RequestHandleType.APPROVE:
-            req = await FgRequest.approve(bot, id)
+            req = await FgRequest.approve(bot, handle_id)
         if handle_type == RequestHandleType.REFUSED:
-            req = await FgRequest.refused(bot, id)
+            req = await FgRequest.refused(bot, handle_id)
         if handle_type == RequestHandleType.IGNORE:
-            req = await FgRequest.ignore(id)
+            req = await FgRequest.ignore(handle_id)
     except NotFoundError:
         await MessageUtils.build_message("未发现此id的请求...").finish(reply_to=True)
     except Exception:
         await MessageUtils.build_message("其他错误, 可能flag已失效...").finish(
             reply_to=True
         )
-    logger.info("处理请求", arparma.header_result, session=session)
+    logger.info(
+        f"处理请求 Id: {req.id if req else ''}", arparma.header_result, session=session
+    )
     await MessageUtils.build_message("成功处理请求!").send(reply_to=True)
     if req and handle_type == RequestHandleType.APPROVE:
         await bot.send_private_msg(