MoeNetwork / Tieba-Cloud-Sign

百度贴吧云签到,在服务器上配置好就无需进行任何操作便可以实现贴吧的全自动签到。配合插件使用还可实现云灌水、点赞、封禁、删帖、审查等功能。注意:Gitee (原Git@osc) 仓库将不再维护,目前唯一指定的仓库为 Github。本项目没有官方交流群,如需交流可以直接使用Github的Discussions。没有商业版本,目前贴吧云签到由社区共同维护,不会停止更新(PR 通常在一天内处理)。
https://github.com/MoeNetwork/Tieba-Cloud-Sign/wiki
Other
1.81k stars 414 forks source link

添加2个插件到主线 #219

Closed Weltolk closed 1 year ago

Weltolk commented 1 year ago

https://github.com/Weltolk/weltolk_sign_qq :

每日用户签到结果qq推送,目前支持go-cqhttp的正向WebSocket和HTTP API,基于D丶L和quericy的版本重写

https://github.com/Weltolk/weltolk_backup_qq :

每日数据库备份qq推送,目前支持go-cqhttp的正向WebSocket和HTTP API,基于D丶L的版本重写

n0099 commented 1 year ago

https://github.com/MoeNetwork/Tieba-Cloud-Sign/discussions/211#discussioncomment-3956620

然而 https://github.com/MoeNetwork/Tieba-Cloud-Sign/pull/193#issuecomment-1239048750 对此早有预言

Weltolk commented 1 year ago

使用后发现的小bug,改好了应该就可以合并

@BANKA2017 @n0099 感谢使用和修复,都已经合并进去了,前几个修改的地方我没注意到还有 @n0099 提交的修改,直接合并了 @BANKA2017 的方法,后面的几个用的是 @n0099 的方法, 说实话对于php我也不知道哪个更好一些((

n0099 commented 1 year ago

对于php我也不知道哪个更好一些

https://stackoverflow.com/questions/3210935/whats-the-difference-between-isset-and-array-key-exists

BANKA2017 commented 1 year ago

哪个更好一些

isset(aa) ? aa : bbaa ?? bb 都是可以用的,只是 ?? 语法糖需要的 PHP 版本是 7.0+

至于 issetarray_key_exists 的区别就看上面n0099发的吧,虽然在本pr的特定环境下用这两个函数都是可以的

n0099 commented 1 year ago

https://stitcher.io/blog/php-8-nullsafe-operator 建议快进到c#的?[]

BANKA2017 commented 1 year ago

我还有一个疑问是关于开源协议的问题,已知 go-cqhttp 的协议是 AGPL3.0,本项目的协议是GPLv3,这些插件用到了 go-cqhttp 的私有 API(发送群文件/获取群文件列表),比如

https://github.com/Weltolk/Tieba-Cloud-Sign/blob/bf20acb9511574901ed694dc9fd9f344848f2d98/plugins/weltolk_backup_qq/weltolk_backup_qq_cron.php#L110-L129

这样合并有无影响 @n0099

n0099 commented 1 year ago

https://opensource.stackexchange.com/questions/8432/is-gpl-linking-to-agpl-possible

这在 GPLv3 的第 13 节(以及相应的 AGPLv3 的第 13 节)中明确处理,它阐明了 GPLv3 和 AGPLv3 许可代码在组合时的交互:

  1. 使用 GNU Affero 通用公共许可证。 尽管本许可证有任何其他规定,您有权将任何涵盖的作品与根据 GNU Affero 通用公共许可证第 3 版许可的作品链接或组合成一个单一的组合作品,并传达由此产生的作品。本许可证的条款将继续适用于涵盖作品的部分,但 GNU Affero 通用公共许可证第 13 节关于通过网络进行交互的特殊要求将同样适用于组合。
Weltolk commented 1 year ago

鉴于本项目中(主程序和其他插件)并未有使用过??语法糖和array_key_exists()函数:

https://github.com/search?q=repo%3AMoeNetwork%2FTieba-Cloud-Sign+%3F%3F&type=code

repo:MoeNetwork/Tieba-Cloud-Sign array_key_exists

所以感觉还是使用isset(aa) ? aa : bb更妥一些

n0099 commented 1 year ago

因为有些人(我不说是谁,切勿对号入座)还在死守十年前的php56 然而array_key_exists()是php4时代就有了的

image 另外commit msg里您可以写Co-authored-by: username <email> https://docs.github.com/en/pull-requests/committing-changes-to-your-project/creating-and-editing-commits/creating-a-commit-with-multiple-authors

BANKA2017 commented 1 year ago

鉴于本项目中(主程序和其他插件)并未有使用过??语法糖和array_key_exists()函数

本pr提交的是插件,只要在相关字段说清楚最低php版本即可,并不强制要求兼容到5.x

Weltolk commented 1 year ago

image 另外commit msg里您可以写Co-authored-by: username <email> https://docs.github.com/en/pull-requests/committing-changes-to-your-project/creating-and-editing-commits/creating-a-commit-with-multiple-authors

感谢指点

Weltolk commented 1 year ago

鉴于本项目中(主程序和其他插件)并未有使用过??语法糖和array_key_exists()函数

本pr提交的是插件,只要在相关字段说清楚最低php版本即可,并不强制要求兼容到5.x

明白, 个人认为本pr提交的插件和主程序的代码保持统一比较好

n0099 commented 1 year ago

鉴于本项目中(主程序和其他插件)并未有使用过??语法糖和array_key_exists()函数

本pr提交的是插件,只要在相关字段说清楚最低php版本即可,并不强制要求兼容到5.x

明白, 个人认为本pr提交的插件和主程序的代码保持统一比较好

建议先跟PSR-12统一:https://github.com/MoeNetwork/Tieba-Cloud-Sign/pull/180

Weltolk commented 1 year ago

鉴于本项目中(主程序和其他插件)并未有使用过??语法糖和array_key_exists()函数

本pr提交的是插件,只要在相关字段说清楚最低php版本即可,并不强制要求兼容到5.x

明白, 个人认为本pr提交的插件和主程序的代码保持统一比较好

建议先跟PSR-12统一:#180

已使用该项目完成:

https://github.com/squizlabs/PHP_CodeSniffer

PS D:\PHP_CodeSniffer_data> phpcbf --standard=PSR12 -d memory_limit=512M .\Tieba-Cloud-Sign

PHPCBF RESULT SUMMARY
----------------------------------------------------------------------
FILE                                                  FIXED  REMAINING
----------------------------------------------------------------------
...\Tieba-Cloud-Sign\plugins\ver4_style\css\test.css  514    0
...ta\Tieba-Cloud-Sign\plugins\ver4_style\css\ui.css  28     0
...ieba-Cloud-Sign\plugins\ver4_style\ver4_style.php  6      1
...n\plugins\weltolk_backup_qq\weltolk_backup_qq.php  1      1
...\weltolk_backup_qq\weltolk_backup_qq_callback.php  5      1
...gins\weltolk_backup_qq\weltolk_backup_qq_cron.php  56     23
...s\weltolk_backup_qq\weltolk_backup_qq_setting.php  76     27
...weltolk_backup_qq\weltolk_backup_qq_websocket.php  3      34
...\plugins\weltolk_sign_qq\cron_weltolk_sign_qq.php  20     11
...d-Sign\plugins\weltolk_sign_qq\websocketclass.php  3      27
...-Sign\plugins\weltolk_sign_qq\weltolk_sign_qq.php  3      3
...gins\weltolk_sign_qq\weltolk_sign_qq_callback.php  5      1
...lugins\weltolk_sign_qq\weltolk_sign_qq_public.php  1      3
...ugins\weltolk_sign_qq\weltolk_sign_qq_setting.php  1      1
...\plugins\weltolk_sign_qq\weltolk_sign_qq_show.php  42     27
...\Tieba-Cloud-Sign\plugins\wmzz_anno\wmzz_anno.php  25     2
...oud-Sign\plugins\wmzz_anno\wmzz_anno_callback.php  20     1
...loud-Sign\plugins\wmzz_anno\wmzz_anno_setting.php  58     3
...a-Cloud-Sign\plugins\wmzz_anno\wmzz_anno_show.php  8      0
...ba-Cloud-Sign\plugins\wmzz_debug\view_phpinfo.php  1      0
...ieba-Cloud-Sign\plugins\wmzz_debug\wmzz_debug.php  1      3
...d-Sign\plugins\wmzz_debug\wmzz_debug_callback.php  1      0
...Cloud-Sign\plugins\wmzz_debug\wmzz_debug_core.php  1      0
...Cloud-Sign\plugins\wmzz_debug\wmzz_debug_desc.php  1      0
...ud-Sign\plugins\wmzz_debug\wmzz_debug_setting.php  1      0
...Cloud-Sign\plugins\wmzz_debug\wmzz_debug_show.php  1      0
...ba-Cloud-Sign\plugins\wmzz_flatui\wmzz_flatui.php  13     1
...data\Tieba-Cloud-Sign\plugins\wmzz_gz\wmzz_gz.php  9      0
...ba-Cloud-Sign\plugins\wmzz_gz\wmzz_gz_setting.php  12     0
D:\PHP_CodeSniffer_data\Tieba-Cloud-Sign\setting.php  1      56
...CodeSniffer_data\Tieba-Cloud-Sign\setup\check.php  1      5
...deSniffer_data\Tieba-Cloud-Sign\setup\install.php  1      46
...odeSniffer_data\Tieba-Cloud-Sign\setup\update.php  1      3
...er_data\Tieba-Cloud-Sign\setup\update3.9to4.0.php  1      2
...er_data\Tieba-Cloud-Sign\setup\update4.4to4.5.php  1      2
..._data\Tieba-Cloud-Sign\setup\update4.96to4.97.php  1      3
..._data\Tieba-Cloud-Sign\setup\update4.97to4.98.php  1      1
...deSniffer_data\Tieba-Cloud-Sign\source\css\ui.css  1      0
...CodeSniffer_data\Tieba-Cloud-Sign\source\js\js.js  1      0
...er_data\Tieba-Cloud-Sign\templates\admin-cron.php  1      7
...ata\Tieba-Cloud-Sign\templates\admin-editcron.php  1      3
...data\Tieba-Cloud-Sign\templates\admin-plugins.php  1      15
...fer_data\Tieba-Cloud-Sign\templates\admin-set.php  1      44
...er_data\Tieba-Cloud-Sign\templates\admin-stat.php  1      6
...r_data\Tieba-Cloud-Sign\templates\admin-tools.php  1      17
..._data\Tieba-Cloud-Sign\templates\admin-update.php  1      5
...r_data\Tieba-Cloud-Sign\templates\admin-users.php  1      5
...iffer_data\Tieba-Cloud-Sign\templates\baiduid.php  1      11
...iffer_data\Tieba-Cloud-Sign\templates\control.php  1      2
...Sniffer_data\Tieba-Cloud-Sign\templates\index.php  1      10
...Sniffer_data\Tieba-Cloud-Sign\templates\login.php  1      2
...eSniffer_data\Tieba-Cloud-Sign\templates\navi.php  1      34
...deSniffer_data\Tieba-Cloud-Sign\templates\reg.php  1      3
...deSniffer_data\Tieba-Cloud-Sign\templates\set.php  1      3
...niffer_data\Tieba-Cloud-Sign\templates\showtb.php  1      12
----------------------------------------------------------------------
A TOTAL OF 942 ERRORS WERE FIXED IN 55 FILES
----------------------------------------------------------------------

Time: 24.67 secs; Memory: 168MB
n0099 commented 1 year ago

您直接在repo根目录下run的?导致把其他插件也改了imagecherry-pick commit ffdbc1e5613980c887778b54409d08d707105522 出单独的branch发pr吧

Weltolk commented 1 year ago

您直接在repo根目录下run的?导致把其他插件也改了imagecherry-pick commit ffdbc1e 出单独的branch发pr吧

没注意,我只想run我的pr来着,怎么把整个repo都run了...我reset一下是不是也可以

n0099 commented 1 year ago

Tieba-Cloud-Signrepo根目录下run

git reset --hard ffdbc1e5613980c887778b54409d08d707105522^1
phpcbf --standard=PSR12 plugins/weltolk_backup_qq
phpcbf --standard=PSR12 plugins/weltolk_sign_qq
git commit -a -m 'commit msg'
Weltolk commented 1 year ago

Tieba-Cloud-Signrepo根目录下run

git reset --hard ffdbc1e5613980c887778b54409d08d707105522^1
phpcbf --standard=PSR12 plugins/weltolk_backup_qq
phpcbf --standard=PSR12 plugins/weltolk_sign_qq
git commit -a -m 'commit msg'

thx, 已完成:

PS D:\PhpstormProjects\Tieba-Cloud-Sign> phpcbf --standard=PSR12 -d memory_limit=512M .\plugins\weltolk_sign_qq\

PHPCBF RESULT SUMMARY
----------------------------------------------------------------------
FILE                                                  FIXED  REMAINING
----------------------------------------------------------------------
...\plugins\weltolk_sign_qq\cron_weltolk_sign_qq.php  20     11
...d-Sign\plugins\weltolk_sign_qq\websocketclass.php  3      27
...-Sign\plugins\weltolk_sign_qq\weltolk_sign_qq.php  3      3
...gins\weltolk_sign_qq\weltolk_sign_qq_callback.php  5      1
...lugins\weltolk_sign_qq\weltolk_sign_qq_public.php  1      3
...ugins\weltolk_sign_qq\weltolk_sign_qq_setting.php  1      1
...\plugins\weltolk_sign_qq\weltolk_sign_qq_show.php  42     27
----------------------------------------------------------------------
A TOTAL OF 75 ERRORS WERE FIXED IN 7 FILES
----------------------------------------------------------------------

Time: 6.18 secs; Memory: 18MB

PS D:\PhpstormProjects\Tieba-Cloud-Sign> phpcbf --standard=PSR12 -d memory_limit=512M .\plugins\weltolk_backup_qq\

PHPCBF RESULT SUMMARY
----------------------------------------------------------------------
FILE                                                  FIXED  REMAINING
----------------------------------------------------------------------
...n\plugins\weltolk_backup_qq\weltolk_backup_qq.php  1      1
...\weltolk_backup_qq\weltolk_backup_qq_callback.php  5      1
...gins\weltolk_backup_qq\weltolk_backup_qq_cron.php  56     23
...s\weltolk_backup_qq\weltolk_backup_qq_setting.php  76     27
...weltolk_backup_qq\weltolk_backup_qq_websocket.php  3      34
----------------------------------------------------------------------
A TOTAL OF 141 ERRORS WERE FIXED IN 5 FILES
----------------------------------------------------------------------

Time: 7.51 secs; Memory: 22MB