Skip to content
New issue

Have a question about this project? # for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “#”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? # to your account

🐛 修复群组中帮助功能状态显示问题 #1650

Merged
merged 1 commit into from
Sep 25, 2024
Merged

Conversation

HibiKier
Copy link
Owner

@HibiKier HibiKier commented Sep 25, 2024

Sourcery的总结

修复群组设置中帮助功能状态显示的问题,并增强删除帮助图片的逻辑。更新README,添加更多数据库连接示例,并注释掉过时的部分。

错误修复:

  • 通过调整将插件标记为不可用的条件,修复群组设置中帮助功能状态显示的问题。

增强功能:

  • 改进删除帮助图片的逻辑,确保在必要时取消链接群组帮助路径中的所有文件。

文档:

  • 更新README,包含更多数据库连接字符串示例,并注释掉旧的功能列表部分。
Original summary in English

Summary by Sourcery

Fix the help feature status display issue in group settings and enhance the logic for deleting help images. Update the README with additional database connection examples and comment out outdated sections.

Bug Fixes:

  • Fix the issue with the help feature status display in group settings by adjusting the conditions for marking plugins as unavailable.

Enhancements:

  • Improve the logic for deleting help images by ensuring all files in the group help path are unlinked when necessary.

Documentation:

  • Update the README to include additional examples for database connection strings and comment out the old feature list section.

@HibiKier HibiKier merged commit 6be9e47 into dev Sep 25, 2024
1 of 2 checks passed
@HibiKier HibiKier deleted the bugfix/help_fix branch September 25, 2024 10:29
Copy link
Contributor

sourcery-ai bot commented Sep 25, 2024

审核指南由 Sourcery 提供

此拉取请求解决了群聊中帮助功能状态显示的一个错误。更改主要影响插件可用性状态的处理,并改进了与帮助相关文件的管理。此外,还对 README 和插件切换功能进行了小幅更新。

文件级更改

更改 详情 文件
改进了群聊中插件可用性状态的处理
  • 分离了群聊和私聊插件可用性的条件
  • 在群设置中添加了对被阻止插件的检查
  • 更新了插件名称显示,根据各种条件显示“(不可用)”
zhenxun/builtin_plugins/help/zhenxun_help.py
增强了插件切换功能中的帮助文件管理
  • 修改了 delete_help_image 函数,以便在未提供特定群组 ID 时删除所有群组帮助图像
  • 改进了文件删除逻辑,以处理全局和群组特定的帮助文件
zhenxun/builtin_plugins/admin/plugin_switch/_data_source.py
更新了 README,进行了小幅改进
  • 添加了 MySQL 和 SQLite 数据库 URL 的示例
  • 注释掉了旧的功能列表部分
  • 修正了第三方安装描述中的一个拼写错误
README.md

序列图

sequenceDiagram
    participant User
    participant System
    participant Plugin
    User->>System: 请求插件状态
    System->>Plugin: 检查插件状态
    alt 插件不可用
        Plugin-->>System: 返回不可用状态
        System->>System: 在插件名称后附加“(不可用)”
    else 插件可用但在群组中被阻止
        Plugin-->>System: 返回可用状态
        System->>System: 检查群组阻止列表
        System->>System: 如果被阻止则附加“(不可用)”
    else 插件可用且未被阻止
        Plugin-->>System: 返回可用状态
    end
    System-->>User: 显示插件状态
Loading

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

Reviewer's Guide by Sourcery

This pull request addresses a bug in the help functionality status display within group chats. The changes primarily affect the handling of plugin availability status and improve the management of help-related files. Additionally, there are minor updates to the README and the plugin switch functionality.

File-Level Changes

Change Details Files
Improved plugin availability status handling in group chats
  • Separated the conditions for group and private chat plugin availability
  • Added a check for blocked plugins in group settings
  • Updated the plugin name display to show '(不可用)' (unavailable) based on various conditions
zhenxun/builtin_plugins/help/zhenxun_help.py
Enhanced help file management in plugin switch functionality
  • Modified the delete_help_image function to remove all group help images when no specific group ID is provided
  • Improved file deletion logic to handle both global and group-specific help files
zhenxun/builtin_plugins/admin/plugin_switch/_data_source.py
Updated README with minor improvements
  • Added examples for MySQL and SQLite database URLs
  • Commented out the old feature list section
  • Fixed a typo in the third-party installation description
README.md

Sequence Diagram

sequenceDiagram
    participant User
    participant System
    participant Plugin
    User->>System: Request plugin status
    System->>Plugin: Check plugin status
    alt Plugin not available
        Plugin-->>System: Return unavailable status
        System->>System: Append '(不可用)' to plugin name
    else Plugin available but blocked in group
        Plugin-->>System: Return available status
        System->>System: Check group block list
        System->>System: Append '(不可用)' if blocked
    else Plugin available and not blocked
        Plugin-->>System: Return available status
    end
    System-->>User: Display plugin status
Loading

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.

Copy link
Contributor

@sourcery-ai sourcery-ai bot left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@HibiKier - 我已经审查了你的更改,看起来很棒!

这是我在审查期间查看的内容
  • 🟡 一般问题:发现1个问题
  • 🟢 安全性:一切看起来都很好
  • 🟢 测试:一切看起来都很好
  • 🟢 复杂性:一切看起来都很好
  • 🟡 文档:发现1个问题

Sourcery对开源项目免费 - 如果你喜欢我们的审查,请考虑分享它们 ✨
帮助我变得更有用!请点击👍或👎来告诉我每条评论是否有帮助。
Original comment in English

Hey @HibiKier - I've reviewed your changes and they look great!

Here's what I looked at during the review
  • 🟡 General issues: 1 issue found
  • 🟢 Security: all looks good
  • 🟢 Testing: all looks good
  • 🟢 Complexity: all looks good
  • 🟡 Documentation: 1 issue found

Sourcery is free for open source - if you like our reviews please consider sharing them ✨
Help me be more useful! Please click 👍 or 👎 on each comment to tell me if it was helpful.

Comment on lines +23 to +24
for file in GROUP_HELP_PATH.iterdir():
file.unlink()
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

issue (bug_risk): 当 gid 为 None 时删除 GROUP_HELP_PATH 中的所有文件

此更改会导致在 gid 为 None 时删除 GROUP_HELP_PATH 中的所有文件。这可能导致意外的数据丢失。你确定这是预期的行为吗?如果是这样,考虑在代码中添加警告注释。

Original comment in English

issue (bug_risk): Deleting all files in GROUP_HELP_PATH when gid is None

This change results in deleting all files in GROUP_HELP_PATH when gid is None. This could lead to unexpected data loss. Are you sure this is the intended behavior? If so, consider adding a warning comment in the code.

@@ -166,7 +168,7 @@ playwright install-deps

```

## 功能列表 (旧版列表)
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

question (documentation): 需要澄清注释掉旧功能列表的原因。

这个部分是故意注释掉以便移除,还是为了参考而保留?如果是保留,考虑添加简短说明以解释该部分的状态。

Original comment in English

question (documentation): Clarification needed on commenting out the old feature list.

Is this section intentionally commented out for removal, or is it being preserved for reference? Consider adding a brief note explaining the status of this section if it's being kept.

HibiKier added a commit that referenced this pull request Sep 30, 2024
* ✨ 父级插件加载

* ✅ 添加测试:更新与添加插件 (#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>
# for free to join this conversation on GitHub. Already have an account? # to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

1 participant