Skip to content
New issue

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

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

Already on GitHub? Sign in to your account

🐛 修复功能少时zhenxun帮助图片排序问题 #1620

Merged
merged 1 commit into from
Sep 11, 2024
Merged

Conversation

HibiKier
Copy link
Owner

@HibiKier HibiKier commented Sep 11, 2024

Summary by Sourcery

修复zhenxun插件中帮助图片的排序逻辑,以正确处理功能较少的情况。

错误修复:

  • 修复zhenxun插件中当功能较少时帮助图片排序的问题。
Original summary in English

Summary by Sourcery

Fix the sorting logic for help images in the zhenxun plugin to handle cases with fewer features correctly.

Bug Fixes:

  • Fix the issue with sorting help images when there are fewer features in the zhenxun plugin.

Copy link
Contributor

sourcery-ai bot commented Sep 11, 2024

审核指南由 Sourcery 提供

此拉取请求修复了在功能较少时 Zhenxun 帮助图片中的排序问题。主要更改涉及修改在帮助图片生成过程中组织和显示插件数据的逻辑。

文件级更改

更改 详情 文件
修改插件信息的数据结构和排序逻辑
  • 将 max_data 初始化为一个空字典而不是 None
  • 移除在 plugin_list 开头插入 max_data 的操作
  • 实现一个新算法,将 max_data 项目分成两列
  • 创建一个新的数据结构来存储分割后的 max_data 项目
zhenxun/builtin_plugins/help/_utils.py
调整帮助图片的布局
  • 添加新变量 _pu1 和 _pu2 来存储分割项目
  • 创建 _plugins 列表,特定定位分割项目
  • 将一个新的字典附加到 _data 中,包含重新组织的 max_data 信息
zhenxun/builtin_plugins/help/_utils.py

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

Reviewer's Guide by Sourcery

This pull request fixes a sorting issue in the Zhenxun help image when there are fewer features. The main changes involve modifying the logic for organizing and displaying plugin data in the help image generation process.

File-Level Changes

Change Details Files
Modify the data structure and sorting logic for plugin information
  • Initialize max_data as an empty dictionary instead of None
  • Remove the insertion of max_data at the beginning of plugin_list
  • Implement a new algorithm to split max_data items into two columns
  • Create a new data structure for storing the split max_data items
zhenxun/builtin_plugins/help/_utils.py
Adjust the layout of the help image
  • Add new variables _pu1 and _pu2 to store split items
  • Create _plugins list with specific positioning for the split items
  • Append a new dictionary to _data with the reorganized max_data information
zhenxun/builtin_plugins/help/_utils.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.

@HibiKier HibiKier merged commit a8355fb into dev Sep 11, 2024
1 check passed
@HibiKier HibiKier deleted the bugfix/help branch September 11, 2024 03:54
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 - 我已经审查了你的更改 - 这里有一些反馈:

总体评论

  • 考虑使用更具描述性的变量名,而不是 _pu1_pu2,以提高代码可读性。
  • 如果不再需要,注释掉的行 # plugin_list.insert(0, max_data) 应该被删除。
这是我在审查期间查看的内容
  • 🟡 一般问题:发现2个问题
  • 🟢 安全性:一切看起来都很好
  • 🟢 测试:一切看起来都很好
  • 🟢 复杂性:一切看起来都很好
  • 🟢 文档:一切看起来都很好

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

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

Overall Comments:

  • Consider using more descriptive variable names instead of _pu1 and _pu2 to improve code readability.
  • The commented-out line # plugin_list.insert(0, max_data) should be removed if it's no longer needed.
Here's what I looked at during the review
  • 🟡 General issues: 2 issues found
  • 🟢 Security: all looks good
  • 🟢 Testing: all looks good
  • 🟢 Complexity: all looks good
  • 🟢 Documentation: all looks good

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.

@@ -124,9 +124,24 @@ async def build_ss_image(self, bot_id: str, group_id: str | None) -> bytes:
max_data = data
plugin_list.append(data)
del plugin_list[flag_index]
plugin_list.insert(0, max_data)
# plugin_list.insert(0, max_data)
Copy link
Contributor

Choose a reason for hiding this comment

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

建议: 如果不再需要,请删除注释掉的代码

如果这行代码不再需要,最好完全删除它,而不是将其注释掉。这有助于保持代码的整洁和可读性。

Suggested change
# plugin_list.insert(0, max_data)
plugin_list.insert(0, max_data)
Original comment in English

suggestion: Remove commented-out code if no longer needed

If this line is no longer needed, it's better to remove it entirely rather than leaving it commented out. This helps maintain cleaner, more readable code.

Suggested change
# plugin_list.insert(0, max_data)
plugin_list.insert(0, max_data)

_pu1.append(max_data["items"][i])
else:
_pu2.append(max_data["items"][i])
_plugins = [(30, 50, _pu1), (0, 50, _pu2)]
Copy link
Contributor

Choose a reason for hiding this comment

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

建议: 用命名常量替换魔法数字

这个代码块中的硬编码值(30, 50, 0, 100)可以通过命名常量替换来受益。这将提高可读性和可维护性。考虑在文件顶部或配置文件中定义这些常量。

FIRST_COLUMN_WIDTH = 30
SECOND_COLUMN_WIDTH = 50
THIRD_COLUMN_WIDTH = 0

_plugins = [(FIRST_COLUMN_WIDTH, SECOND_COLUMN_WIDTH, _pu1),
            (THIRD_COLUMN_WIDTH, SECOND_COLUMN_WIDTH, _pu2)]
Original comment in English

suggestion: Replace magic numbers with named constants

The hardcoded values (30, 50, 0, 100) in this block could benefit from being replaced with named constants. This would improve readability and maintainability. Consider defining these at the top of the file or in a configuration file.

FIRST_COLUMN_WIDTH = 30
SECOND_COLUMN_WIDTH = 50
THIRD_COLUMN_WIDTH = 0

_plugins = [(FIRST_COLUMN_WIDTH, SECOND_COLUMN_WIDTH, _pu1),
            (THIRD_COLUMN_WIDTH, SECOND_COLUMN_WIDTH, _pu2)]

@HibiKier HibiKier mentioned this pull request Sep 30, 2024
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 <[email protected]>

* 🎨 代码结构优化

* 🐛 私聊时修改插件时删除私聊帮助

* 🐛 过滤父插件

* 🐛 修复自检在ARM上的问题 (#1607)

* 🐛 修复自检在ARM上的问题

* ✅ 优化测试

* ✨ 支持mysql,psql,sqlite随机函数

* 🔧 VSCode配置修改

* 🔧 VSCode配置修改

* ✨ 添加金币排行

Co-Authored-By: HibiKier <[email protected]>

* 📝 修改README

Co-Authored-By: HibiKier <[email protected]>

* 🔨 提取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 <[email protected]>

* 🧪 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 <[email protected]>

* 🐳 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 <[email protected]>

* ✨ 移除默认图片文件夹:爬 (#1653)

* ✨ 安装/移除插件提供插件安装/卸载方法用于插件初始化 (#1654)

* ✨ 新增超级用户与管理员帮助模板 (#1655)

* ✨ 新增个人信息命令 (#1657)

* ✨ 修改个人信息菜单名称 (#1658)

* ✨ 新增插件商店api (#1659)

* ✨ 新增插件商店api

* chore(version): Update version to v0.2.2-7e15f20

---------

Co-authored-by: HibiKier <[email protected]>

* ✨ 将cd,block,count限制复原配置文件 (#1662)

* 🎨 修改README (#1663)

* 🎨 修改版本号 (#1664)

* 🎨 修改requirements (#1665)

---------

Co-authored-by: AkashiCoin <[email protected]>
Co-authored-by: fanyinrumeng <[email protected]>
Co-authored-by: AkashiCoin <[email protected]>
Co-authored-by: Elaga <[email protected]>
Co-authored-by: AkashiCoin <[email protected]>
Co-authored-by: HibiKier <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

1 participant