✨ 当管理员尝试ban真寻时将被反杀

[HibiKier]

Summary by Sourcery

实现一个功能，当管理员尝试禁止机器人时，反转禁止操作，导致他们被暂时禁止。通过添加对空用户ID的检查和提供反馈来增强消息处理。

新功能：

• 引入一个功能，当管理员尝试禁止机器人时，管理员将被暂时禁止。

增强：

• 通过检查空用户ID并提供适当的反馈来改进消息处理。

Original summary in English

Summary by Sourcery

Implement a feature that reverses the ban action on administrators attempting to ban the bot, resulting in their temporary ban. Enhance message handling by adding checks for empty user IDs and providing feedback.

New Features:

• Introduce a feature where attempting to ban the bot by an administrator results in the administrator being temporarily banned instead.

Enhancements:

• Improve message handling by checking for empty user IDs and providing appropriate feedback.

[sourcery-ai]

审核指南由 Sourcery 提供

此拉取请求实现了一个功能，即试图封禁机器人（真寻）的管理员将被自己封禁。它还包括对封禁和解封功能、错误处理和日志记录的改进。

文件级别更改

更改	详情	文件
为针对机器人的管理员实现反向封禁	在封禁时添加对机器人的 self_id 的检查 对试图封禁机器人的管理员实施 30 秒封禁 为反向封禁场景添加自定义消息	zhenxun/builtin_plugins/admin/ban/__init__.py
改进封禁时长处理和消息传递	在封禁消息中添加时长文本 改进日志消息和用户反馈中封禁时长的格式	zhenxun/builtin_plugins/admin/ban/__init__.py
增强错误处理和输入验证	添加对空用户 ID 的检查 改进封禁和解封功能中对群组 ID 和用户 ID 的处理	zhenxun/builtin_plugins/admin/ban/__init__.py
重构和改进代码结构	简化条件语句 改进字符串格式化和消息构建 在 _data_source.py 中重新排序导入	zhenxun/builtin_plugins/admin/ban/__init__.py zhenxun/builtin_plugins/admin/ban/_data_source.py

---

提示

• 通过在拉取请求中评论 @sourcery-ai review 来触发新的 Sourcery 审核。
• 通过直接回复审核评论继续与 Sourcery 的讨论。
• 您可以随时通过访问您的仪表板来更改审核设置：
  • 启用或禁用 Sourcery 生成的拉取请求摘要或审核指南；
  • 更改审核语言；
• 如果您有任何问题或反馈，您可以随时联系我们。

Original review guide in English

Reviewer's Guide by Sourcery

This pull request implements a feature where administrators attempting to ban the bot (真寻) will be banned themselves. It also includes improvements to the ban and unban functionality, error handling, and logging.

File-Level Changes

Change	Details	Files
Implement reverse ban for administrators targeting the bot	Add check for bot's self_id when banning Implement 30-second ban for administrators attempting to ban the bot Add custom message for reverse ban scenario	zhenxun/builtin_plugins/admin/ban/__init__.py
Improve ban duration handling and messaging	Add duration text to ban messages Improve formatting of ban duration in log messages and user feedback	zhenxun/builtin_plugins/admin/ban/__init__.py
Enhance error handling and input validation	Add check for empty user ID Improve handling of group ID and user ID in ban and unban functions	zhenxun/builtin_plugins/admin/ban/__init__.py
Refactor and improve code structure	Simplify conditional statements Improve string formatting and message construction Reorder imports in _data_source.py	zhenxun/builtin_plugins/admin/ban/__init__.py zhenxun/builtin_plugins/admin/ban/_data_source.py

---

Tips

• Trigger a new Sourcery review by commenting @sourcery-ai review on the pull request.
• Continue your discussion with Sourcery by replying directly to review comments.
• You can change your review settings at any time by accessing your dashboard:
  • Enable or disable the Sourcery-generated pull request summary or reviewer's guide;
  • Change the review language;
• You can always contact us if you have any questions or feedback.

[sourcery-ai]

嗨 @HibiKier - 我已经审查了你的更改 - 这里有一些反馈：

总体评论：

• 考虑记录或通知超级用户关于机器人上的管理员禁令尝试，而不是自动禁止管理员。这可以防止潜在的滥用和混淆。
• 代码改进，例如更具描述性的禁令持续时间消息和重构，是好的。然而，管理员操作行为的变化可能需要进一步讨论。

这是我在审查期间查看的内容

• 🟢 一般问题：一切看起来都很好
• 🟢 安全性：一切看起来都很好
• 🟢 测试：一切看起来都很好
• 🟡 复杂性：发现1个问题
• 🟢 文档：一切看起来都很好

---

Sourcery 对开源是免费的 - 如果你喜欢我们的评论，请考虑分享它们 ✨

• X
• Mastodon
• LinkedIn
• Facebook

_{帮助我变得更有用！请点击👍或👎在每条评论上告诉我它是否有帮助。}

Original comment in English

Hey @HibiKier - I've reviewed your changes - here's some feedback:

Overall Comments:

• Consider logging or notifying superusers about admin ban attempts on the bot instead of automatically banning the admin. This could prevent potential abuse and confusion.
• The code improvements, such as more descriptive ban duration messages and refactoring, are good. However, the change in behavior for admin actions might need further discussion.

Here's what I looked at during the review

• 🟢 General issues: all looks good
• 🟢 Security: all looks good
• 🟢 Testing: all looks good
• 🟡 Complexity: 1 issue found
• 🟢 Documentation: all looks good

---

Sourcery is free for open source - if you like our reviews please consider sharing them ✨

• X
• Mastodon
• LinkedIn
• Facebook

_{Help me be more useful! Please click 👍 or 👎 on each comment to tell me if it was helpful.}

[sourcery-ai]

issue (complexity): 考虑重构禁令功能以改善代码结构和可读性。

禁令功能确实随着反向禁令保护功能的添加变得更加复杂。虽然此功能对于防止滥用至关重要，但我们可以改进代码结构以增强可读性和可维护性。以下是一些建议：

1. 将反向禁令逻辑提取到一个单独的函数中：

def handle_reverse_ban(session, bot, gid, arparma):
    if not user_id or user_id == bot.self_id and session.id1 not in bot.config.superusers:
        duration = 30
        logger.info(
            f"尝试ban {BotConfig.self_nickname} 反被拿下",
            arparma.header_result,
            session=session,
        )
        return session.id1, duration, "半 分钟"
    return None, None, None

# 在主函数中：
reverse_ban_user, reverse_ban_duration, reverse_ban_text = handle_reverse_ban(session, bot, gid, arparma)
if reverse_ban_user:
    await BanManage.ban(reverse_ban_user, gid, reverse_ban_duration, session, True)
    await MessageUtils.build_message([
        "倒反天罡，小小管理速速退下！对 ",
        At(flag="user", target=reverse_ban_user),
        f" 狠狠惩戒了一番，一脚踢进了小黑屋! 在里面乖乖呆 {reverse_ban_text}吧!",
    ]).finish(reply_to=True)
    return

2. 简化主要禁令执行：

def execute_ban(user_id, gid, duration, session, is_superuser):
    BanManage.ban(user_id, gid, duration, session, is_superuser)
    logger.info(
        "管理员Ban" if not is_superuser else "超级用户Ban",
        arparma.header_result,
        session=session,
        target=f"{gid}:{user_id}",
    )

# 在主函数中：
execute_ban(user_id, gid, _duration, session, session.id1 in bot.config.superusers)

3. 简化消息构建：

def construct_ban_message(user_id, user_result, duration_text):
    return [
        "对 ",
        At(flag="user", target=user_id) if isinstance(user_result, At) else user_id,
        f" 狠狠惩戒了一番，一脚踢进了小黑屋! 在里面乖乖呆 {duration_text} 吧!",
    ]

# 在主函数中：
await MessageUtils.build_message(construct_ban_message(user_id, user.result, _duration_text)).finish(reply_to=True)

这些更改将保持所有新功能，同时减少嵌套并改善代码的整体结构。主函数将更易于阅读和理解，提取的函数可以在需要时独立重用或测试。

Original comment in English

issue (complexity): Consider refactoring the ban function to improve code structure and readability.

The ban function has indeed become more complex with the addition of the reverse ban protection feature. While this feature is crucial for preventing abuse, we can improve the code structure to enhance readability and maintainability. Here are some suggestions:

1. Extract the reverse ban logic into a separate function:

def handle_reverse_ban(session, bot, gid, arparma):
    if not user_id or user_id == bot.self_id and session.id1 not in bot.config.superusers:
        duration = 30
        logger.info(
            f"尝试ban {BotConfig.self_nickname} 反被拿下",
            arparma.header_result,
            session=session,
        )
        return session.id1, duration, "半 分钟"
    return None, None, None

# In the main function:
reverse_ban_user, reverse_ban_duration, reverse_ban_text = handle_reverse_ban(session, bot, gid, arparma)
if reverse_ban_user:
    await BanManage.ban(reverse_ban_user, gid, reverse_ban_duration, session, True)
    await MessageUtils.build_message([
        "倒反天罡，小小管理速速退下！对 ",
        At(flag="user", target=reverse_ban_user),
        f" 狠狠惩戒了一番，一脚踢进了小黑屋! 在里面乖乖呆 {reverse_ban_text}吧!",
    ]).finish(reply_to=True)
    return

2. Simplify the main ban execution:

def execute_ban(user_id, gid, duration, session, is_superuser):
    BanManage.ban(user_id, gid, duration, session, is_superuser)
    logger.info(
        "管理员Ban" if not is_superuser else "超级用户Ban",
        arparma.header_result,
        session=session,
        target=f"{gid}:{user_id}",
    )

# In the main function:
execute_ban(user_id, gid, _duration, session, session.id1 in bot.config.superusers)

3. Simplify the message construction:

def construct_ban_message(user_id, user_result, duration_text):
    return [
        "对 ",
        At(flag="user", target=user_id) if isinstance(user_result, At) else user_id,
        f" 狠狠惩戒了一番，一脚踢进了小黑屋! 在里面乖乖呆 {duration_text} 吧!",
    ]

# In the main function:
await MessageUtils.build_message(construct_ban_message(user_id, user.result, _duration_text)).finish(reply_to=True)

These changes will maintain all the new functionality while reducing nesting and improving the overall structure of the code. The main function will be easier to read and understand, and the extracted functions can be reused or tested independently if needed.