🔖 1.3.3-beta4

* modified:   plugin/manager/manager.go

* use message.UnescapeCQCodeText instead

README.md

@@ -1,11 +1,10 @@
 <div align="center">
-  <img src=".github/yaya.jpg" width = "150" height = "150" alt="OneBot-YaYa"><br>
+  <img src=".github/gopher.jpg" width = "200" height = "150" alt="Gopher"><br>
   <h1>ZeroBot-Plugin</h1>
   ZeroBot-Plugin 是 ZeroBot 的 实用插件合集<br><br>
 
   <img src="http://sayuri.fumiama.top/cmoe?name=ZeroBot-Plugin&theme=r34" />
 
-[![YAYA](https://img.shields.io/badge/OneBot-YaYa-green.svg?style=social&logo=appveyor)](https://github.com/Yiwen-Chan/OneBot-YaYa)
 [![GOCQ](https://img.shields.io/badge/OneBot-MiraiGo-green.svg?style=social&logo=appveyor)](https://github.com/Mrs4s/go-cqhttp)
 [![OICQ](https://img.shields.io/badge/OneBot-OICQ-green.svg?style=social&logo=appveyor)](https://github.com/takayama-lily/node-onebot)
 [![MIRAI](https://img.shields.io/badge/OneBot-Mirai-green.svg?style=social&logo=appveyor)](https://github.com/yyuueexxiinngg/onebot-kotlin)
@@ -30,9 +29,11 @@
 ## 命令行参数
 > `[]`代表是可选参数
 ```bash
-zerobot [-h] [-t token] [-u url] [-n nickname] [-p prefix] [-d|w] [-g 监听地址:端口] [qq1 qq2 qq3 ...] [&]
+zerobot [-c config.json] [-h] [-s config.json] [-t token] [-u url] [-n nickname] [-p prefix] [-d|w] [-g 监听地址:端口] [qq1 qq2 qq3 ...] [&]
 ```
+- **-c config.json**: 从`config.json`加载`bot`配置
 - **-h**: 显示帮助
+- **-s config.json**: 保存现在`bot`配置到`config.json`
 - **-t token**: 设置`AccessToken`，默认为空
 - **-u url**: 设置`Url`，默认为`ws://127.0.0.1:6700`
 - **-n nickname**: 设置默认昵称，默认为`椛椛`
@@ -42,6 +43,29 @@ zerobot [-h] [-t token] [-u url] [-n nickname] [-p prefix] [-d|w] [-g 监听地
 - **qqs**: superusers 的 qq 号
 - **&**: 驻留在后台，必须放在最后，仅`Linux`下有效
 
+默认配置文件格式如下。当选择从配置文件加载时，将忽略相应命令行参数。
+```json
+{
+    "zero": {
+        "nickname": [
+            "椛椛",
+            "ATRI",
+            "atri",
+            "亚托莉",
+            "アトリ"
+        ],
+        "command_prefix": "/",
+        "super_users": []
+    },
+    "ws": [
+        {
+            "Url": "ws://127.0.0.1:6700",
+            "AccessToken": ""
+        }
+    ]
+}
+```
+
 ## 功能
 > 在编译时，以下功能除插件控制外，均可通过注释`main.go`中的相应`import`而物理禁用，减小插件体积。
 > 通过插件控制，还可动态管理某个功能在某个群的打开/关闭。
@@ -148,7 +172,7 @@ print("run[CQ:image,file="+j["img"]+"]")
     - [x] 退出群聊[群号]@Bot
     - [x] *入群欢迎
     - [x] *退群通知
-    - [x] 设置欢迎语[欢迎~]  可选添加 [{at}] [{nickname}] [{avatar}]
+    - [x] 设置欢迎语[欢迎~]  可选添加 [{at}] [{nickname}] [{avatar}] [{id}]
     - [x] 在[MM]月[dd]日的[hh]点[mm]分时(用[url])提醒大家[xxx]
     - [x] 在[MM]月[每周 | 周几]的[hh]点[mm]分时(用[url])提醒大家[xxx]
     - [x] 取消在[MM]月[dd]日的[hh]点[mm]分的提醒
@@ -249,7 +273,7 @@ print("run[CQ:image,file="+j["img"]+"]")
     - [x] 放大图片[图片]
 - **每日运势** `import _ github.com/FloatTech/ZeroBot-Plugin/plugin/fortune`
     - [x] 运势 | 抽签
-    - [x] 设置底图[车万 DC4 爱因斯坦 星空列车 樱云之恋 富婆妹 李清歌 公主连结 原神 明日方舟 碧蓝航线 碧蓝幻想 战双 阴阳师 赛马娘 东方归言录]
+    - [x] 设置底图[车万 DC4 爱因斯坦 星空列车 樱云之恋 富婆妹 李清歌 公主连结 原神 明日方舟 碧蓝航线 碧蓝幻想 战双 阴阳师 赛马娘 东方归言录 奇异恩典]
 - **原神抽卡** `import _ github.com/FloatTech/ZeroBot-Plugin/plugin/genshin`
     - [x] 切换原神卡池
     - [x] 原神十连
@@ -346,15 +370,16 @@ print("run[CQ:image,file="+j["img"]+"]")
 - **签到得分** `import _ "github.com/FloatTech/ZeroBot-Plugin/plugin/score"`
     - [x] 签到
     - [x] 获得签到背景[@xxx] | 获得签到背景
+    - [x] 查看分数排名
 - **骂人** `import _ "github.com/FloatTech/ZeroBot-Plugin/plugin/curse"`
     - [x] 骂我
     - [x] 大力骂我
 - **b站推送** `import _ "github.com/FloatTech/ZeroBot-Plugin/plugin/bilibili_push"`
-    - [x] 添加订阅[uid]
-    - [x] 取消订阅[uid]
-    - [x] 取消动态订阅[uid]
-    - [x] 取消直播订阅[uid]
-    - [x] 推送列表
+    - [x] 添加b站订阅[uid]
+    - [x] 取消b站订阅[uid]
+    - [x] 取消b站动态订阅[uid]
+    - [x] 取消b站直播订阅[uid]
+    - [x] b站推送列表
 - **网易云音乐热评** `import _ "github.com/FloatTech/ZeroBot-Plugin/plugin/wangyiyun"`
     - [x] 来份网易云热评
 - **b站视频链接解析** `import _ "github.com/FloatTech/ZeroBot-Plugin/plugin/bilibili_parse"`

config.go

@@ -0,0 +1,13 @@
+package main
+
+import (
+	zero "github.com/wdvxdr1123/ZeroBot"
+	"github.com/wdvxdr1123/ZeroBot/driver"
+)
+
+type zbpcfg struct {
+	Z zero.Config        `json:"zero"`
+	W []*driver.WSClient `json:"ws"`
+}
+
+var config zbpcfg

go.mod

@@ -3,9 +3,9 @@ module github.com/FloatTech/ZeroBot-Plugin
 go 1.18
 
 require (
-	github.com/FloatTech/AnimeAPI v1.3.2-0.20220330051608-0599bc2286fc
+	github.com/FloatTech/AnimeAPI v1.3.3-0.20220414074426-878b31943a9b
 	github.com/FloatTech/sqlite v0.2.1
-	github.com/FloatTech/zbputils v1.3.2-0.20220330051507-f26fec6ab9d8
+	github.com/FloatTech/zbputils v1.3.3-0.20220414074216-3fe2fb332371
 	github.com/antchfx/htmlquery v1.2.4
 	github.com/corona10/goimagehash v1.0.3
 	github.com/fogleman/gg v1.3.0
@@ -22,11 +22,13 @@ require (
 	github.com/shirou/gopsutil/v3 v3.22.2
 	github.com/sirupsen/logrus v1.8.1
 	github.com/tidwall/gjson v1.14.0
-	github.com/wdvxdr1123/ZeroBot v1.4.2-0.20220330050111-d962c23b4f4d
+	github.com/wcharczuk/go-chart/v2 v2.1.0
+	github.com/wdvxdr1123/ZeroBot v1.4.2-0.20220414063422-1ca81bc47496
 	golang.org/x/image v0.0.0-20220321031419-a8550c1d254a
 )
 
 require (
+	github.com/RomiChan/syncx v0.0.0-20220404072119-d7ea0ae15a4c // indirect
 	github.com/RomiChan/websocket v1.4.3-0.20220123145318-307a86b127bc // indirect
 	github.com/antchfx/xpath v1.2.0 // indirect
 	github.com/disintegration/imaging v1.6.2 // indirect

go.sum

@@ -1,10 +1,12 @@
-github.com/FloatTech/AnimeAPI v1.3.2-0.20220330051608-0599bc2286fc h1:kTdQ6MvYGhVFpXlnAYdWeXAy8pdcpCUEcInT6zVOq+g=
-github.com/FloatTech/AnimeAPI v1.3.2-0.20220330051608-0599bc2286fc/go.mod h1:lZmZecNyucV88/1GllxoAh4F41Gy1nLannviQ4ahVWg=
+github.com/FloatTech/AnimeAPI v1.3.3-0.20220414074426-878b31943a9b h1:9wvS99e1838XnQWmhW1Ya2OEbydpN5dvNGTpOF/XpXU=
+github.com/FloatTech/AnimeAPI v1.3.3-0.20220414074426-878b31943a9b/go.mod h1:MGVkR1LFoP6aTQCXlZKG0t9pGIdKESrXAc8SdU5ypHo=
 github.com/FloatTech/sqlite v0.2.1 h1:9t6Me48XJJCIoPy4nLRvcdhcVKfT0c2lilp7SEKROG8=
 github.com/FloatTech/sqlite v0.2.1/go.mod h1:6NfHRzqOo9RWeMJEoAQVuo51Omd5LFNxCNQhMF02/9U=
-github.com/FloatTech/zbputils v1.3.2-0.20220330051507-f26fec6ab9d8 h1:qFMThl7qav2WwRGxNNcD1qviIZhfANW8Y0aXRpnhwMM=
-github.com/FloatTech/zbputils v1.3.2-0.20220330051507-f26fec6ab9d8/go.mod h1:V2Y8jkxjwACWuJsDCyNVKc+qABfMAUh/mgBYdWBxOPo=
+github.com/FloatTech/zbputils v1.3.3-0.20220414074216-3fe2fb332371 h1:nb5UF/WXDX5ATh0OYFa1FUU1NMzIBpRhiEhxDMMeIXg=
+github.com/FloatTech/zbputils v1.3.3-0.20220414074216-3fe2fb332371/go.mod h1:J6+PC/yjgnMEKVbaIyYxSGxKPb9mGjLWeJLfdJZH8RU=
 github.com/PuerkitoBio/goquery v1.5.1/go.mod h1:GsLWisAFVj4WgDibEWF4pvYnkVQBpKBKeU+7zCJoLcc=
+github.com/RomiChan/syncx v0.0.0-20220404072119-d7ea0ae15a4c h1:cNPOdTNiVwxLpROLjXCgbIPvdkE+BwvxDvgmdYmWx6Q=
+github.com/RomiChan/syncx v0.0.0-20220404072119-d7ea0ae15a4c/go.mod h1:KqZzu7slNKROh3TSYEH/IUMG6f4M+1qubZ5e52QypsE=
 github.com/RomiChan/websocket v1.4.3-0.20220123145318-307a86b127bc h1:AAx50/fb/xS4lvsdQg+bFbGvqSDhyV1MF+p2PLCamZ0=
 github.com/RomiChan/websocket v1.4.3-0.20220123145318-307a86b127bc/go.mod h1:OMmITAib6POA37xCichWM0aRnoVpSMZO1rB/G01wrr0=
 github.com/andybalholm/cascadia v1.1.0/go.mod h1:GsXiBklL0woXo1j/WYWtSYYC4ouU9PqHO0sqidkEA4Y=
@@ -28,7 +30,6 @@ github.com/erikstmartin/go-testdb v0.0.0-20160219214506-8d10e4a1bae5 h1:Yzb9+7DP
 github.com/erikstmartin/go-testdb v0.0.0-20160219214506-8d10e4a1bae5/go.mod h1:a2zkGnVExMxdzMo3M0Hi/3sEU+cWnZpSni0O6/Yb/P0=
 github.com/fogleman/gg v1.3.0 h1:/7zJX8F6AaYQc57WQCyN9cAIz+4bCJGO9B+dyW29am8=
 github.com/fogleman/gg v1.3.0/go.mod h1:R/bRT+9gY/C5z7JzPU0zXsXHKM4/ayA+zqcVNZzPa1k=
-github.com/fsnotify/fsnotify v1.4.7/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMoQvtojpjFo=
 github.com/fumiama/cron v1.3.0 h1:ZWlwuexF+HQHl3cYytEE5HNwD99q+3vNZF1GrEiXCFo=
 github.com/fumiama/cron v1.3.0/go.mod h1:bz5Izvgi/xEUI8tlBN8BI2jr9Moo8N4or0KV8xXuPDY=
 github.com/fumiama/go-base16384 v1.4.0 h1:4KrtewnmAChrZjPA7/QYc72t+vvsKF+DYB0q1iRPdpo=
@@ -53,15 +54,12 @@ github.com/golang/freetype v0.0.0-20170609003504-e2365dfdc4a0/go.mod h1:E/TSTwGw
 github.com/golang/groupcache v0.0.0-20200121045136-8c9f03a8e57e/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc=
 github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da h1:oI5xCqsCo564l8iNU+DwB5epxmsaqB+rhGL0m5jtYqE=
 github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc=
-github.com/golang/protobuf v1.2.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
-github.com/golang/snappy v0.0.0-20180518054509-2e65f85255db/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q=
 github.com/google/go-cmp v0.5.3/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
 github.com/google/go-cmp v0.5.6/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
 github.com/google/go-cmp v0.5.7 h1:81/ik6ipDQS2aGcBfIN5dHDB36BwrStyeAQquSYCV4o=
 github.com/google/go-cmp v0.5.7/go.mod h1:n+brtR0CgQNWTVd5ZUFpTBC8YFBDLK/h/bpaJ8/DtOE=
 github.com/google/uuid v1.3.0 h1:t6JiXgmwXMjEs8VusXIJk2BXHsn+wx8BZdTaoZ5fu7I=
 github.com/google/uuid v1.3.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
-github.com/hpcloud/tail v1.0.0/go.mod h1:ab1qPbhIpdTxEkNHXyeSf5vhxWSCs/tWer42PpOxQnU=
 github.com/jinzhu/gorm v1.9.16 h1:+IyIjPEABKRpsu/F8OvDPy9fyQlgsg2luMV2ZIH5i5o=
 github.com/jinzhu/gorm v1.9.16/go.mod h1:G3LB3wezTOWM2ITLzPxEXgSkOXAntiLHS7UdBefADcs=
 github.com/jinzhu/inflection v1.0.0 h1:K317FqzuhWc8YvSVlFMCCUb36O/S9MCKRDI7QkRKD/E=
@@ -69,7 +67,6 @@ github.com/jinzhu/inflection v1.0.0/go.mod h1:h+uFLlag+Qp1Va5pdKtLDYj+kHp5pxUVkr
 github.com/jinzhu/now v1.0.1 h1:HjfetcXq097iXP0uoPCdnM4Efp5/9MsM0/M+XOTeR3M=
 github.com/jinzhu/now v1.0.1/go.mod h1:d3SSVoowX0Lcu0IBviAWJpolVfI5UJVZZ7cO71lE/z8=
 github.com/kballard/go-shellquote v0.0.0-20180428030007-95032a82bc51/go.mod h1:CzGEWj7cYgsdH8dAjBGEr58BoE7ScuLd+fwFZ44+/x8=
-github.com/konsorten/go-windows-terminal-sequences v1.0.1/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ=
 github.com/lib/pq v1.1.1 h1:sJZmqHoEaY7f+NPP8pgLB/WxulyR3fewgCM2qaSlBb4=
 github.com/lib/pq v1.1.1/go.mod h1:5WUZQaWbwv1U+lTReE5YruASi9Al49XbQIvNi/34Woo=
 github.com/lufia/plan9stats v0.0.0-20211012122336-39d0f177ccd0/go.mod h1:zJYVVT2jmtg6P3p1VtQj7WsuWi/y4VnjVBn7F8KPB3I=
@@ -85,9 +82,6 @@ github.com/mroth/weightedrand v0.4.1 h1:rHcbUBopmi/3x4nnrvwGJBhX9d0vk+KgoLUZeDP6
 github.com/mroth/weightedrand v0.4.1/go.mod h1:3p2SIcC8al1YMzGhAIoXD+r9olo/g/cdJgAD905gyNE=
 github.com/nfnt/resize v0.0.0-20180221191011-83c6a9932646 h1:zYyBkD/k9seD2A7fsi6Oo2LfFZAehjjQMERAvZLEDnQ=
 github.com/nfnt/resize v0.0.0-20180221191011-83c6a9932646/go.mod h1:jpp1/29i3P1S/RLdc7JQKbRpFeM1dOBd8T9ki5s+AY8=
-github.com/onsi/ginkgo v1.6.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE=
-github.com/onsi/ginkgo v1.7.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE=
-github.com/onsi/gomega v1.4.3/go.mod h1:ex+gbHU/CVuBBDIJjb2X0qEXbFg53c61hWP/1CpauHY=
 github.com/pkumza/numcn v1.0.0 h1:ZT5cf9IJkUZgRgEtCiNNykk0RwsrKXSTsvDHOwUTzgE=
 github.com/pkumza/numcn v1.0.0/go.mod h1:QSeH+al9dWCd8di5HZM/ZqHqhZmUKfph572e9Ev/ETc=
 github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
@@ -99,18 +93,13 @@ github.com/remyoudompheng/bigfft v0.0.0-20200410134404-eec4a21b6bb0 h1:OdAsTTz6O
 github.com/remyoudompheng/bigfft v0.0.0-20200410134404-eec4a21b6bb0/go.mod h1:qqbHyh8v60DhA7CoWK5oRCqLrMHRGoxYCSS9EjAz6Eo=
 github.com/shirou/gopsutil/v3 v3.22.2 h1:wCrArWFkHYIdDxx/FSfF5RB4dpJYW6t7rcp3+zL8uks=
 github.com/shirou/gopsutil/v3 v3.22.2/go.mod h1:WapW1AOOPlHyXr+yOyw3uYx36enocrtSoSBy0L5vUHY=
-github.com/sirupsen/logrus v1.4.2/go.mod h1:tLMulIdttU9McNUspp0xgXVQah82FyeX6MwdIuYE2rE=
 github.com/sirupsen/logrus v1.8.1 h1:dJKuHgqk1NNQlqoA6BTlM1Wf9DOH3NBjQyu0h9+AZZE=
 github.com/sirupsen/logrus v1.8.1/go.mod h1:yWOB1SBYBC5VeMP7gHvWumXLIWorT60ONWic61uBYv0=
 github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
-github.com/stretchr/objx v0.1.1/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
 github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs=
 github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
 github.com/stretchr/testify v1.7.1 h1:5TQK59W5E3v0r2duFAb7P95B6hEeOyEnHRa8MjYSMTY=
 github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
-github.com/syndtr/goleveldb v1.0.0/go.mod h1:ZVVdQEZoIme9iO1Ch2Jdy24qqXrMMOU6lpPAyBWyWuQ=
-github.com/t-tomalak/logrus-easy-formatter v0.0.0-20190827215021-c074f06c5816/go.mod h1:tzym/CEb5jnFI+Q0k4Qq3+LvRF4gO3E2pxS8fHP8jcA=
-github.com/tidwall/gjson v1.13.0/go.mod h1:/wbyibRr2FHMks5tjHJ5F8dMZh3AcwJEMf5vlfC0lxk=
 github.com/tidwall/gjson v1.14.0 h1:6aeJ0bzojgWLa82gDQHcx3S0Lr/O51I9bJ5nv6JFx5w=
 github.com/tidwall/gjson v1.14.0/go.mod h1:/wbyibRr2FHMks5tjHJ5F8dMZh3AcwJEMf5vlfC0lxk=
 github.com/tidwall/match v1.1.1 h1:+Ho715JplO36QYgwN9PGYNhgZvoUSc9X2c80KVTi+GA=
@@ -123,8 +112,10 @@ github.com/tklauser/go-sysconf v0.3.10/go.mod h1:C8XykCvCb+Gn0oNCWPIlcb0RuglQTYa
 github.com/tklauser/numcpus v0.3.0/go.mod h1:yFGUr7TUHQRAhyqBcEg0Ge34zDBAsIvJJcyE6boqnA8=
 github.com/tklauser/numcpus v0.4.0 h1:E53Dm1HjH1/R2/aoCtXtPgzmElmn51aOkhCFSuZq//o=
 github.com/tklauser/numcpus v0.4.0/go.mod h1:1+UI3pD8NW14VMwdgJNJ1ESk2UnwhAnz5hMwiKKqXCQ=
-github.com/wdvxdr1123/ZeroBot v1.4.2-0.20220330050111-d962c23b4f4d h1:NGea1vhhGuvv7E6sPeUyPyTxCtCkEVn8ShNniZY9bQA=
-github.com/wdvxdr1123/ZeroBot v1.4.2-0.20220330050111-d962c23b4f4d/go.mod h1:NwXIp7PgjV+kUALMXJ4v4/3QcsRSOodtjhLekuPXFog=
+github.com/wcharczuk/go-chart/v2 v2.1.0 h1:tY2slqVQ6bN+yHSnDYwZebLQFkphK4WNrVwnt7CJZ2I=
+github.com/wcharczuk/go-chart/v2 v2.1.0/go.mod h1:yx7MvAVNcP/kN9lKXM/NTce4au4DFN99j6i1OwDclNA=
+github.com/wdvxdr1123/ZeroBot v1.4.2-0.20220414063422-1ca81bc47496 h1:4ANuTo7sm2cjy6cnYEKjr2JnCsaeonVC+QSqDWI5RZo=
+github.com/wdvxdr1123/ZeroBot v1.4.2-0.20220414063422-1ca81bc47496/go.mod h1:/DiS/UKTmGtOys9am9bA4i4/jOgXaoEHkjJRjuA/oZs=
 github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
 github.com/yusufpapurcu/wmi v1.2.2 h1:KBNDSne4vP5mbSWnJbO+51IMOXJB67QiYCSBrubbPRg=
 github.com/yusufpapurcu/wmi v1.2.2/go.mod h1:SBZ9tNy3G9/m5Oi98Zks0QjeHVDvuK0qfxQmPyzfmi0=
@@ -135,11 +126,11 @@ golang.org/x/crypto v0.0.0-20191205180655-e7c4368fe9dd/go.mod h1:LzIPMQfyMNhhGPh
 golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
 golang.org/x/crypto v0.0.0-20220321153916-2c7772ba3064 h1:S25/rfnfsMVgORT4/J61MJ7rdyseOZOyvLIrZEZ7s6s=
 golang.org/x/image v0.0.0-20191009234506-e7c1f5e7dbb8/go.mod h1:FeLwcggjj3mMvU+oOTbSwawSJRM1uh48EjtB4UJZlP0=
+golang.org/x/image v0.0.0-20200927104501-e162460cd6b5/go.mod h1:FeLwcggjj3mMvU+oOTbSwawSJRM1uh48EjtB4UJZlP0=
 golang.org/x/image v0.0.0-20220321031419-a8550c1d254a h1:LnH9RNcpPv5Kzi15lXg42lYMPUf0x8CuPv1YnvBWZAg=
 golang.org/x/image v0.0.0-20220321031419-a8550c1d254a/go.mod h1:023OzeP/+EPmXeapQh35lcL3II3LrY8Ic+EFFKVhULM=
 golang.org/x/mod v0.3.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
 golang.org/x/net v0.0.0-20180218175443-cbe0f9307d01/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
-golang.org/x/net v0.0.0-20180906233101-161cd47e91fd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
 golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
 golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
 golang.org/x/net v0.0.0-20200202094626-16171245cfb2/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
@@ -148,13 +139,10 @@ golang.org/x/net v0.0.0-20200421231249-e086a090c8fd/go.mod h1:qpuaurCH72eLCgpAm/
 golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU=
 golang.org/x/net v0.0.0-20220325170049-de3da57026de h1:pZB1TWnKi+o4bENlbzAgLrEbY4RMYmUIRobMcSmfeYc=
 golang.org/x/net v0.0.0-20220325170049-de3da57026de/go.mod h1:CfG3xpIq0wQ8r1q4Su4UZFWDARRcnwPjda9FqA0JpMk=
-golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
-golang.org/x/sys v0.0.0-20180909124046-d0be0721c37e/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20190422165155-953cdadca894/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20190916202348-b4ddaad3f8a3/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20191026070338-33540a1f6037/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20200116001909-b77594299b42/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
@@ -185,9 +173,6 @@ golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8T
 golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1 h1:go1bK/D/BFZV2I8cIQd1NKEZ+0owSTG1fDTci4IqFcE=
 golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
-gopkg.in/fsnotify.v1 v1.4.7/go.mod h1:Tz8NjZHkW78fSQdbUxIjBTcgA1z1m8ZHf0WmKUhAMys=
-gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7/go.mod h1:dt/ZhP58zS4L8KSrWDmTeBkI65Dw0HsyUHuEVlX15mw=
-gopkg.in/yaml.v2 v2.2.1/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
 gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
 gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b h1:h8qDotaEPuJATrMmW04NCwg7v22aHH28wwpauUhK9Oo=
 lukechampine.com/uint128 v1.1.1/go.mod h1:c4eWIwlEGaxC/+H1VguhU4PHXNWDCDMUlWdIWl2j1gk=

kanban/banner.go

@@ -10,7 +10,7 @@ import (
 var (
 	info = [...]string{
 		"* OneBot + ZeroBot + Golang",
-		"* Version 1.3.2 - 2022-03-13 13:21:15 +0800 CST",
+		"* Version 1.3.3-beta4 - 2022-04-14 17:09:47 +0800 CST",
 		"* Copyright © 2020 - 2022 FloatTech. All Rights Reserved.",
 		"* Project: https://github.com/FloatTech/ZeroBot-Plugin",
 	}

main.go

@@ -1,10 +1,12 @@
 package main
 
 import (
+	"encoding/json"
 	"flag"
 	"fmt"
 	"math/rand"
 	"os"
+	"strconv"
 	"time"
 
 	"github.com/FloatTech/ZeroBot-Plugin/kanban" // 在最前打印 banner
@@ -157,31 +159,26 @@ import (
 	// -----------------------以上为内置依赖，勿动------------------------ //
 )
 
-var (
-	nicks  = []string{"ATRI", "atri", "亚托莉", "アトリ"}
-	token  *string
-	url    *string
-	adana  *string
-	prefix *string
-)
-
 func init() {
+	sus := make([]int64, 0, 16)
 	// 解析命令行参数
+	// 输入 `-g 监听地址:端口` 指定 gui 访问地址，默认 127.0.0.1:3000
+	// g := flag.String("g", "127.0.0.1:3000", "Set web gui listening address.")
 	d := flag.Bool("d", false, "Enable debug level log and higher.")
 	w := flag.Bool("w", false, "Enable warning level log and higher.")
 	h := flag.Bool("h", false, "Display this help.")
-	// 解析命令行参数，输入 `-g 监听地址:端口` 指定 gui 访问地址，默认 127.0.0.1:3000
-	// g := flag.String("g", "127.0.0.1:3000", "Set web gui listening address.")
-
 	// 直接写死 AccessToken 时，请更改下面第二个参数
-	token = flag.String("t", "", "Set AccessToken of WSClient.")
+	token := flag.String("t", "", "Set AccessToken of WSClient.")
 	// 直接写死 URL 时，请更改下面第二个参数
-	url = flag.String("u", "ws://127.0.0.1:6700", "Set Url of WSClient.")
+	url := flag.String("u", "ws://127.0.0.1:6700", "Set Url of WSClient.")
 	// 默认昵称
-	adana = flag.String("n", "椛椛", "Set default nickname.")
-	prefix = flag.String("p", "/", "Set command prefix.")
+	adana := flag.String("n", "椛椛", "Set default nickname.")
+	prefix := flag.String("p", "/", "Set command prefix.")
+	runcfg := flag.String("c", "", "Run from config file.")
+	save := flag.String("s", "", "Save default config to file and exit.")
 
 	flag.Parse()
+
 	if *h {
 		kanban.PrintBanner()
 		fmt.Println("Usage:")
@@ -196,8 +193,61 @@ func init() {
 		}
 	}
 
+	for _, s := range flag.Args() {
+		i, err := strconv.ParseInt(s, 10, 64)
+		if err != nil {
+			continue
+		}
+		sus = append(sus, i)
+	}
+
+	// 通过代码写死的方式添加主人账号
+	// sus = append(sus, 12345678)
+	// sus = append(sus, 87654321)
+
 	// 启用 gui
 	// webctrl.InitGui(*g)
+
+	if *runcfg != "" {
+		f, err := os.Open(*runcfg)
+		if err != nil {
+			panic(err)
+		}
+		config.W = make([]*driver.WSClient, 0, 2)
+		err = json.NewDecoder(f).Decode(&config)
+		f.Close()
+		if err != nil {
+			panic(err)
+		}
+		config.Z.Driver = make([]zero.Driver, len(config.W))
+		for i, w := range config.W {
+			config.Z.Driver[i] = w
+		}
+		logrus.Infoln("[main] 从", *runcfg, "读取配置文件")
+		return
+	}
+
+	config.W = []*driver.WSClient{driver.NewWebSocketClient(*url, *token)}
+	config.Z = zero.Config{
+		NickName:      append([]string{*adana}, "ATRI", "atri", "亚托莉", "アトリ"),
+		CommandPrefix: *prefix,
+		SuperUsers:    sus,
+		Driver:        []zero.Driver{config.W[0]},
+	}
+
+	if *save != "" {
+		f, err := os.Create(*save)
+		if err != nil {
+			panic(err)
+		}
+		err = json.NewEncoder(f).Encode(&config)
+		f.Close()
+		if err != nil {
+			panic(err)
+		}
+		logrus.Infoln("[main] 配置文件已保存到", *save)
+		os.Exit(0)
+	}
 }
 
 func main() {
@@ -211,15 +261,5 @@ func main() {
 		Handle(func(ctx *zero.Ctx) {
 			ctx.SendChain(message.Text(kanban.Kanban()))
 		})
-	zero.RunAndBlock(
-		zero.Config{
-			NickName:      append([]string{*adana}, nicks...),
-			CommandPrefix: *prefix,
-			// SuperUsers 某些功能需要主人权限，可通过以下两种方式修改
-			// SuperUsers: []string{"12345678", "87654321"}, // 通过代码写死的方式添加主人账号
-			SuperUsers: flag.Args(), // 通过命令行参数的方式添加主人账号
-			Driver:     []zero.Driver{driver.NewWebSocketClient(*url, *token)},
-		},
-		process.GlobalInitMutex.Unlock,
-	)
+	zero.RunAndBlock(config.Z, process.GlobalInitMutex.Unlock)
 }

plugin/acgimage/classify.go

@@ -11,7 +11,6 @@ import (
 	"github.com/FloatTech/AnimeAPI/classify"
 
 	"github.com/FloatTech/zbputils/control"
-	"github.com/FloatTech/zbputils/control/order"
 	"github.com/FloatTech/zbputils/ctxext"
 	"github.com/FloatTech/zbputils/img/pool"
 	"github.com/FloatTech/zbputils/web"
@@ -31,7 +30,7 @@ var (
 )
 
 func init() { // 插件主体
-	engine := control.Register("acgimage", order.AcquirePrio(), &control.Options{
+	engine := control.Register("acgimage", &control.Options{
 		DisableOnDefault: false,
 		Help: "随机图片与AI点评\n" +
 			"- 随机图片(评级大于6的图将私发)\n" +
@@ -77,13 +76,13 @@ func init() { // 插件主体
 				} else {
 					url = randapi
 				}
-				setLastMsg(ctx.Event.GroupID, message.NewMessageID(
+				setLastMsg(ctx.Event.GroupID, message.NewMessageIDFromInteger(
 					ctx.SendGroupForwardMessage(ctx.Event.GroupID,
 						message.Message{
 							ctxext.FakeSenderForwardNode(ctx,
 								message.Image(url).Add("cache", "0"),
 							),
-						}).Get("message_id").String()))
+						}).Get("message_id").Int()))
 				block = false
 			}
 		})

plugin/ai_false/ai_false.go

@@ -12,14 +12,12 @@ import (
 	"github.com/shirou/gopsutil/v3/disk"
 	"github.com/shirou/gopsutil/v3/mem"
 
-	"github.com/FloatTech/zbputils/control/order"
-
 	zero "github.com/wdvxdr1123/ZeroBot"
 	"github.com/wdvxdr1123/ZeroBot/message"
 )
 
 func init() { // 插件主体
-	engine := control.Register("aifalse", order.AcquirePrio(), &control.Options{
+	engine := control.Register("aifalse", &control.Options{
 		DisableOnDefault: false,
 		Help: "AIfalse\n" +
 			"- 查询计算机当前活跃度: [检查身体 | 自检 | 启动自检 | 系统状态]",

plugin/ai_reply/ai_tts.go

@@ -17,8 +17,6 @@ import (
 	"github.com/FloatTech/AnimeAPI/tts/mockingbird"
 	"github.com/FloatTech/zbputils/control"
 	"github.com/FloatTech/zbputils/ctxext"
-
-	"github.com/FloatTech/zbputils/control/order"
 )
 
 const ttsServiceName = "tts"
@@ -51,7 +49,7 @@ func init() {
 		},
 		l: []string{"拟声鸟阿梓", "拟声鸟药水哥", "百度女声", "百度男声", "百度度逍遥", "百度度丫丫"},
 	}
-	engine := control.Register(ttsServiceName, order.AcquirePrio(), &control.Options{
+	engine := control.Register(ttsServiceName, &control.Options{
 		DisableOnDefault: true,
 		Help: "语音回复(包括拟声鸟和百度)\n" +
 			"- @Bot 任意文本(任意一句话回复)\n" +
@@ -74,7 +72,7 @@ func init() {
 						}
 						return numcn.EncodeFromFloat64(f)
 					})
-					log.Println("[tts]:", reply)
+					log.Debugln("[tts]:", reply)
 					return reply
 				})))
 			}

plugin/ai_reply/main.go

@@ -10,8 +10,6 @@ import (
 	"github.com/FloatTech/zbputils/ctxext"
 	zero "github.com/wdvxdr1123/ZeroBot"
 	"github.com/wdvxdr1123/ZeroBot/message"
-
-	"github.com/FloatTech/zbputils/control/order"
 )
 
 const (
@@ -21,7 +19,7 @@ const (
 var replyModes = [...]string{"青云客", "小爱"}
 
 func init() { // 插件主体
-	engine := control.Register(replyServiceName, order.AcquirePrio(), &control.Options{
+	engine := control.Register(replyServiceName, &control.Options{
 		DisableOnDefault: false,
 		Help: "人工智能回复\n" +
 			"- @Bot 任意文本(任意一句话回复)\n- 设置回复模式[青云客  |  小爱]\n- ",

plugin/aiwife/non-existent.go

@@ -9,8 +9,6 @@ import (
 	"github.com/FloatTech/zbputils/ctxext"
 	zero "github.com/wdvxdr1123/ZeroBot"
 	"github.com/wdvxdr1123/ZeroBot/message"
-
-	"github.com/FloatTech/zbputils/control/order"
 )
 
 const (
@@ -18,7 +16,7 @@ const (
 )
 
 func init() { // 插件主体
-	control.Register("aiwife", order.AcquirePrio(), &control.Options{
+	control.Register("aiwife", &control.Options{
 		DisableOnDefault: false,
 		Help: "AIWife\n" +
 			"- waifu | 随机waifu",

plugin/atri/atri.go

@@ -14,8 +14,6 @@ import (
 
 	control "github.com/FloatTech/zbputils/control"
 	"github.com/FloatTech/zbputils/process"
-
-	"github.com/FloatTech/zbputils/control/order"
 )
 
 const (
@@ -26,7 +24,7 @@ const (
 )
 
 func init() { // 插件主体
-	engine := control.Register(servicename, order.AcquirePrio(), &control.Options{
+	engine := control.Register(servicename, &control.Options{
 		DisableOnDefault: false,
 		Help: "本插件基于 ATRI ，为 Golang 移植版\n" +
 			"- ATRI醒醒\n- ATRI睡吧\n- 萝卜子\n- 喜欢 | 爱你 | 爱 | suki | daisuki | すき | 好き | 贴贴 | 老婆 | 亲一个 | mua\n" +
@@ -34,26 +32,16 @@ func init() { // 插件主体
 			"- 中午好 | 午安 | 午好\n- 晚安 | oyasuminasai | おやすみなさい | 晚好 | 晚上好\n- 高性能 | 太棒了 | すごい | sugoi | 斯国一 | よかった\n" +
 			"- 没事 | 没关系 | 大丈夫 | 还好 | 不要紧 | 没出大问题 | 没伤到哪\n- 好吗 | 是吗 | 行不行 | 能不能 | 可不可以\n- 啊这\n- 我好了\n- ？ | ? | ¿\n" +
 			"- 离谱\n- 答应我",
+		OnEnable: func(ctx *zero.Ctx) {
+			process.SleepAbout1sTo2s()
+			ctx.SendChain(message.Text("嗯呜呜……夏生先生……？"))
+		},
+		OnDisable: func(ctx *zero.Ctx) {
+			process.SleepAbout1sTo2s()
+			ctx.SendChain(message.Text("Zzz……Zzz……"))
+		},
 	})
-	zero.OnFullMatch("ATRI醒醒", zero.AdminPermission).SetBlock(true).
-		Handle(func(ctx *zero.Ctx) {
-			c, ok := control.Lookup(servicename)
-			if ok && !c.IsEnabledIn(ctx.Event.GroupID) {
-				c.Enable(ctx.Event.GroupID)
-				process.SleepAbout1sTo2s()
-				ctx.SendChain(message.Text("嗯呜呜……夏生先生……？"))
-			}
-		})
-	engine.OnFullMatch("ATRI睡吧", zero.AdminPermission).SetBlock(true).
-		Handle(func(ctx *zero.Ctx) {
-			c, ok := control.Lookup(servicename)
-			if ok && c.IsEnabledIn(ctx.Event.GroupID) {
-				c.Disable(ctx.Event.GroupID)
-				process.SleepAbout1sTo2s()
-				ctx.SendChain(message.Text("Zzz……Zzz……"))
-			}
-		})
-	engine.OnFullMatch("萝卜子", atriSleep).SetBlock(true).
+	engine.OnFullMatch("萝卜子", isAtriSleeping).SetBlock(true).
 		Handle(func(ctx *zero.Ctx) {
 			process.SleepAbout1sTo2s()
 			switch rand.Intn(2) {
@@ -63,12 +51,12 @@ func init() { // 插件主体
 				ctx.SendChain(randRecord("RocketPunch.amr"))
 			}
 		})
-	engine.OnFullMatchGroup([]string{"喜欢", "爱你", "爱", "suki", "daisuki", "すき", "好き", "贴贴", "老婆", "亲一个", "mua"}, atriSleep, zero.OnlyToMe).SetBlock(true).
+	engine.OnFullMatchGroup([]string{"喜欢", "爱你", "爱", "suki", "daisuki", "すき", "好き", "贴贴", "老婆", "亲一个", "mua"}, isAtriSleeping, zero.OnlyToMe).SetBlock(true).
 		Handle(func(ctx *zero.Ctx) {
 			process.SleepAbout1sTo2s()
 			ctx.SendChain(randImage("SUKI.jpg", "SUKI1.jpg", "SUKI2.png"))
 		})
-	engine.OnKeywordGroup([]string{"草你妈", "操你妈", "脑瘫", "废柴", "fw", "five", "废物", "战斗", "爬", "爪巴", "sb", "SB", "傻B"}, atriSleep, zero.OnlyToMe).SetBlock(true).
+	engine.OnKeywordGroup([]string{"草你妈", "操你妈", "脑瘫", "废柴", "fw", "five", "废物", "战斗", "爬", "爪巴", "sb", "SB", "傻B"}, isAtriSleeping, zero.OnlyToMe).SetBlock(true).
 		Handle(func(ctx *zero.Ctx) {
 			process.SleepAbout1sTo2s()
 			ctx.SendChain(randImage("FN.jpg", "WQ.jpg", "WQ1.jpg"))
@@ -169,7 +157,7 @@ func init() { // 插件主体
 				))
 			}
 		})
-	engine.OnKeywordGroup([]string{"高性能", "太棒了", "すごい", "sugoi", "斯国一", "よかった"}, atriSleep, zero.OnlyToMe).SetBlock(true).
+	engine.OnKeywordGroup([]string{"高性能", "太棒了", "すごい", "sugoi", "斯国一", "よかった"}, isAtriSleeping, zero.OnlyToMe).SetBlock(true).
 		Handle(func(ctx *zero.Ctx) {
 			process.SleepAbout1sTo2s()
 			ctx.SendChain(randText(
@@ -190,7 +178,7 @@ func init() { // 插件主体
 				"呣......我的高性能，毫无遗憾地施展出来了......",
 			))
 		})
-	engine.OnKeywordGroup([]string{"没事", "没关系", "大丈夫", "还好", "不要紧", "没出大问题", "没伤到哪"}, atriSleep, zero.OnlyToMe).SetBlock(true).
+	engine.OnKeywordGroup([]string{"没事", "没关系", "大丈夫", "还好", "不要紧", "没出大问题", "没伤到哪"}, isAtriSleeping, zero.OnlyToMe).SetBlock(true).
 		Handle(func(ctx *zero.Ctx) {
 			process.SleepAbout1sTo2s()
 			ctx.SendChain(randText(
@@ -205,26 +193,26 @@ func init() { // 插件主体
 			))
 		})
 
-	engine.OnKeywordGroup([]string{"好吗", "是吗", "行不行", "能不能", "可不可以"}, atriSleep).SetBlock(true).
+	engine.OnKeywordGroup([]string{"好吗", "是吗", "行不行", "能不能", "可不可以"}, isAtriSleeping).SetBlock(true).
 		Handle(func(ctx *zero.Ctx) {
 			process.SleepAbout1sTo2s()
 			if rand.Intn(2) == 0 {
 				ctx.SendChain(randImage("YES.png", "NO.jpg"))
 			}
 		})
-	engine.OnKeywordGroup([]string{"啊这"}, atriSleep).SetBlock(true).
+	engine.OnKeywordGroup([]string{"啊这"}, isAtriSleeping).SetBlock(true).
 		Handle(func(ctx *zero.Ctx) {
 			process.SleepAbout1sTo2s()
 			if rand.Intn(2) == 0 {
 				ctx.SendChain(randImage("AZ.jpg", "AZ1.jpg"))
 			}
 		})
-	engine.OnKeywordGroup([]string{"我好了"}, atriSleep).SetBlock(true).
+	engine.OnKeywordGroup([]string{"我好了"}, isAtriSleeping).SetBlock(true).
 		Handle(func(ctx *zero.Ctx) {
 			process.SleepAbout1sTo2s()
 			ctx.SendChain(message.Reply(ctx.Event.MessageID), randText("不许好！", "憋回去！"))
 		})
-	engine.OnFullMatchGroup([]string{"？", "?", "¿"}, atriSleep).SetBlock(true).
+	engine.OnFullMatchGroup([]string{"？", "?", "¿"}, isAtriSleeping).SetBlock(true).
 		Handle(func(ctx *zero.Ctx) {
 			process.SleepAbout1sTo2s()
 			switch rand.Intn(5) {
@@ -234,7 +222,7 @@ func init() { // 插件主体
 				ctx.SendChain(randImage("WH.jpg", "WH1.jpg", "WH2.jpg", "WH3.jpg"))
 			}
 		})
-	engine.OnKeyword("离谱", atriSleep).SetBlock(true).
+	engine.OnKeyword("离谱", isAtriSleeping).SetBlock(true).
 		Handle(func(ctx *zero.Ctx) {
 			switch rand.Intn(5) {
 			case 0:
@@ -243,7 +231,7 @@ func init() { // 插件主体
 				ctx.SendChain(randImage("WH.jpg"))
 			}
 		})
-	engine.OnKeyword("答应我", atriSleep, zero.OnlyToMe).SetBlock(true).
+	engine.OnKeyword("答应我", isAtriSleeping, zero.OnlyToMe).SetBlock(true).
 		Handle(func(ctx *zero.Ctx) {
 			process.SleepAbout1sTo2s()
 			ctx.SendChain(randText("我无法回应你的请求"))
@@ -262,8 +250,8 @@ func randRecord(file ...string) message.MessageSegment {
 	return message.Record(res + file[rand.Intn(len(file))])
 }
 
-// atriSleep 凌晨0点到6点，ATRI 在睡觉，不回应任何请求
-func atriSleep(ctx *zero.Ctx) bool {
+// isAtriSleeping 凌晨0点到6点，ATRI 在睡觉，不回应任何请求
+func isAtriSleeping(ctx *zero.Ctx) bool {
 	if now := time.Now().Hour(); now >= 1 && now < 6 {
 		return false
 	}

plugin/b14/main.go

@@ -10,12 +10,10 @@ import (
 	zero "github.com/wdvxdr1123/ZeroBot"
 	"github.com/wdvxdr1123/ZeroBot/message"
 	"github.com/wdvxdr1123/ZeroBot/utils/helper"
-
-	"github.com/FloatTech/zbputils/control/order"
 )
 
 func init() {
-	en := control.Register("base16384", order.AcquirePrio(), &control.Options{
+	en := control.Register("base16384", &control.Options{
 		DisableOnDefault: false,
 		Help: "base16384加解密\n" +
 			"- 加密xxx\n- 解密xxx\n- 用yyy加密xxx\n- 用yyy解密xxx",

plugin/baidu/search.go

@@ -8,12 +8,11 @@ import (
 	"github.com/wdvxdr1123/ZeroBot/message"
 
 	"github.com/FloatTech/zbputils/control"
-	"github.com/FloatTech/zbputils/control/order"
 	"github.com/FloatTech/zbputils/ctxext"
 )
 
 func init() {
-	control.Register("baidu", order.AcquirePrio(), &control.Options{
+	control.Register("baidu", &control.Options{
 		DisableOnDefault: false,
 		Help: "baidu\n" +
 			"- 百度下[xxx]",

plugin/bilibili/info.go

@@ -11,7 +11,6 @@ import (
 	"time"
 
 	control "github.com/FloatTech/zbputils/control"
-	"github.com/FloatTech/zbputils/control/order"
 	"github.com/FloatTech/zbputils/file"
 	"github.com/FloatTech/zbputils/img"
 	"github.com/FloatTech/zbputils/img/text"
@@ -23,7 +22,7 @@ import (
 	"github.com/wdvxdr1123/ZeroBot/message"
 )
 
-var engine = control.Register("bilibili", order.AcquirePrio(), &control.Options{
+var engine = control.Register("bilibili", &control.Options{
 	DisableOnDefault: false,
 	Help: "bilibili\n" +
 		"- >vup info [xxx]\n" +
@@ -147,19 +146,21 @@ func init() {
 				}
 			}
 			facePath := cachePath + id + "vupFace.png"
-			initFacePic(facePath, u.Face)
+			err = initFacePic(facePath, u.Face)
+			if err != nil {
+				ctx.SendChain(message.Text("ERROR:", err))
+				return
+			}
 			var backX int
 			var backY int
 			back, err := gg.LoadImage(facePath)
 			if err != nil {
 				ctx.SendChain(message.Text("ERROR:", err))
-				backX = 500
-				backY = 500
-			} else {
-				back = img.Limit(back, 500, 500)
-				backX = back.Bounds().Size().X
-				backY = back.Bounds().Size().Y
+				return
 			}
+			back = img.Limit(back, 500, 500)
+			backX = back.Bounds().Size().X
+			backY = back.Bounds().Size().Y
 			if len(vups) > 50 {
 				ctx.SendChain(message.Text(u.Name + "关注的up主太多了，只展示前50个up"))
 				vups = vups[:50]
@@ -172,6 +173,10 @@ func init() {
 				canvas.DrawImage(back, 0, 0)
 			}
 			canvas.SetColor(color.Black)
+			_, err = file.GetLazyData(text.BoldFontFile, false, true)
+			if err != nil {
+				ctx.SendChain(message.Text("ERROR:", err))
+			}
 			if err = canvas.LoadFontFace(text.BoldFontFile, fontSize); err != nil {
 				ctx.SendChain(message.Text("ERROR:", err))
 				return
@@ -265,22 +270,27 @@ func init() {
 	engine.OnFullMatch("更新vup", zero.SuperUserPermission).SetBlock(true).
 		Handle(func(ctx *zero.Ctx) {
 			ctx.SendChain(message.Text("少女祈祷中..."))
-			updateVup()
+			err := updateVup()
+			if err != nil {
+				ctx.SendChain(message.Text("ERROR:", err))
+				return
+			}
 			ctx.SendChain(message.Text("vup已更新"))
 		})
 }
 
-func initFacePic(filename, faceURL string) {
+func initFacePic(filename, faceURL string) error {
 	if file.IsNotExist(filename) {
 		data, err := web.GetData(faceURL)
 		if err != nil {
-			log.Errorln("[bilibili]", err)
+			return err
 		}
 		err = os.WriteFile(filename, data, 0666)
 		if err != nil {
-			log.Errorln("[bilibili]", err)
+			return err
 		}
 	}
+	return nil
 }
 
 func int2rbg(t int64) (int64, int64, int64) {

plugin/bilibili/model.go

@@ -7,7 +7,6 @@ import (
 	"github.com/FloatTech/zbputils/web"
 	_ "github.com/fumiama/sqlite3" // use sql
 	"github.com/jinzhu/gorm"
-	log "github.com/sirupsen/logrus"
 	"github.com/tidwall/gjson"
 )
 
@@ -84,11 +83,11 @@ func (vdb *vupdb) filterVup(ids []int64) (vups []vup, err error) {
 	return
 }
 
-func updateVup() {
+func updateVup() error {
 	for _, v := range vtbURLs {
 		data, err := web.GetData(v)
 		if err != nil {
-			log.Errorln("[bilibili]:", err)
+			return err
 		}
 		gjson.Get(binary.BytesToString(data), "@this").ForEach(func(key, value gjson.Result) bool {
 			mid := value.Get("mid").Int()
@@ -96,11 +95,15 @@ func updateVup() {
 			roomid := value.Get("roomid").Int()
 			err = vdb.insertVupByMid(mid, uname, roomid)
 			if err != nil {
-				log.Errorln("[bilibili]:", err)
+				return false
 			}
 			return true
 		})
+		if err != nil {
+			return err
+		}
 	}
+	return nil
 }
 
 func (vdb *vupdb) setBilibiliCookie(cookie string) (err error) {

plugin/bilibili_parse/bilibili_parse.go

@@ -8,11 +8,8 @@ import (
 
 	"github.com/FloatTech/zbputils/control"
 	"github.com/antchfx/htmlquery"
-	log "github.com/sirupsen/logrus"
 	zero "github.com/wdvxdr1123/ZeroBot"
 	"github.com/wdvxdr1123/ZeroBot/message"
-
-	"github.com/FloatTech/zbputils/control/order"
 )
 
 const (
@@ -21,7 +18,7 @@ const (
 )
 
 func init() {
-	engine := control.Register("bilibiliparse", order.AcquirePrio(), &control.Options{
+	engine := control.Register("bilibiliparse", &control.Options{
 		DisableOnDefault: false,
 		Help: "b站视频链接解析\n" +
 			"- https://www.bilibili.com/video/BV1xx411c7BF | https://www.bilibili.com/video/av1605 | https://b23.tv/I8uzWCA | https://www.bilibili.com/video/bv1xx411c7BF",
@@ -29,17 +26,21 @@ func init() {
 
 	engine.OnRegex(bilibiliRe).SetBlock(true).Handle(func(ctx *zero.Ctx) {
 		bilibiliURL := ctx.State["regex_matched"].([]string)[0]
-		m := parseURL(bilibiliURL)
+		m, err := parseURL(bilibiliURL)
+		if err != nil {
+			ctx.SendChain(message.Text("ERROR:", err))
+			return
+		}
 		if len(m) != 0 {
 			ctx.Send(m)
 		}
 	})
 }
 
-func parseURL(bilibiliURL string) (m message.Message) {
+func parseURL(bilibiliURL string) (m message.Message, err error) {
 	doc, err := htmlquery.LoadURL(bilibiliURL)
 	if err != nil {
-		log.Errorln("[bilibiliparse]:访问的链接为", bilibiliURL, ",错误为", err)
+		return
 	}
 	videoURL := htmlquery.FindOne(doc, "/html/head/meta[@itemprop='url']").Attr[2].Val
 	re := regexp.MustCompile(validRe)

plugin/bilibili_push/bilibili_push.go

@@ -15,7 +15,6 @@ import (
 
 	"github.com/FloatTech/zbputils/binary"
 	"github.com/FloatTech/zbputils/control"
-	"github.com/FloatTech/zbputils/control/order"
 	"github.com/FloatTech/zbputils/img/text"
 	"github.com/FloatTech/zbputils/web"
 )
@@ -37,13 +36,14 @@ var bdb *bilibilipushdb
 var (
 	lastTime = map[int64]int64{}
 	typeMsg  = map[int64]string{
-		1:   "转发了一条动态",
-		2:   "有图营业",
-		4:   "无图营业",
-		8:   "发布了新投稿",
-		16:  "发布了短视频",
-		64:  "发布了新专栏",
-		256: "发布了新音频",
+		1:    "转发了一条动态",
+		2:    "有图营业",
+		4:    "无图营业",
+		8:    "发布了新投稿",
+		16:   "发布了短视频",
+		64:   "发布了新专栏",
+		256:  "发布了新音频",
+		2048: "发布了新简报",
 	}
 	liveStatus  = map[int64]int{}
 	uidErrorMsg = map[int]string{
@@ -57,14 +57,14 @@ var (
 
 func init() {
 	go bilibiliPushDaily()
-	en := control.Register(serviceName, order.AcquirePrio(), &control.Options{
+	en := control.Register(serviceName, &control.Options{
 		DisableOnDefault: false,
 		Help: "bilibilipush\n" +
-			"- 添加订阅[uid]\n" +
-			"- 取消订阅[uid]\n" +
-			"- 取消动态订阅[uid]\n" +
-			"- 取消直播订阅[uid]\n" +
-			"- 推送列表",
+			"- 添加b站订阅[uid]\n" +
+			"- 取消b站订阅[uid]\n" +
+			"- 取消b站动态订阅[uid]\n" +
+			"- 取消b站直播订阅[uid]\n" +
+			"- b站推送列表",
 		PrivateDataFolder: serviceName,
 	})
 
@@ -73,16 +73,20 @@ func init() {
 		dbpath := en.DataFolder()
 		dbfile := dbpath + "push.db"
 		bdb = initialize(dbfile)
-		log.Println("[bilibilipush]加载bilibilipush数据库")
 	}()
 
-	en.OnRegex(`^添加订阅\s?(\d+)$`, zero.UserOrGrpAdmin).SetBlock(true).Handle(func(ctx *zero.Ctx) {
+	en.OnRegex(`^添加b站订阅\s?(\d+)$`, zero.UserOrGrpAdmin).SetBlock(true).Handle(func(ctx *zero.Ctx) {
 		buid, _ := strconv.ParseInt(ctx.State["regex_matched"].([]string)[1], 10, 64)
 		var name string
 		var ok bool
 		if name, ok = upMap[buid]; !ok {
 			var status int
-			status, name = checkBuid(buid)
+			var err error
+			status, name, err = checkBuid(buid)
+			if err != nil {
+				ctx.SendChain(message.Text("ERROR:", err))
+				return
+			}
 			if status != 0 {
 				msg, ok := uidErrorMsg[status]
 				if !ok {
@@ -97,18 +101,23 @@ func init() {
 			gid = -ctx.Event.UserID
 		}
 		if err := subscribe(buid, gid); err != nil {
-			log.Errorln("[bilibilipush]:", err)
-		} else {
-			ctx.SendChain(message.Text("已添加" + name + "的订阅"))
+			ctx.SendChain(message.Text("ERROR:", err))
+			return
 		}
+		ctx.SendChain(message.Text("已添加" + name + "的订阅"))
 	})
-	en.OnRegex(`^取消订阅\s?(\d+)$`, zero.UserOrGrpAdmin).SetBlock(true).Handle(func(ctx *zero.Ctx) {
+	en.OnRegex(`^取消b站订阅\s?(\d+)$`, zero.UserOrGrpAdmin).SetBlock(true).Handle(func(ctx *zero.Ctx) {
 		buid, _ := strconv.ParseInt(ctx.State["regex_matched"].([]string)[1], 10, 64)
 		var name string
 		var ok bool
 		if name, ok = upMap[buid]; !ok {
 			var status int
-			status, name = checkBuid(buid)
+			var err error
+			status, name, err = checkBuid(buid)
+			if err != nil {
+				ctx.SendChain(message.Text("ERROR:", err))
+				return
+			}
 			if status != 0 {
 				msg, ok := uidErrorMsg[status]
 				if !ok {
@@ -123,18 +132,23 @@ func init() {
 			gid = -ctx.Event.UserID
 		}
 		if err := unsubscribe(buid, gid); err != nil {
-			log.Errorln("[bilibilipush]:", err)
-		} else {
-			ctx.SendChain(message.Text("已取消" + name + "的订阅"))
+			ctx.SendChain(message.Text("ERROR:", err))
+			return
 		}
+		ctx.SendChain(message.Text("已取消" + name + "的订阅"))
 	})
-	en.OnRegex(`^取消动态订阅\s?(\d+)$`, zero.UserOrGrpAdmin).SetBlock(true).Handle(func(ctx *zero.Ctx) {
+	en.OnRegex(`^取消b站动态订阅\s?(\d+)$`, zero.UserOrGrpAdmin).SetBlock(true).Handle(func(ctx *zero.Ctx) {
 		buid, _ := strconv.ParseInt(ctx.State["regex_matched"].([]string)[1], 10, 64)
 		var name string
 		var ok bool
 		if name, ok = upMap[buid]; !ok {
 			var status int
-			status, name = checkBuid(buid)
+			var err error
+			status, name, err = checkBuid(buid)
+			if err != nil {
+				ctx.SendChain(message.Text("ERROR:", err))
+				return
+			}
 			if status != 0 {
 				msg, ok := uidErrorMsg[status]
 				if !ok {
@@ -149,18 +163,23 @@ func init() {
 			gid = -ctx.Event.UserID
 		}
 		if err := unsubscribeDynamic(buid, gid); err != nil {
-			log.Errorln("[bilibilipush]:", err)
-		} else {
-			ctx.SendChain(message.Text("已取消" + name + "的动态订阅"))
+			ctx.SendChain(message.Text("ERROR:", err))
+			return
 		}
+		ctx.SendChain(message.Text("已取消" + name + "的动态订阅"))
 	})
-	en.OnRegex(`^取消直播订阅\s?(\d+)$`, zero.UserOrGrpAdmin).SetBlock(true).Handle(func(ctx *zero.Ctx) {
+	en.OnRegex(`^取消b站直播订阅\s?(\d+)$`, zero.UserOrGrpAdmin).SetBlock(true).Handle(func(ctx *zero.Ctx) {
 		buid, _ := strconv.ParseInt(ctx.State["regex_matched"].([]string)[1], 10, 64)
 		var name string
 		var ok bool
 		if name, ok = upMap[buid]; !ok {
 			var status int
-			status, name = checkBuid(buid)
+			var err error
+			status, name, err = checkBuid(buid)
+			if err != nil {
+				ctx.SendChain(message.Text("ERROR:", err))
+				return
+			}
 			if status != 0 {
 				msg, ok := uidErrorMsg[status]
 				if !ok {
@@ -175,19 +194,19 @@ func init() {
 			gid = -ctx.Event.UserID
 		}
 		if err := unsubscribeLive(buid, gid); err != nil {
-			log.Errorln("[bilibilipush]:", err)
-		} else {
-			ctx.SendChain(message.Text("已取消" + name + "的直播订阅"))
+			ctx.SendChain(message.Text("ERROR:", err))
+			return
 		}
+		ctx.SendChain(message.Text("已取消" + name + "的直播订阅"))
 	})
-	en.OnFullMatch("推送列表", zero.UserOrGrpAdmin).SetBlock(true).Handle(func(ctx *zero.Ctx) {
+	en.OnFullMatch("b站推送列表", zero.UserOrGrpAdmin).SetBlock(true).Handle(func(ctx *zero.Ctx) {
 		gid := ctx.Event.GroupID
 		if gid == 0 {
 			gid = -ctx.Event.UserID
 		}
 		bpl := bdb.getAllPushByGroup(gid)
 		fmt.Println(bpl)
-		msg := "--------推送列表--------"
+		msg := "--------b站推送列表--------"
 		for _, v := range bpl {
 			if _, ok := upMap[v.BilibiliUID]; !ok {
 				bdb.updateAllUp()
@@ -209,7 +228,8 @@ func init() {
 		}
 		data, err := text.RenderToBase64(msg, text.FontFile, 600, 20)
 		if err != nil {
-			log.Errorln("[bilibilipush]:", err)
+			ctx.SendChain(message.Text("ERROR:", err))
+			return
 		}
 		if id := ctx.SendChain(message.Image("base64://" + binary.BytesToString(data))); id.ID() == 0 {
 			ctx.SendChain(message.Text("ERROR:可能被风控了"))
@@ -221,16 +241,16 @@ func bilibiliPushDaily() {
 	t := time.NewTicker(time.Second * 10)
 	defer t.Stop()
 	for range t.C {
-		log.Println("-----bilibilipush拉取推送信息-----")
-		sendDynamic()
-		sendLive()
+		log.Debugln("-----bilibilipush拉取推送信息-----")
+		_ = sendDynamic()
+		_ = sendLive()
 	}
 }
 
-func checkBuid(buid int64) (status int, name string) {
+func checkBuid(buid int64) (status int, name string, err error) {
 	data, err := web.RequestDataWith(web.NewDefaultClient(), fmt.Sprintf(infoURL, buid), "GET", referer, ua)
 	if err != nil {
-		log.Errorln("[bilibilipush]:", err)
+		return
 	}
 	status = int(gjson.Get(binary.BytesToString(data), "code").Int())
 	name = gjson.Get(binary.BytesToString(data), "data.name").String()
@@ -285,37 +305,37 @@ func unsubscribeLive(buid, groupid int64) (err error) {
 	return
 }
 
-func getUserDynamicCard(buid int64) (cardList []gjson.Result) {
+func getUserDynamicCard(buid int64) (cardList []gjson.Result, err error) {
 	data, err := web.RequestDataWith(web.NewDefaultClient(), fmt.Sprintf(userDynamicURL, buid), "GET", referer, ua)
 	if err != nil {
-		log.Errorln("[bilibilipush]:", err)
+		return
 	}
 	cardList = gjson.Get(binary.BytesToString(data), "data.cards").Array()
 	return
 }
 
-func getLiveList(uids ...int64) string {
+func getLiveList(uids ...int64) (string, error) {
 	m := make(map[string]interface{})
 	m["uids"] = uids
 	b, _ := json.Marshal(m)
 	data, err := web.PostData(liveListURL, "application/json", bytes.NewReader(b))
 	if err != nil {
-		log.Errorln("[bilibilipush]:", err)
+		return "", err
 	}
-	return binary.BytesToString(data)
+	return binary.BytesToString(data), nil
 }
 
-func sendDynamic() {
+func sendDynamic() error {
 	uids := bdb.getAllBuidByDynamic()
 	for _, buid := range uids {
-		cardList := getUserDynamicCard(buid)
-		if len(cardList) == 0 {
-			return
+		cardList, err := getUserDynamicCard(buid)
+		if err != nil {
+			return err
 		}
 		t, ok := lastTime[buid]
 		if !ok {
 			lastTime[buid] = cardList[0].Get("desc.timestamp").Int()
-			return
+			return nil
 		}
 		for i := len(cardList) - 1; i >= 0; i-- {
 			ct := cardList[i].Get("desc.timestamp").Int()
@@ -402,6 +422,19 @@ func sendDynamic() {
 							msg = append(msg, message.Text(cTitle))
 							cCover := gjson.Get(cOrigin, "cover").String()
 							msg = append(msg, message.Image(cCover))
+						case 2048:
+							cName := gjson.Get(cOrigin, "user.uname").String()
+							msg = append(msg, message.Text(cName+typeMsg[cOrigType]+"\n"))
+							cContent := gjson.Get(cOrigin, "vest.content").String()
+							msg = append(msg, message.Text(cContent+"\n"))
+							cTitle := gjson.Get(cOrigin, "sketch.title").String()
+							msg = append(msg, message.Text(cTitle+"\n"))
+							cDescText := gjson.Get(cOrigin, "sketch.desc_text").String()
+							msg = append(msg, message.Text(cDescText))
+							cCoverURL := gjson.Get(cOrigin, "sketch.cover_url").String()
+							msg = append(msg, message.Image(cCoverURL))
+							cTargetURL := gjson.Get(cOrigin, "sketch.target_url").String()
+							msg = append(msg, message.Text("简报链接："+cTargetURL+"\n"))
 						default:
 							msg = append(msg, message.Text("未知动态类型"+strconv.FormatInt(cOrigType, 10)+"\n"))
 						}
@@ -463,6 +496,19 @@ func sendDynamic() {
 						msg = append(msg, message.Text(cTitle))
 						cCover := gjson.Get(cardStr, "cover").String()
 						msg = append(msg, message.Image(cCover))
+					case 2048:
+						cName := gjson.Get(cardStr, "user.uname").String()
+						msg = append(msg, message.Text(cName+typeMsg[cType]+"\n"))
+						cContent := gjson.Get(cardStr, "vest.content").String()
+						msg = append(msg, message.Text(cContent+"\n"))
+						cTitle := gjson.Get(cardStr, "sketch.title").String()
+						msg = append(msg, message.Text(cTitle+"\n"))
+						cDescText := gjson.Get(cardStr, "sketch.desc_text").String()
+						msg = append(msg, message.Text(cDescText))
+						cCoverURL := gjson.Get(cardStr, "sketch.cover_url").String()
+						msg = append(msg, message.Image(cCoverURL))
+						cTargetURL := gjson.Get(cardStr, "sketch.target_url").String()
+						msg = append(msg, message.Text("简报链接："+cTargetURL+"\n"))
 					default:
 						msg = append(msg, message.Text("未知动态类型"+strconv.FormatInt(cType, 10)+"\n"))
 					}
@@ -477,8 +523,6 @@ func sendDynamic() {
 									ctx.SendGroupMessage(gid, msg)
 								case gid < 0:
 									ctx.SendPrivateMessage(-gid, msg)
-								default:
-									log.Errorln("[bilibilipush]:gid为0")
 								}
 							}
 						}
@@ -488,11 +532,16 @@ func sendDynamic() {
 			}
 		}
 	}
+	return nil
 }
 
-func sendLive() {
+func sendLive() error {
 	uids := bdb.getAllBuidByLive()
-	gjson.Get(getLiveList(uids...), "data").ForEach(func(key, value gjson.Result) bool {
+	ll, err := getLiveList(uids...)
+	if err != nil {
+		return err
+	}
+	gjson.Get(ll, "data").ForEach(func(key, value gjson.Result) bool {
 		newStatus := int(value.Get("live_status").Int())
 		if newStatus == 2 {
 			newStatus = 0
@@ -531,8 +580,6 @@ func sendLive() {
 								ctx.SendGroupMessage(gid, msg)
 							case gid < 0:
 								ctx.SendPrivateMessage(-gid, msg)
-							default:
-								log.Errorln("[bilibilipush]:gid为0")
 							}
 						}
 					}
@@ -544,4 +591,5 @@ func sendLive() {
 		}
 		return true
 	})
+	return nil
 }

plugin/book_review/book_review.go

@@ -8,13 +8,12 @@ import (
 
 	"github.com/FloatTech/zbputils/binary"
 	"github.com/FloatTech/zbputils/control"
-	"github.com/FloatTech/zbputils/control/order"
 	"github.com/FloatTech/zbputils/file"
 	"github.com/FloatTech/zbputils/img/text"
 )
 
 func init() {
-	engine := control.Register("bookreview", order.AcquirePrio(), &control.Options{
+	engine := control.Register("bookreview", &control.Options{
 		DisableOnDefault: false,
 		Help:             "哀伤雪刃推书记录\n- 书评[xxx]\n- 随机书评",
 		PublicDataFolder: "BookReview",
@@ -42,7 +41,8 @@ func init() {
 			b := getBookReviewByKeyword(ctx.State["regex_matched"].([]string)[1])
 			data, err := text.RenderToBase64(b.BookReview, text.FontFile, 400, 20)
 			if err != nil {
-				log.Println("err:", err)
+				ctx.SendChain(message.Text("ERROR:", err))
+				return
 			}
 			if id := ctx.SendChain(message.Image("base64://" + binary.BytesToString(data))); id.ID() == 0 {
 				ctx.SendChain(message.Text("ERROR:可能被风控了"))
@@ -54,7 +54,8 @@ func init() {
 			br := getRandomBookReview()
 			data, err := text.RenderToBase64(br.BookReview, text.FontFile, 400, 20)
 			if err != nil {
-				log.Println("err:", err)
+				ctx.SendChain(message.Text("ERROR:", err))
+				return
 			}
 			if id := ctx.SendChain(message.Image("base64://" + binary.BytesToString(data))); id.ID() == 0 {
 				ctx.SendChain(message.Text("ERROR:可能被风控了"))

plugin/cangtoushi/cangtoushi.go

@@ -11,12 +11,9 @@ import (
 
 	control "github.com/FloatTech/zbputils/control"
 	"github.com/antchfx/htmlquery"
-	log "github.com/sirupsen/logrus"
 	zero "github.com/wdvxdr1123/ZeroBot"
 	"github.com/wdvxdr1123/ZeroBot/message"
 	"github.com/wdvxdr1123/ZeroBot/utils/helper"
-
-	"github.com/FloatTech/zbputils/control/order"
 )
 
 const (
@@ -32,92 +29,110 @@ var (
 )
 
 func init() {
-	engine := control.Register("cangtoushi", order.AcquirePrio(), &control.Options{
+	engine := control.Register("cangtoushi", &control.Options{
 		DisableOnDefault: false,
 		Help: "藏头诗\n" +
 			"- 藏头诗[xxx]\n- 藏尾诗[xxx]",
 	})
 	engine.OnRegex(`藏头诗\s?([一-龥]{3,10})$`).SetBlock(true).Handle(func(ctx *zero.Ctx) {
 		kw := ctx.State["regex_matched"].([]string)[1]
-		login()
+		err := login()
+		if err != nil {
+			ctx.SendChain(message.Text("ERROR:", err))
+			return
+		}
 		data, err := search(kw, "7", "0")
 		if err != nil {
-			log.Errorln("[cangtoushi]:", err)
+			ctx.SendChain(message.Text("ERROR:", err))
+			return
+		}
+		text, err := dealHTML(helper.BytesToString(data))
+		if err != nil {
+			ctx.SendChain(message.Text("ERROR:", err))
+			return
 		}
-		text := dealHTML(helper.BytesToString(data))
 		ctx.SendChain(message.Text(text))
 	})
 
 	engine.OnRegex(`藏尾诗\s?([一-龥]{3,10})$`).SetBlock(true).Handle(func(ctx *zero.Ctx) {
 		kw := ctx.State["regex_matched"].([]string)[1]
-		login()
+		err := login()
+		if err != nil {
+			ctx.SendChain(message.Text("ERROR:", err))
+			return
+		}
 		data, err := search(kw, "7", "2")
 		if err != nil {
-			log.Errorln("[cangtoushi]:", err)
+			ctx.SendChain(message.Text("ERROR:", err))
+			return
+		}
+		text, err := dealHTML(helper.BytesToString(data))
+		if err != nil {
+			ctx.SendChain(message.Text("ERROR:", err))
+			return
 		}
-		text := dealHTML(helper.BytesToString(data))
 		ctx.SendChain(message.Text(text))
 	})
 }
 
-func login() {
+func login() error {
 	gCurCookieJar, _ = cookiejar.New(nil)
 	client := &http.Client{
 		Jar: gCurCookieJar,
 	}
 	request, err := http.NewRequest("GET", loginURL, nil)
 	if err != nil {
-		log.Errorln("[cangtoushi]:", err)
+		return err
 	}
 	request.Header.Add("User-Agent", ua)
 	response, err := client.Do(request)
 	if err != nil {
-		log.Errorln("[cangtoushi]:", err)
+		return err
 	}
 	data, err := io.ReadAll(response.Body)
 	if err != nil {
-		log.Errorln("[cangtoushi]:", err)
+		return err
 	}
 	response.Body.Close()
 	doc, err := htmlquery.Parse(strings.NewReader(helper.BytesToString(data)))
 	if err != nil {
-		log.Errorln("[cangtoushi]:", err)
+		return err
 	}
 	csrf = htmlquery.SelectAttr(htmlquery.FindOne(doc, "//input[@name='_csrf']"), "value")
+	return nil
 }
 
 func search(kw, zishu, position string) (data []byte, err error) {
 	postStr := fmt.Sprintf("_csrf=%s&kw=%s&zishu=%s&position=%s", url.QueryEscape(csrf), url.QueryEscape(kw), zishu, position)
-	log.Println("postStr:", postStr)
 	client := &http.Client{
 		Jar: gCurCookieJar,
 	}
 	request, err := http.NewRequest("POST", searchURL, strings.NewReader(postStr))
 	if err != nil {
-		log.Errorln("[cangtoushi]:", err)
+		return nil, err
 	}
 	request.Header.Add("Referer", referer)
 	request.Header.Add("User-Agent", ua)
 	request.Header.Add("Content-Type", "application/x-www-form-urlencoded")
 	response, err := client.Do(request)
 	if err != nil {
-		log.Errorln("[cangtoushi]:", err)
+		return nil, err
 	}
 	data, err = io.ReadAll(response.Body)
 	if err != nil {
-		log.Errorln("[cangtoushi]:", err)
+		return nil, err
 	}
 	response.Body.Close()
 	return
 }
 
-func dealHTML(data string) (text string) {
+func dealHTML(data string) (text string, err error) {
 	doc, err := htmlquery.Parse(strings.NewReader(data))
 	if err != nil {
-		log.Errorln("[cangtoushi]:", err)
+		return "", err
 	}
 	text = htmlquery.InnerText(htmlquery.FindOne(doc, "//div[@class='card']/div[@class='card']"))
 	text = strings.ReplaceAll(text, " ", "")
 	text = strings.Replace(text, "\n", "", 1)
-	return text
+	return text, nil
 }

plugin/chat/chat.go

@@ -10,13 +10,11 @@ import (
 	zero "github.com/wdvxdr1123/ZeroBot"
 	"github.com/wdvxdr1123/ZeroBot/extension/rate"
 	"github.com/wdvxdr1123/ZeroBot/message"
-
-	"github.com/FloatTech/zbputils/control/order"
 )
 
 var (
-	poke   = rate.NewManager(time.Minute*5, 8) // 戳一戳
-	engine = control.Register("chat", order.AcquirePrio(), &control.Options{
+	poke   = rate.NewManager[int64](time.Minute*5, 8) // 戳一戳
+	engine = control.Register("chat", &control.Options{
 		DisableOnDefault: false,
 		Help:             "chat\n- [BOT名字]\n- [戳一戳BOT]\n- 空调开\n- 空调关\n- 群温度\n- 设置温度[正整数]",
 	})

plugin/choose/choose.go

@@ -9,12 +9,10 @@ import (
 	control "github.com/FloatTech/zbputils/control"
 	zero "github.com/wdvxdr1123/ZeroBot"
 	"github.com/wdvxdr1123/ZeroBot/message"
-
-	"github.com/FloatTech/zbputils/control/order"
 )
 
 func init() {
-	engine := control.Register("choose", order.AcquirePrio(), &control.Options{
+	engine := control.Register("choose", &control.Options{
 		DisableOnDefault: false,
 		Help: "choose\n" +
 			"- 选择可口可乐还是百事可乐\n" +

plugin/chouxianghua/chouxianghua.go

@@ -7,12 +7,11 @@ import (
 	"github.com/wdvxdr1123/ZeroBot/message"
 
 	"github.com/FloatTech/zbputils/control"
-	"github.com/FloatTech/zbputils/control/order"
 	"github.com/FloatTech/zbputils/file"
 )
 
 func init() {
-	en := control.Register("chouxianghua", order.AcquirePrio(), &control.Options{
+	en := control.Register("chouxianghua", &control.Options{
 		DisableOnDefault: false,
 		Help:             "抽象话\n- 抽象翻译xxx",
 		PublicDataFolder: "ChouXiangHua",

plugin/coser/coser.go

@@ -6,7 +6,6 @@ import (
 
 	"github.com/tidwall/gjson"
 
-	log "github.com/sirupsen/logrus"
 	zero "github.com/wdvxdr1123/ZeroBot"
 	"github.com/wdvxdr1123/ZeroBot/message"
 	"github.com/wdvxdr1123/ZeroBot/utils/helper"
@@ -14,8 +13,6 @@ import (
 	control "github.com/FloatTech/zbputils/control"
 	"github.com/FloatTech/zbputils/ctxext"
 	"github.com/FloatTech/zbputils/web"
-
-	"github.com/FloatTech/zbputils/control/order"
 )
 
 var (
@@ -25,7 +22,7 @@ var (
 )
 
 func init() {
-	control.Register("coser", order.AcquirePrio(), &control.Options{
+	control.Register("coser", &control.Options{
 		DisableOnDefault: false,
 		Help:             "三次元小姐姐\n- coser",
 	}).ApplySingle(ctxext.DefaultSingle).OnFullMatch("coser", zero.OnlyGroup).SetBlock(true).Limit(ctxext.LimitByGroup).
@@ -33,9 +30,9 @@ func init() {
 			ctx.SendChain(message.Text("少女祈祷中......"))
 			data, err := web.RequestDataWith(web.NewDefaultClient(), coserURL, "GET", "", ua)
 			if err != nil {
-				log.Println("err为:", err)
+				ctx.SendChain(message.Text("ERROR:", err))
+				return
 			}
-
 			text := gjson.Get(helper.BytesToString(data), "data.Title").String()
 			m := message.Message{ctxext.FakeSenderForwardNode(ctx, message.Text(text))}
 			ds := ""

plugin/cpstory/cpstory.go

@@ -11,12 +11,10 @@ import (
 	control "github.com/FloatTech/zbputils/control"
 	"github.com/FloatTech/zbputils/file"
 	"github.com/FloatTech/zbputils/math"
-
-	"github.com/FloatTech/zbputils/control/order"
 )
 
 func init() {
-	engine := control.Register("cpstory", order.AcquirePrio(), &control.Options{
+	engine := control.Register("cpstory", &control.Options{
 		DisableOnDefault: false,
 		Help:             "cp短打\n- 组cp[@xxx][@xxx]\n- 磕cp大老师 雪乃",
 		PublicDataFolder: "CpStory",

plugin/curse/curse.go

@@ -10,8 +10,6 @@ import (
 	"github.com/FloatTech/zbputils/ctxext"
 	"github.com/FloatTech/zbputils/file"
 	"github.com/FloatTech/zbputils/process"
-
-	"github.com/FloatTech/zbputils/control/order"
 )
 
 const (
@@ -20,7 +18,7 @@ const (
 )
 
 func init() {
-	engine := control.Register("curse", order.AcquirePrio(), &control.Options{
+	engine := control.Register("curse", &control.Options{
 		DisableOnDefault: true,
 		Help:             "骂人(求骂,自卫)\n- 骂我\n- 大力骂我",
 		PublicDataFolder: "Curse",

plugin/danbooru/main.go

@@ -13,12 +13,10 @@ import (
 	zero "github.com/wdvxdr1123/ZeroBot"
 	"github.com/wdvxdr1123/ZeroBot/message"
 	"github.com/wdvxdr1123/ZeroBot/utils/helper"
-
-	"github.com/FloatTech/zbputils/control/order"
 )
 
 func init() { // 插件主体
-	engine := control.Register("danbooru", order.AcquirePrio(), &control.Options{
+	engine := control.Register("danbooru", &control.Options{
 		DisableOnDefault: false,
 		Help: "二次元图片标签识别\n" +
 			"- 鉴赏图片[图片]",

plugin/diana/bing.go

@@ -7,12 +7,10 @@ import (
 
 	control "github.com/FloatTech/zbputils/control"
 
-	"github.com/FloatTech/zbputils/control/order"
-
 	"github.com/FloatTech/ZeroBot-Plugin/plugin/diana/data"
 )
 
-var engine = control.Register("diana", order.AcquirePrio(), &control.Options{
+var engine = control.Register("diana", &control.Options{
 	DisableOnDefault: false,
 	Help: "嘉然\n" +
 		"- 小作文\n" +

plugin/diana/zhiwang.go

@@ -3,106 +3,87 @@ package diana
 
 import (
 	"bytes"
-	"encoding/json"
 	"math"
+	"strings"
 	"time"
 
+	"github.com/FloatTech/zbputils/binary"
+	"github.com/FloatTech/zbputils/ctxext"
+	"github.com/FloatTech/zbputils/web"
+	"github.com/tidwall/gjson"
 	"github.com/wdvxdr1123/ZeroBot/message"
 
-	"net/http"
-	"strings"
-
 	zero "github.com/wdvxdr1123/ZeroBot"
 )
 
-type zhiwang struct {
-	Code int `json:"code"`
-	Data struct {
-		EndTime   int             `json:"end_time"`
-		Rate      float64         `json:"rate"`
-		Related   [][]interface{} `json:"related"`
-		StartTime int             `json:"start_time"`
-	} `json:"data"`
-	Message string `json:"message"`
-}
-
 // 小作文查重: 回复要查的消息 查重
 func init() {
-	engine.OnMessage(fullmatch("查重")).SetBlock(true).
-		Handle(func(ctx *zero.Ctx) {
-			msg := ctx.Event.Message
-			if msg[0].Type == "reply" {
-				msg := ctx.GetMessage(message.NewMessageID(msg[0].Data["id"])).Elements[0].Data["text"]
-				zhiwangjson := zhiwangapi(msg)
-
-				if zhiwangjson == nil || zhiwangjson.Code != 0 {
-					ctx.SendChain(message.Text("api返回错误"))
-					return
-				}
-
-				if len(zhiwangjson.Data.Related) == 0 {
-					ctx.SendChain(message.Text("枝网没搜到，查重率为0%，我的评价是：一眼真"))
-					return
-				}
-
-				related := zhiwangjson.Data.Related[0][1].(map[string]interface{})
-				ctx.SendChain(message.Text(
-					"枝网文本复制检测报告(简洁)", "\n",
-					"查重时间: ", time.Now().Format("2006-01-02 15:04:05"), "\n",
-					"总文字复制比: ", math.Floor(zhiwangjson.Data.Rate*100), "%", "\n",
-					"相似小作文:", "\n",
-					related["content"].(string)[:102]+".....", "\n",
-					"获赞数", related["like_num"], "\n",
-					zhiwangjson.Data.Related[0][2].(string), "\n",
-					"作者: ", related["m_name"], "\n",
-					"发表时间: ", time.Unix(int64(related["ctime"].(float64)), 0).Format("2006-01-02 15:04:05"), "\n",
-					"查重结果仅作参考，请注意辨别是否为原创", "\n",
-					"数据来源: https://asoulcnki.asia/",
-				))
-			}
-		})
-}
-
-// 发起api请求并把返回body交由json库解析
-func zhiwangapi(text string) *zhiwang {
-	url := "https://asoulcnki.asia/v1/api/check"
-	post := "{\n\"text\":\"" + text + "\"\n}"
-	var jsonStr = []byte(post)
-
-	req, _ := http.NewRequest("POST", url, bytes.NewBuffer(jsonStr))
-	req.Header.Set("Content-Type", "application/json")
-	client := &http.Client{}
-
-	resp, err := client.Do(req)
-
-	if err != nil {
-		return nil
-	}
-	defer resp.Body.Close()
-
-	result := &zhiwang{}
-	if err1 := json.NewDecoder(resp.Body).Decode(result); err1 != nil {
-		return nil
-	}
-	return result
-}
-
-func fullmatch(src ...string) zero.Rule {
-	return func(ctx *zero.Ctx) bool {
+	engine.OnMessage(func(ctx *zero.Ctx) bool {
 		msg := ctx.Event.Message
+		if msg[0].Type != "reply" {
+			return false
+		}
 		for _, elem := range msg {
 			if elem.Type == "text" {
 				text := elem.Data["text"]
 				text = strings.ReplaceAll(text, " ", "")
 				text = strings.ReplaceAll(text, "\r", "")
 				text = strings.ReplaceAll(text, "\n", "")
-				for _, s := range src {
-					if text == s {
-						return true
-					}
+				if text == "查重" {
+					return true
 				}
 			}
 		}
 		return false
-	}
+	}).SetBlock(true).Limit(ctxext.LimitByUser).Handle(func(ctx *zero.Ctx) {
+		msg := ctx.GetMessage(message.NewMessageIDFromString(ctx.Event.Message[0].Data["id"])).Elements[0].Data["text"]
+		result, err := zhiwangapi(msg)
+		if err != nil {
+			ctx.SendChain(message.Text("ERROR:", err))
+			return
+		}
+		if result.Get("code").Int() != 0 {
+			ctx.SendChain(message.Text("api返回错误:", result.Get("code").Int()))
+			return
+		}
+		if result.Get("data.related.#").Int() == 0 {
+			ctx.Send(message.ReplyWithMessage(ctx.Event.MessageID, message.Text("枝网没搜到，查重率为0%，鉴定为原创")))
+			return
+		}
+		related := result.Get("data.related.0.reply").Map()
+		rate := result.Get("data.related.0.rate").Float()
+		relatedcontent := related["content"].String()
+		if len(relatedcontent) > 102 {
+			relatedcontent = relatedcontent[:102] + "....."
+		}
+		ctx.Send(message.ReplyWithMessage(ctx.Event.MessageID, message.Text(
+			"枝网文本复制检测报告(简洁)", "\n",
+			"查重时间: ", time.Now().Format("2006-01-02 15:04:05"), "\n",
+			"总文字复制比: ", math.Floor(rate*100), "%", "\n",
+			"相似小作文：", "\n", relatedcontent, "\n",
+			"获赞数：", related["like_num"].String(), "\n",
+			result.Get("data.related.0.reply_url").String(), "\n",
+			"作者: ", related["m_name"].String(), "\n",
+			"发表时间: ", time.Unix(int64(related["ctime"].Float()), 0).Format("2006-01-02 15:04:05"), "\n",
+			"查重结果仅作参考，请注意辨别是否为原创", "\n",
+			"数据来源: https://asoulcnki.asia/",
+		)))
+	})
+}
+
+func zhiwangapi(text string) (*gjson.Result, error) {
+	b, cl := binary.OpenWriterF(func(w *binary.Writer) {
+		w.WriteString("{\n\"text\":\"")
+		w.WriteString(text)
+		w.WriteString("\"\n}")
+	})
+
+	data, err := web.PostData("https://asoulcnki.asia/v1/api/check", "application/json", bytes.NewReader(b))
+	cl()
+	if err != nil {
+		return nil, err
+	}
+
+	result := gjson.ParseBytes(data)
+	return &result, nil
 }

plugin/drift_bottle/main.go

@@ -7,14 +7,13 @@ import (
 	"sync"
 
 	"github.com/FloatTech/zbputils/control"
-	"github.com/FloatTech/zbputils/control/order"
 	"github.com/sirupsen/logrus"
 	zero "github.com/wdvxdr1123/ZeroBot"
 	"github.com/wdvxdr1123/ZeroBot/message"
 )
 
 func init() {
-	en := control.Register("driftbottle", order.AcquirePrio(), &control.Options{
+	en := control.Register("driftbottle", &control.Options{
 		DisableOnDefault:  false,
 		Help:              "漂流瓶\n- (在群xxx)丢漂流瓶(到频道xxx) [消息]\n- (从频道xxx)捡漂流瓶\n- @BOT 创建频道 xxx\n- 跳入(频道)海中\n- 注：不显式限制时，私聊发送可在所有群抽到，群聊发送仅可在本群抽到，默认频道为 global",
 		PrivateDataFolder: "driftbottle",

plugin/emojimix/mix.go

@@ -7,7 +7,6 @@ import (
 	"strconv"
 
 	"github.com/FloatTech/zbputils/control"
-	"github.com/FloatTech/zbputils/control/order"
 	"github.com/FloatTech/zbputils/ctxext"
 	"github.com/sirupsen/logrus"
 	zero "github.com/wdvxdr1123/ZeroBot"
@@ -17,7 +16,7 @@ import (
 const bed = "https://www.gstatic.com/android/keyboard/emojikitchen/%d/u%x/u%x_u%x.png"
 
 func init() {
-	control.Register("emojimix", order.AcquirePrio(), &control.Options{
+	control.Register("emojimix", &control.Options{
 		DisableOnDefault: false,
 		Help: "合成emoji\n" +
 			"- [emoji][emoji]",

plugin/epidemic/epidemic.go

@@ -9,7 +9,6 @@ import (
 
 	"github.com/FloatTech/zbputils/binary"
 	"github.com/FloatTech/zbputils/control"
-	"github.com/FloatTech/zbputils/control/order"
 	"github.com/FloatTech/zbputils/ctxext"
 	"github.com/FloatTech/zbputils/web"
 )
@@ -49,7 +48,7 @@ type area struct {
 }
 
 func init() {
-	engine := control.Register(servicename, order.AcquirePrio(), &control.Options{
+	engine := control.Register(servicename, &control.Options{
 		DisableOnDefault: false,
 		Help: "城市疫情查询\n" +
 			"- xxx疫情\n",

plugin/font/main.go

@@ -4,7 +4,6 @@ package font
 import (
 	"github.com/FloatTech/zbputils/binary"
 	"github.com/FloatTech/zbputils/control"
-	"github.com/FloatTech/zbputils/control/order"
 	"github.com/FloatTech/zbputils/ctxext"
 	"github.com/FloatTech/zbputils/img/text"
 	zero "github.com/wdvxdr1123/ZeroBot"
@@ -12,7 +11,7 @@ import (
 )
 
 func init() {
-	control.Register("font", order.AcquirePrio(), &control.Options{
+	control.Register("font", &control.Options{
 		DisableOnDefault: false,
 		Help:             "渲染任意文字到图片\n- (用[终末体|终末变体|紫罗兰体|樱酥体|Consolas体|苹方体])渲染文字xxx",
 	}).OnRegex(`^(用.+)?渲染文字([\s\S]+)$`).SetBlock(true).Limit(ctxext.LimitByUser).Handle(func(ctx *zero.Ctx) {

plugin/fortune/fortune.go

@@ -25,8 +25,6 @@ import (
 	"github.com/FloatTech/zbputils/img/pool"
 	"github.com/FloatTech/zbputils/img/writer"
 	"github.com/FloatTech/zbputils/math"
-
-	"github.com/FloatTech/zbputils/control/order"
 )
 
 const (
@@ -42,7 +40,7 @@ const (
 
 var (
 	// 底图类型列表
-	table = [...]string{"车万", "DC4", "爱因斯坦", "星空列车", "樱云之恋", "富婆妹", "李清歌", "公主连结", "原神", "明日方舟", "碧蓝航线", "碧蓝幻想", "战双", "阴阳师", "赛马娘", "东方归言录"}
+	table = [...]string{"车万", "DC4", "爱因斯坦", "星空列车", "樱云之恋", "富婆妹", "李清歌", "公主连结", "原神", "明日方舟", "碧蓝航线", "碧蓝幻想", "战双", "阴阳师", "赛马娘", "东方归言录", "奇异恩典"}
 	// 映射底图与 index
 	index = make(map[string]uint8)
 	// 签文
@@ -51,11 +49,11 @@ var (
 
 func init() {
 	// 插件主体
-	en := control.Register("fortune", order.AcquirePrio(), &control.Options{
+	en := control.Register("fortune", &control.Options{
 		DisableOnDefault: false,
 		Help: "每日运势: \n" +
 			"- 运势 | 抽签\n" +
-			"- 设置底图[车万 | DC4 | 爱因斯坦 | 星空列车 | 樱云之恋 | 富婆妹 | 李清歌 | 公主连结 | 原神 | 明日方舟 | 碧蓝航线 | 碧蓝幻想 | 战双 | 阴阳师 | 赛马娘 | 东方归言录]",
+			"- 设置底图[车万 | DC4 | 爱因斯坦 | 星空列车 | 樱云之恋 | 富婆妹 | 李清歌 | 公主连结 | 原神 | 明日方舟 | 碧蓝航线 | 碧蓝幻想 | 战双 | 阴阳师 | 赛马娘 | 东方归言录 | 奇异恩典]",
 		PublicDataFolder: "Fortune",
 	})
 	_ = os.RemoveAll(cache)

plugin/funny/laugh.go

@@ -12,8 +12,6 @@ import (
 	control "github.com/FloatTech/zbputils/control"
 	"github.com/FloatTech/zbputils/ctxext"
 	"github.com/FloatTech/zbputils/file"
-
-	"github.com/FloatTech/zbputils/control/order"
 )
 
 type joke struct {
@@ -24,7 +22,7 @@ type joke struct {
 var db = &sql.Sqlite{}
 
 func init() {
-	en := control.Register("funny", order.AcquirePrio(), &control.Options{
+	en := control.Register("funny", &control.Options{
 		DisableOnDefault: false,
 		Help: "讲个笑话\n" +
 			"- 讲个笑话[@xxx] | 讲个笑话[qq号]",

plugin/genshin/ys.go

@@ -13,7 +13,6 @@ import (
 	"sync/atomic"
 
 	"github.com/FloatTech/zbputils/control"
-	"github.com/FloatTech/zbputils/control/order"
 	"github.com/FloatTech/zbputils/ctxext"
 	"github.com/FloatTech/zbputils/file"
 	"github.com/FloatTech/zbputils/img/writer"
@@ -33,7 +32,7 @@ var (
 )
 
 func init() {
-	engine := control.Register("genshin", order.AcquirePrio(), &control.Options{
+	engine := control.Register("genshin", &control.Options{
 		DisableOnDefault: false,
 		Help:             "原神抽卡\n- 原神十连\n- 切换原神卡池",
 		PublicDataFolder: "Genshin",

plugin/gif/run.go

@@ -11,8 +11,6 @@ import (
 	"github.com/FloatTech/zbputils/file"
 	zero "github.com/wdvxdr1123/ZeroBot"
 	"github.com/wdvxdr1123/ZeroBot/message"
-
-	"github.com/FloatTech/zbputils/control/order"
 )
 
 var (
@@ -22,7 +20,7 @@ var (
 )
 
 func init() { // 插件主体
-	en := control.Register("gif", order.AcquirePrio(), &control.Options{
+	en := control.Register("gif", &control.Options{
 		DisableOnDefault:  false,
 		Help:              "制图\n- " + strings.Join(cmds, "\n- "),
 		PrivateDataFolder: "gif",

plugin/github/repo_searcher.go

@@ -13,13 +13,11 @@ import (
 	zero "github.com/wdvxdr1123/ZeroBot"
 	"github.com/wdvxdr1123/ZeroBot/message"
 
-	"github.com/FloatTech/zbputils/control/order"
-
 	"github.com/tidwall/gjson"
 )
 
 func init() { // 插件主体
-	control.Register("github", order.AcquirePrio(), &control.Options{
+	control.Register("github", &control.Options{
 		DisableOnDefault: false,
 		Help: "GitHub仓库搜索\n" +
 			"- >github [xxx]\n" +

plugin/hs/run.go

@@ -16,8 +16,6 @@ import (
 	"github.com/FloatTech/zbputils/ctxext"
 	"github.com/FloatTech/zbputils/file"
 	"github.com/FloatTech/zbputils/web"
-
-	"github.com/FloatTech/zbputils/control/order"
 )
 
 var reqconf = [...]string{"GET", "https://hs.fbigame.com",
@@ -43,7 +41,7 @@ const (
 )
 
 func init() {
-	engine := control.Register("hs", order.AcquirePrio(), &control.Options{
+	engine := control.Register("hs", &control.Options{
 		DisableOnDefault: false,
 		Help: "炉石\n" +
 			"- 搜卡[xxxx]\n" +

plugin/hyaku/main.go

@@ -11,7 +11,6 @@ import (
 
 	"github.com/FloatTech/zbputils/binary"
 	"github.com/FloatTech/zbputils/control"
-	"github.com/FloatTech/zbputils/control/order"
 	"github.com/FloatTech/zbputils/ctxext"
 	"github.com/FloatTech/zbputils/file"
 	zero "github.com/wdvxdr1123/ZeroBot"
@@ -51,7 +50,7 @@ func (l *line) String() string {
 var lines [100]*line
 
 func init() {
-	engine := control.Register("hyaku", order.AcquirePrio(), &control.Options{
+	engine := control.Register("hyaku", &control.Options{
 		DisableOnDefault: false,
 		Help: "百人一首\n" +
 			"- 百人一首(随机发一首)\n" +

plugin/image_finder/keyword.go

@@ -14,7 +14,6 @@ import (
 	"github.com/FloatTech/AnimeAPI/pixiv"
 
 	"github.com/FloatTech/zbputils/control"
-	"github.com/FloatTech/zbputils/control/order"
 	"github.com/FloatTech/zbputils/ctxext"
 	"github.com/FloatTech/zbputils/img/pool"
 	"github.com/FloatTech/zbputils/web"
@@ -35,7 +34,7 @@ type resultjson struct {
 }
 
 func init() {
-	control.Register("imgfinder", order.AcquirePrio(), &control.Options{
+	control.Register("imgfinder", &control.Options{
 		DisableOnDefault: false,
 		Help: "关键字搜图\n" +
 			"- 来张 [xxx]",

plugin/inject/main.go

@@ -3,13 +3,12 @@ package inject
 
 import (
 	"github.com/FloatTech/zbputils/control"
-	"github.com/FloatTech/zbputils/control/order"
 	zero "github.com/wdvxdr1123/ZeroBot"
 	"github.com/wdvxdr1123/ZeroBot/message"
 )
 
 func init() {
-	en := control.Register("inject", order.AcquirePrio(), &control.Options{
+	en := control.Register("inject", &control.Options{
 		DisableOnDefault: false,
 		Help: "注入指令\n" +
 			"- run[CQ码]",

plugin/jandan/jandan.go

@@ -14,8 +14,6 @@ import (
 	"github.com/sirupsen/logrus"
 	zero "github.com/wdvxdr1123/ZeroBot"
 	"github.com/wdvxdr1123/ZeroBot/message"
-
-	"github.com/FloatTech/zbputils/control/order"
 )
 
 const (
@@ -23,7 +21,7 @@ const (
 )
 
 func init() {
-	engine := control.Register("jandan", order.AcquirePrio(), &control.Options{
+	engine := control.Register("jandan", &control.Options{
 		DisableOnDefault: false,
 		Help:             "煎蛋网无聊图\n- 来份[屌|弔|吊]图\n- 更新[屌|弔|吊]图\n",
 		PublicDataFolder: "Jandan",
@@ -71,7 +69,7 @@ func init() {
 			}
 		LOOP:
 			for i := 0; i < pageTotal; i++ {
-				logrus.Infoln("[jandan]", fmt.Sprintf("处理第%d/%d页...", i, pageTotal))
+				logrus.Debugln("[jandan]", fmt.Sprintf("处理第%d/%d页...", i, pageTotal))
 				doc, err = htmlquery.LoadURL(webpageURL)
 				if err != nil {
 					ctx.SendChain(message.Text("ERROR:", err))

plugin/juejuezi/juejuezi.go

@@ -9,13 +9,10 @@ import (
 
 	control "github.com/FloatTech/zbputils/control"
 	"github.com/FloatTech/zbputils/ctxext"
-	log "github.com/sirupsen/logrus"
 	"github.com/tidwall/gjson"
 	zero "github.com/wdvxdr1123/ZeroBot"
 	"github.com/wdvxdr1123/ZeroBot/message"
 	"github.com/wdvxdr1123/ZeroBot/utils/helper"
-
-	"github.com/FloatTech/zbputils/control/order"
 )
 
 const (
@@ -25,7 +22,7 @@ const (
 )
 
 func init() {
-	control.Register("juejuezi", order.AcquirePrio(), &control.Options{
+	control.Register("juejuezi", &control.Options{
 		DisableOnDefault: false,
 		Help: "绝绝子生成器\n" +
 			"- 喝奶茶绝绝子 | 绝绝子吃饭",
@@ -37,14 +34,16 @@ func init() {
 		case 2:
 			data, err := juejuezi(string(toDealStr[0]), string(toDealStr[1]))
 			if err != nil {
-				ctx.SendChain(message.Text(err))
+				ctx.SendChain(message.Text("ERROR:", err))
+				return
 			}
 			ctx.SendChain(message.Text(gjson.Get(helper.BytesToString(data), "text").String()))
 		default:
 			params := ctx.GetWordSlices(string(toDealStr)).Get("slices").Array()
 			data, err := juejuezi(params[0].String(), params[1].String())
 			if err != nil {
-				ctx.SendChain(message.Text(err))
+				ctx.SendChain(message.Text("ERROR:", err))
+				return
 			}
 			ctx.SendChain(message.Text(gjson.Get(helper.BytesToString(data), "text").String()))
 		}
@@ -57,13 +56,13 @@ func juejuezi(verb, noun string) (data []byte, err error) {
 	// 提交请求
 	request, err := http.NewRequest("POST", juejueziURL, strings.NewReader(juejueziStr))
 	if err != nil {
-		log.Errorln("[juejuezi]:", err)
+		return nil, err
 	}
 	request.Header.Add("Referer", referer)
 	request.Header.Add("User-Agent", ua)
 	response, err := client.Do(request)
 	if err != nil {
-		log.Errorln("[juejuezi]:", err)
+		return nil, err
 	}
 	data, err = io.ReadAll(response.Body)
 	response.Body.Close()

plugin/lolicon/lolicon.go

@@ -15,8 +15,6 @@ import (
 	"github.com/FloatTech/zbputils/math"
 	"github.com/FloatTech/zbputils/process"
 	"github.com/FloatTech/zbputils/web"
-
-	"github.com/FloatTech/zbputils/control/order"
 )
 
 const (
@@ -29,7 +27,7 @@ var (
 )
 
 func init() {
-	control.Register("lolicon", order.AcquirePrio(), &control.Options{
+	control.Register("lolicon", &control.Options{
 		DisableOnDefault: false,
 		Help: "lolicon\n" +
 			"- 来份萝莉",

plugin/manager/manager.go

@@ -19,8 +19,6 @@ import (
 	"github.com/FloatTech/zbputils/math"
 	"github.com/FloatTech/zbputils/process"
 
-	"github.com/FloatTech/zbputils/control/order"
-
 	"github.com/FloatTech/ZeroBot-Plugin/plugin/manager/timer"
 )
 
@@ -61,7 +59,7 @@ var (
 )
 
 func init() { // 插件主体
-	engine := control.Register("manager", order.AcquirePrio(), &control.Options{
+	engine := control.Register("manager", &control.Options{
 		DisableOnDefault:  false,
 		Help:              hint,
 		PrivateDataFolder: "manager",
@@ -449,9 +447,11 @@ func init() { // 插件主体
 	// 设置欢迎语
 	engine.OnRegex(`^设置欢迎语([\s\S]*)$`, zero.OnlyGroup, zero.AdminPermission).SetBlock(true).
 		Handle(func(ctx *zero.Ctx) {
+			welcomestring := ctx.State["regex_matched"].([]string)[1]
+			welcomestring = message.UnescapeCQCodeText(welcomestring)
 			w := &welcome{
 				GrpID: ctx.Event.GroupID,
-				Msg:   ctx.State["regex_matched"].([]string)[1],
+				Msg:   welcomestring,
 			}
 			err := db.Insert("welcome", w)
 			if err == nil {
@@ -474,9 +474,11 @@ func init() { // 插件主体
 	// 设置告别辞
 	engine.OnRegex(`^设置告别辞([\s\S]*)$`, zero.OnlyGroup, zero.AdminPermission).SetBlock(true).
 		Handle(func(ctx *zero.Ctx) {
+			farewellstring := ctx.State["regex_matched"].([]string)[1]
+			farewellstring = message.UnescapeCQCodeText(farewellstring)
 			w := &welcome{
 				GrpID: ctx.Event.GroupID,
-				Msg:   ctx.State["regex_matched"].([]string)[1],
+				Msg:   farewellstring,
 			}
 			err := db.Insert("farewell", w)
 			if err == nil {
@@ -566,7 +568,7 @@ func init() { // 插件主体
 			}
 			ghun := ans[:divi]
 			hash := ans[divi+1:]
-			logrus.Infoln("[manager]收到加群申请, 用户:", ghun, ", hash:", hash)
+			logrus.Debugln("[manager]收到加群申请, 用户:", ghun, ", hash:", hash)
 			ok, reason := checkNewUser(ctx.Event.UserID, ctx.Event.GroupID, ghun, hash)
 			if ok {
 				ctx.SetGroupAddRequest(ctx.Event.Flag, "add", true, "")
@@ -581,13 +583,17 @@ func init() { // 插件主体
 
 // 传入 ctx 和 welcome格式string 返回cq格式string  使用方法:welcometocq(ctx,w.Msg)
 func welcometocq(ctx *zero.Ctx, welcome string) string {
-	at := "[CQ:at,qq=" + strconv.FormatInt(ctx.Event.UserID, 10) + "]"
-	avatar := "[CQ:image,file=" + "http://q4.qlogo.cn/g?b=qq&nk=" + strconv.FormatInt(ctx.Event.UserID, 10) + "&s=640]"
-	id := strconv.FormatInt(ctx.Event.UserID, 10)
-	nickname := ctx.CardOrNickName(ctx.Event.UserID)
+	uid := strconv.FormatInt(ctx.Event.UserID, 10)                                  // 用户id
+	nickname := ctx.CardOrNickName(ctx.Event.UserID)                                // 用户昵称
+	at := "[CQ:at,qq=" + uid + "]"                                                  // at用户
+	avatar := "[CQ:image,file=" + "http://q4.qlogo.cn/g?b=qq&nk=" + uid + "&s=640]" // 用户头像
+	gid := strconv.FormatInt(ctx.Event.GroupID, 10)                                 // 群id
+	groupname := ctx.GetGroupInfo(ctx.Event.GroupID, true).Name                     // 群名
 	cqstring := strings.ReplaceAll(welcome, "{at}", at)
 	cqstring = strings.ReplaceAll(cqstring, "{nickname}", nickname)
 	cqstring = strings.ReplaceAll(cqstring, "{avatar}", avatar)
-	cqstring = strings.ReplaceAll(cqstring, "{id}", id)
+	cqstring = strings.ReplaceAll(cqstring, "{uid}", uid)
+	cqstring = strings.ReplaceAll(cqstring, "{gid}", gid)
+	cqstring = strings.ReplaceAll(cqstring, "{groupname}", groupname)
 	return cqstring
 }

plugin/manager/timer/parse.go

@@ -106,10 +106,10 @@ func GetFilledTimer(dateStrs []string, botqq, grp int64, matchDateOnly bool) *Ti
 		urlStr := dateStrs[5]
 		if urlStr != "" { // 是图片url
 			t.URL = urlStr[3:] // utf-8下用为3字节
-			logrus.Println("[群管]" + t.URL)
+			logrus.Debugln("[群管]" + t.URL)
 			if !strings.HasPrefix(t.URL, "http") {
 				t.URL = "illegal"
-				logrus.Println("[群管]url非法！")
+				logrus.Debugln("[群管]url非法！")
 				return &t
 			}
 		}

plugin/manager/timer/timer.go

@@ -60,7 +60,7 @@ func (c *Clock) RegisterTimer(ts *Timer, save, isinit bool) bool {
 	if t != ts && ok { // 避免重复注册定时器
 		t.SetEn(false)
 	}
-	logrus.Println("[群管]注册计时器", key)
+	logrus.Infoln("[群管]注册计时器", key)
 	if ts.Cron != "" {
 		var ctx *zero.Ctx
 		if isinit {

plugin/moyu/run.go

@@ -8,8 +8,6 @@ import (
 	control "github.com/FloatTech/zbputils/control"
 	zero "github.com/wdvxdr1123/ZeroBot"
 	"github.com/wdvxdr1123/ZeroBot/message"
-
-	"github.com/FloatTech/zbputils/control/order"
 )
 
 var (
@@ -19,7 +17,7 @@ var (
 )
 
 func init() { // 插件主体
-	control.Register("moyu", order.AcquirePrio(), &control.Options{
+	control.Register("moyu", &control.Options{
 		DisableOnDefault: true,
 		Help: "moyu\n" +
 			"- /启用 moyu\n" +

plugin/moyu_calendar/calendar.go

@@ -13,7 +13,6 @@ import (
 	"time"
 
 	control "github.com/FloatTech/zbputils/control"
-	"github.com/FloatTech/zbputils/control/order"
 	zero "github.com/wdvxdr1123/ZeroBot"
 	"github.com/wdvxdr1123/ZeroBot/message"
 
@@ -26,7 +25,7 @@ var weixin = regexp.MustCompile(`url \+= '(.+)';`)
 var client = &http.Client{}
 
 func init() {
-	control.Register("moyucalendar", order.AcquirePrio(), &control.Options{
+	control.Register("moyucalendar", &control.Options{
 		DisableOnDefault: true,
 		Help: "摸鱼人日历\n" +
 			"- /启用 moyucalendar\n" +

plugin/music/selecter.go

@@ -16,12 +16,10 @@ import (
 	"github.com/tidwall/gjson"
 	zero "github.com/wdvxdr1123/ZeroBot"
 	"github.com/wdvxdr1123/ZeroBot/message"
-
-	"github.com/FloatTech/zbputils/control/order"
 )
 
 func init() {
-	control.Register("music", order.AcquirePrio(), &control.Options{
+	control.Register("music", &control.Options{
 		DisableOnDefault: false,
 		Help: "点歌\n" +
 			"- 点歌[xxx]\n" +

plugin/nativesetu/main.go

@@ -13,8 +13,6 @@ import (
 	"github.com/FloatTech/zbputils/control"
 	"github.com/FloatTech/zbputils/ctxext"
 	"github.com/FloatTech/zbputils/file"
-
-	"github.com/FloatTech/zbputils/control/order"
 )
 
 var (
@@ -22,7 +20,7 @@ var (
 )
 
 func init() {
-	engine := control.Register("nativesetu", order.AcquirePrio(), &control.Options{
+	engine := control.Register("nativesetu", &control.Options{
 		DisableOnDefault: false,
 		Help: "本地涩图\n" +
 			"- 本地[xxx]\n" +
@@ -39,7 +37,7 @@ func init() {
 		b, err := os.ReadFile(cfgfile)
 		if err == nil {
 			setupath = helper.BytesToString(b)
-			logrus.Println("[nsetu] set setu dir to", setupath)
+			logrus.Infoln("[nsetu] set setu dir to", setupath)
 		}
 	}
 

plugin/nativewife/main.go

@@ -16,14 +16,12 @@ import (
 	"github.com/wdvxdr1123/ZeroBot/message"
 	"github.com/wdvxdr1123/ZeroBot/utils/helper"
 
-	"github.com/FloatTech/zbputils/control/order"
-
 	control "github.com/FloatTech/zbputils/control"
 	"github.com/FloatTech/zbputils/file"
 )
 
 func init() {
-	engine := control.Register("nwife", order.AcquirePrio(), &control.Options{
+	engine := control.Register("nwife", &control.Options{
 		DisableOnDefault:  false,
 		Help:              "nativewife\n- 抽wife[@xxx]\n- 添加wife[名字][图片]\n- 删除wife[名字]\n- [让 | 不让]所有人均可添加wife",
 		PrivateDataFolder: "nwife",

plugin/nbnhhsh/nbnhhsh.go

@@ -11,12 +11,10 @@ import (
 	"github.com/tidwall/gjson"
 	zero "github.com/wdvxdr1123/ZeroBot"
 	"github.com/wdvxdr1123/ZeroBot/message"
-
-	"github.com/FloatTech/zbputils/control/order"
 )
 
 func init() {
-	control.Register("nbnhhsh", order.AcquirePrio(), &control.Options{
+	control.Register("nbnhhsh", &control.Options{
 		DisableOnDefault: false,
 		Help:             "拼音首字母释义工具\n- ?? [缩写]",
 	}).OnRegex(`^[?？]{1,2} ?([a-z0-9]+)$`).SetBlock(false).

plugin/novel/qianbi.go

@@ -11,7 +11,6 @@ import (
 	"strings"
 
 	"github.com/antchfx/htmlquery"
-	log "github.com/sirupsen/logrus"
 	zero "github.com/wdvxdr1123/ZeroBot"
 	"github.com/wdvxdr1123/ZeroBot/message"
 	"github.com/wdvxdr1123/ZeroBot/utils/helper"
@@ -20,8 +19,6 @@ import (
 	control "github.com/FloatTech/zbputils/control"
 	"github.com/FloatTech/zbputils/ctxext"
 	"github.com/FloatTech/zbputils/img/text"
-
-	"github.com/FloatTech/zbputils/control/order"
 )
 
 const (
@@ -40,25 +37,35 @@ const (
 var gCurCookieJar *cookiejar.Jar
 
 func init() {
-	control.Register("novel", order.AcquirePrio(), &control.Options{
+	control.Register("novel", &control.Options{
 		DisableOnDefault: false,
 		Help:             "铅笔小说网搜索\n- 小说[xxx]",
 	}).OnRegex("^小说([\u4E00-\u9FA5A-Za-z0-9]{1,25})$").SetBlock(true).Limit(ctxext.LimitByUser).
 		Handle(func(ctx *zero.Ctx) {
 			ctx.SendChain(message.Text("少女祈祷中......"))
-			login(username, password)
+			err := login(username, password)
+			if err != nil {
+				ctx.SendChain(message.Text("ERROR:", err))
+				return
+			}
 			searchKey := ctx.State["regex_matched"].([]string)[1]
-			searchHTML := search(searchKey)
+			searchHTML, err := search(searchKey)
+			if err != nil {
+				ctx.SendChain(message.Text("ERROR:", err))
+				return
+			}
 			doc, err := htmlquery.Parse(strings.NewReader(searchHTML))
 			if err != nil {
-				log.Errorln("[novel]", err)
+				ctx.SendChain(message.Text("ERROR:", err))
+				return
 			}
 			htmlTitle := htmlquery.InnerText(htmlquery.FindOne(doc, "/html/head/title"))
 			switch htmlTitle {
 			case websiteTitle:
 				list, err := htmlquery.QueryAll(doc, "//dl[@id='nr']")
 				if err != nil {
-					log.Errorln("[novel]", err)
+					ctx.SendChain(message.Text("ERROR:", err))
+					return
 				}
 				if len(list) != 0 {
 					txt := ""
@@ -81,7 +88,8 @@ func init() {
 					}
 					data, err := text.RenderToBase64(txt, text.FontFile, 400, 20)
 					if err != nil {
-						log.Println("err:", err)
+						ctx.SendChain(message.Text("ERROR:", err))
+						return
 					}
 					if id := ctx.SendChain(message.Image("base64://" + helper.BytesToString(data))); id.ID() == 0 {
 						ctx.SendChain(message.Text("ERROR:可能被风控了"))
@@ -116,38 +124,39 @@ func init() {
 		})
 }
 
-func login(username, password string) {
+func login(username, password string) (err error) {
 	gCurCookieJar, _ = cookiejar.New(nil)
 	client := &http.Client{
 		Jar: gCurCookieJar,
 	}
 	usernameData, err := ub.UTF82GBK(helper.StringToBytes(username))
 	if err != nil {
-		log.Errorln("[novel]", err)
+		return
 	}
 	usernameGbk := helper.BytesToString(usernameData)
 	passwordData, err := ub.UTF82GBK(helper.StringToBytes(password))
 	if err != nil {
-		log.Errorln("[novel]", err)
+		return
 	}
 	passwordGbk := helper.BytesToString(passwordData)
 	loginReq, err := http.NewRequest("POST", loginURL, strings.NewReader(fmt.Sprintf("username=%s&password=%s&usecookie=315360000&action=login&submit=%s", url.QueryEscape(usernameGbk), url.QueryEscape(passwordGbk), submit)))
 	if err != nil {
-		log.Errorln("[novel]", err)
+		return
 	}
 	loginReq.Header.Set("Content-Type", "application/x-www-form-urlencoded")
 	loginReq.Header.Set("User-Agent", ua)
 	loginResp, err := client.Do(loginReq)
 	if err != nil {
-		log.Errorln("[novel]", err)
+		return
 	}
-	defer loginResp.Body.Close()
+	_ = loginResp.Body.Close()
+	return
 }
 
-func search(searchKey string) (searchHTML string) {
+func search(searchKey string) (searchHTML string, err error) {
 	searchKeyData, err := ub.UTF82GBK(helper.StringToBytes(searchKey))
 	if err != nil {
-		log.Errorln("[novel]", err)
+		return
 	}
 	searchKeyGbk := helper.BytesToString(searchKeyData)
 	client := &http.Client{
@@ -155,23 +164,23 @@ func search(searchKey string) (searchHTML string) {
 	}
 	searchReq, err := http.NewRequest("POST", searchURL, strings.NewReader(fmt.Sprintf("searchkey=%s&searchtype=all", url.QueryEscape(searchKeyGbk))))
 	if err != nil {
-		log.Errorln("[novel]", err)
+		return
 	}
 	searchReq.Header.Set("Content-Type", "application/x-www-form-urlencoded")
 	searchReq.Header.Set("User-Agent", ua)
 	searchResp, err := client.Do(searchReq)
 	if err != nil {
-		log.Errorln("[novel]", err)
+		return
 	}
-	defer searchResp.Body.Close()
 	searchData, err := io.ReadAll(searchResp.Body)
+	_ = searchResp.Body.Close()
 	if err != nil {
-		log.Errorf("[novel] get response for url=%s got error=%s\n", searchURL, err.Error())
+		return
 	}
 	searchData, err = ub.GBK2UTF8(searchData)
 	if err != nil {
-		log.Errorln("[novel]", err)
+		return
 	}
 	searchHTML = helper.BytesToString(searchData)
-	return searchHTML
+	return searchHTML, nil
 }

plugin/nsfw/main.go

@@ -8,14 +8,12 @@ import (
 	"github.com/FloatTech/zbputils/process"
 	zero "github.com/wdvxdr1123/ZeroBot"
 	"github.com/wdvxdr1123/ZeroBot/message"
-
-	"github.com/FloatTech/zbputils/control/order"
 )
 
 const hso = "https://gchat.qpic.cn/gchatpic_new//--4234EDEC5F147A4C319A41149D7E0EA9/0"
 
 func init() {
-	engine := control.Register("nsfw", order.AcquirePrio(), &control.Options{
+	engine := control.Register("nsfw", &control.Options{
 		DisableOnDefault: false,
 		Help:             "nsfw图片识别\n- nsfw打分[图片]",
 	}).ApplySingle(ctxext.DefaultSingle)
@@ -25,15 +23,15 @@ func init() {
 			url := ctx.State["image_url"].([]string)
 			if len(url) > 0 {
 				ctx.SendChain(message.Text("少女祈祷中..."))
-				p, err := nsfw.Classify(url...)
+				p, err := nsfw.Classify(url[0])
 				if err != nil {
 					ctx.SendChain(message.Text("ERROR:", err))
 					return
 				}
-				ctx.Send(message.ReplyWithMessage(ctx.Event.MessageID, message.Text(judge(p[0]))))
+				ctx.Send(message.ReplyWithMessage(ctx.Event.MessageID, message.Text(judge(p))))
 			}
 		})
-	control.Register("nsfwauto", order.AcquirePrio(), &control.Options{
+	control.Register("nsfwauto", &control.Options{
 		DisableOnDefault: true,
 		Help:             "nsfw图片自动识别\n- 当图片属于非 neutral 类别时自动发送评价",
 	}).OnMessage(zero.HasPicture).SetBlock(false).
@@ -41,17 +39,17 @@ func init() {
 			url := ctx.State["image_url"].([]string)
 			if len(url) > 0 {
 				process.SleepAbout1sTo2s()
-				p, err := nsfw.Classify(url...)
+				p, err := nsfw.Classify(url[0])
 				if err != nil {
 					return
 				}
 				process.SleepAbout1sTo2s()
-				autojudge(ctx, p[0])
+				autojudge(ctx, p)
 			}
 		})
 }
 
-func judge(p nsfw.Picture) string {
+func judge(p *nsfw.Picture) string {
 	if p.Neutral > 0.3 {
 		return "普通哦"
 	}
@@ -73,7 +71,7 @@ func judge(p nsfw.Picture) string {
 	return c
 }
 
-func autojudge(ctx *zero.Ctx, p nsfw.Picture) {
+func autojudge(ctx *zero.Ctx, p *nsfw.Picture) {
 	if p.Neutral > 0.3 {
 		return
 	}

plugin/omikuji/sensou.go

@@ -16,14 +16,12 @@ import (
 	"github.com/FloatTech/zbputils/ctxext"
 	"github.com/FloatTech/zbputils/file"
 	"github.com/FloatTech/zbputils/img/text"
-
-	"github.com/FloatTech/zbputils/control/order"
 )
 
 const bed = "https://gitcode.net/u011570312/senso-ji-omikuji/-/raw/main/%d_%d.jpg"
 
 func init() { // 插件主体
-	engine := control.Register("omikuji", order.AcquirePrio(), &control.Options{
+	engine := control.Register("omikuji", &control.Options{
 		DisableOnDefault: false,
 		Help: "浅草寺求签\n" +
 			"- 求签 | 占卜\n- 解签",
@@ -47,7 +45,11 @@ func init() { // 插件主体
 
 	engine.OnFullMatchGroup([]string{"求签", "占卜"}).SetBlock(true).
 		Handle(func(ctx *zero.Ctx) {
-			miku := bangoToday(ctx.Event.UserID)
+			miku, err := bangoToday(ctx.Event.UserID)
+			if err != nil {
+				ctx.SendChain(message.Text("ERROR:", err))
+				return
+			}
 			ctx.SendChain(
 				message.At(ctx.Event.UserID),
 				message.Image(fmt.Sprintf(bed, miku, 0)),
@@ -56,9 +58,15 @@ func init() { // 插件主体
 		})
 	engine.OnFullMatchGroup([]string{"解签"}).SetBlock(true).
 		Handle(func(ctx *zero.Ctx) {
-			kujiBytes, err := text.RenderToBase64(getKujiByBango(bangoToday(ctx.Event.UserID)), text.FontFile, 400, 20)
+			bg, err := bangoToday(ctx.Event.UserID)
 			if err != nil {
-				log.Errorln("[omikuji]:", err)
+				ctx.SendChain(message.Text("ERROR:", err))
+				return
+			}
+			kujiBytes, err := text.RenderToBase64(getKujiByBango(bg), text.FontFile, 400, 20)
+			if err != nil {
+				ctx.SendChain(message.Text("ERROR:", err))
+				return
 			}
 			if id := ctx.SendChain(message.At(ctx.Event.UserID), message.Image("base64://"+helper.BytesToString(kujiBytes))); id.ID() == 0 {
 				ctx.SendChain(message.Text("ERROR:可能被风控了"))
@@ -66,12 +74,12 @@ func init() { // 插件主体
 		})
 }
 
-func bangoToday(uid int64) uint8 {
+func bangoToday(uid int64) (uint8, error) {
 	today, err := strconv.ParseInt(time.Now().Format("20060102"), 10, 64)
 	if err != nil {
-		log.Errorln("string转化为int64格式有问题:", err)
+		return 0, err
 	}
 	seed := uid + today
 	r := rand.New(rand.NewSource(seed))
-	return uint8(r.Intn(100) + 1)
+	return uint8(r.Intn(100) + 1), nil
 }

plugin/reborn/main.go

@@ -10,12 +10,10 @@ import (
 	"github.com/sirupsen/logrus"
 	zero "github.com/wdvxdr1123/ZeroBot"
 	"github.com/wdvxdr1123/ZeroBot/message"
-
-	"github.com/FloatTech/zbputils/control/order"
 )
 
 func init() {
-	en := control.Register("reborn", order.AcquirePrio(), &control.Options{
+	en := control.Register("reborn", &control.Options{
 		DisableOnDefault: false,
 		Help:             "投胎\n- reborn",
 		PublicDataFolder: "Reborn",

plugin/runcode/code_runner.go

@@ -14,8 +14,6 @@ import (
 	zero "github.com/wdvxdr1123/ZeroBot"
 	"github.com/wdvxdr1123/ZeroBot/message"
 
-	"github.com/FloatTech/zbputils/control/order"
-
 	"github.com/tidwall/gjson"
 )
 
@@ -93,7 +91,7 @@ var (
 )
 
 func init() {
-	control.Register("runcode", order.AcquirePrio(), &control.Options{
+	control.Register("runcode", &control.Options{
 		DisableOnDefault: false,
 		Help: "在线代码运行: \n" +
 			">runcode [language] [code block]\n" +

plugin/saucenao/searcher.go

@@ -15,14 +15,13 @@ import (
 	"github.com/FloatTech/AnimeAPI/yandex"
 
 	"github.com/FloatTech/zbputils/control"
-	"github.com/FloatTech/zbputils/control/order"
 	"github.com/FloatTech/zbputils/ctxext"
 	"github.com/FloatTech/zbputils/file"
 	"github.com/FloatTech/zbputils/img/pool"
 )
 
 func init() { // 插件主体
-	engine := control.Register("saucenao", order.AcquirePrio(), &control.Options{
+	engine := control.Register("saucenao", &control.Options{
 		DisableOnDefault: false,
 		Help: "搜图\n" +
 			"- 以图搜图 | 搜索图片 | 以图识图[图片]\n" +

plugin/scale/main.go

@@ -23,7 +23,6 @@ import (
 
 	"github.com/FloatTech/zbputils/binary"
 	"github.com/FloatTech/zbputils/control"
-	"github.com/FloatTech/zbputils/control/order"
 	"github.com/FloatTech/zbputils/ctxext"
 	"github.com/FloatTech/zbputils/file"
 	"github.com/FloatTech/zbputils/img"
@@ -32,7 +31,7 @@ import (
 )
 
 func init() {
-	engine := control.Register("scale", order.AcquirePrio(), &control.Options{
+	engine := control.Register("scale", &control.Options{
 		DisableOnDefault:  false,
 		Help:              "叔叔的AI二次元图片放大\n- 放大图片[图片]",
 		PrivateDataFolder: "scale",
@@ -57,7 +56,7 @@ func init() {
 					ctx.SendChain(message.Text("ERROR:", err))
 					return
 				}
-				if p[0].Drawings < 0.1 || p[0].Neutral > 0.8 {
+				if p.Drawings < 0.1 || p.Neutral > 0.8 {
 					ctx.SendChain(message.Text("请发送二次元图片!"))
 					return
 				}

plugin/score/model.go

@@ -117,3 +117,9 @@ func (sdb *scoredb) InsertOrUpdateSignInCountByUID(uid int64, count int) (err er
 	}
 	return
 }
+
+func (sdb *scoredb) GetScoreRankByTopN(n int) (st []scoretable, err error) {
+	db := (*gorm.DB)(sdb)
+	err = db.Debug().Model(&scoretable{}).Order("score desc").Limit(n).Find(&st).Error
+	return
+}

plugin/score/sign_in.go

@@ -8,8 +8,10 @@ import (
 	"time"
 
 	"github.com/fogleman/gg"
+	"github.com/golang/freetype"
 	log "github.com/sirupsen/logrus"
 	"github.com/tidwall/gjson"
+	"github.com/wcharczuk/go-chart/v2"
 	zero "github.com/wdvxdr1123/ZeroBot"
 	"github.com/wdvxdr1123/ZeroBot/message"
 
@@ -19,8 +21,6 @@ import (
 	"github.com/FloatTech/zbputils/img/text"
 	"github.com/FloatTech/zbputils/img/writer"
 	"github.com/FloatTech/zbputils/web"
-
-	"github.com/FloatTech/zbputils/control/order"
 )
 
 const (
@@ -35,9 +35,9 @@ const (
 var levelArray = [...]int{0, 1, 2, 5, 10, 20, 35, 55, 75, 100, 120}
 
 func init() {
-	engine := control.Register("score", order.AcquirePrio(), &control.Options{
+	engine := control.Register("score", &control.Options{
 		DisableOnDefault:  false,
-		Help:              "签到得分\n- 签到\n- 获得签到背景[@xxx] | 获得签到背景",
+		Help:              "签到得分\n- 签到\n- 获得签到背景[@xxx] | 获得签到背景\n- 查看分数排名",
 		PrivateDataFolder: "score",
 	})
 	cachePath := engine.DataFolder() + "cache/"
@@ -48,7 +48,6 @@ func init() {
 			panic(err)
 		}
 		sdb = initialize(engine.DataFolder() + "score.db")
-		log.Println("[score]加载score数据库")
 	}()
 	engine.OnFullMatch("签到", zero.OnlyGroup).SetBlock(true).
 		Handle(func(ctx *zero.Ctx) {
@@ -71,7 +70,11 @@ func init() {
 			}
 
 			picFile := cachePath + strconv.FormatInt(uid, 10) + today + ".png"
-			initPic(picFile)
+			err := initPic(picFile)
+			if err != nil {
+				ctx.SendChain(message.Text("ERROR:", err))
+				return
+			}
 
 			_ = sdb.InsertOrUpdateSignInCountByUID(uid, si.Count+1)
 
@@ -172,6 +175,71 @@ func init() {
 			}
 			ctx.SendChain(message.Image("file:///" + file.BOTPATH + "/" + picFile))
 		})
+	engine.OnFullMatch("查看分数排名", zero.OnlyGroup).SetBlock(true).
+		Handle(func(ctx *zero.Ctx) {
+			today := time.Now().Format("20060102")
+			drawedFile := cachePath + today + "scoreRank.png"
+			if file.IsExist(drawedFile) {
+				ctx.SendChain(message.Image("file:///" + file.BOTPATH + "/" + drawedFile))
+				return
+			}
+			st, err := sdb.GetScoreRankByTopN(10)
+			if err != nil {
+				ctx.SendChain(message.Text("ERROR:", err))
+				return
+			}
+			if len(st) == 0 {
+				ctx.SendChain(message.Text("ERROR:目前还没有人签到过"))
+				return
+			}
+			_, err = file.GetLazyData(text.FontFile, false, true)
+			if err != nil {
+				ctx.SendChain(message.Text("ERROR:", err))
+				return
+			}
+			b, err := os.ReadFile(text.FontFile)
+			if err != nil {
+				ctx.SendChain(message.Text("ERROR:", err))
+				return
+			}
+			font, err := freetype.ParseFont(b)
+			if err != nil {
+				ctx.SendChain(message.Text("ERROR:", err))
+				return
+			}
+			bars := make([]chart.Value, len(st))
+			for i, v := range st {
+				bars[i] = chart.Value{
+					Value: float64(v.Score),
+					Label: ctx.CardOrNickName(v.UID),
+				}
+			}
+			graph := chart.BarChart{
+				Font:  font,
+				Title: "饼干排名",
+				Background: chart.Style{
+					Padding: chart.Box{
+						Top: 40,
+					},
+				},
+				Height:   500,
+				BarWidth: 50,
+				Bars:     bars,
+			}
+			f, err := os.Create(drawedFile)
+			if err != nil {
+				ctx.SendChain(message.Text("ERROR:", err))
+				return
+			}
+			err = graph.Render(chart.PNG, f)
+			_ = f.Close()
+			if err != nil {
+				os.Remove(drawedFile)
+				ctx.SendChain(message.Text("ERROR:", err))
+				return
+			}
+			ctx.SendChain(message.Image("file:///" + file.BOTPATH + "/" + drawedFile))
+		})
 }
 
 func getHourWord(t time.Time) string {
@@ -202,20 +270,21 @@ func getLevel(count int) int {
 	return -1
 }
 
-func initPic(picFile string) {
+func initPic(picFile string) error {
 	if file.IsNotExist(picFile) {
 		data, err := web.RequestDataWith(web.NewDefaultClient(), backgroundURL, "GET", referer, ua)
 		if err != nil {
-			log.Errorln("[score]", err)
+			return err
 		}
 		picURL := gjson.Get(string(data), "pic").String()
 		data, err = web.RequestDataWith(web.NewDefaultClient(), picURL, "GET", "", ua)
 		if err != nil {
-			log.Errorln("[score]", err)
+			return err
 		}
 		err = os.WriteFile(picFile, data, 0666)
 		if err != nil {
-			log.Errorln("[score]", err)
+			return err
 		}
 	}
+	return nil
 }

plugin/setutime/setu_geter.go

@@ -18,8 +18,6 @@ import (
 	"github.com/FloatTech/zbputils/process"
 	zero "github.com/wdvxdr1123/ZeroBot"
 	"github.com/wdvxdr1123/ZeroBot/message"
-
-	"github.com/FloatTech/zbputils/control/order"
 )
 
 // Pools 图片缓冲池
@@ -51,7 +49,7 @@ var pool = &imgpool{
 }
 
 func init() { // 插件主体
-	engine := control.Register("setutime", order.AcquirePrio(), &control.Options{
+	engine := control.Register("setutime", &control.Options{
 		DisableOnDefault: false,
 		Help: "涩图\n" +
 			"- 来份[涩图/二次元/风景/车万]\n" +
@@ -76,7 +74,7 @@ func init() { // 插件主体
 		}
 	}()
 
-	engine.OnRegex(`^来份(.*)$`, ctxext.FirstValueInList(pool)).SetBlock(true).Limit(ctxext.LimitByUser).
+	engine.OnRegex(`^来份(.+)$`, ctxext.FirstValueInList(pool)).SetBlock(true).Limit(ctxext.LimitByUser).
 		Handle(func(ctx *zero.Ctx) {
 			var imgtype = ctx.State["regex_matched"].([]string)[1]
 			// 补充池子
@@ -96,7 +94,7 @@ func init() { // 插件主体
 			}
 		})
 
-	engine.OnRegex(`^添加(.*?)(\d+)$`, zero.SuperUserPermission).SetBlock(true).
+	engine.OnRegex(`^添加(.+)\s?(\d+)$`, zero.SuperUserPermission).SetBlock(true).
 		Handle(func(ctx *zero.Ctx) {
 			var (
 				imgtype = ctx.State["regex_matched"].([]string)[1]
@@ -110,7 +108,7 @@ func init() { // 插件主体
 			ctx.SendChain(message.Text("成功向分类", imgtype, "添加图片", id))
 		})
 
-	engine.OnRegex(`^删除(.*?)(\d+)$`, ctxext.FirstValueInList(pool), zero.SuperUserPermission).SetBlock(true).
+	engine.OnRegex(`^删除(.+)\s?(\d+)$`, ctxext.FirstValueInList(pool), zero.SuperUserPermission).SetBlock(true).
 		Handle(func(ctx *zero.Ctx) {
 			var (
 				imgtype = ctx.State["regex_matched"].([]string)[1]

plugin/shadiao/shadiao.go

@@ -3,8 +3,6 @@ package shadiao
 
 import (
 	control "github.com/FloatTech/zbputils/control"
-
-	"github.com/FloatTech/zbputils/control/order"
 )
 
 const (
@@ -23,7 +21,7 @@ const (
 )
 
 var (
-	engine = control.Register("shadiao", order.AcquirePrio(), &control.Options{
+	engine = control.Register("shadiao", &control.Options{
 		DisableOnDefault: false,
 		Help: "沙雕app\n" +
 			"- 哄我\n- 渣我\n- 来碗绿茶\n- 发个朋友圈\n- 来碗毒鸡汤\n- 讲个段子",

plugin/shindan/shindan.go

@@ -3,20 +3,17 @@ package shindan
 
 import (
 	"github.com/FloatTech/AnimeAPI/shindanmaker"
-	log "github.com/sirupsen/logrus"
 	zero "github.com/wdvxdr1123/ZeroBot"
 	"github.com/wdvxdr1123/ZeroBot/message"
 	"github.com/wdvxdr1123/ZeroBot/utils/helper"
 
-	"github.com/FloatTech/zbputils/control/order"
-
 	control "github.com/FloatTech/zbputils/control"
 	"github.com/FloatTech/zbputils/ctxext"
 	"github.com/FloatTech/zbputils/img/text"
 )
 
 func init() {
-	engine := control.Register("shindan", order.AcquirePrio(), &control.Options{
+	engine := control.Register("shindan", &control.Options{
 		DisableOnDefault: false,
 		Help: "shindan\n" +
 			"- 今天是什么少女[@xxx]\n" +
@@ -66,7 +63,8 @@ func handlepic(ctx *zero.Ctx) {
 	}
 	data, err := text.RenderToBase64(txt, text.FontFile, 400, 20)
 	if err != nil {
-		log.Errorln("[shindan]:", err)
+		ctx.SendChain(message.Text("ERROR:", err))
+		return
 	}
 	if id := ctx.SendChain(message.Image("base64://" + helper.BytesToString(data))); id.ID() == 0 {
 		ctx.SendChain(message.Text("ERROR:可能被风控了"))

plugin/sleep_manage/model.go

@@ -74,7 +74,7 @@ func (sdb *sleepdb) sleep(gid, uid int64) (position int, awakeTime time.Duration
 			db.Debug().Model(&SleepManage{}).Create(&st) // newUser not user
 		}
 	} else {
-		log.Println("sleeptime为", st)
+		log.Debugln("sleeptime为", st)
 		awakeTime = now.Sub(st.SleepTime)
 		db.Debug().Model(&SleepManage{}).Where("group_id = ? and user_id = ?", gid, uid).Update(
 			map[string]interface{}{
@@ -101,7 +101,7 @@ func (sdb *sleepdb) getUp(gid, uid int64) (position int, sleepTime time.Duration
 			db.Debug().Model(&SleepManage{}).Create(&st) // newUser not user
 		}
 	} else {
-		log.Println("sleeptime为", st)
+		log.Debugln("sleeptime为", st)
 		sleepTime = now.Sub(st.SleepTime)
 		db.Debug().Model(&SleepManage{}).Where("group_id = ? and user_id = ?", gid, uid).Update(
 			map[string]interface{}{

plugin/sleep_manage/sleep_manage.go

@@ -10,24 +10,21 @@ import (
 	"github.com/wdvxdr1123/ZeroBot/message"
 
 	control "github.com/FloatTech/zbputils/control"
-
-	"github.com/FloatTech/zbputils/control/order"
 )
 
 func init() {
-	engine := control.Register("sleepmanage", order.AcquirePrio(), &control.Options{
+	engine := control.Register("sleepmanage", &control.Options{
 		DisableOnDefault:  false,
 		Help:              "sleepmanage\n- 早安\n- 晚安",
 		PrivateDataFolder: "sleep",
 	})
 	go func() {
 		sdb = initialize(engine.DataFolder() + "manage.db")
-		log.Println("[sleepmanage]加载sleepmanage数据库")
 	}()
 	engine.OnFullMatch("早安", isMorning, zero.OnlyGroup).SetBlock(true).
 		Handle(func(ctx *zero.Ctx) {
 			position, getUpTime := sdb.getUp(ctx.Event.GroupID, ctx.Event.UserID)
-			log.Println(position, getUpTime)
+			log.Debugln(position, getUpTime)
 			hour, minute, second := timeDuration(getUpTime)
 			if (hour == 0 && minute == 0 && second == 0) || hour >= 24 {
 				ctx.SendChain(message.Reply(ctx.Event.MessageID), message.Text(fmt.Sprintf("早安成功！你是今天第%d个起床的", position)))
@@ -38,7 +35,7 @@ func init() {
 	engine.OnFullMatch("晚安", isEvening, zero.OnlyGroup).SetBlock(true).
 		Handle(func(ctx *zero.Ctx) {
 			position, sleepTime := sdb.sleep(ctx.Event.GroupID, ctx.Event.UserID)
-			log.Println(position, sleepTime)
+			log.Debugln(position, sleepTime)
 			hour, minute, second := timeDuration(sleepTime)
 			if (hour == 0 && minute == 0 && second == 0) || hour >= 24 {
 				ctx.SendChain(message.Reply(ctx.Event.MessageID), message.Text(fmt.Sprintf("晚安成功！你是今天第%d个睡觉的", position)))

plugin/thesaurus/chat.go

@@ -10,14 +10,12 @@ import (
 	"github.com/sirupsen/logrus"
 	zero "github.com/wdvxdr1123/ZeroBot"
 	"github.com/wdvxdr1123/ZeroBot/message"
-
-	"github.com/FloatTech/zbputils/control/order"
 )
 
 type kimo = map[string]*[]string
 
 func init() {
-	engine := control.Register("thesaurus", order.AcquirePrio(), &control.Options{
+	engine := control.Register("thesaurus", &control.Options{
 		DisableOnDefault: false,
 		Help:             "thesaurus\n- 词典匹配回复",
 		PublicDataFolder: "Chat",

plugin/tiangou/tiangou.go

@@ -4,7 +4,6 @@ package tiangou
 import (
 	sql "github.com/FloatTech/sqlite"
 	"github.com/FloatTech/zbputils/control"
-	"github.com/FloatTech/zbputils/control/order"
 	"github.com/FloatTech/zbputils/ctxext"
 	"github.com/FloatTech/zbputils/file"
 	"github.com/sirupsen/logrus"
@@ -20,7 +19,7 @@ type tiangou struct {
 var db = &sql.Sqlite{}
 
 func init() {
-	en := control.Register("tiangou", order.AcquirePrio(), &control.Options{
+	en := control.Register("tiangou", &control.Options{
 		DisableOnDefault: false,
 		Help: "舔狗日记\n" +
 			"- 舔狗日记",

plugin/tracemoe/moe.go

@@ -8,8 +8,6 @@ import (
 	trmoe "github.com/fumiama/gotracemoe"
 	zero "github.com/wdvxdr1123/ZeroBot"
 	"github.com/wdvxdr1123/ZeroBot/message"
-
-	"github.com/FloatTech/zbputils/control/order"
 )
 
 var (
@@ -17,7 +15,7 @@ var (
 )
 
 func init() { // 插件主体
-	engine := control.Register("tracemoe", order.AcquirePrio(), &control.Options{
+	engine := control.Register("tracemoe", &control.Options{
 		DisableOnDefault: false,
 		Help:             "tracemoe\n- 搜番 | 搜索番剧[图片]",
 	})

plugin/translation/tl.go

@@ -2,33 +2,26 @@
 package translation
 
 import (
-	"github.com/tidwall/gjson"
-	zero "github.com/wdvxdr1123/ZeroBot"
-	"github.com/wdvxdr1123/ZeroBot/message"
-
+	"github.com/FloatTech/AnimeAPI/tl"
 	control "github.com/FloatTech/zbputils/control"
 	"github.com/FloatTech/zbputils/ctxext"
-	"github.com/FloatTech/zbputils/process"
-	"github.com/FloatTech/zbputils/web"
-
-	"github.com/FloatTech/zbputils/control/order"
+	zero "github.com/wdvxdr1123/ZeroBot"
+	"github.com/wdvxdr1123/ZeroBot/message"
 )
 
 func init() {
-	control.Register("translation", order.AcquirePrio(), &control.Options{
+	control.Register("translation", &control.Options{
 		DisableOnDefault: false,
 		Help: "翻译\n" +
 			">TL 你好",
 	}).OnRegex(`^>TL\s(-.{1,10}? )?(.*)$`).SetBlock(true).Limit(ctxext.LimitByUser).
 		Handle(func(ctx *zero.Ctx) {
 			msg := []string{ctx.State["regex_matched"].([]string)[2]}
-			data, err := web.GetData("https://api.cloolc.club/fanyi?data=" + msg[0])
+			data, err := tl.Translate(msg[0])
 			if err != nil {
-				ctx.SendChain(message.Text("ERROR:", err))
+				ctx.SendChain(message.Text("Error:", data))
+				return
 			}
-			info := gjson.ParseBytes(data)
-			repo := info.Get("data.0")
-			process.SleepAbout1sTo2s()
-			ctx.SendChain(message.Text(repo.Get("value.0")))
+			ctx.SendChain(message.Text(data))
 		})
 }

plugin/vtb_quotation/model/model.go

@@ -95,23 +95,22 @@ func (ThirdCategory) TableName() string {
 }
 
 // GetAllFirstCategoryMessage 取出所有vtb
-func (vdb *VtbDB) GetAllFirstCategoryMessage() string {
+func (vdb *VtbDB) GetAllFirstCategoryMessage() (string, error) {
 	db := (*gorm.DB)(vdb)
 	firstStepMessage := "请选择一个vtb并发送序号:\n"
 	var fcl []FirstCategory
 	err := db.Debug().Model(&FirstCategory{}).Find(&fcl).Error
 	if err != nil {
-		log.Errorln("[vtb/model]数据库读取错误", err)
-		return ""
+		return "", err
 	}
 	for _, v := range fcl {
 		firstStepMessage += strconv.FormatInt(v.FirstCategoryIndex, 10) + ". " + v.FirstCategoryName + "\n"
 	}
-	return firstStepMessage
+	return firstStepMessage, nil
 }
 
 // GetAllSecondCategoryMessageByFirstIndex 取得同一个vtb所有语录类别
-func (vdb *VtbDB) GetAllSecondCategoryMessageByFirstIndex(firstIndex int) string {
+func (vdb *VtbDB) GetAllSecondCategoryMessageByFirstIndex(firstIndex int) (string, error) {
 	db := (*gorm.DB)(vdb)
 	secondStepMessage := "请选择一个语录类别并发送序号:\n"
 	var scl []SecondCategory
@@ -119,17 +118,16 @@ func (vdb *VtbDB) GetAllSecondCategoryMessageByFirstIndex(firstIndex int) string
 	db.Model(FirstCategory{}).Where("first_category_index = ?", firstIndex).First(&fc)
 	err := db.Debug().Model(&SecondCategory{}).Find(&scl, "first_category_uid = ?", fc.FirstCategoryUID).Error
 	if err != nil || len(scl) == 0 {
-		log.Errorln("[vtb/model]数据库读取错误", err)
-		return ""
+		return "", err
 	}
 	for _, v := range scl {
 		secondStepMessage += strconv.FormatInt(v.SecondCategoryIndex, 10) + ". " + v.SecondCategoryName + "\n"
 	}
-	return secondStepMessage
+	return secondStepMessage, nil
 }
 
 // GetAllThirdCategoryMessageByFirstIndexAndSecondIndex 取得同一个vtb同个类别的所有语录
-func (vdb *VtbDB) GetAllThirdCategoryMessageByFirstIndexAndSecondIndex(firstIndex, secondIndex int) string {
+func (vdb *VtbDB) GetAllThirdCategoryMessageByFirstIndexAndSecondIndex(firstIndex, secondIndex int) (string, error) {
 	db := (*gorm.DB)(vdb)
 	thirdStepMessage := "请选择一个语录并发送序号:\n"
 	var fc FirstCategory
@@ -137,13 +135,12 @@ func (vdb *VtbDB) GetAllThirdCategoryMessageByFirstIndexAndSecondIndex(firstInde
 	var tcl []ThirdCategory
 	err := db.Debug().Model(&ThirdCategory{}).Find(&tcl, "first_category_uid = ? and second_category_index = ?", fc.FirstCategoryUID, secondIndex).Error
 	if err != nil || len(tcl) == 0 {
-		log.Errorln("[vtb/model]数据库读取错误", err)
-		return ""
+		return "", err
 	}
 	for _, v := range tcl {
 		thirdStepMessage = thirdStepMessage + strconv.FormatInt(v.ThirdCategoryIndex, 10) + ". " + v.ThirdCategoryName + "\n"
 	}
-	return thirdStepMessage
+	return thirdStepMessage, nil
 }
 
 // GetThirdCategory ...
@@ -182,39 +179,35 @@ func (vdb *VtbDB) Close() error {
 const vtbURL = "https://vtbkeyboard.moe/api/get_vtb_list"
 
 // GetVtbList ...
-func (vdb *VtbDB) GetVtbList() (uidList []string) {
+func (vdb *VtbDB) GetVtbList() (uidList []string, err error) {
 	db := (*gorm.DB)(vdb)
 	client := &http.Client{}
 	req, err := http.NewRequest("GET", vtbURL, nil)
 	if err != nil {
-		log.Errorln(err)
 		return
 	}
 	// 自定义Header
 	req.Header.Set("User-Agent", web.RandUA())
 	resp, err := client.Do(req)
 	if err != nil {
-		log.Errorln(err)
 		return
 	}
 
 	defer resp.Body.Close()
 	bytes, err := io.ReadAll(resp.Body)
 	if err != nil {
-		log.Errorln(err)
 		return
 	}
 
 	vtbListStr, err := strconv.Unquote(strings.ReplaceAll(strconv.Quote(string(bytes)), `\\u`, `\u`))
 	if err != nil {
-		log.Errorln(err)
 		return
 	}
 
 	count := gjson.Get(vtbListStr, "#").Int()
 	for i := int64(0); i < count; i++ {
 		item := gjson.Get(vtbListStr, strconv.FormatInt(i, 10))
-		log.Println(item)
+		log.Debugln(item)
 		fc := FirstCategory{
 			FirstCategoryIndex:       i,
 			FirstCategoryName:        item.Get("name").String(),
@@ -222,7 +215,7 @@ func (vdb *VtbDB) GetVtbList() (uidList []string) {
 			FirstCategoryIconPath:    item.Get("icon_path").String(),
 			FirstCategoryUID:         item.Get("uid").String(),
 		}
-		log.Println(fc)
+		log.Debugln(fc)
 
 		if err := db.Debug().Model(&FirstCategory{}).First(&fc, "first_category_uid = ?", fc.FirstCategoryUID).Error; err != nil {
 			if gorm.IsRecordNotFoundError(err) {
@@ -240,45 +233,41 @@ func (vdb *VtbDB) GetVtbList() (uidList []string) {
 		uidList = append(uidList, fc.FirstCategoryUID)
 	}
 
-	return uidList
+	return
 }
 
 // StoreVtb ...
-func (vdb *VtbDB) StoreVtb(uid string) {
+func (vdb *VtbDB) StoreVtb(uid string) (err error) {
 	db := (*gorm.DB)(vdb)
 	vtbURL := "https://vtbkeyboard.moe/api/get_vtb_page?uid=" + uid
 	client := &http.Client{}
 	req, err := http.NewRequest("GET", vtbURL, nil)
 	if err != nil {
-		log.Errorln(err)
 		return
 	}
 	// 自定义Header
 	req.Header.Set("User-Agent", web.RandUA())
 	resp, err := client.Do(req)
 	if err != nil {
-		log.Errorln(err)
 		return
 	}
 
 	defer resp.Body.Close()
 	bytes, err := io.ReadAll(resp.Body)
 	if err != nil {
-		log.Errorln(err)
 		return
 	}
 
 	vtbStr, err := strconv.Unquote(strings.ReplaceAll(strconv.Quote(string(bytes)), `\\u`, `\u`))
 	if err != nil {
-		log.Errorln(err)
 		return
 	}
 
 	secondCount := gjson.Get(vtbStr, "data.voices.#").Int()
-	log.Println("二级品类一共有", secondCount)
+	log.Debugln("二级品类一共有", secondCount)
 	for secondIndex := int64(0); secondIndex < secondCount; secondIndex++ {
 		secondItem := gjson.Get(vtbStr, "data.voices."+strconv.FormatInt(secondIndex, 10))
-		log.Println(secondItem)
+		log.Debugln(secondItem)
 		sc := SecondCategory{
 			SecondCategoryName:        secondItem.Get("categoryName").String(),
 			SecondCategoryIndex:       secondIndex,
@@ -301,10 +290,10 @@ func (vdb *VtbDB) StoreVtb(uid string) {
 				})
 		}
 		thirdCount := secondItem.Get("voiceList.#").Int()
-		log.Println("三级品类一共有", thirdCount)
+		log.Debugln("三级品类一共有", thirdCount)
 		for thirdIndex := int64(0); thirdIndex < thirdCount; thirdIndex++ {
 			thirdItem := secondItem.Get("voiceList." + strconv.FormatInt(thirdIndex, 10))
-			log.Println(thirdItem)
+			log.Debugln(thirdItem)
 			tc := ThirdCategory{
 				ThirdCategoryName:        thirdItem.Get("name").String(),
 				ThirdCategoryIndex:       thirdIndex,
@@ -314,7 +303,7 @@ func (vdb *VtbDB) StoreVtb(uid string) {
 				ThirdCategoryPath:        thirdItem.Get("path").String(),
 				ThirdCategoryAuthor:      thirdItem.Get("author").String(),
 			}
-			log.Println(tc)
+			log.Debugln(tc)
 
 			if err := db.Debug().Model(&ThirdCategory{}).First(&tc, "first_category_uid = ? and second_category_index = ? and third_category_index = ?",
 				uid, secondIndex, thirdIndex).Error; err != nil {
@@ -333,4 +322,5 @@ func (vdb *VtbDB) StoreVtb(uid string) {
 			}
 		}
 	}
+	return
 }

plugin/vtb_quotation/vtb_quotation.go

@@ -13,7 +13,6 @@ import (
 	"time"
 
 	_ "github.com/fumiama/sqlite3" // use sql
-	log "github.com/sirupsen/logrus"
 	zero "github.com/wdvxdr1123/ZeroBot"
 	"github.com/wdvxdr1123/ZeroBot/message"
 	"github.com/wdvxdr1123/ZeroBot/utils/helper"
@@ -23,8 +22,6 @@ import (
 	"github.com/FloatTech/zbputils/img/text"
 	"github.com/FloatTech/zbputils/web"
 
-	"github.com/FloatTech/zbputils/control/order"
-
 	"github.com/FloatTech/ZeroBot-Plugin/plugin/vtb_quotation/model"
 )
 
@@ -36,7 +33,7 @@ var (
 )
 
 func init() {
-	engine := control.Register("vtbquotation", order.AcquirePrio(), &control.Options{
+	engine := control.Register("vtbquotation", &control.Options{
 		DisableOnDefault: false,
 		Help:             "vtbkeyboard.moe\n- vtb语录\n- 随机vtb\n- 更新vtb\n",
 		PublicDataFolder: "VtbQuotation",
@@ -60,14 +57,20 @@ func init() {
 				Repeat()             // 不断监听复读
 			db, err := model.Open(dbfile)
 			if err != nil {
-				log.Errorln("[vtb]:", err)
+				ctx.SendChain(message.Text("ERROR:", err))
 				return
 			}
 			defer db.Close()
 			defer cancel()
-			firstStepImageBytes, err := text.RenderToBase64(db.GetAllFirstCategoryMessage(), text.FontFile, 400, 20)
+			r, err := db.GetAllFirstCategoryMessage()
 			if err != nil {
-				log.Errorln("[vtb]:", err)
+				ctx.SendChain(message.Text("ERROR:", err))
+				return
+			}
+			firstStepImageBytes, err := text.RenderToBase64(r, text.FontFile, 400, 20)
+			if err != nil {
+				ctx.SendChain(message.Text("ERROR:", err))
+				return
 			}
 			if id := ctx.SendChain(message.Reply(ctx.Event.MessageID), message.Image("base64://"+helper.BytesToString(firstStepImageBytes))); id.ID() == 0 {
 				ctx.SendChain(message.Text("ERROR:可能被风控了"))
@@ -87,19 +90,29 @@ func init() {
 					switch step {
 					case 0:
 						firstIndex, err = strconv.Atoi(c.Event.RawMessage)
-						// log.Println(fmt.Sprintf("当前在第%d步", step))
-						// log.Println(fmt.Sprintf("firstIndex:%d,secondIndex:%d,thirdIndex:%d", firstIndex, secondIndex, thirdIndex))
+						// log.Debugln(fmt.Sprintf("当前在第%d步", step))
+						// log.Debugln(fmt.Sprintf("firstIndex:%d,secondIndex:%d,thirdIndex:%d", firstIndex, secondIndex, thirdIndex))
 						if err != nil {
 							ctx.SendChain(message.Reply(c.Event.MessageID), message.Text("请输入正确的序号,三次输入错误，指令可退出重输"))
 							errorCount++
 						} else {
-							secondStepMessage := db.GetAllSecondCategoryMessageByFirstIndex(firstIndex)
-							// log.Println(secondStepMessage)
+							secondStepMessage, err := db.GetAllSecondCategoryMessageByFirstIndex(firstIndex)
+							if err != nil {
+								ctx.SendChain(message.Text("ERROR:", err))
+								return
+							}
+							// log.Debugln(secondStepMessage)
 							if secondStepMessage == "" {
 								ctx.SendChain(message.Reply(c.Event.MessageID), message.Text("你选择的序号没有内容，请重新选择，三次输入错误，指令可退出重输"))
-								firstStepImageBytes, err := text.RenderToBase64(db.GetAllFirstCategoryMessage(), text.FontFile, 400, 20)
+								r, err := db.GetAllFirstCategoryMessage()
 								if err != nil {
-									log.Errorln("[vtb]:", err)
+									ctx.SendChain(message.Text("ERROR:", err))
+									return
+								}
+								firstStepImageBytes, err := text.RenderToBase64(r, text.FontFile, 400, 20)
+								if err != nil {
+									ctx.SendChain(message.Text("ERROR:", err))
+									return
 								}
 								if id := ctx.SendChain(message.Reply(ctx.Event.MessageID), message.Image("base64://"+helper.BytesToString(firstStepImageBytes))); id.ID() == 0 {
 									ctx.SendChain(message.Text("ERROR:可能被风控了"))
@@ -108,7 +121,8 @@ func init() {
 							} else {
 								secondStepMessageBytes, err := text.RenderToBase64(secondStepMessage, text.FontFile, 400, 20)
 								if err != nil {
-									log.Errorln("[vtb]:", err)
+									ctx.SendChain(message.Text("ERROR:", err))
+									return
 								}
 								if id := ctx.SendChain(message.Reply(ctx.Event.MessageID), message.Image("base64://"+helper.BytesToString(secondStepMessageBytes))); id.ID() == 0 {
 									ctx.SendChain(message.Text("ERROR:可能被风控了"))
@@ -118,19 +132,29 @@ func init() {
 						}
 					case 1:
 						secondIndex, err = strconv.Atoi(c.Event.RawMessage)
-						// log.Println(fmt.Sprintf("当前在第%d步", step))
-						// log.Println(fmt.Sprintf("firstIndex:%d,secondIndex:%d,thirdIndex:%d", firstIndex, secondIndex, thirdIndex))
+						// log.Debugln(fmt.Sprintf("当前在第%d步", step))
+						// log.Debugln(fmt.Sprintf("firstIndex:%d,secondIndex:%d,thirdIndex:%d", firstIndex, secondIndex, thirdIndex))
 						if err != nil {
 							ctx.SendChain(message.Reply(c.Event.MessageID), message.Text("请输入正确的序号，三次输入错误，指令可退出重输"))
 							errorCount++
 						} else {
-							thirdStepMessage := db.GetAllThirdCategoryMessageByFirstIndexAndSecondIndex(firstIndex, secondIndex)
-							// log.Println(thirdStepMessage)
+							thirdStepMessage, err := db.GetAllThirdCategoryMessageByFirstIndexAndSecondIndex(firstIndex, secondIndex)
+							if err != nil {
+								ctx.SendChain(message.Text("ERROR:", err))
+								return
+							}
+							// log.Debugln(thirdStepMessage)
 							if thirdStepMessage == "" {
 								ctx.SendChain(message.Reply(c.Event.MessageID), message.Text("你选择的序号没有内容，请重新选择，三次输入错误，指令可退出重输"))
-								secondStepMessageBytes, err := text.RenderToBase64(db.GetAllSecondCategoryMessageByFirstIndex(firstIndex), text.FontFile, 400, 20)
+								r, err := db.GetAllSecondCategoryMessageByFirstIndex(firstIndex)
 								if err != nil {
-									log.Errorln("[vtb]:", err)
+									ctx.SendChain(message.Text("ERROR:", err))
+									return
+								}
+								secondStepMessageBytes, err := text.RenderToBase64(r, text.FontFile, 400, 20)
+								if err != nil {
+									ctx.SendChain(message.Text("ERROR:", err))
+									return
 								}
 								if id := ctx.SendChain(message.Reply(ctx.Event.MessageID), message.Image("base64://"+helper.BytesToString(secondStepMessageBytes))); id.ID() == 0 {
 									ctx.SendChain(message.Text("ERROR:可能被风控了"))
@@ -139,7 +163,8 @@ func init() {
 							} else {
 								thirdStepMessageBytes, err := text.RenderToBase64(thirdStepMessage, text.FontFile, 400, 20)
 								if err != nil {
-									log.Errorln("[vtb]:", err)
+									ctx.SendChain(message.Text("ERROR:", err))
+									return
 								}
 								if id := ctx.SendChain(message.Reply(ctx.Event.MessageID), message.Image("base64://"+helper.BytesToString(thirdStepMessageBytes))); id.ID() == 0 {
 									ctx.SendChain(message.Text("ERROR:可能被风控了"))
@@ -149,8 +174,8 @@ func init() {
 						}
 					case 2:
 						thirdIndex, err = strconv.Atoi(c.Event.RawMessage)
-						// log.Println(fmt.Sprintf("当前在第%d步", step))
-						// log.Println(fmt.Sprintf("firstIndex:%d,secondIndex:%d,thirdIndex:%d", firstIndex, secondIndex, thirdIndex))
+						// log.Debugln(fmt.Sprintf("当前在第%d步", step))
+						// log.Debugln(fmt.Sprintf("firstIndex:%d,secondIndex:%d,thirdIndex:%d", firstIndex, secondIndex, thirdIndex))
 						if err != nil {
 							ctx.SendChain(message.Reply(c.Event.MessageID), message.Text("请输入正确的序号，三次输入错误，指令可退出重输"))
 							errorCount++
@@ -160,9 +185,15 @@ func init() {
 							recURL := tc.ThirdCategoryPath
 							if recURL == "" {
 								ctx.SendChain(message.Reply(c.Event.MessageID), message.Text("没有内容请重新选择，三次输入错误，指令可退出重输"))
-								firstStepImageBytes, err := text.RenderToBase64(db.GetAllFirstCategoryMessage(), text.FontFile, 400, 20)
+								r, err := db.GetAllFirstCategoryMessage()
 								if err != nil {
-									log.Errorln("[vtb]:", err)
+									ctx.SendChain(message.Text("ERROR:", err))
+									return
+								}
+								firstStepImageBytes, err := text.RenderToBase64(r, text.FontFile, 400, 20)
+								if err != nil {
+									ctx.SendChain(message.Text("ERROR:", err))
+									return
 								}
 								if id := ctx.SendChain(message.Reply(ctx.Event.MessageID), message.Image("base64://"+helper.BytesToString(firstStepImageBytes))); id.ID() == 0 {
 									ctx.SendChain(message.Text("ERROR:可能被风控了"))
@@ -171,16 +202,16 @@ func init() {
 								step = 1
 							} else {
 								if reg.MatchString(recURL) {
-									// log.Println(reg.FindStringSubmatch(recordUrl)[1])
-									// log.Println(url.QueryEscape(reg.FindStringSubmatch(recordUrl)[1]))
+									// log.Debugln(reg.FindStringSubmatch(recordUrl)[1])
+									// log.Debugln(url.QueryEscape(reg.FindStringSubmatch(recordUrl)[1]))
 									recURL = strings.ReplaceAll(recURL, reg.FindStringSubmatch(recURL)[1], url.QueryEscape(reg.FindStringSubmatch(recURL)[1]))
 									recURL = strings.ReplaceAll(recURL, "+", "%20")
-									// log.Println(recordUrl)
+									// log.Debugln(recordUrl)
 								}
 								ctx.SendChain(message.Reply(c.Event.MessageID), message.Text("请欣赏《"+tc.ThirdCategoryName+"》"))
 
 								if !re.MatchString(recURL) {
-									log.Errorln("[vtb]:文件格式不匹配")
+									ctx.SendChain(message.Text("ERROR:文件格式不匹配"))
 									return
 								}
 								format := re.FindStringSubmatch(recURL)[1]
@@ -189,7 +220,11 @@ func init() {
 									ctx.SendChain(message.Record("file:///" + file.BOTPATH + "/" + recordFile))
 									return
 								}
-								initRecord(recordFile, recURL)
+								err = initRecord(recordFile, recURL)
+								if err != nil {
+									ctx.SendChain(message.Text("ERROR:", err))
+									return
+								}
 								ctx.SendChain(message.Record("file:///" + file.BOTPATH + "/" + recordFile))
 								return
 							}
@@ -207,9 +242,10 @@ func init() {
 		Handle(func(ctx *zero.Ctx) {
 			db, err := model.Open(dbfile)
 			if err != nil {
-				log.Errorln("[vtb]:", err)
+				ctx.SendChain(message.Text("ERROR:", err))
 				return
 			}
+			defer db.Close()
 			tc := db.RandomVtb()
 			fc := db.GetFirstCategoryByFirstUID(tc.FirstCategoryUID)
 			if (tc != model.ThirdCategory{}) && (fc != model.FirstCategory{}) {
@@ -221,7 +257,7 @@ func init() {
 				}
 				ctx.SendChain(message.Reply(ctx.Event.MessageID), message.Text("请欣赏"+fc.FirstCategoryName+"的《"+tc.ThirdCategoryName+"》"))
 				if !re.MatchString(recURL) {
-					log.Errorln("[vtb]:文件格式不匹配")
+					ctx.SendChain(message.Text("ERROR:文件格式不匹配"))
 					return
 				}
 				format := re.FindStringSubmatch(recURL)[1]
@@ -230,29 +266,42 @@ func init() {
 					ctx.SendChain(message.Record("file:///" + file.BOTPATH + "/" + recordFile))
 					return
 				}
-				initRecord(recordFile, recURL)
+				err = initRecord(recordFile, recURL)
+				if err != nil {
+					ctx.SendChain(message.Text("ERROR:", err))
+					return
+				}
 				ctx.SendChain(message.Record("file:///" + file.BOTPATH + "/" + recordFile))
 			}
-			db.Close()
 		})
 	engine.OnFullMatch("更新vtb", zero.SuperUserPermission).SetBlock(true).
 		Handle(func(ctx *zero.Ctx) {
 			ctx.Send("少女祈祷中......")
 			db := model.Initialize(dbfile)
 			if db != nil {
-				for _, v := range db.GetVtbList() {
-					db.StoreVtb(v)
-				}
-				err := db.Close()
+				vl, err := db.GetVtbList()
 				if err != nil {
-					log.Errorln("[vtb/cron]", err)
+					ctx.SendChain(message.Text("ERROR:", err))
+					return
+				}
+				for _, v := range vl {
+					err = db.StoreVtb(v)
+					if err != nil {
+						ctx.SendChain(message.Text("ERROR:", err))
+						return
+					}
+				}
+				err = db.Close()
+				if err != nil {
+					ctx.SendChain(message.Text("ERROR:", err))
+					return
 				}
 			}
 			ctx.Send("vtb数据库已更新")
 		})
 }
 
-func initRecord(recordFile, recordURL string) {
+func initRecord(recordFile, recordURL string) error {
 	if file.IsNotExist(recordFile) {
 		client := web.NewTLS12Client()
 		req, _ := http.NewRequest("GET", recordURL, nil)
@@ -260,18 +309,17 @@ func initRecord(recordFile, recordURL string) {
 		req.Header.Set("User-Agent", "Mozilla/5.0 (Windows NT 6.1; WOW64; rv:6.0) Gecko/20100101 Firefox/6.0")
 		resp, err := client.Do(req)
 		if err != nil {
-			log.Errorln("[vtb]:", err)
-			return
+			return err
 		}
 		defer resp.Body.Close()
 		data, err := io.ReadAll(resp.Body)
 		if err != nil {
-			log.Errorln("[vtb]:", err)
-			return
+			return err
 		}
 		err = os.WriteFile(recordFile, data, 0666)
 		if err != nil {
-			log.Errorln("[vtb]:", err)
+			return err
 		}
 	}
+	return nil
 }

plugin/wangyiyun/main.go

@@ -8,8 +8,6 @@ import (
 	zero "github.com/wdvxdr1123/ZeroBot"
 	"github.com/wdvxdr1123/ZeroBot/message"
 	"github.com/wdvxdr1123/ZeroBot/utils/helper"
-
-	"github.com/FloatTech/zbputils/control/order"
 )
 
 const (
@@ -19,7 +17,7 @@ const (
 )
 
 func init() {
-	control.Register("wangyiyun", order.AcquirePrio(), &control.Options{
+	control.Register("wangyiyun", &control.Options{
 		DisableOnDefault: false,
 		Help:             "wangyiyun \n- 来份网易云热评",
 	}).OnFullMatch("来份网易云热评").SetBlock(true).Limit(ctxext.LimitByUser).

plugin/wordle/wordle.go

@@ -11,8 +11,9 @@ import (
 	"sync"
 	"time"
 
+	"github.com/FloatTech/AnimeAPI/tl"
+
 	"github.com/FloatTech/zbputils/control"
-	"github.com/FloatTech/zbputils/control/order"
 	"github.com/FloatTech/zbputils/ctxext"
 	"github.com/FloatTech/zbputils/file"
 	"github.com/FloatTech/zbputils/img/writer"
@@ -60,15 +61,15 @@ var (
 )
 
 func init() {
-	en := control.Register("wordle", order.AcquirePrio(), &control.Options{
+	en := control.Register("wordle", &control.Options{
 		DisableOnDefault: false,
 		Help: "猜单词\n" +
-			"- 个人猜单词" +
+			"- 个人猜单词\n" +
 			"- 团队猜单词",
 		PublicDataFolder: "Wordle",
 	}).ApplySingle(single.New(
-		single.WithKeyFn(func(ctx *zero.Ctx) interface{} { return ctx.Event.GroupID }),
-		single.WithPostFn(func(ctx *zero.Ctx) {
+		single.WithKeyFn(func(ctx *zero.Ctx) int64 { return ctx.Event.GroupID }),
+		single.WithPostFn[int64](func(ctx *zero.Ctx) {
 			ctx.Send(
 				message.ReplyWithMessage(ctx.Event.MessageID,
 					message.Text("已经有正在进行的游戏..."),
@@ -108,6 +109,11 @@ func init() {
 		Handle(func(ctx *zero.Ctx) {
 			class := classdict[ctx.State["regex_matched"].([]string)[2]]
 			target := words[class].cet4[rand.Intn(len(words[class].cet4))]
+			tt, err := tl.Translate(target)
+			if err != nil {
+				ctx.SendChain(message.Text("ERROR:", err))
+				return
+			}
 			game := newWordleGame(target)
 			_, img, cl, _ := game("")
 			ctx.Send(
@@ -126,35 +132,44 @@ func init() {
 					zero.OnlyGroup, zero.CheckGroup(ctx.Event.GroupID))
 			}
 			var win bool
-			var err error
 			recv, cancel := next.Repeat()
 			defer cancel()
+			tick := time.NewTimer(105 * time.Second)
+			after := time.NewTimer(120 * time.Second)
 			for {
 				select {
-				case <-time.After(time.Second * 120):
+				case <-tick.C:
+					ctx.SendChain(message.Text("猜单词，你还有15s作答时间"))
+				case <-after.C:
 					ctx.Send(
 						message.ReplyWithMessage(ctx.Event.MessageID,
-							message.Text("猜单词超时，游戏结束...答案是: ", target),
+							message.Text("猜单词超时，游戏结束...答案是: ", target, "(", tt, ")"),
 						),
 					)
 					return
 				case c := <-recv:
+					tick.Reset(105 * time.Second)
+					after.Reset(120 * time.Second)
 					win, img, cl, err = game(c.Event.Message.String())
 					switch {
 					case win:
+						tick.Stop()
+						after.Stop()
 						ctx.Send(
 							message.ReplyWithMessage(c.Event.MessageID,
 								message.ImageBytes(img),
-								message.Text("太棒了，你猜出来了！"),
+								message.Text("太棒了，你猜出来了！答案是: ", target, "(", tt, ")"),
 							),
 						)
 						cl()
 						return
 					case err == errTimesRunOut:
+						tick.Stop()
+						after.Stop()
 						ctx.Send(
 							message.ReplyWithMessage(c.Event.MessageID,
 								message.ImageBytes(img),
-								message.Text("游戏结束...答案是: ", target),
+								message.Text("游戏结束...答案是: ", target, "(", tt, ")"),
 							),
 						)
 						cl()

plugin/wtf/main.go

@@ -9,12 +9,10 @@ import (
 	"github.com/FloatTech/zbputils/ctxext"
 	zero "github.com/wdvxdr1123/ZeroBot"
 	"github.com/wdvxdr1123/ZeroBot/message"
-
-	"github.com/FloatTech/zbputils/control/order"
 )
 
 func init() {
-	en := control.Register("wtf", order.AcquirePrio(), &control.Options{
+	en := control.Register("wtf", &control.Options{
 		DisableOnDefault: false,
 		Help:             "鬼东西\n- 鬼东西列表\n- 查询鬼东西[序号][@xxx]",
 	})

plugin/ymgal/model.go

@@ -13,7 +13,6 @@ import (
 	"github.com/antchfx/htmlquery"
 	_ "github.com/fumiama/sqlite3" // import sql
 	"github.com/jinzhu/gorm"
-	log "github.com/sirupsen/logrus"
 )
 
 // gdb 得分数据库
@@ -125,27 +124,27 @@ var (
 	emoticonIDList       []string
 )
 
-func initPageNumber() (maxCgPageNumber, maxEmoticonPageNumber int) {
+func initPageNumber() (maxCgPageNumber, maxEmoticonPageNumber int, err error) {
 	doc, err := htmlquery.LoadURL(cgURL + "1")
 	if err != nil {
-		log.Errorln("[ymgal]:", err)
+		return
 	}
 	maxCgPageNumber, err = strconv.Atoi(htmlquery.FindOne(doc, commonPageNumberExpr).Data)
 	if err != nil {
-		log.Errorln("[ymgal]:", err)
+		return
 	}
 	doc, err = htmlquery.LoadURL(emoticonURL + "1")
 	if err != nil {
-		log.Errorln("[ymgal]:", err)
+		return
 	}
 	maxEmoticonPageNumber, err = strconv.Atoi(htmlquery.FindOne(doc, commonPageNumberExpr).Data)
 	if err != nil {
-		log.Errorln("[ymgal]:", err)
+		return
 	}
 	return
 }
 
-func getPicID(pageNumber int, pictureType string) {
+func getPicID(pageNumber int, pictureType string) error {
 	var picURL string
 	if pictureType == cgType {
 		picURL = cgURL + strconv.Itoa(pageNumber)
@@ -154,7 +153,7 @@ func getPicID(pageNumber int, pictureType string) {
 	}
 	doc, err := htmlquery.LoadURL(picURL)
 	if err != nil {
-		log.Errorln("[ymgal]:", err)
+		return err
 	}
 	list := htmlquery.Find(doc, "//*[@id='picset-result-list']/ul/div/div[1]/a")
 	for i := 0; i < len(list); i++ {
@@ -166,16 +165,26 @@ func getPicID(pageNumber int, pictureType string) {
 			emoticonIDList = append(emoticonIDList, picID)
 		}
 	}
+	return nil
 }
 
-func updatePic() {
-	maxCgPageNumber, maxEmoticonPageNumber := initPageNumber()
+func updatePic() error {
+	maxCgPageNumber, maxEmoticonPageNumber, err := initPageNumber()
+	if err != nil {
+		return err
+	}
 	for i := 1; i <= maxCgPageNumber; i++ {
-		getPicID(i, cgType)
+		err = getPicID(i, cgType)
+		if err != nil {
+			return err
+		}
 		time.Sleep(time.Millisecond * 500)
 	}
 	for i := 1; i <= maxEmoticonPageNumber; i++ {
-		getPicID(i, emoticonType)
+		err = getPicID(i, emoticonType)
+		if err != nil {
+			return err
+		}
 		time.Sleep(time.Millisecond * 500)
 	}
 CGLOOP:
@@ -185,8 +194,11 @@ CGLOOP:
 		mu.RUnlock()
 		if y.PictureList == "" {
 			mu.Lock()
-			storeCgPic(cgIDList[i])
+			err = storeCgPic(cgIDList[i])
 			mu.Unlock()
+			if err != nil {
+				return err
+			}
 		} else {
 			break CGLOOP
 		}
@@ -199,24 +211,28 @@ EMOTICONLOOP:
 		mu.RUnlock()
 		if y.PictureList == "" {
 			mu.Lock()
-			storeEmoticonPic(emoticonIDList[i])
+			err = storeEmoticonPic(emoticonIDList[i])
 			mu.Unlock()
+			if err != nil {
+				return err
+			}
 		} else {
 			break EMOTICONLOOP
 		}
 		time.Sleep(time.Millisecond * 500)
 	}
+	return nil
 }
 
-func storeCgPic(picIDStr string) {
+func storeCgPic(picIDStr string) (err error) {
 	picID, err := strconv.ParseInt(picIDStr, 10, 64)
 	if err != nil {
-		log.Errorln("[ymgal]:", err)
+		return
 	}
 	pictureType := cgType
 	doc, err := htmlquery.LoadURL(webPicURL + picIDStr)
 	if err != nil {
-		log.Errorln("[ymgal]:", err)
+		return
 	}
 	title := htmlquery.FindOne(doc, "//meta[@name='name']").Attr[1].Val
 	pictureDescription := htmlquery.FindOne(doc, "//meta[@name='description']").Attr[1].Val
@@ -224,7 +240,7 @@ func storeCgPic(picIDStr string) {
 	re := regexp.MustCompile(reNumber)
 	pictureNumber, err := strconv.Atoi(re.FindString(pictureNumberStr))
 	if err != nil {
-		log.Errorln("[ymgal]:", err)
+		return
 	}
 	pictureList := ""
 	for i := 1; i <= pictureNumber; i++ {
@@ -236,20 +252,18 @@ func storeCgPic(picIDStr string) {
 		}
 	}
 	err = gdb.insertOrUpdateYmgalByID(picID, title, pictureType, pictureDescription, pictureList)
-	if err != nil {
-		log.Errorln("[ymgal]:", err)
-	}
+	return
 }
 
-func storeEmoticonPic(picIDStr string) {
+func storeEmoticonPic(picIDStr string) error {
 	picID, err := strconv.ParseInt(picIDStr, 10, 64)
 	if err != nil {
-		log.Errorln("[ymgal]:", err)
+		return err
 	}
 	pictureType := emoticonType
 	doc, err := htmlquery.LoadURL(webPicURL + picIDStr)
 	if err != nil {
-		log.Errorln("[ymgal]:", err)
+		return err
 	}
 	title := htmlquery.FindOne(doc, "//meta[@name='name']").Attr[1].Val
 	pictureDescription := htmlquery.FindOne(doc, "//meta[@name='description']").Attr[1].Val
@@ -257,7 +271,7 @@ func storeEmoticonPic(picIDStr string) {
 	re := regexp.MustCompile(reNumber)
 	pictureNumber, err := strconv.Atoi(re.FindString(pictureNumberStr))
 	if err != nil {
-		log.Errorln("[ymgal]:", err)
+		return err
 	}
 	pictureList := ""
 	for i := 1; i <= pictureNumber; i++ {
@@ -268,8 +282,5 @@ func storeEmoticonPic(picIDStr string) {
 			pictureList += "," + picURL
 		}
 	}
-	err = gdb.insertOrUpdateYmgalByID(picID, title, pictureType, pictureDescription, pictureList)
-	if err != nil {
-		log.Errorln("[ymgal]:", err)
-	}
+	return gdb.insertOrUpdateYmgalByID(picID, title, pictureType, pictureDescription, pictureList)
 }

plugin/ymgal/ymgal.go

@@ -5,7 +5,6 @@ import (
 	"strings"
 
 	"github.com/FloatTech/zbputils/control"
-	"github.com/FloatTech/zbputils/control/order"
 	"github.com/FloatTech/zbputils/ctxext"
 	"github.com/FloatTech/zbputils/file"
 	zero "github.com/wdvxdr1123/ZeroBot"
@@ -13,7 +12,7 @@ import (
 )
 
 func init() {
-	engine := control.Register("ymgal", order.AcquirePrio(), &control.Options{
+	engine := control.Register("ymgal", &control.Options{
 		DisableOnDefault: false,
 		Help:             "月幕galgame\n- 随机galCG\n- 随机gal表情包\n- galCG[xxx]\n- gal表情包[xxx]\n- 更新gal\n",
 		PublicDataFolder: "Ymgal",
@@ -51,7 +50,11 @@ func init() {
 	engine.OnFullMatch("更新gal", zero.SuperUserPermission).SetBlock(true).Handle(
 		func(ctx *zero.Ctx) {
 			ctx.Send("少女祈祷中......")
-			updatePic()
+			err := updatePic()
+			if err != nil {
+				ctx.SendChain(message.Text("ERROR:", err))
+				return
+			}
 			ctx.Send("ymgal数据库已更新")
 		})
 }

plugin/zaobao/zaobao.go

@@ -12,8 +12,6 @@ import (
 	"github.com/FloatTech/zbputils/binary"
 	control "github.com/FloatTech/zbputils/control"
 	"github.com/FloatTech/zbputils/web"
-
-	"github.com/FloatTech/zbputils/control/order"
 )
 
 const (
@@ -29,7 +27,7 @@ var (
 )
 
 func init() { // 插件主体
-	engine := control.Register("zaobao", order.AcquirePrio(), &control.Options{
+	engine := control.Register("zaobao", &control.Options{
 		DisableOnDefault: true,
 		Help: "易即今日公众号api的今日早报\n" +
 			"api早上8点更新，推荐定时在8点30后\n" +

run.bat

@@ -3,5 +3,5 @@ go env -w GOPROXY=https://goproxy.cn,direct
 go env -w GO111MODULE=auto
 go mod tidy
 ::go build -ldflags="-s -w" -o ZeroBot-Plugin.exe
-go run main.go main_win.go
+go run main.go main_win.go config.go
 pause

run.sh

@@ -3,4 +3,4 @@ go env -w GOPROXY=https://goproxy.cn,direct
 go env -w GO111MODULE=auto
 go mod tidy
 #go build -ldflags="-s -w" -o ZeroBot-Plugin
-go run main.go
+go run main.go config.go