版本更新 (#1666)

* ✨ 父级插件加载 * ✅ 添加测试：更新与添加插件 (#1594) * ✅ 测试更新与添加插件 * ✅ Sourcery建议 * 👷 添加pytest * 🎨 优化代码 * 🐛 bug修复 * 🐛修复添加插件返回403的问题 (#1595) * 完善测试方法 * vscode测试配置 * 重构插件安装过程 * 🎨 修改readme * Update README.md * 🐛 修改bug与版本锁定 * 🐛 修复超级用户对群组功能开关 * 🐛 修复插件商店检查插件更新问题 (#1597) * 🐛 修复插件商店检查插件更新问题 * 🐛 恶意命令检测问题 * 🐛 增加插件状态检查 (#1598) * ✅ 优化测试用例 * 🐛 更改插件更新与安装逻辑 * 🐛 修复更新群组成员信息 * 🎨 代码优化 * 🚀 更新Dockerfile (#1599) * 🎨 更新requirements * ➕ 添加依赖aiocache * ⚡ 添加github镜像 * ✨ 添加仓库目录多获取渠道 * 🐛 修复测试用例 * ✨ 添加API缓存 * 🎨 采取Sourcery建议 * 🐛 文件下载逻辑修改 * 🎨 优化代码 * 🐛 修复插件开关有时出现错误 * ✨ 重构自检ui * 🐛 自检html修正 * 修复签到逻辑bug，并使代码更灵活以适应签到好感度等级配置 (#1606) * 修复签到功能已知问题 * 修复签到功能已知问题 * 修改参数名称 * 修改uid判断 --------- Co-authored-by: HibiKier <45528451+HibiKier@users.noreply.github.com> * 🎨 代码结构优化 * 🐛 私聊时修改插件时删除私聊帮助 * 🐛 过滤父插件 * 🐛 修复自检在ARM上的问题 (#1607) * 🐛 修复自检在ARM上的问题 * ✅ 优化测试 * ✨ 支持mysql，psql，sqlite随机函数 * 🔧 VSCode配置修改 * 🔧 VSCode配置修改 * ✨ 添加金币排行 Co-Authored-By: HibiKier <45528451+HibiKier@users.noreply.github.com> * 📝 修改README Co-Authored-By: HibiKier <45528451+HibiKier@users.noreply.github.com> * 🔨 提取GitHub相关操作 (#1609) * 🔨 提取GitHub相关操作 * 🔨 重构API策略 * ✨ 签到/金币排行限制最大数量 (#1616) * ✨ 签到/金币排行限制最大数量 * 🐛 修复超级用户id获取问题 * 🐛 修复路径解压与挂载 (#1619) * 🐛 修复功能少时zhenxun帮助图片排序问题 (#1620) * 🐛 签到文本适应 (#1622) * 🐛 好感度排行提供默认值 (#1624) * 🎈 优先使用github api (#1625) * ✨ 重构帮助，限制普通用户查询管理插件 (#1626) * 🐛 修复群权限与插件等级匹配 (#1627) * ✨ 当管理员尝试ban真寻时将被反杀 (#1628) * ✨ 群组发言时间检测提供开关配置 (#1630) * 🐳 chore: 支持自动修改版本号 (#1629) * 🎈 perf(github_utils): 支持github url下载遍历 (#1632) * 🎈 perf(github_utils): 支持github url下载遍历 * 🐞 fix(http_utils): 修复一些下载问题 * 🦄 refactor(http_utils): 部分重构 * chore(version): Update version to v0.2.2-e6f17c4 --------- Co-authored-by: AkashiCoin <AkashiCoin@users.noreply.github.com> * 🧪 test(auto_update): 修复测试用例 (#1633) * 🐛 修复商店商品为空时报错 (#1634) * 🐛 修复群权限与插件等级匹配 (#1635) * ✨ message_build支持AtAll (#1639) * 🎈 perf: 使用commit号下载插件 (#1641) * 🎈 perf: 使用commit号下载插件 * chore(version): Update version to v0.2.2-f9c7360 --------- Co-authored-by: AkashiCoin <AkashiCoin@users.noreply.github.com> * 🐳 chore: 修改运行检查触发路径 (#1642) * 🐳 chore: 修改运行检查触发路径 * 🐳 chore: 添加tests目录 * ✨ 重构qq群事件处理 (#1643) * 🐛 签到名称自适应 (#1644) * 🎨 更新README (#1645) * 🐛 fix(http_utils): 流式下载Content-Length错误 (#1647) * 🐛 修复群组中帮助功能状态显示问题 (#1650) * 🐛 修复群欢迎消息设置 (#1651) * 🐛 修复webui下载后首次启动错误 (#1652) * 🐛 修复webui下载后首次启动错误 * chore(version): Update version to v0.2.2-4a8ef85 --------- Co-authored-by: HibiKier <HibiKier@users.noreply.github.com> * ✨ 移除默认图片文件夹：爬 (#1653) * ✨ 安装/移除插件提供插件安装/卸载方法用于插件初始化 (#1654) * ✨ 新增超级用户与管理员帮助模板 (#1655) * ✨ 新增个人信息命令 (#1657) * ✨ 修改个人信息菜单名称 (#1658) * ✨ 新增插件商店api (#1659) * ✨ 新增插件商店api * chore(version): Update version to v0.2.2-7e15f20 --------- Co-authored-by: HibiKier <HibiKier@users.noreply.github.com> * ✨ 将cd，block，count限制复原配置文件 (#1662) * 🎨 修改README (#1663) * 🎨 修改版本号 (#1664) * 🎨 修改requirements (#1665) --------- Co-authored-by: AkashiCoin <l1040186796@gmail.com> Co-authored-by: fanyinrumeng <42991257+fanyinrumeng@users.noreply.github.com> Co-authored-by: AkashiCoin <i@loli.vet> Co-authored-by: Elaga <1728903318@qq.com> Co-authored-by: AkashiCoin <AkashiCoin@users.noreply.github.com> Co-authored-by: HibiKier <HibiKier@users.noreply.github.com>
2026-09-29 08:39:59 +08:00 · 2024-10-01 00:42:23 +08:00
parent daa40ae8b8
commit 4e33bf3a50
216 changed files with 10281 additions and 2538 deletions
@@ -0,0 +1,11 @@
+class ForceAddGroupError(Exception):
+    """
+    强制拉群
+    """
+
+    def __init__(self, info: str):
+        super().__init__(self)
+        self._info = info
+
+    def get_info(self) -> str:
+        return self._info
@@ -105,7 +105,7 @@ add_group = on_request(priority=1, block=False)

@group_increase_handle.handle()
 async def _(bot: Bot, event: GroupIncreaseNoticeEvent | GroupMemberIncreaseEvent):
-    superuser = BotConfig.get_superuser("qq")
+    superusers = BotConfig.get_superuser("qq")
    user_id = str(event.user_id)
    group_id = str(event.group_id)
    if user_id == bot.self_id:
@@ -123,10 +123,11 @@ async def _(bot: Bot, event: GroupIncreaseNoticeEvent | GroupMemberIncreaseEvent
                            group_id=event.group_id, message=result_msg
                        )
                    await bot.set_group_leave(group_id=event.group_id)
-                    await bot.send_private_msg(
-                        user_id=int(superuser),
-                        message=f"触发强制入群保护，已成功退出群聊 {group_id}...",
-                    )
+                    if superusers:
+                        await bot.send_private_msg(
+                            user_id=int(superusers[0]),
+                            message=f"触发强制入群保护，已成功退出群聊 {group_id}...",
+                        )
                    logger.info(
                        "强制拉群或未有群信息，退出群聊成功",
                        "入群检测",
@@ -144,10 +145,12 @@ async def _(bot: Bot, event: GroupIncreaseNoticeEvent | GroupMemberIncreaseEvent
                        group_id=event.group_id,
                        e=e,
                    )
-                    await bot.send_private_msg(
-                        user_id=int(superuser),
-                        message=f"触发强制入群保护，退出群聊 {event.group_id} 失败...",
-                    )
+                    if superusers:
+                        await bot.send_private_msg(
+                            user_id=int(superusers[0]),
+                            message="触发强制入群保护，"
+                            f"退出群聊 {event.group_id} 失败...",
+                        )
                await GroupConsole.filter(group_id=group_id).delete()
            else:
                """允许群组并设置群认证，默认群功能开关"""
@@ -274,8 +277,8 @@ async def _(bot: Bot, event: GroupDecreaseNoticeEvent | GroupMemberDecreaseEvent
            operator_name = "None"
        group = await GroupConsole.filter(group_id=str(group_id)).first()
        group_name = group.group_name if group else ""
-        if superuser := BotConfig.get_superuser("qq"):
-            coffee = int(superuser)
+        if superusers := BotConfig.get_superuser("qq"):
+            coffee = int(superusers[0])
            await bot.send_private_msg(
                user_id=coffee,
                message=f"****呜..一份踢出报告****\n"
@@ -0,0 +1,125 @@
+from nonebot.adapters import Bot
+from nonebot import on_notice, on_request
+from nonebot.plugin import PluginMetadata
+from nonebot.adapters.onebot.v11 import (
+    GroupDecreaseNoticeEvent,
+    GroupIncreaseNoticeEvent,
+)
+from nonebot.adapters.onebot.v12 import (
+    GroupMemberDecreaseEvent,
+    GroupMemberIncreaseEvent,
+)
+
+from zhenxun.utils.enum import PluginType
+from zhenxun.utils.platform import PlatformUtils
+from zhenxun.utils.common_utils import CommonUtils
+from zhenxun.configs.config import Config, BotConfig
+from zhenxun.models.group_console import GroupConsole
+from zhenxun.configs.utils import Task, RegisterConfig, PluginExtraData
+
+from .data_source import GroupManager
+from ..exception import ForceAddGroupError
+
+__plugin_meta__ = PluginMetadata(
+    name="QQ群事件处理",
+    description="群事件处理",
+    usage="",
+    extra=PluginExtraData(
+        author="HibiKier",
+        version="0.1",
+        plugin_type=PluginType.HIDDEN,
+        configs=[
+            RegisterConfig(
+                module="invite_manager",
+                key="message",
+                value=f"请不要未经同意就拉{BotConfig.self_nickname}入群！告辞！",
+                help="强制拉群后进群回复的内容",
+            ),
+            RegisterConfig(
+                module="invite_manager",
+                key="flag",
+                value=True,
+                help="强制拉群后进群退出并回复内容",
+                default_value=True,
+                type=bool,
+            ),
+            RegisterConfig(
+                module="invite_manager",
+                key="welcome_msg_cd",
+                value=5,
+                help="群欢迎消息cd",
+                default_value=5,
+                type=int,
+            ),
+            RegisterConfig(
+                module="_task",
+                key="DEFAULT_GROUP_WELCOME",
+                value=True,
+                help="被动 进群欢迎 进群默认开关状态",
+                default_value=True,
+                type=bool,
+            ),
+            RegisterConfig(
+                module="_task",
+                key="DEFAULT_REFUND_GROUP_REMIND",
+                value=True,
+                help="被动 退群提醒 进群默认开关状态",
+                default_value=True,
+                type=bool,
+            ),
+        ],
+        tasks=[
+            Task(module="group_welcome", name="进群欢迎"),
+            Task(module="refund_group_remind", name="退群提醒"),
+        ],
+    ).dict(),
+)
+
+
+base_config = Config.get("invite_manager")
+
+
+limit_cd = base_config.get("welcome_msg_cd")
+
+
+group_increase_handle = on_notice(priority=1, block=False)
+"""群员增加处理"""
+group_decrease_handle = on_notice(priority=1, block=False)
+"""群员减少处理"""
+add_group = on_request(priority=1, block=False)
+"""加群同意请求"""
+
+
+@group_increase_handle.handle()
+async def _(bot: Bot, event: GroupIncreaseNoticeEvent | GroupMemberIncreaseEvent):
+    user_id = str(event.user_id)
+    group_id = str(event.group_id)
+    if user_id == bot.self_id:
+        """新成员为bot本身"""
+        group, _ = await GroupConsole.get_or_create(
+            group_id=group_id, channel_id__isnull=True
+        )
+        if group.group_flag == 0:
+            try:
+                await GroupManager.add_bot(bot, str(event.operator_id), group_id, group)
+            except ForceAddGroupError as e:
+                await PlatformUtils.send_superuser(bot, e.get_info())
+    else:
+        await GroupManager.add_user(bot, user_id, group_id)
+
+
+@group_decrease_handle.handle()
+async def _(bot: Bot, event: GroupDecreaseNoticeEvent | GroupMemberDecreaseEvent):
+    user_id = str(event.user_id)
+    group_id = str(event.group_id)
+    if event.sub_type == "kick_me":
+        """踢出Bot"""
+        await GroupManager.kick_bot(bot, user_id, group_id)
+    elif event.sub_type in ["leave", "kick"]:
+        result = await GroupManager.run_user(
+            bot, user_id, group_id, str(event.operator_id), event.sub_type
+        )
+        if result and not await CommonUtils.task_is_block(
+            "refund_group_remind", group_id
+        ):
+            await group_decrease_handle.send(result)
@@ -0,0 +1,294 @@
+import os
+import re
+import random
+from pathlib import Path
+from datetime import datetime
+
+import ujson as json
+from nonebot.adapters import Bot
+from nonebot_plugin_alconna import At
+
+from zhenxun.services.log import logger
+from zhenxun.configs.config import Config
+from zhenxun.utils.utils import FreqLimiter
+from zhenxun.utils.message import MessageUtils
+from zhenxun.models.fg_request import FgRequest
+from zhenxun.models.level_user import LevelUser
+from zhenxun.utils.enum import RequestHandleType
+from zhenxun.utils.platform import PlatformUtils
+from zhenxun.models.plugin_info import PluginInfo
+from zhenxun.utils.common_utils import CommonUtils
+from zhenxun.models.group_console import GroupConsole
+from zhenxun.models.group_member_info import GroupInfoUser
+from zhenxun.configs.path_config import DATA_PATH, IMAGE_PATH
+
+from ..exception import ForceAddGroupError
+
+base_config = Config.get("invite_manager")
+
+limit_cd = base_config.get("welcome_msg_cd")
+
+WELCOME_PATH = DATA_PATH / "welcome_message" / "qq"
+
+DEFAULT_IMAGE_PATH = IMAGE_PATH / "qxz"
+
+
+class GroupManager:
+    _flmt = FreqLimiter(limit_cd)
+
+    @classmethod
+    async def __handle_add_group(
+        cls, bot: Bot, group_id: str, group: GroupConsole | None
+    ):
+        """允许群组并设置群认证，默认群功能开关
+
+        参数:
+            bot: Bot
+            group_id: 群组id
+            group: GroupConsole
+        """
+        if group:
+            await GroupConsole.filter(
+                group_id=group_id, channel_id__isnull=True
+            ).update(group_flag=1)
+        else:
+            block_plugin = ""
+            if plugin_list := await PluginInfo.filter(default_status=False).all():
+                for plugin in plugin_list:
+                    block_plugin += f"{plugin.module},"
+            group_info = await bot.get_group_info(group_id=group_id)
+            await GroupConsole.create(
+                group_id=group_info["group_id"],
+                group_name=group_info["group_name"],
+                max_member_count=group_info["max_member_count"],
+                member_count=group_info["member_count"],
+                group_flag=1,
+                block_plugin=block_plugin,
+                platform="qq",
+            )
+
+    @classmethod
+    async def __refresh_level(cls, bot: Bot, group_id: str):
+        """刷新权限
+
+        参数:
+            bot: Bot
+            group_id: 群组id
+        """
+        admin_default_auth = Config.get_config("admin_bot_manage", "ADMIN_DEFAULT_AUTH")
+        member_list = await bot.get_group_member_list(group_id=group_id)
+        member_id_list = [str(user_info["user_id"]) for user_info in member_list]
+        flag2u = await LevelUser.filter(
+            user_id__in=member_id_list, group_id=group_id, group_flag=1
+        ).values_list("user_id", flat=True)
+        # 即刻刷新权限
+        for user_info in member_list:
+            user_id = user_info["user_id"]
+            role = user_info["role"]
+            if user_id in bot.config.superusers:
+                await LevelUser.set_level(user_id, user_info["group_id"], 9)
+                logger.debug(
+                    "添加超级用户权限: 9",
+                    "入群检测",
+                    session=user_id,
+                    group_id=user_info["group_id"],
+                )
+            elif (
+                admin_default_auth is not None
+                and role in ["owner", "admin"]
+                and user_id not in flag2u
+            ):
+                await LevelUser.set_level(
+                    user_id,
+                    user_info["group_id"],
+                    admin_default_auth,
+                )
+                logger.debug(
+                    f"添加默认群管理员权限: {admin_default_auth}",
+                    "入群检测",
+                    session=user_id,
+                    group_id=user_info["group_id"],
+                )
+
+    @classmethod
+    async def add_bot(
+        cls, bot: Bot, operator_id: str, group_id: str, group: GroupConsole | None
+    ):
+        """拉入bot
+
+        参数:
+            bot: Bot
+            operator_id: 操作者id
+            group_id: 群组id
+            group: GroupConsole
+        """
+        if base_config.get("flag") and operator_id not in bot.config.superusers:
+            """退出群组"""
+            try:
+                if result_msg := base_config.get("message"):
+                    await bot.send_group_msg(group_id=int(group_id), message=result_msg)
+                await bot.set_group_leave(group_id=int(group_id))
+                logger.info(
+                    "强制拉群或未有群信息，退出群聊成功", "入群检测", group_id=group_id
+                )
+                await FgRequest.filter(
+                    group_id=group_id, handle_type__isnull=True
+                ).update(handle_type=RequestHandleType.IGNORE)
+            except Exception as e:
+                logger.error(
+                    "强制拉群或未有群信息，退出群聊失败",
+                    "入群检测",
+                    group_id=group_id,
+                    e=e,
+                )
+                raise ForceAddGroupError("强制拉群或未有群信息，退出群聊失败...") from e
+            await GroupConsole.filter(group_id=group_id).delete()
+            raise ForceAddGroupError(f"触发强制入群保护，已成功退出群聊 {group_id}...")
+        else:
+            await cls.__handle_add_group(bot, group_id, group)
+            """刷新群管理员权限"""
+            await cls.__refresh_level(bot, group_id)
+
+    @classmethod
+    def __build_welcome_message(cls, user_id: str, path: Path) -> list[At | Path | str]:
+        """构造群欢迎消息
+
+        参数:
+            user_id: 用户id
+            path: 群欢迎消息存储路径
+
+        返回:
+            list[At | Path | str]: 消息列表
+        """
+        file = path / "text.json"
+        data = json.load(file.open(encoding="utf-8"))
+        message = data["message"]
+        msg_split = re.split(r"\[image:\d+\]", message)
+        msg_list = []
+        if data["at"]:
+            msg_list.append(At(flag="user", target=user_id))
+        for i, text in enumerate(msg_split):
+            msg_list.append(text)
+            img_file = path / f"{i}.png"
+            if img_file.exists():
+                msg_list.append(img_file)
+        return msg_list
+
+    @classmethod
+    async def __send_welcome_message(cls, user_id: str, group_id: str):
+        """发送群欢迎消息
+
+        参数:
+            user_id: 用户id
+            group_id: 群组id
+        """
+        cls._flmt.start_cd(group_id)
+        path = WELCOME_PATH / f"{group_id}"
+        file = path / "text.json"
+        if file.exists():
+            msg_list = cls.__build_welcome_message(user_id, path)
+            logger.info("发送群欢迎消息...", "入群检测", group_id=group_id)
+            if msg_list:
+                await MessageUtils.build_message(msg_list).send()  # type: ignore
+            else:
+                image = DEFAULT_IMAGE_PATH / random.choice(
+                    os.listdir(DEFAULT_IMAGE_PATH)
+                )
+                await MessageUtils.build_message(
+                    [
+                        "新人快跑啊！！本群现状↓（快使用自定义！）",
+                        image,
+                    ]
+                ).send()
+
+    @classmethod
+    async def add_user(cls, bot: Bot, user_id: str, group_id: str):
+        """拉入用户
+
+        参数:
+            bot: Bot
+            user_id: 用户id
+            group_id: 群组id
+        """
+        join_time = datetime.now()
+        user_info = await bot.get_group_member_info(group_id=group_id, user_id=user_id)
+        await GroupInfoUser.update_or_create(
+            user_id=str(user_info["user_id"]),
+            group_id=str(user_info["group_id"]),
+            defaults={"user_name": user_info["nickname"], "user_join_time": join_time},
+        )
+        logger.info(f"用户{user_info['user_id']} 所属{user_info['group_id']} 更新成功")
+        if not await CommonUtils.task_is_block(
+            "group_welcome", group_id
+        ) and cls._flmt.check(group_id):
+            await cls.__send_welcome_message(user_id, group_id)
+
+    @classmethod
+    async def kick_bot(cls, bot: Bot, group_id: str, operator_id: str):
+        """踢出bot
+
+        参数:
+            bot: Bot
+            group_id: 群组id
+            operator_id: 操作员id
+        """
+        if user := await GroupInfoUser.get_or_none(
+            user_id=operator_id, group_id=group_id
+        ):
+            operator_name = user.user_name
+        else:
+            operator_name = "None"
+        group = await GroupConsole.get_group(group_id)
+        group_name = group.group_name if group else ""
+        if group:
+            await group.delete()
+        await PlatformUtils.send_superuser(
+            bot,
+            f"****呜..一份踢出报告****\n"
+            f"我被 {operator_name}({operator_id})\n"
+            f"踢出了 {group_name}({group_id})\n"
+            f"日期：{str(datetime.now()).split('.')[0]}",
+        )
+
+    @classmethod
+    async def run_user(
+        cls,
+        bot: Bot,
+        user_id: str,
+        group_id: str,
+        operator_id: str,
+        sub_type: str,
+    ) -> str | None:
+        """踢出用户或用户离开
+
+        参数:
+            bot: Bot
+            user_id: 用户id
+            group_id: 群组id
+            operator_id: 操作员id
+            sub_type: 类型
+
+        返回:
+            str | None: 返回消息
+        """
+        if user := await GroupInfoUser.get_or_none(user_id=user_id, group_id=group_id):
+            user_name = user.user_name
+        else:
+            user_name = f"{user_id}"
+        if user:
+            await user.delete()
+        logger.info(
+            f"名称: {user_name} 退出群聊",
+            "group_decrease_handle",
+            session=user_id,
+            group_id=group_id,
+        )
+        if sub_type == "kick":
+            operator = await bot.get_group_member_info(
+                user_id=int(operator_id), group_id=int(group_id)
+            )
+            operator_name = operator["card"] or operator["nickname"]
+            return f"{user_name} 被 {operator_name} 送走了."
+        elif sub_type == "leave":
+            return f"{user_name}离开了我们..."
+        return None