🐛 job 指令触发可能失败

* 优化在两个命令中使用空格分隔的体验
- fortune的设置底图功能
- b14的加密功能

* 优化四个插件中使用空格分隔的体验
- 加密
- 哔哩哔哩推送
- 藏头诗
- 运势

* 优化并修正了上一个commit
- 加上了因为复制粘贴疏忽又没有注意测试遗漏的`?`
- 调整藏头诗和加密的正则触发，使其不必多此一举
- 删去了未被发现的测试代码

* - 删去了遗漏的Trim

* 优化了更多插件中使用空格的体验
- 优化了music bilibili image_finder 中使用空格的体验
- 补上了plugin_bilibili中未实现的vup开头触发
- 为plugin_bilibili_parse输出的消息加上一个换行符，优化排版

* 小调整

- 考虑到屌字既难打又有碍观瞻,改为正则匹配`[屌|弔|吊]图`
- 增加了退群提醒的定制

* - 修复退群提醒本身忘记修改了的问题

* fix:修复了枝网查重无法使用的问题

* readme适配上次的欢迎语修改

* 删去调试语句

* Update setu_geter.go

* Update zhiwang.go

Co-authored-by: 源文雨 <41315874+fumiama@users.noreply.github.com>

.github/workflows/nightly.yml

@@ -28,7 +28,7 @@ jobs:
       - name: Setup Go environment
         uses: actions/setup-go@v2.1.3
         with:
-          go-version: 1.17
+          go-version: 1.18
       - name: Cache downloaded module
         uses: actions/cache@v2
         with:

.github/workflows/pull.yml

@@ -8,7 +8,7 @@ jobs:
       - name: Set up Go
         uses: actions/setup-go@v2
         with:
-          go-version: 1.17
+          go-version: 1.18
 
       - name: Check out code into the Go module directory
         uses: actions/checkout@v2
@@ -28,9 +28,6 @@ jobs:
           # Optional: show only new issues if it's a pull request. The default value is `false`.
           # only-new-issues: true
 
-          # Optional: if set to true then the action will use pre-installed Go.
-          skip-go-installation: true
-
           # Optional: if set to true then the action don't cache or restore ~/go/pkg.
           # skip-pkg-cache: true
 

.github/workflows/push.yml

@@ -8,7 +8,7 @@ jobs:
       - name: Set up Go
         uses: actions/setup-go@v2
         with:
-          go-version: 1.17
+          go-version: 1.18
 
       - name: Check out code into the Go module directory
         uses: actions/checkout@v2
@@ -18,7 +18,6 @@ jobs:
         with:
           version: latest
           args: --issues-exit-code=0
-          skip-go-installation: true
       - name: Commit back
         continue-on-error: true
         run: |

.github/workflows/release.yml

@@ -16,7 +16,7 @@ jobs:
       - name: Set up Go
         uses: actions/setup-go@v2
         with:
-          go-version: '1.17'
+          go-version: '1.18'
 
       - name: Run GoReleaser
         uses: goreleaser/goreleaser-action@v2

.golangci.yml

@@ -6,10 +6,6 @@ linters-settings:
   goimports:
     local-prefixes: github.com/FloatTech/ZeroBot-Plugin
 
-  gocritic:
-    disabled-checks:
-      - exitAfterDefer
-
   forbidigo:
     # Forbid the following identifiers
     forbid:
@@ -66,6 +62,7 @@ run:
   tests: false
   skip-dirs:
     - order
+  go: '1.18'
 
 # output configuration options
 output:

README.md

@@ -5,7 +5,6 @@
 
   <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)
@@ -66,7 +65,8 @@ zerobot [-h] [-t token] [-u url] [-n nickname] [-p prefix] [-d|w] [-g 监听地
     - [x] /服务列表
     - [x] /服务详情
     - [x] @Bot 插件冲突检测 (会在本群发送一条消息并在约 1s 后撤回以检测其它同类 bot 中已启用的插件并禁用)
-- **定时指令触发器** `import _ "github.com/FloatTech/ZeroBot-Plugin/plugin/job"`
+- **定时指令触发器** `import _ "github.com/FloatTech/zbputils/job"`
+    - 注意：触发器具有限速，每 2s 仅允许最多一次触发
     - [x] 记录以"完全匹配关键词"触发的(代表我执行的)指令
     - [x] 取消以"完全匹配关键词"触发的(代表我执行的)指令
     - [x] 记录在"cron"触发的指令
@@ -118,6 +118,8 @@ print("run[CQ:image,file="+j["img"]+"]")
 ```
 ![随机b站404页趣图](https://user-images.githubusercontent.com/41315874/157371451-c09ad3bb-c61a-4a42-9c47-fab3305bc0f8.png)
 
+- **渲染任意文字到图片** `import _ "github.com/FloatTech/ZeroBot-Plugin/plugin/font"`
+    - [x] (用[终末体|终末变体|紫罗兰体|樱酥体|Consolas体|苹方体])渲染文字xxx
 - **聊天** `import _ "github.com/FloatTech/ZeroBot-Plugin/plugin/chat"`
     - [x] [BOT名字]
     - [x] [戳一戳BOT]
@@ -145,7 +147,7 @@ print("run[CQ:image,file="+j["img"]+"]")
     - [x] 退出群聊[群号]@Bot
     - [x] *入群欢迎
     - [x] *退群通知
-    - [x] 设置欢迎语[欢迎~]
+    - [x] 设置欢迎语[欢迎~]  可选添加 [{at}] [{nickname}] [{avatar}] [{id}]
     - [x] 在[MM]月[dd]日的[hh]点[mm]分时(用[url])提醒大家[xxx]
     - [x] 在[MM]月[每周 | 周几]的[hh]点[mm]分时(用[url])提醒大家[xxx]
     - [x] 取消在[MM]月[dd]日的[hh]点[mm]分的提醒
@@ -159,11 +161,13 @@ print("run[CQ:image,file="+j["img"]+"]")
     - [ ] 同意好友请求
     - [ ] 撤回[@xxx] [xxx]
     - [ ] 警告[@xxx]
-    - [x] run[xxx]
     - 注：使用gist加群自动审批，请在群介绍添加以下说明，同时开启`需要回答问题并由管理员审核`：加群请在github新建一个gist，其文件名为本群群号的字符串的md5(小写)，内容为一行，是当前unix时间戳(10分钟内有效)。然后请将您的用户名和gist哈希(小写)按照username/gisthash的格式填写到回答即可。
+    - 设置欢迎语可选添加参数说明：{at}可在发送时艾特被欢迎者 {nickname}是被欢迎者名字 {avatar}是被欢迎者头像
 - **GitHub仓库搜索** `import _ "github.com/FloatTech/ZeroBot-Plugin/plugin/github"`
     - [x] >github [xxx]
     - [x] >github -p [xxx]
+- **注入指令** `import _ "github.com/FloatTech/ZeroBot-Plugin/plugin/inject"`
+    - [x] run[CQ码]
 - **在线代码运行** `import _ "github.com/FloatTech/ZeroBot-Plugin/plugin/runcode"`
     - [x] > runcode [language] help
     - [x] > runcode [language] [code block]
@@ -178,6 +182,7 @@ print("run[CQ:image,file="+j["img"]+"]")
     - [x] 异世界转生[@xxx]
     - [x] 卖萌[@xxx]
     - [x] 抽老婆[@xxx]
+    - [x] 黄油角色[@xxx]
 - **AIWife** `import _ "github.com/FloatTech/ZeroBot-Plugin/plugin/aiwife"`
     - [x] waifu | 随机waifu(从[100000个AI生成的waifu](https://www.thiswaifudoesnotexist.net/)中随机一位)
 - **gif** `import _ "github.com/FloatTech/ZeroBot-Plugin/plugin/gif"`
@@ -193,9 +198,17 @@ print("run[CQ:image,file="+j["img"]+"]")
 - **摸鱼** `import _ "github.com/FloatTech/ZeroBot-Plugin/plugin/moyu"`
     - [x] /启用 moyu
     - [x] /禁用 moyu
+```
+记录在"0 10 * * *"触发的指令
+摸鱼提醒
+```
 - **摸鱼人日历** `import _ "github.com/FloatTech/ZeroBot-Plugin/plugin/moyu_calendar"`
     - [x] /启用 moyucalendar
     - [x] /禁用 moyucalendar
+```
+记录在"30 8 * * *"触发的指令
+摸鱼人日历
+```
 - **涩图** `import _ "github.com/FloatTech/ZeroBot-Plugin/plugin/setutime"`
     - [x] 来份[涩图/二次元/风景/车万]
     - [x] 添加[涩图/二次元/风景/车万][P站图片ID]
@@ -220,6 +233,9 @@ print("run[CQ:image,file="+j["img"]+"]")
     - [x] 搜番 | 搜索番剧[图片]
 - **百度一下** `import _ "github.com/FloatTech/ZeroBot-Plugin/plugin/baidu"`
     - [x] 百度下[xxx]
+- **百人一首** `import _ "github.com/FloatTech/ZeroBot-Plugin/plugin/hyaku"`
+    - [x] 百人一首
+    - [x] 百人一首之n
 - **随机图片与AI点评** `import _ github.com/FloatTech/ZeroBot-Plugin/plugin/acgimage`
     - [x] 随机图片(评级大于6的图将私发)
     - [x] 直接随机(无r18检测，务必小心，仅管理可用)
@@ -232,7 +248,10 @@ 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] 原神十连
 - **睡眠管理** `import _ github.com/FloatTech/ZeroBot-Plugin/plugin/sleep_manage`
     - [x] 早安 | 晚安
 - **浅草寺求签** `import _ github.com/FloatTech/ZeroBot-Plugin/plugin/omikuji`
@@ -248,8 +267,11 @@ print("run[CQ:image,file="+j["img"]+"]")
     - [x] 个人猜单词
     - [x] 团队猜单词
 - **bilibili** `import _ "github.com/FloatTech/ZeroBot-Plugin/plugin/bilibili"`
-    - [x] >vup info [名字 | uid]
-    - [x] >user info [名字 | uid]
+    - [x] >vup info [xxx]
+    - [x] >user info [xxx]
+    - [x] 查成分 [xxx]
+    - [x] 设置b站cookie SESSDATA=82da790d,1663822823,06ecf*31
+    - [x] 更新vup
 - **嘉然** `import _ "github.com/FloatTech/ZeroBot-Plugin/plugin/diana"`
     - [x] 小作文
     - [x] 发大病
@@ -337,14 +359,26 @@ print("run[CQ:image,file="+j["img"]+"]")
 - **b站视频链接解析** `import _ "github.com/FloatTech/ZeroBot-Plugin/plugin/bilibili_parse"`
     - [x] https://www.bilibili.com/video/BV1xx411c7BF | https://www.bilibili.com/video/av1605 | https://b23.tv/I8uzWCA | https://www.bilibili.com/video/bv1xx411c7BF
 - **煎蛋网无聊图** `import _ "github.com/FloatTech/ZeroBot-Plugin/plugin/jandan"`
-    - [x] 来份屌图
-    - [x] 更新屌图
+    - [x] 来份[屌|弔|吊]图
+    - [x] 更新[屌|弔|吊]图
 - **月幕galgame图** `import _ "github.com/FloatTech/ZeroBot-Plugin/plugin/ymgal"`
     - [x] 随机galCG
     - [x] 随机gal表情包
     - [x] galCG[xxx]
     - [x] gal表情包[xxx]
     - [x] 更新gal
+- **城市疫情查询** `import _ "github.com/FloatTech/ZeroBot-Plugin/plugin/epidemic"`
+    - [x] xxx疫情
+- **早报** `import _ "github.com/FloatTech/ZeroBot-Plugin/plugin/zaobao"`
+    - api早上8点更新，推荐定时在8点30后。配合插件`job`中的记录在"cron"触发的指令使用
+    - [x] /启用 zaobao
+    - [x] /禁用 zaobao
+```
+记录在"00 9 * * *"触发的指令
+今日早报
+```
+- **舔狗日记** `import _ "github.com/FloatTech/ZeroBot-Plugin/plugin/tiangou"`
+    - [x] 舔狗日记
 - **TODO...**
 
 ## 使用方法

go.mod

@@ -1,28 +1,29 @@
 module github.com/FloatTech/ZeroBot-Plugin
 
-go 1.17
+go 1.18
 
 require (
-	github.com/FloatTech/AnimeAPI v1.3.1-0.20220311024222-ed58ddf6834e
+	github.com/FloatTech/AnimeAPI v1.3.3-0.20220404043354-914e2358e584
 	github.com/FloatTech/sqlite v0.2.1
-	github.com/FloatTech/zbputils v1.3.1-0.20220311032316-df8ab8b3c180
+	github.com/FloatTech/zbputils v1.3.3-0.20220404050136-180c64cdee96
 	github.com/antchfx/htmlquery v1.2.4
 	github.com/corona10/goimagehash v1.0.3
 	github.com/fogleman/gg v1.3.0
 	github.com/fumiama/cron v1.3.0
-	github.com/fumiama/go-base16384 v1.3.0
-	github.com/fumiama/go-registry v0.1.1
-	github.com/fumiama/gofastTEA v0.0.9
+	github.com/fumiama/go-base16384 v1.4.0
+	github.com/fumiama/go-registry v0.1.3
+	github.com/fumiama/gofastTEA v0.0.10
 	github.com/fumiama/gotracemoe v0.0.3
 	github.com/fumiama/sqlite3 v1.14.6
+	github.com/golang/freetype v0.0.0-20170609003504-e2365dfdc4a0
 	github.com/jinzhu/gorm v1.9.16
 	github.com/mroth/weightedrand v0.4.1
 	github.com/pkumza/numcn v1.0.0
 	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.20220307142419-a1b34e6da007
-	golang.org/x/image v0.0.0-20220302094943-723b81ca9867
+	github.com/wdvxdr1123/ZeroBot v1.4.2-0.20220330050111-d962c23b4f4d
+	golang.org/x/image v0.0.0-20220321031419-a8550c1d254a
 )
 
 require (
@@ -31,11 +32,10 @@ require (
 	github.com/disintegration/imaging v1.6.2 // indirect
 	github.com/ericpauley/go-quantize v0.0.0-20200331213906-ae555eb2afa4 // indirect
 	github.com/go-ole/go-ole v1.2.6 // indirect
-	github.com/golang/freetype v0.0.0-20170609003504-e2365dfdc4a0 // indirect
 	github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
 	github.com/google/uuid v1.3.0 // indirect
 	github.com/jinzhu/inflection v1.0.0 // indirect
-	github.com/lufia/plan9stats v0.0.0-20211012122336-39d0f177ccd0 // indirect
+	github.com/lufia/plan9stats v0.0.0-20220326011226-f1430873d8db // indirect
 	github.com/mattn/go-isatty v0.0.14 // indirect
 	github.com/mattn/go-sqlite3 v1.14.12 // indirect
 	github.com/nfnt/resize v0.0.0-20180221191011-83c6a9932646 // indirect
@@ -46,10 +46,10 @@ require (
 	github.com/tklauser/go-sysconf v0.3.10 // indirect
 	github.com/tklauser/numcpus v0.4.0 // indirect
 	github.com/yusufpapurcu/wmi v1.2.2 // indirect
-	golang.org/x/net v0.0.0-20220225172249-27dd8689420f // indirect
-	golang.org/x/sys v0.0.0-20220227234510-4e6760a101f9 // indirect
+	golang.org/x/net v0.0.0-20220325170049-de3da57026de // indirect
+	golang.org/x/sys v0.0.0-20220330033206-e17cdc41300f // indirect
 	golang.org/x/text v0.3.7 // indirect
-	modernc.org/libc v1.14.6 // indirect
+	modernc.org/libc v1.14.12 // indirect
 	modernc.org/mathutil v1.4.1 // indirect
-	modernc.org/memory v1.0.5 // indirect
+	modernc.org/memory v1.0.7 // indirect
 )

go.sum

@@ -1,11 +1,9 @@
-github.com/FloatTech/AnimeAPI v1.3.1-0.20220311024222-ed58ddf6834e h1:PKm/g1M7rYu6YMOV5k8xCOkgXTKF2Tk9v2exeYyCe+0=
-github.com/FloatTech/AnimeAPI v1.3.1-0.20220311024222-ed58ddf6834e/go.mod h1:JNF2O/RdbrsDIccSQ29a4g1pQRrZsN0Jh3ggFZYzZuY=
-github.com/FloatTech/bot-manager v1.0.0/go.mod h1:8YYRJ16oroGHQGD2En0oVnmcKJkxR9O/jd5BPSfWfOQ=
+github.com/FloatTech/AnimeAPI v1.3.3-0.20220404043354-914e2358e584 h1:sBTSbodmIO4gmeKtU1BCiaDGYCsKNO7+ldg9oebyyVI=
+github.com/FloatTech/AnimeAPI v1.3.3-0.20220404043354-914e2358e584/go.mod h1:IKFBpKHgFAzo6cU4wOaRdb1ywa5mQ4NFc0mJk/wzgyY=
 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.1-0.20220307143543-1139754cacdf/go.mod h1:u+PiX1khNvtAgfRVTVP4hkA2oUnn5q5dTZSk1Cgp0Gw=
-github.com/FloatTech/zbputils v1.3.1-0.20220311032316-df8ab8b3c180 h1:8tE9DYu0+YMk3oKeO0ffl80818ZrPM9afbRgb2ag0tQ=
-github.com/FloatTech/zbputils v1.3.1-0.20220311032316-df8ab8b3c180/go.mod h1:u+PiX1khNvtAgfRVTVP4hkA2oUnn5q5dTZSk1Cgp0Gw=
+github.com/FloatTech/zbputils v1.3.3-0.20220404050136-180c64cdee96 h1:nS5auZd5HfJ/Qj0BTwhD+CmKlxtWa5/Uogzu1Y/RnUc=
+github.com/FloatTech/zbputils v1.3.3-0.20220404050136-180c64cdee96/go.mod h1:V2Y8jkxjwACWuJsDCyNVKc+qABfMAUh/mgBYdWBxOPo=
 github.com/PuerkitoBio/goquery v1.5.1/go.mod h1:GsLWisAFVj4WgDibEWF4pvYnkVQBpKBKeU+7zCJoLcc=
 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=
@@ -16,7 +14,6 @@ github.com/antchfx/xpath v1.2.0 h1:mbwv7co+x0RwgeGAOHdrKy89GvHaGvxxBtPK0uF9Zr8=
 github.com/antchfx/xpath v1.2.0/go.mod h1:i54GszH55fYfBmoZXapTHN8T8tkcHfRgLyVwwqzXNcs=
 github.com/corona10/goimagehash v1.0.3 h1:NZM518aKLmoNluluhfHGxT3LGOnrojrxhGn63DR/CZA=
 github.com/corona10/goimagehash v1.0.3/go.mod h1:VkvE0mLn84L4aF8vCb6mafVajEb6QYMHl2ZJLn0mOGI=
-github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E=
 github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
 github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
@@ -34,27 +31,19 @@ github.com/fogleman/gg v1.3.0/go.mod h1:R/bRT+9gY/C5z7JzPU0zXsXHKM4/ayA+zqcVNZzP
 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.3.0 h1:J5Xtwh/3alGJt/z/0IFralo5UQA89iFWQqbxj5ZQZi8=
-github.com/fumiama/go-base16384 v1.3.0/go.mod h1:RGA715p34BiLoZvPRtaxuo2q25Kq9jFsgUsJb8dwy14=
-github.com/fumiama/go-registry v0.1.1 h1:cmCRizjXHFW2ApwUHCXi8wKLJ6Gtt4GrShJlamGPbVI=
-github.com/fumiama/go-registry v0.1.1/go.mod h1:iJT3DVgH7KXpJZs6waXEjnWtJPUBBGhF+ByJIMRfngk=
-github.com/fumiama/gofastTEA v0.0.9 h1:adaWz+014vMShnLUNWIHLBs0Yv6JNUohcaXZNtct5J0=
-github.com/fumiama/gofastTEA v0.0.9/go.mod h1:RIdbYZyB4MbH6ZBlPymRaXn3cD6SedlCu5W/HHfMPBk=
+github.com/fumiama/go-base16384 v1.4.0 h1:4KrtewnmAChrZjPA7/QYc72t+vvsKF+DYB0q1iRPdpo=
+github.com/fumiama/go-base16384 v1.4.0/go.mod h1:OEn+947GV5gsbTAnyuUW/SrfxJYUdYupSIQXOuGOcXM=
+github.com/fumiama/go-registry v0.1.3 h1:WvUN2wdziB2+LyYs4zNy1FHGQOvZeto7lbADfSqbMPw=
+github.com/fumiama/go-registry v0.1.3/go.mod h1:iJT3DVgH7KXpJZs6waXEjnWtJPUBBGhF+ByJIMRfngk=
+github.com/fumiama/gofastTEA v0.0.10 h1:JJJ+brWD4kie+mmK2TkspDXKzqq0IjXm89aGYfoGhhQ=
+github.com/fumiama/gofastTEA v0.0.10/go.mod h1:RIdbYZyB4MbH6ZBlPymRaXn3cD6SedlCu5W/HHfMPBk=
 github.com/fumiama/gotracemoe v0.0.3 h1:iI5EbE9A3UUbfukG6+/soYPjp1S31eCNYf4tw7s6/Jc=
 github.com/fumiama/gotracemoe v0.0.3/go.mod h1:tyqahdUzHf0bQIAVY/GYmDWvYYe5ik1ZbhnGYh+zl40=
 github.com/fumiama/sqlite3 v1.14.6 h1:+e+iygyiDXQJVi7xeXIviBvR7hAc5y20WA9hRwfKn10=
 github.com/fumiama/sqlite3 v1.14.6/go.mod h1:Xx9a2/OtHuy9pBjow0N+bE/RhNeZ7zZz5xh25vqbA5A=
-github.com/gin-contrib/sse v0.1.0/go.mod h1:RHrZQHXnP2xjPF+u1gW/2HnVO7nvIa9PG3Gm+fLHvGI=
-github.com/gin-gonic/gin v1.7.7/go.mod h1:axIBovoeJpVj8S3BwE0uPMTeReE4+AfFtqpqaZ1qq1U=
 github.com/go-ole/go-ole v1.2.6 h1:/Fpf6oFPoeFik9ty7siob0G6Ke8QvQEuVcuChpwXzpY=
 github.com/go-ole/go-ole v1.2.6/go.mod h1:pprOEPIfldk/42T2oK7lQ4v4JSDwmV0As9GaiUsvbm0=
-github.com/go-playground/assert/v2 v2.0.1/go.mod h1:VDjEfimB/XKnb+ZQfWdccd7VUvScMdVu0Titje2rxJ4=
-github.com/go-playground/locales v0.13.0/go.mod h1:taPMhCMXrRLJO55olJkUXHZBHCxTMfnGwq/HNwmWNS8=
-github.com/go-playground/locales v0.14.0/go.mod h1:sawfccIbzZTqEDETgFXqTho0QybSa7l++s0DH+LDiLs=
-github.com/go-playground/universal-translator v0.17.0/go.mod h1:UkSxE5sNxxRwHyU+Scu5vgOQjsIJAF8j9muTVoKLVtA=
-github.com/go-playground/universal-translator v0.18.0/go.mod h1:UvRDBj+xPUEGrFYl+lu/H90nyDXpg0fqeB/AQUGNTVA=
-github.com/go-playground/validator/v10 v10.4.1/go.mod h1:nlOn6nFhuKACm19sB/8EGNn9GlaMV7XkbRSipzJ0Ii4=
-github.com/go-playground/validator/v10 v10.10.0/go.mod h1:74x4gJWsvQexRdW8Pn3dXSGrTK4nAUsbPlLADvpJkos=
+github.com/go-playground/assert/v2 v2.0.1 h1:MsBgLAaY856+nPRTKrp3/OZK38U/wa0CcBYNjji3q3A=
 github.com/go-sql-driver/mysql v1.5.0 h1:ozyZYNQW3x3HtqT1jira07DN2PArx2v7/mN66gGcHOs=
 github.com/go-sql-driver/mysql v1.5.0/go.mod h1:DCzpHaOWr8IXmIStZouvnhqoel9Qv2LBy8hT2VhHyBg=
 github.com/golang-sql/civil v0.0.0-20190719163853-cb61b32ac6fe h1:lXe2qZdvpiX5WZkZR4hgp4KJVfY3nMkvmwbVkpv1rVY=
@@ -65,16 +54,11 @@ github.com/golang/groupcache v0.0.0-20200121045136-8c9f03a8e57e/go.mod h1:cIg4er
 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/protobuf v1.3.3/go.mod h1:vzj43D7+SQXF/4pzW/hwtAqwc6iTitCiVSaWz5lYuqw=
-github.com/golang/protobuf v1.5.0/go.mod h1:FsONVRAS9T7sI+LIUmWTfcYkHO4aIWwzhcaSAoJOfIk=
-github.com/golang/protobuf v1.5.2/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiuN0vRsmY=
 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.5/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/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg=
 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=
@@ -84,32 +68,19 @@ github.com/jinzhu/inflection v1.0.0 h1:K317FqzuhWc8YvSVlFMCCUb36O/S9MCKRDI7QkRKD
 github.com/jinzhu/inflection v1.0.0/go.mod h1:h+uFLlag+Qp1Va5pdKtLDYj+kHp5pxUVkryuEj+Srlc=
 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/json-iterator/go v1.1.9/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4=
-github.com/json-iterator/go v1.1.12/go.mod h1:e30LSqwooZae/UwlEbR2852Gd8hjQvJoHmT4TnhNGBo=
 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/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo=
-github.com/kr/pretty v0.2.1/go.mod h1:ipq/a2n7PKx3OHsz4KJII5eveXtPO4qwEXGdVfWzfnI=
-github.com/kr/pretty v0.3.0/go.mod h1:640gp4NfQd8pI5XOwp5fnNeVWj67G7CFk/SaSQn7NBk=
-github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ=
-github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI=
-github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE=
-github.com/leodido/go-urn v1.2.0/go.mod h1:+8+nEpDfqqsY+g338gtMEUOtuK+4dEMhiQEgxpxOKII=
-github.com/leodido/go-urn v1.2.1/go.mod h1:zt4jvISO2HfUBqxjfIshjdMTYS56ZS/qv49ictyFfxY=
 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 h1:6E+4a0GO5zZEnZ81pIr0yLvtUWk2if982qA3F3QD6H4=
 github.com/lufia/plan9stats v0.0.0-20211012122336-39d0f177ccd0/go.mod h1:zJYVVT2jmtg6P3p1VtQj7WsuWi/y4VnjVBn7F8KPB3I=
+github.com/lufia/plan9stats v0.0.0-20220326011226-f1430873d8db h1:m2s7Fwo4OwmcheIWUc/Nw9/MZ0eFtP3to0ovTpqOiCQ=
+github.com/lufia/plan9stats v0.0.0-20220326011226-f1430873d8db/go.mod h1:VgrrWVwBO2+6XKn8ypT3WUqvoxCa8R2M5to2tRzGovI=
 github.com/mattn/go-isatty v0.0.12/go.mod h1:cbi8OIDigv2wuxKPP5vlRcQ1OAZbq2CE4Kysco4FUpU=
 github.com/mattn/go-isatty v0.0.14 h1:yVuAays6BHfxijgZPzw+3Zlu5yQgKGP2/hcQbHb7S9Y=
 github.com/mattn/go-isatty v0.0.14/go.mod h1:7GGIvUiUoEMVVmxf/4nioHXj79iQHKdU27kJ6hsGG94=
 github.com/mattn/go-sqlite3 v1.14.0/go.mod h1:JIl7NbARA7phWnGvh0LKTyg7S9BA+6gx71ShQilpsus=
 github.com/mattn/go-sqlite3 v1.14.12 h1:TJ1bhYJPV44phC+IMu1u2K/i5RriLTPe+yc68XDJ1Z0=
 github.com/mattn/go-sqlite3 v1.14.12/go.mod h1:NyWgC/yNuGj7Q9rpYnZvas74GogHl5/Z4A/KQRfk6bU=
-github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q=
-github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q=
-github.com/modern-go/reflect2 v0.0.0-20180701023420-4b7aa43c6742/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3RllmbCylyMrvgv0=
-github.com/modern-go/reflect2 v1.0.2/go.mod h1:yWuevngMOJpCy52FWWMvUC8ws7m/LJsjYzDa0/r8luk=
 github.com/mroth/weightedrand v0.4.1 h1:rHcbUBopmi/3x4nnrvwGJBhX9d0vk+KgoLUZeDP6YyI=
 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=
@@ -117,7 +88,6 @@ github.com/nfnt/resize v0.0.0-20180221191011-83c6a9932646/go.mod h1:jpp1/29i3P1S
 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/pkg/diff v0.0.0-20210226163009-20ebb0f2a09e/go.mod h1:pJLUxLENpZxwdsKMEsNbx1VGcRFpLqf3715MtcvvzbA=
 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=
@@ -127,8 +97,6 @@ github.com/power-devops/perfstat v0.0.0-20220216144756-c35f1ee13d7c h1:NRoLoZvkB
 github.com/power-devops/perfstat v0.0.0-20220216144756-c35f1ee13d7c/go.mod h1:OmDBASR4679mdNQnz2pUhc2G8CO2JrUAVFDRBDP/hJE=
 github.com/remyoudompheng/bigfft v0.0.0-20200410134404-eec4a21b6bb0 h1:OdAsTTz6OkFY5QxjkYwrChwuRruF69c169dPK26NUlk=
 github.com/remyoudompheng/bigfft v0.0.0-20200410134404-eec4a21b6bb0/go.mod h1:qqbHyh8v60DhA7CoWK5oRCqLrMHRGoxYCSS9EjAz6Eo=
-github.com/rogpeppe/go-internal v1.6.1/go.mod h1:xXDCJY+GAPziupqXw64V24skbSoqbTEfhy4qGm1nDQc=
-github.com/rogpeppe/go-internal v1.8.0/go.mod h1:WmiCO8CzOY8rg0OYDC4/i/2WRWAB6poM+XZ2dLUbcbE=
 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=
@@ -137,11 +105,9 @@ github.com/sirupsen/logrus v1.8.1/go.mod h1:yWOB1SBYBC5VeMP7gHvWumXLIWorT60ONWic
 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.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI=
-github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4=
-github.com/stretchr/testify v1.6.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
-github.com/stretchr/testify v1.7.0 h1:nwc3DEeHmmLAfoZucVR881uASk0Mfjw8xYJ99tb5CcY=
 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=
@@ -157,12 +123,8 @@ 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/ugorji/go v1.1.7/go.mod h1:kZn38zHttfInRq0xu/PH0az30d+z6vm202qpg1oXVMw=
-github.com/ugorji/go v1.2.7/go.mod h1:nF9osbDWLy6bDVv/Rtoh6QgnvNDpmCalQV5urGCCS6M=
-github.com/ugorji/go/codec v1.1.7/go.mod h1:Ax+UKWsSmolVDwsd+7N3ZtXu+yMGCf907BLYF3GoBXY=
-github.com/ugorji/go/codec v1.2.7/go.mod h1:WGN1fab3R1fzQlVQTkfxVtIBhWDRqOviHU95kRgeqEY=
-github.com/wdvxdr1123/ZeroBot v1.4.2-0.20220307142419-a1b34e6da007 h1:yHCJCj8u3Y0JDgTlrUqPHxIO6KU0WK9+voECZ2im5lo=
-github.com/wdvxdr1123/ZeroBot v1.4.2-0.20220307142419-a1b34e6da007/go.mod h1:NwXIp7PgjV+kUALMXJ4v4/3QcsRSOodtjhLekuPXFog=
+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/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=
@@ -171,12 +133,10 @@ golang.org/x/crypto v0.0.0-20190325154230-a5d413f7728c/go.mod h1:djNgcEr1/C05ACk
 golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
 golang.org/x/crypto v0.0.0-20191205180655-e7c4368fe9dd/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
 golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
-golang.org/x/crypto v0.0.0-20210711020723-a769d52b0f97/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc=
-golang.org/x/crypto v0.0.0-20220214200702-86341886e292 h1:f+lwQ+GtmgoY+A2YaQxlSOnDjXcQ7ZRLWOHbC6HtRqE=
-golang.org/x/crypto v0.0.0-20220214200702-86341886e292/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4=
+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-20220302094943-723b81ca9867 h1:TcHcE0vrmgzNH1v3ppjcMGbhG5+9fMuvOmUYwNEF4q4=
-golang.org/x/image v0.0.0-20220302094943-723b81ca9867/go.mod h1:023OzeP/+EPmXeapQh35lcL3II3LrY8Ic+EFFKVhULM=
+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=
@@ -186,10 +146,8 @@ golang.org/x/net v0.0.0-20200202094626-16171245cfb2/go.mod h1:z5CRVTTTmAJ677TzLL
 golang.org/x/net v0.0.0-20200324143707-d3edc9973b7e/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A=
 golang.org/x/net v0.0.0-20200421231249-e086a090c8fd/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A=
 golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU=
-golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg=
-golang.org/x/net v0.0.0-20211112202133-69e39bad7dc2/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
-golang.org/x/net v0.0.0-20220225172249-27dd8689420f h1:oA4XRj0qtSt8Yo1Zms0CUlsT3KG69V2UGQWPBxujDmc=
-golang.org/x/net v0.0.0-20220225172249-27dd8689420f/go.mod h1:CfG3xpIq0wQ8r1q4Su4UZFWDARRcnwPjda9FqA0JpMk=
+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=
@@ -202,26 +160,18 @@ golang.org/x/sys v0.0.0-20191026070338-33540a1f6037/go.mod h1:h1NjWce9XRLGQEsW7w
 golang.org/x/sys v0.0.0-20200116001909-b77594299b42/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20200323222414-85ca7c5b95cd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20201126233918-771906719818/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20201204225414-ed752295db88/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20210423082822-04245dca01da/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20210630005230-0f9fa26af87c/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.0.0-20210806184541-e5e7981a1069/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20210816074244-15123e1e1f71/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20210902050250-f475640dd07b/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20211007075335-d3039528d8ac/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.0.0-20211216021012-1d35b9e2eb4e/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20220111092808-5a964db01320/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20220128215802-99c3d69c2c27/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20220209214540-3681064d5158/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.0.0-20220227234510-4e6760a101f9 h1:nhht2DYV/Sn3qOayu8lM+cU1ii9sTLUeBQwQQfUHtrs=
-golang.org/x/sys v0.0.0-20220227234510-4e6760a101f9/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
-golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=
+golang.org/x/sys v0.0.0-20220330033206-e17cdc41300f h1:rlezHXNlxYWvBCzNses9Dlc7nGFaNMJeqLolcmQSSZY=
+golang.org/x/sys v0.0.0-20220330033206-e17cdc41300f/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
-golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk=
 golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
 golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
 golang.org/x/text v0.3.7 h1:olpwvP2KacW1ZWvsR7uQhoyTYvKAupfQrRGBFM352Gk=
@@ -234,22 +184,12 @@ golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8T
 golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 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=
-google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp09yW+WbY/TyQbw=
-google.golang.org/protobuf v1.26.0/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc=
-google.golang.org/protobuf v1.27.1/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
-gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
-gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c/go.mod h1:JHkPIbrfpd72SG/EVd6muEfDQjcINNoR0C8j2r3qZ4Q=
-gopkg.in/errgo.v2 v2.1.0/go.mod h1:hNsd1EY+bozCKY1Ytp96fpM3vjJbqLJn88ws8XvfDNI=
 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.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
-gopkg.in/yaml.v2 v2.2.8/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
-gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ=
 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=
-gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
 lukechampine.com/uint128 v1.1.1/go.mod h1:c4eWIwlEGaxC/+H1VguhU4PHXNWDCDMUlWdIWl2j1gk=
 modernc.org/cc/v3 v3.33.6/go.mod h1:iPJg1pkwXqAV16SNgFBVYmggfMg6xhs+2oiO0vclK3g=
 modernc.org/cc/v3 v3.33.9/go.mod h1:iPJg1pkwXqAV16SNgFBVYmggfMg6xhs+2oiO0vclK3g=
@@ -267,6 +207,7 @@ modernc.org/cc/v3 v3.35.17/go.mod h1:iPJg1pkwXqAV16SNgFBVYmggfMg6xhs+2oiO0vclK3g
 modernc.org/cc/v3 v3.35.18/go.mod h1:iPJg1pkwXqAV16SNgFBVYmggfMg6xhs+2oiO0vclK3g=
 modernc.org/cc/v3 v3.35.20/go.mod h1:iPJg1pkwXqAV16SNgFBVYmggfMg6xhs+2oiO0vclK3g=
 modernc.org/cc/v3 v3.35.22/go.mod h1:iPJg1pkwXqAV16SNgFBVYmggfMg6xhs+2oiO0vclK3g=
+modernc.org/cc/v3 v3.35.24/go.mod h1:NFUHyPn4ekoC/JHeZFfZurN6ixxawE1BnVonP/oahEI=
 modernc.org/ccgo/v3 v3.9.5/go.mod h1:umuo2EP2oDSBnD3ckjaVUXMrmeAw8C8OSICVa0iFf60=
 modernc.org/ccgo/v3 v3.10.0/go.mod h1:c0yBmkRFi7uW4J7fwx/JiijwOjeAeR2NoSaRVFPmjMw=
 modernc.org/ccgo/v3 v3.11.0/go.mod h1:dGNposbDp9TOZ/1KBxghxtUp/bzErD0/0QW4hhSaBMI=
@@ -308,7 +249,12 @@ modernc.org/ccgo/v3 v3.13.1/go.mod h1:aBYVOUfIlcSnrsRVU8VRS35y2DIfpgkmVkYZ0tpIXi
 modernc.org/ccgo/v3 v3.15.9/go.mod h1:md59wBwDT2LznX/OTCPoVS6KIsdRgY8xqQwBV+hkTH0=
 modernc.org/ccgo/v3 v3.15.10/go.mod h1:wQKxoFn0ynxMuCLfFD09c8XPUCc8obfchoVR9Cn0fI8=
 modernc.org/ccgo/v3 v3.15.12/go.mod h1:VFePOWoCd8uDGRJpq/zfJ29D0EVzMSyID8LCMWYbX6I=
+modernc.org/ccgo/v3 v3.15.14/go.mod h1:144Sz2iBCKogb9OKwsu7hQEub3EVgOlyI8wMUPGKUXQ=
+modernc.org/ccgo/v3 v3.15.15/go.mod h1:z5qltXjU4PJl0pE5nhYQCvA9DhPHiWsl5GWl89+NSYE=
+modernc.org/ccgo/v3 v3.15.16/go.mod h1:XbKRMeMWMdq712Tr5ECgATYMrzJ+g9zAZEj2ktzBe24=
+modernc.org/ccgo/v3 v3.15.17/go.mod h1:bofnFkpRFf5gLY+mBZIyTW6FEcp26xi2lgOFk2Rlvs0=
 modernc.org/ccorpus v1.11.1/go.mod h1:2gEUTrWqdpH2pXsmTM1ZkjeSrUWDpjMu2T6m29L/ErQ=
+modernc.org/ccorpus v1.11.6/go.mod h1:2gEUTrWqdpH2pXsmTM1ZkjeSrUWDpjMu2T6m29L/ErQ=
 modernc.org/httpfs v1.0.6/go.mod h1:7dosgurJGp0sPaRanU53W4xZYKh14wfzX420oZADeHM=
 modernc.org/libc v1.9.8/go.mod h1:U1eq8YWr/Kc1RWCMFUWEdkTg8OTcfLw2kY8EDwl039w=
 modernc.org/libc v1.9.11/go.mod h1:NyF3tsA5ArIjJ83XB0JlqhjTabTCHm9aX4XMPHyQn0Q=
@@ -352,16 +298,22 @@ modernc.org/libc v1.14.1/go.mod h1:npFeGWjmZTjFeWALQLrvklVmAxv4m80jnG3+xI8FdJk=
 modernc.org/libc v1.14.2/go.mod h1:MX1GBLnRLNdvmK9azU9LCxZ5lMyhrbEMK8rG3X/Fe34=
 modernc.org/libc v1.14.3/go.mod h1:GPIvQVOVPizzlqyRX3l756/3ppsAgg1QgPxjr5Q4agQ=
 modernc.org/libc v1.14.5/go.mod h1:2PJHINagVxO4QW/5OQdRrvMYo+bm5ClpUFfyXCYl9ak=
-modernc.org/libc v1.14.6 h1:SSiZiE5199iYsGM9gtkDj90xqcXVwubWG8CtoYE+Mnk=
 modernc.org/libc v1.14.6/go.mod h1:2PJHINagVxO4QW/5OQdRrvMYo+bm5ClpUFfyXCYl9ak=
+modernc.org/libc v1.14.7/go.mod h1:f8xfWXW8LW41qb4X5+huVQo5dcfPlq7Cbny2TDheMv0=
+modernc.org/libc v1.14.8/go.mod h1:9+JCLb1MWSY23smyOpIPbd5ED+rSS/ieiDWUpdyO3mo=
+modernc.org/libc v1.14.10/go.mod h1:y1MtIWhwpJFpLYm6grAThtuXJKEsY6xkdZmXbRngIdo=
+modernc.org/libc v1.14.12 h1:pUBZTYoISfbb4pCf4PECENpbvwDBxeKc+/dS9LyOWFM=
+modernc.org/libc v1.14.12/go.mod h1:fJdoe23MHu2ruPQkFPPqCpToDi5cckzsbmkI6Ez0LqQ=
 modernc.org/mathutil v1.1.1/go.mod h1:mZW8CKdRPY1v87qxC/wUdX5O1qDzXMP5TH3wjfpga6E=
 modernc.org/mathutil v1.2.2/go.mod h1:mZW8CKdRPY1v87qxC/wUdX5O1qDzXMP5TH3wjfpga6E=
 modernc.org/mathutil v1.4.0/go.mod h1:mZW8CKdRPY1v87qxC/wUdX5O1qDzXMP5TH3wjfpga6E=
 modernc.org/mathutil v1.4.1 h1:ij3fYGe8zBF4Vu+g0oT7mB06r8sqGWKuJu1yXeR4by8=
 modernc.org/mathutil v1.4.1/go.mod h1:mZW8CKdRPY1v87qxC/wUdX5O1qDzXMP5TH3wjfpga6E=
 modernc.org/memory v1.0.4/go.mod h1:nV2OApxradM3/OVbs2/0OsP6nPfakXpi50C7dcoHXlc=
-modernc.org/memory v1.0.5 h1:XRch8trV7GgvTec2i7jc33YlUI0RKVDBvZ5eZ5m8y14=
 modernc.org/memory v1.0.5/go.mod h1:B7OYswTRnfGg+4tDH1t1OeUNnsy2viGTdME4tzd+IjM=
+modernc.org/memory v1.0.6/go.mod h1:/0wo5ibyrQiaoUoH7f9D8dnglAmILJ5/cxZlRECf+Nw=
+modernc.org/memory v1.0.7 h1:UE3cxTRFa5tfUibAV7Jqq8P7zRY0OlJg+yWVIIaluEE=
+modernc.org/memory v1.0.7/go.mod h1:/0wo5ibyrQiaoUoH7f9D8dnglAmILJ5/cxZlRECf+Nw=
 modernc.org/opt v0.1.1/go.mod h1:WdSiB5evDcignE70guQKxYUl14mgWtbClRi5wmkkTX0=
 modernc.org/strutil v1.1.1/go.mod h1:DE+MQQ/hjKBZS2zNInV5hhcipt5rLPWkmpbGeW5mmdw=
 modernc.org/token v1.0.0/go.mod h1:UGzOrNV1mAFSEB63lOFHIpNRUVMvYTc6yu1SMY/XTDM=

kanban/banner.go

@@ -10,7 +10,7 @@ import (
 var (
 	info = [...]string{
 		"* OneBot + ZeroBot + Golang",
-		"* Version 1.3.1 - 2022-03-07 13:40:58 +0800 CST",
+		"* Version 1.3.3-beta1 - 2022-04-03 18:52:12 +0800 CST",
 		"* Copyright © 2020 - 2022 FloatTech. All Rights Reserved.",
 		"* Project: https://github.com/FloatTech/ZeroBot-Plugin",
 	}

main.go

@@ -35,6 +35,8 @@ import (
 
 	_ "github.com/FloatTech/ZeroBot-Plugin/plugin/thesaurus" // 词典匹配回复
 
+	_ "github.com/FloatTech/zbputils/job" // 定时指令触发器
+
 	//                               ^^^^                               //
 	//                          ^^^^^^^^^^^^^^                          //
 	//                      ^^^^^^^高优先级区^^^^^^^                      //
@@ -70,14 +72,18 @@ import (
 	_ "github.com/FloatTech/ZeroBot-Plugin/plugin/diana"          // 嘉心糖发病
 	_ "github.com/FloatTech/ZeroBot-Plugin/plugin/drift_bottle"   // 漂流瓶
 	_ "github.com/FloatTech/ZeroBot-Plugin/plugin/emojimix"       // 合成emoji
+	_ "github.com/FloatTech/ZeroBot-Plugin/plugin/epidemic"       // 城市疫情查询
+	_ "github.com/FloatTech/ZeroBot-Plugin/plugin/font"           // 渲染任意文字到图片
 	_ "github.com/FloatTech/ZeroBot-Plugin/plugin/fortune"        // 运势
 	_ "github.com/FloatTech/ZeroBot-Plugin/plugin/funny"          // 笑话
+	_ "github.com/FloatTech/ZeroBot-Plugin/plugin/genshin"        // 原神抽卡
 	_ "github.com/FloatTech/ZeroBot-Plugin/plugin/gif"            // 制图
 	_ "github.com/FloatTech/ZeroBot-Plugin/plugin/github"         // 搜索GitHub仓库
 	_ "github.com/FloatTech/ZeroBot-Plugin/plugin/hs"             // 炉石
+	_ "github.com/FloatTech/ZeroBot-Plugin/plugin/hyaku"          // 百人一首
 	_ "github.com/FloatTech/ZeroBot-Plugin/plugin/image_finder"   // 关键字搜图
+	_ "github.com/FloatTech/ZeroBot-Plugin/plugin/inject"         // 注入指令
 	_ "github.com/FloatTech/ZeroBot-Plugin/plugin/jandan"         // 煎蛋网无聊图
-	_ "github.com/FloatTech/ZeroBot-Plugin/plugin/job"            // 定时指令触发器
 	_ "github.com/FloatTech/ZeroBot-Plugin/plugin/juejuezi"       // 绝绝子生成器
 	_ "github.com/FloatTech/ZeroBot-Plugin/plugin/lolicon"        // lolicon 随机图片
 	_ "github.com/FloatTech/ZeroBot-Plugin/plugin/moyu"           // 摸鱼
@@ -97,12 +103,14 @@ import (
 	_ "github.com/FloatTech/ZeroBot-Plugin/plugin/setutime"       // 来份涩图
 	_ "github.com/FloatTech/ZeroBot-Plugin/plugin/shadiao"        // 沙雕app
 	_ "github.com/FloatTech/ZeroBot-Plugin/plugin/shindan"        // 测定
+	_ "github.com/FloatTech/ZeroBot-Plugin/plugin/tiangou"        // 舔狗日记
 	_ "github.com/FloatTech/ZeroBot-Plugin/plugin/tracemoe"       // 搜番
 	_ "github.com/FloatTech/ZeroBot-Plugin/plugin/translation"    // 翻译
 	_ "github.com/FloatTech/ZeroBot-Plugin/plugin/vtb_quotation"  // vtb语录
 	_ "github.com/FloatTech/ZeroBot-Plugin/plugin/wangyiyun"      // 网易云音乐热评
 	_ "github.com/FloatTech/ZeroBot-Plugin/plugin/wordle"         // 猜单词
 	_ "github.com/FloatTech/ZeroBot-Plugin/plugin/ymgal"          // 月幕galgame
+	_ "github.com/FloatTech/ZeroBot-Plugin/plugin/zaobao"         // 早报
 
 	// _ "github.com/FloatTech/ZeroBot-Plugin/plugin/wtf"            // 鬼东西
 	// _ "github.com/FloatTech/ZeroBot-Plugin/plugin/bilibili_push"  // b站推送
@@ -203,7 +211,7 @@ func main() {
 		Handle(func(ctx *zero.Ctx) {
 			ctx.SendChain(message.Text(kanban.Kanban()))
 		})
-	zero.Run(
+	zero.RunAndBlock(
 		zero.Config{
 			NickName:      append([]string{*adana}, nicks...),
 			CommandPrefix: *prefix,
@@ -212,7 +220,6 @@ func main() {
 			SuperUsers: flag.Args(), // 通过命令行参数的方式添加主人账号
 			Driver:     []zero.Driver{driver.NewWebSocketClient(*url, *token)},
 		},
+		process.GlobalInitMutex.Unlock,
 	)
-	process.GlobalInitMutex.Unlock()
-	select {}
 }

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" +
@@ -65,7 +64,7 @@ func init() { // 插件主体
 			}
 		})
 	// 直接随机图片，无r18保护，后果自负。如果出r18图可尽快通过发送"太涩了"撤回
-	engine.OnFullMatch("直接随机", ctxext.UserOrGrpAdmin).SetBlock(true).
+	engine.OnFullMatch("直接随机", zero.UserOrGrpAdmin).SetBlock(true).
 		Handle(func(ctx *zero.Ctx) {
 			if block {
 				ctx.SendChain(message.Text("请稍后再试哦"))
@@ -97,7 +96,7 @@ func init() { // 插件主体
 			}
 		})
 	// 上传一张图进行评价
-	engine.OnKeywordGroup([]string{"评价图片"}, zero.OnlyGroup, ctxext.MustProvidePicture).SetBlock(true).
+	engine.OnKeywordGroup([]string{"评价图片"}, zero.OnlyGroup, zero.MustProvidePicture).SetBlock(true).
 		Handle(func(ctx *zero.Ctx) {
 			ctx.SendChain(message.Text("少女祈祷中..."))
 			url := ctx.State["image_url"].([]string)[0]

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,26 +17,11 @@ 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"
 
-var (
-	t = &ttsInstances{
-		m: map[string]tts.TTS{
-			"百度女声":   baidutts.NewBaiduTTS(0),
-			"百度男声":   baidutts.NewBaiduTTS(1),
-			"百度度逍遥":  baidutts.NewBaiduTTS(3),
-			"百度度丫丫":  baidutts.NewBaiduTTS(4),
-			"拟声鸟阿梓":  mockingbird.NewMockingBirdTTS(0),
-			"拟声鸟药水哥": mockingbird.NewMockingBirdTTS(1),
-		},
-		l: []string{"拟声鸟阿梓", "拟声鸟药水哥", "百度女声", "百度男声", "百度度逍遥", "百度度丫丫"},
-	}
-	re = regexp.MustCompile(`(\-|\+)?\d+(\.\d+)?`)
-)
+var re = regexp.MustCompile(`(\-|\+)?\d+(\.\d+)?`)
 
 type ttsInstances struct {
 	sync.RWMutex
@@ -53,7 +38,18 @@ func (t *ttsInstances) List() []string {
 }
 
 func init() {
-	engine := control.Register(ttsServiceName, order.AcquirePrio(), &control.Options{
+	t := &ttsInstances{
+		m: map[string]tts.TTS{
+			"百度女声":   baidutts.NewBaiduTTS(0),
+			"百度男声":   baidutts.NewBaiduTTS(1),
+			"百度度逍遥":  baidutts.NewBaiduTTS(3),
+			"百度度丫丫":  baidutts.NewBaiduTTS(4),
+			"拟声鸟阿梓":  nil,
+			"拟声鸟药水哥": nil,
+		},
+		l: []string{"拟声鸟阿梓", "拟声鸟药水哥", "百度女声", "百度男声", "百度度逍遥", "百度度丫丫"},
+	}
+	engine := control.Register(ttsServiceName, &control.Options{
 		DisableOnDefault: true,
 		Help: "语音回复(包括拟声鸟和百度)\n" +
 			"- @Bot 任意文本(任意一句话回复)\n" +
@@ -65,19 +61,21 @@ func init() {
 			msg := ctx.ExtractPlainText()
 			r := aireply.NewAIReply(getReplyMode(ctx))
 			tts := t.new(t.getSoundMode(ctx))
-			ctx.SendChain(message.Record(tts.Speak(ctx.Event.UserID, func() string {
-				reply := r.TalkPlain(msg, zero.BotConfig.NickName[0])
-				reply = re.ReplaceAllStringFunc(reply, func(s string) string {
-					f, err := strconv.ParseFloat(s, 64)
-					if err != nil {
-						log.Errorln("[tts]:", err)
-						return s
-					}
-					return numcn.EncodeFromFloat64(f)
-				})
-				log.Println("[tts]:", reply)
-				return reply
-			})))
+			if tts != nil {
+				ctx.SendChain(message.Record(tts.Speak(ctx.Event.UserID, func() string {
+					reply := r.TalkPlain(msg, zero.BotConfig.NickName[0])
+					reply = re.ReplaceAllStringFunc(reply, func(s string) string {
+						f, err := strconv.ParseFloat(s, 64)
+						if err != nil {
+							log.Errorln("[tts]:", err)
+							return s
+						}
+						return numcn.EncodeFromFloat64(f)
+					})
+					log.Println("[tts]:", reply)
+					return reply
+				})))
+			}
 		})
 	engine.OnRegex(`^设置语音模式(.*)$`, ctxext.FirstValueInList(t)).SetBlock(true).
 		Handle(func(ctx *zero.Ctx) {
@@ -98,8 +96,23 @@ func init() {
 }
 
 // new 语音简单工厂
-func (t *ttsInstances) new(name string) tts.TTS {
-	return t.m[name]
+func (t *ttsInstances) new(name string) (ts tts.TTS) {
+	t.RLock()
+	ts = t.m[name]
+	t.RUnlock()
+	if ts == nil {
+		switch name {
+		case "拟声鸟阿梓":
+			t.Lock()
+			ts, _ = mockingbird.NewMockingBirdTTS(0)
+			t.Unlock()
+		case "拟声鸟药水哥":
+			t.Lock()
+			ts, _ = mockingbird.NewMockingBirdTTS(1)
+			t.Unlock()
+		}
+	}
+	return
 }
 
 func (t *ttsInstances) setSoundMode(ctx *zero.Ctx, name string) error {

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",
@@ -23,9 +21,9 @@ func init() {
 	en.OnRegex(`^加密\s?(.*)`).SetBlock(true).
 		Handle(func(ctx *zero.Ctx) {
 			str := ctx.State["regex_matched"].([]string)[1]
-			es, err := base14.UTF16be2utf8(base14.EncodeString(str))
-			if err == nil {
-				ctx.SendChain(message.Text(helper.BytesToString(es)))
+			es := base14.EncodeString(str)
+			if es != "" {
+				ctx.SendChain(message.Text(es))
 			} else {
 				ctx.SendChain(message.Text("加密失败!"))
 			}
@@ -33,9 +31,9 @@ func init() {
 	en.OnRegex(`^解密\s?([一-踀]*[㴁-㴆]?)$`).SetBlock(true).
 		Handle(func(ctx *zero.Ctx) {
 			str := ctx.State["regex_matched"].([]string)[1]
-			es, err := base14.UTF82utf16be(helper.StringToBytes(str))
-			if err == nil {
-				ctx.SendChain(message.Text(base14.DecodeString(es)))
+			es := base14.DecodeString(str)
+			if es != "" {
+				ctx.SendChain(message.Text(es))
 			} else {
 				ctx.SendChain(message.Text("解密失败!"))
 			}
@@ -44,7 +42,7 @@ func init() {
 		Handle(func(ctx *zero.Ctx) {
 			key, str := ctx.State["regex_matched"].([]string)[1], ctx.State["regex_matched"].([]string)[2]
 			t := getea(key)
-			es, err := base14.UTF16be2utf8(base14.Encode(t.Encrypt(helper.StringToBytes(str))))
+			es, err := base14.UTF16BE2UTF8(base14.Encode(t.Encrypt(helper.StringToBytes(str))))
 			if err == nil {
 				ctx.SendChain(message.Text(helper.BytesToString(es)))
 			} else {
@@ -55,7 +53,7 @@ func init() {
 		Handle(func(ctx *zero.Ctx) {
 			key, str := ctx.State["regex_matched"].([]string)[1], ctx.State["regex_matched"].([]string)[2]
 			t := getea(key)
-			es, err := base14.UTF82utf16be(helper.StringToBytes(str))
+			es, err := base14.UTF82UTF16BE(helper.StringToBytes(str))
 			if err == nil {
 				ctx.SendChain(message.Text(helper.BytesToString(t.Decrypt(base14.Decode(es)))))
 			} else {

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/api.go

@@ -0,0 +1,180 @@
+package bilibili
+
+import (
+	"encoding/json"
+	"errors"
+	"fmt"
+	"io"
+	"net/http"
+
+	"github.com/FloatTech/zbputils/binary"
+	"github.com/FloatTech/zbputils/web"
+	"github.com/tidwall/gjson"
+)
+
+var (
+	errNeedCookie = errors.New("该api需要设置b站cookie，请发送命令设置cookie，例如\"设置b站cookie SESSDATA=82da790d,1663822823,06ecf*31\"")
+)
+
+type searchResult struct {
+	Mid    int64  `json:"mid"`
+	Uname  string `json:"uname"`
+	Gender int64  `json:"gender"`
+	Usign  string `json:"usign"`
+	Level  int64  `json:"level"`
+}
+
+// 搜索api：通过把触发指令传入的昵称找出uid返回
+func search(keyword string) (r []searchResult, err error) {
+	searchURL := "http://api.bilibili.com/x/web-interface/search/type?search_type=bili_user&keyword=" + keyword
+	data, err := web.GetData(searchURL)
+	if err != nil {
+		return
+	}
+	j := gjson.ParseBytes(data)
+	if j.Get("data.numResults").Int() == 0 {
+		err = errors.New("查无此人")
+		return
+	}
+	err = json.Unmarshal(binary.StringToBytes(j.Get("data.result").Raw), &r)
+	if err != nil {
+		return
+	}
+	return
+}
+
+type follower struct {
+	Mid      int    `json:"mid"`
+	Uname    string `json:"uname"`
+	Video    int    `json:"video"`
+	Roomid   int    `json:"roomid"`
+	Rise     int    `json:"rise"`
+	Follower int    `json:"follower"`
+	GuardNum int    `json:"guardNum"`
+	AreaRank int    `json:"areaRank"`
+}
+
+// 请求api
+func fansapi(uid string) (result follower, err error) {
+	fanURL := "https://api.vtbs.moe/v1/detail/" + uid
+	data, err := web.GetData(fanURL)
+	if err != nil {
+		return
+	}
+	if err = json.Unmarshal(data, &result); err != nil {
+		return
+	}
+	return
+}
+
+func followings(uid string) (s string, err error) {
+	followingURL := "https://api.bilibili.com/x/relation/same/followings?vmid=" + uid
+	method := "GET"
+	client := &http.Client{}
+	req, err := http.NewRequest(method, followingURL, nil)
+	if err != nil {
+		return
+	}
+	c := vdb.getBilibiliCookie()
+	req.Header.Add("cookie", c.Value)
+	res, err := client.Do(req)
+	if err != nil {
+		return
+	}
+	defer res.Body.Close()
+	body, err := io.ReadAll(res.Body)
+	if err != nil {
+		return
+	}
+	json := gjson.ParseBytes(body)
+	s = json.Get("data.list.#.uname").Raw
+	if json.Get("code").Int() == -101 {
+		err = errNeedCookie
+		return
+	}
+	if json.Get("code").Int() != 0 {
+		err = errors.New(json.Get("message").String())
+		return
+	}
+	return
+}
+
+type userinfo struct {
+	Name       string  `json:"name"`
+	Mid        string  `json:"mid"`
+	Face       string  `json:"face"`
+	Fans       int64   `json:"fans"`
+	Attentions []int64 `json:"attentions"`
+}
+
+type medalInfo struct {
+	Mid              int64  `json:"target_id"`
+	MedalName        string `json:"medal_name"`
+	Level            int64  `json:"level"`
+	MedalColorStart  int64  `json:"medal_color_start"`
+	MedalColorEnd    int64  `json:"medal_color_end"`
+	MedalColorBorder int64  `json:"medal_color_border"`
+}
+type medal struct {
+	Uname     string `json:"target_name"`
+	medalInfo `json:"medal_info"`
+}
+
+type medalSlice []medal
+
+func (m medalSlice) Len() int {
+	return len(m)
+}
+func (m medalSlice) Swap(i, j int) {
+	m[i], m[j] = m[j], m[i]
+}
+func (m medalSlice) Less(i, j int) bool {
+	return m[i].Level > m[j].Level
+}
+
+// 获取详情
+func card(uid string) (result userinfo, err error) {
+	cardURL := "https://account.bilibili.com/api/member/getCardByMid?mid=" + uid
+	data, err := web.GetData(cardURL)
+	if err != nil {
+		return
+	}
+	err = json.Unmarshal(binary.StringToBytes(gjson.ParseBytes(data).Get("card").Raw), &result)
+	if err != nil {
+		return
+	}
+	return
+}
+
+// 获得牌子
+func medalwall(uid string) (result []medal, err error) {
+	medalwallURL := "https://api.live.bilibili.com/xlive/web-ucenter/user/MedalWall?target_id=" + uid
+	method := "GET"
+	client := &http.Client{}
+	req, err := http.NewRequest(method, medalwallURL, nil)
+	if err != nil {
+		return
+	}
+	c := vdb.getBilibiliCookie()
+	req.Header.Add("cookie", c.Value)
+	res, err := client.Do(req)
+	if err != nil {
+		return
+	}
+	defer res.Body.Close()
+	data, err := io.ReadAll(res.Body)
+	if err != nil {
+		return
+	}
+	fmt.Println("medalwall:", binary.BytesToString(data))
+	j := gjson.ParseBytes(data)
+	if j.Get("code").Int() == -101 {
+		err = errNeedCookie
+		return
+	}
+	if j.Get("code").Int() != 0 {
+		err = errors.New(j.Get("message").String())
+	}
+	_ = json.Unmarshal(binary.StringToBytes(j.Get("data.list").Raw), &result)
+	return
+}

plugin/bilibili/info.go

@@ -2,64 +2,289 @@
 package bilibili
 
 import (
-	"io"
-	"net/http"
+	"encoding/binary"
+	"fmt"
+	"image/color"
+	"os"
+	"sort"
+	"strconv"
+	"time"
 
 	control "github.com/FloatTech/zbputils/control"
-	"github.com/tidwall/gjson"
+	"github.com/FloatTech/zbputils/file"
+	"github.com/FloatTech/zbputils/img"
+	"github.com/FloatTech/zbputils/img/text"
+	"github.com/FloatTech/zbputils/img/writer"
+	"github.com/FloatTech/zbputils/web"
+	"github.com/fogleman/gg"
+	log "github.com/sirupsen/logrus"
 	zero "github.com/wdvxdr1123/ZeroBot"
 	"github.com/wdvxdr1123/ZeroBot/message"
-
-	"github.com/FloatTech/zbputils/control/order"
 )
 
-var engine = control.Register("bilibili", order.AcquirePrio(), &control.Options{
+var engine = control.Register("bilibili", &control.Options{
 	DisableOnDefault: false,
 	Help: "bilibili\n" +
-		"- >vup info [名字 | uid]\n" +
-		"- >user info [名字 | uid]",
+		"- >vup info [xxx]\n" +
+		"- >user info [xxx]\n" +
+		"- 查成分 [xxx]\n" +
+		"- 设置b站cookie SESSDATA=82da790d,1663822823,06ecf*31\n" +
+		"- 更新vup",
+	PublicDataFolder: "Bilibili",
 })
 
 // 查成分的
 func init() {
-	engine.OnRegex(`^>(?:user|vup)\s?info\s?(.{1,25})$`).SetBlock(true).
+	cachePath := engine.DataFolder() + "cache/"
+	dbfile := engine.DataFolder() + "bilibili.db"
+	go func() {
+		_ = os.MkdirAll(cachePath, 0755)
+		_, _ = file.GetLazyData(dbfile, false, false)
+		vdb = initialize(dbfile)
+	}()
+
+	engine.OnRegex(`^>user info\s?(.{1,25})$`).SetBlock(true).
 		Handle(func(ctx *zero.Ctx) {
 			keyword := ctx.State["regex_matched"].([]string)[1]
-			rest, err := uid(keyword)
+			uidRes, err := search(keyword)
 			if err != nil {
-				ctx.SendChain(message.Text("ERROR: ", err))
+				ctx.SendChain(message.Text("ERROR:", err))
 				return
 			}
-			id := rest.Get("data.result.0.mid").String()
-			url := "https://api.bilibili.com/x/relation/same/followings?vmid=" + id
-			method := "GET"
-			client := &http.Client{}
-			req, err := http.NewRequest(method, url, nil)
+			id := strconv.FormatInt(uidRes[0].Mid, 10)
+			follwings, err := followings(id)
 			if err != nil {
-				ctx.SendChain(message.Text("ERROR: ", err))
-				return
+				ctx.SendChain(message.Text("ERROR:", err))
 			}
-			req.Header.Add("cookie", "CURRENT_FNVAL=80; _uuid=772B88E8-3ED1-D589-29BB-F6CB5214239A06137infoc; blackside_state=1; bfe_id=6f285c892d9d3c1f8f020adad8bed553; rpdid=|(umY~Jkl|kJ0J'uYkR|)lu|); fingerprint=0ec2b1140fb30b56d7b5e415bc3b5fb1; buvid_fp=C91F5265-3DF4-4D5A-9FF3-C546370B14C0143096infoc; buvid_fp_plain=C91F5265-3DF4-4D5A-9FF3-C546370B14C0143096infoc; SESSDATA=9e0266f6%2C1639637127%2Cb0172%2A61; bili_jct=96ddbd7e22d527abdc0501339a12d4d3; DedeUserID=695737880; DedeUserID__ckMd5=0117660e75db7b01; sid=5labuhaf; PVID=1; bfe_id=1e33d9ad1cb29251013800c68af42315")
-			res, err := client.Do(req)
-			if err != nil {
-				ctx.SendChain(message.Text("ERROR: ", err))
-				return
-			}
-			defer res.Body.Close()
-
-			body, err := io.ReadAll(res.Body)
-			if err != nil {
-				ctx.SendChain(message.Text("ERROR: ", err))
-				return
-			}
-			data := string(body)
 			ctx.SendChain(message.Text(
-				"uid: ", rest.Get("data.result.0.mid").Int(), "\n",
-				"name: ", rest.Get("data.result.0.uname").Str, "\n",
-				"sex: ", []string{"", "", "女", "男"}[rest.Get("data.result.0.gender").Int()], "\n",
-				"sign: ", rest.Get("data.result.0.usign").Str, "\n",
-				"level: ", rest.Get("data.result.0.level").Int(), "\n",
-				"follow: ", gjson.Get(data, "data.list.#.uname"),
+				"search: ", uidRes[0].Mid, "\n",
+				"name: ", uidRes[0].Uname, "\n",
+				"sex: ", []string{"", "男", "女", "未知"}[uidRes[0].Gender], "\n",
+				"sign: ", uidRes[0].Usign, "\n",
+				"level: ", uidRes[0].Level, "\n",
+				"follow: ", follwings,
 			))
 		})
+
+	engine.OnRegex(`^>vup info\s?(.{1,25})$`).SetBlock(true).
+		Handle(func(ctx *zero.Ctx) {
+			keyword := ctx.State["regex_matched"].([]string)[1]
+			res, err := search(keyword)
+			if err != nil {
+				ctx.SendChain(message.Text("ERROR:", err))
+				return
+			}
+			id := strconv.FormatInt(res[0].Mid, 10)
+			// 获取详情
+			fo, err := fansapi(id)
+			if err != nil {
+				ctx.SendChain(message.Text("ERROR:", err))
+				return
+			}
+			ctx.SendChain(message.Text(
+				"search: ", fo.Mid, "\n",
+				"名字: ", fo.Uname, "\n",
+				"当前粉丝数: ", fo.Follower, "\n",
+				"24h涨粉数: ", fo.Rise, "\n",
+				"视频投稿数: ", fo.Video, "\n",
+				"直播间id: ", fo.Roomid, "\n",
+				"舰队: ", fo.GuardNum, "\n",
+				"直播总排名: ", fo.AreaRank, "\n",
+				"数据来源: ", "https://vtbs.moe/detail/", fo.Mid, "\n",
+				"数据获取时间: ", time.Now().Format("2006-01-02 15:04:05"),
+			))
+		})
+
+	engine.OnRegex(`^查成分\s?(.{1,25})$`).SetBlock(true).
+		Handle(func(ctx *zero.Ctx) {
+			keyword := ctx.State["regex_matched"].([]string)[1]
+			searchRes, err := search(keyword)
+			if err != nil {
+				ctx.SendChain(message.Text("ERROR:", err))
+				return
+			}
+			id := strconv.FormatInt(searchRes[0].Mid, 10)
+			today := time.Now().Format("20060102")
+			drawedFile := cachePath + id + today + "vupLike.png"
+			if file.IsExist(drawedFile) {
+				ctx.SendChain(message.Image("file:///" + file.BOTPATH + "/" + drawedFile))
+				return
+			}
+			u, err := card(id)
+			if err != nil {
+				ctx.SendChain(message.Text("ERROR:", err))
+				return
+			}
+			vups, err := vdb.filterVup(u.Attentions)
+			if err != nil {
+				ctx.SendChain(message.Text("ERROR:", err))
+				return
+			}
+			vupLen := len(vups)
+			medals, err := medalwall(id)
+			sort.Sort(medalSlice(medals))
+			if err != nil {
+				ctx.SendChain(message.Text("ERROR:", err))
+			}
+			frontVups := make([]vup, 0)
+			medalMap := make(map[int64]medal)
+			for _, v := range medals {
+				up := vup{
+					Mid:   v.Mid,
+					Uname: v.Uname,
+				}
+				frontVups = append(frontVups, up)
+				medalMap[v.Mid] = v
+			}
+			vups = append(vups, frontVups...)
+			copy(vups[len(frontVups):], vups)
+			copy(vups, frontVups)
+			for i := len(frontVups); i < len(vups); i++ {
+				if _, ok := medalMap[vups[i].Mid]; ok {
+					vups = append(vups[:i], vups[i+1:]...)
+					i--
+				}
+			}
+			facePath := cachePath + id + "vupFace.png"
+			initFacePic(facePath, u.Face)
+			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
+			}
+			if len(vups) > 50 {
+				ctx.SendChain(message.Text(u.Name + "关注的up主太多了，只展示前50个up"))
+				vups = vups[:50]
+			}
+			canvas := gg.NewContext(backX*3, int(float64(backY)*(1.1+float64(len(vups))/3)))
+			fontSize := float64(backX) * 0.1
+			canvas.SetColor(color.White)
+			canvas.Clear()
+			if back != nil {
+				canvas.DrawImage(back, 0, 0)
+			}
+			canvas.SetColor(color.Black)
+			if err = canvas.LoadFontFace(text.BoldFontFile, fontSize); err != nil {
+				ctx.SendChain(message.Text("ERROR:", err))
+				return
+			}
+			sl, _ := canvas.MeasureString("好")
+			length, h := canvas.MeasureString(u.Mid)
+			n, _ := canvas.MeasureString(u.Name)
+			canvas.DrawString(u.Name, float64(backX)*1.1, float64(backY)/3-h)
+			canvas.DrawRoundedRectangle(float64(backX)*1.2+n-length*0.1, float64(backY)/3-h*2.5, length*1.2, h*2, fontSize*0.2)
+			canvas.SetRGB255(221, 221, 221)
+			canvas.Fill()
+			canvas.SetColor(color.Black)
+			canvas.DrawString(u.Mid, float64(backX)*1.2+n, float64(backY)/3-h)
+			canvas.DrawString(fmt.Sprintf("粉丝：%d", u.Fans), float64(backX)*1.1, float64(backY)/3*2-2.5*h)
+			canvas.DrawString(fmt.Sprintf("关注：%d", len(u.Attentions)), float64(backX)*2, float64(backY)/3*2-2.5*h)
+			canvas.DrawString(fmt.Sprintf("管人痴成分：%.2f%%（%d/%d）", float64(vupLen)/float64(len(u.Attentions))*100, vupLen, len(u.Attentions)), float64(backX)*1.1, float64(backY)-4*h)
+			canvas.DrawString("日期："+time.Now().Format("2006-01-02"), float64(backX)*1.1, float64(backY)-h)
+			for i, v := range vups {
+				if i%2 == 1 {
+					canvas.SetRGB255(245, 245, 245)
+					canvas.DrawRectangle(0, float64(backY)*1.1+float64(i)*float64(backY)/3, float64(backX*3), float64(backY)/3)
+					canvas.Fill()
+				}
+				canvas.SetColor(color.Black)
+				nl, _ := canvas.MeasureString(v.Uname)
+				canvas.DrawString(v.Uname, float64(backX)*0.1, float64(backY)*1.1+float64(i+1)*float64(backY)/3-2*h)
+				ml, _ := canvas.MeasureString(strconv.FormatInt(v.Mid, 10))
+				canvas.DrawRoundedRectangle(nl-0.1*ml+float64(backX)*0.2, float64(backY)*1.1+float64(i+1)*float64(backY)/3-h*3.5, ml*1.2, h*2, fontSize*0.2)
+				canvas.SetRGB255(221, 221, 221)
+				canvas.Fill()
+				canvas.SetColor(color.Black)
+				canvas.DrawString(strconv.FormatInt(v.Mid, 10), nl+float64(backX)*0.2, float64(backY)*1.1+float64(i+1)*float64(backY)/3-2*h)
+				if m, ok := medalMap[v.Mid]; ok {
+					mnl, _ := canvas.MeasureString(m.MedalName)
+					grad := gg.NewLinearGradient(nl+ml-sl/2+float64(backX)*0.4, float64(backY)*1.1+float64(i+1)*float64(backY)/3-3.5*h, nl+ml+mnl+sl/2+float64(backX)*0.4, float64(backY)*1.1+float64(i+1)*float64(backY)/3-1.5*h)
+					r, g, b := int2rbg(m.MedalColorStart)
+					grad.AddColorStop(0, color.RGBA{uint8(r), uint8(g), uint8(b), 255})
+					r, g, b = int2rbg(m.MedalColorEnd)
+					grad.AddColorStop(1, color.RGBA{uint8(r), uint8(g), uint8(b), 255})
+					canvas.SetFillStyle(grad)
+					canvas.SetLineWidth(4)
+					canvas.MoveTo(nl+ml-sl/2+float64(backX)*0.4, float64(backY)*1.1+float64(i+1)*float64(backY)/3-3.5*h)
+					canvas.LineTo(nl+ml+mnl+sl/2+float64(backX)*0.4, float64(backY)*1.1+float64(i+1)*float64(backY)/3-3.5*h)
+					canvas.LineTo(nl+ml+mnl+sl/2+float64(backX)*0.4, float64(backY)*1.1+float64(i+1)*float64(backY)/3-1.5*h)
+					canvas.LineTo(nl+ml-sl/2+float64(backX)*0.4, float64(backY)*1.1+float64(i+1)*float64(backY)/3-1.5*h)
+					canvas.ClosePath()
+					canvas.Fill()
+					canvas.SetColor(color.White)
+					canvas.DrawString(m.MedalName, nl+ml+float64(backX)*0.4, float64(backY)*1.1+float64(i+1)*float64(backY)/3-2*h)
+					r, g, b = int2rbg(m.MedalColorBorder)
+					canvas.SetRGB255(int(r), int(g), int(b))
+					canvas.DrawString(strconv.FormatInt(m.Level, 10), nl+ml+mnl+sl+float64(backX)*0.4, float64(backY)*1.1+float64(i+1)*float64(backY)/3-2*h)
+					mll, _ := canvas.MeasureString(strconv.FormatInt(m.Level, 10))
+					canvas.SetLineWidth(4)
+					canvas.MoveTo(nl+ml-sl/2+float64(backX)*0.4, float64(backY)*1.1+float64(i+1)*float64(backY)/3-3.5*h)
+					canvas.LineTo(nl+ml+mnl+mll+sl/2+float64(backX)*0.5, float64(backY)*1.1+float64(i+1)*float64(backY)/3-3.5*h)
+					canvas.LineTo(nl+ml+mnl+mll+sl/2+float64(backX)*0.5, float64(backY)*1.1+float64(i+1)*float64(backY)/3-1.5*h)
+					canvas.LineTo(nl+ml-sl/2+float64(backX)*0.4, float64(backY)*1.1+float64(i+1)*float64(backY)/3-1.5*h)
+					canvas.ClosePath()
+					canvas.Stroke()
+				}
+			}
+			f, err := os.Create(drawedFile)
+			if err != nil {
+				log.Errorln("[bilibili]", err)
+				data, cl := writer.ToBytes(canvas.Image())
+				ctx.SendChain(message.ImageBytes(data))
+				cl()
+				return
+			}
+			_, err = writer.WriteTo(canvas.Image(), f)
+			_ = f.Close()
+			if err != nil {
+				ctx.SendChain(message.Text("ERROR:", err))
+				return
+			}
+			ctx.SendChain(message.Image("file:///" + file.BOTPATH + "/" + drawedFile))
+		})
+
+	engine.OnRegex(`^设置b站cookie?\s+(.{1,100})$`, zero.SuperUserPermission).SetBlock(true).
+		Handle(func(ctx *zero.Ctx) {
+			cookie := ctx.State["regex_matched"].([]string)[1]
+			err := vdb.setBilibiliCookie(cookie)
+			if err != nil {
+				ctx.SendChain(message.Text("ERROR:", err))
+				return
+			}
+			ctx.SendChain(message.Text("成功设置b站cookie为" + cookie))
+		})
+
+	engine.OnFullMatch("更新vup", zero.SuperUserPermission).SetBlock(true).
+		Handle(func(ctx *zero.Ctx) {
+			ctx.SendChain(message.Text("少女祈祷中..."))
+			updateVup()
+			ctx.SendChain(message.Text("vup已更新"))
+		})
+}
+
+func initFacePic(filename, faceURL string) {
+	if file.IsNotExist(filename) {
+		data, err := web.GetData(faceURL)
+		if err != nil {
+			log.Errorln("[bilibili]", err)
+		}
+		err = os.WriteFile(filename, data, 0666)
+		if err != nil {
+			log.Errorln("[bilibili]", err)
+		}
+	}
+}
+
+func int2rbg(t int64) (int64, int64, int64) {
+	var buf [8]byte
+	binary.LittleEndian.PutUint64(buf[:], uint64(t))
+	b, g, r := int64(buf[0]), int64(buf[1]), int64(buf[2])
+	return r, g, b
 }

plugin/bilibili/live_info.go

@@ -1,85 +0,0 @@
-package bilibili
-
-import (
-	"encoding/json"
-	"errors"
-	"net/http"
-	"time"
-
-	"github.com/FloatTech/zbputils/web"
-	"github.com/tidwall/gjson"
-	zero "github.com/wdvxdr1123/ZeroBot"
-	"github.com/wdvxdr1123/ZeroBot/message"
-)
-
-// 查vup粉丝数据
-func init() {
-	engine.OnRegex(`^>vup info\s?(.{1,25})$`).SetBlock(true).
-		Handle(func(ctx *zero.Ctx) {
-			keyword := ctx.State["regex_matched"].([]string)[1]
-			res, err := uid(keyword)
-			if err != nil {
-				ctx.SendChain(message.Text("ERROR: ", err))
-				return
-			}
-			id := res.Get("data.result.0.mid").String()
-			// 获取详情
-			fo, err := fansapi(id)
-			if err != nil {
-				ctx.SendChain(message.Text("ERROR: ", err))
-				return
-			}
-			ctx.SendChain(message.Text(
-				"uid: ", fo.Mid, "\n",
-				"名字: ", fo.Uname, "\n",
-				"当前粉丝数: ", fo.Follower, "\n",
-				"24h涨粉数: ", fo.Rise, "\n",
-				"视频投稿数: ", fo.Video, "\n",
-				"直播间id: ", fo.Roomid, "\n",
-				"舰队: ", fo.GuardNum, "\n",
-				"直播总排名: ", fo.AreaRank, "\n",
-				"数据来源: ", "https://vtbs.moe/detail/", fo.Mid, "\n",
-				"数据获取时间: ", time.Now().Format("2006-01-02 15:04:05"),
-			))
-		})
-}
-
-// 搜索api：通过把触发指令传入的昵称找出uid返回
-func uid(keyword string) (*gjson.Result, error) {
-	api := "http://api.bilibili.com/x/web-interface/search/type?search_type=bili_user&&user_type=1&keyword=" + keyword
-	data, err := web.GetData(api)
-	if err != nil {
-		return nil, err
-	}
-	json := gjson.ParseBytes(data)
-	if json.Get("data.numResults").Int() == 0 {
-		return nil, errors.New("查无此人")
-	}
-	return &json, nil
-}
-
-type follower struct {
-	Mid      int    `json:"mid"`
-	Uname    string `json:"uname"`
-	Video    int    `json:"video"`
-	Roomid   int    `json:"roomid"`
-	Rise     int    `json:"rise"`
-	Follower int    `json:"follower"`
-	GuardNum int    `json:"guardNum"`
-	AreaRank int    `json:"areaRank"`
-}
-
-// 请求api
-func fansapi(uid string) (*follower, error) {
-	url := "https://api.vtbs.moe/v1/detail/" + uid
-	resp, err := http.Get(url)
-	if err != nil {
-		return nil, err
-	}
-	defer resp.Body.Close()
-	result := &follower{}
-	if err := json.NewDecoder(resp.Body).Decode(result); err != nil {
-		return nil, err
-	}
-	return result, nil
-}

plugin/bilibili/model.go

@@ -0,0 +1,130 @@
+package bilibili
+
+import (
+	"os"
+
+	"github.com/FloatTech/zbputils/binary"
+	"github.com/FloatTech/zbputils/web"
+	_ "github.com/fumiama/sqlite3" // use sql
+	"github.com/jinzhu/gorm"
+	log "github.com/sirupsen/logrus"
+	"github.com/tidwall/gjson"
+)
+
+const (
+	bilibiliCookie = "bilbili_cookie"
+)
+
+var (
+	vtbURLs = [...]string{"https://api.vtbs.moe/v1/short", "https://api.tokyo.vtbs.moe/v1/short", "https://vtbs.musedash.moe/v1/short"}
+	vdb     *vupdb
+)
+
+// vupdb 分数数据库
+type vupdb gorm.DB
+
+type vup struct {
+	Mid    int64  `gorm:"column:mid;primary_key"`
+	Uname  string `gorm:"column:uname"`
+	Roomid int64  `gorm:"column:roomid"`
+}
+
+func (vup) TableName() string {
+	return "vup"
+}
+
+type config struct {
+	Key   string `gorm:"column:key;primary_key"`
+	Value string `gorm:"column:value"`
+}
+
+func (config) TableName() string {
+	return "config"
+}
+
+// initialize 初始化vtb数据库
+func initialize(dbpath string) *vupdb {
+	if _, err := os.Stat(dbpath); err != nil || os.IsNotExist(err) {
+		// 生成文件
+		f, err := os.Create(dbpath)
+		if err != nil {
+			return nil
+		}
+		defer f.Close()
+	}
+	gdb, err := gorm.Open("sqlite3", dbpath)
+	if err != nil {
+		panic(err)
+	}
+	gdb.Debug().AutoMigrate(&vup{}).AutoMigrate(&config{})
+	return (*vupdb)(gdb)
+}
+
+func (vdb *vupdb) insertVupByMid(mid int64, uname string, roomid int64) (err error) {
+	db := (*gorm.DB)(vdb)
+	v := vup{
+		Mid:    mid,
+		Uname:  uname,
+		Roomid: roomid,
+	}
+	if err = db.Debug().Model(&vup{}).First(&v, "mid = ? ", mid).Error; err != nil {
+		if gorm.IsRecordNotFoundError(err) {
+			err = db.Debug().Model(&vup{}).Create(&v).Error
+		}
+	}
+	return
+}
+
+// filterVup 筛选vup
+func (vdb *vupdb) filterVup(ids []int64) (vups []vup, err error) {
+	db := (*gorm.DB)(vdb)
+	if err = db.Debug().Model(&vup{}).Find(&vups, "mid in (?)", ids).Error; err != nil {
+		return vups, err
+	}
+	return
+}
+
+func updateVup() {
+	for _, v := range vtbURLs {
+		data, err := web.GetData(v)
+		if err != nil {
+			log.Errorln("[bilibili]:", err)
+		}
+		gjson.Get(binary.BytesToString(data), "@this").ForEach(func(key, value gjson.Result) bool {
+			mid := value.Get("mid").Int()
+			uname := value.Get("uname").String()
+			roomid := value.Get("roomid").Int()
+			err = vdb.insertVupByMid(mid, uname, roomid)
+			if err != nil {
+				log.Errorln("[bilibili]:", err)
+			}
+			return true
+		})
+	}
+}
+
+func (vdb *vupdb) setBilibiliCookie(cookie string) (err error) {
+	db := (*gorm.DB)(vdb)
+	c := config{
+		Key:   bilibiliCookie,
+		Value: cookie,
+	}
+	if err = db.Debug().Model(&config{}).First(&c, "key = ? ", bilibiliCookie).Error; err != nil {
+		// error handling...
+		if gorm.IsRecordNotFoundError(err) {
+			err = db.Debug().Model(&config{}).Create(&c).Error
+		}
+	} else {
+		err = db.Debug().Model(&config{}).Where("key = ? ", bilibiliCookie).Update(
+			map[string]interface{}{
+				"value": cookie,
+			}).Error
+	}
+	return
+}
+
+func (vdb *vupdb) getBilibiliCookie() (c config) {
+	db := (*gorm.DB)(vdb)
+	db.Debug().Model(&config{}).First(&c, "key = ?", bilibiliCookie)
+	return
+}

plugin/bilibili_parse/bilibili_parse.go

@@ -11,8 +11,6 @@ import (
 	log "github.com/sirupsen/logrus"
 	zero "github.com/wdvxdr1123/ZeroBot"
 	"github.com/wdvxdr1123/ZeroBot/message"
-
-	"github.com/FloatTech/zbputils/control/order"
 )
 
 const (
@@ -21,7 +19,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",

plugin/bilibili_push/bilibili_push.go

@@ -5,8 +5,6 @@ import (
 	"bytes"
 	"encoding/json"
 	"fmt"
-	"io"
-	"net/http"
 	"strconv"
 	"time"
 
@@ -17,8 +15,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/img/text"
 	"github.com/FloatTech/zbputils/web"
 )
@@ -60,7 +56,7 @@ 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" +
@@ -79,7 +75,7 @@ func init() {
 		log.Println("[bilibilipush]加载bilibilipush数据库")
 	}()
 
-	en.OnRegex(`^添加订阅\s?(\d+)$`, ctxext.UserOrGrpAdmin).SetBlock(true).Handle(func(ctx *zero.Ctx) {
+	en.OnRegex(`^添加订阅\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
@@ -105,7 +101,7 @@ func init() {
 			ctx.SendChain(message.Text("已添加" + name + "的订阅"))
 		}
 	})
-	en.OnRegex(`^取消订阅\s?(\d+)$`, ctxext.UserOrGrpAdmin).SetBlock(true).Handle(func(ctx *zero.Ctx) {
+	en.OnRegex(`^取消订阅\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
@@ -131,7 +127,7 @@ func init() {
 			ctx.SendChain(message.Text("已取消" + name + "的订阅"))
 		}
 	})
-	en.OnRegex(`^取消动态订阅\s?(\d+)$`, ctxext.UserOrGrpAdmin).SetBlock(true).Handle(func(ctx *zero.Ctx) {
+	en.OnRegex(`^取消动态订阅\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
@@ -157,7 +153,7 @@ func init() {
 			ctx.SendChain(message.Text("已取消" + name + "的动态订阅"))
 		}
 	})
-	en.OnRegex(`^取消直播订阅\s?(\d+)$`, ctxext.UserOrGrpAdmin).SetBlock(true).Handle(func(ctx *zero.Ctx) {
+	en.OnRegex(`^取消直播订阅\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
@@ -183,7 +179,7 @@ func init() {
 			ctx.SendChain(message.Text("已取消" + name + "的直播订阅"))
 		}
 	})
-	en.OnFullMatch("推送列表", ctxext.UserOrGrpAdmin).SetBlock(true).Handle(func(ctx *zero.Ctx) {
+	en.OnFullMatch("推送列表", zero.UserOrGrpAdmin).SetBlock(true).Handle(func(ctx *zero.Ctx) {
 		gid := ctx.Event.GroupID
 		if gid == 0 {
 			gid = -ctx.Event.UserID
@@ -215,7 +211,7 @@ func init() {
 			log.Errorln("[bilibilipush]:", err)
 		}
 		if id := ctx.SendChain(message.Image("base64://" + binary.BytesToString(data))); id.ID() == 0 {
-			ctx.SendChain(message.Text("ERROR: 可能被风控了"))
+			ctx.SendChain(message.Text("ERROR:可能被风控了"))
 		}
 	})
 }
@@ -231,7 +227,7 @@ func bilibiliPushDaily() {
 }
 
 func checkBuid(buid int64) (status int, name string) {
-	data, err := web.GetDataWith(web.NewDefaultClient(), fmt.Sprintf(infoURL, buid), "GET", referer, ua)
+	data, err := web.RequestDataWith(web.NewDefaultClient(), fmt.Sprintf(infoURL, buid), "GET", referer, ua)
 	if err != nil {
 		log.Errorln("[bilibilipush]:", err)
 	}
@@ -289,7 +285,7 @@ func unsubscribeLive(buid, groupid int64) (err error) {
 }
 
 func getUserDynamicCard(buid int64) (cardList []gjson.Result) {
-	data, err := web.GetDataWith(web.NewDefaultClient(), fmt.Sprintf(userDynamicURL, buid), "GET", referer, ua)
+	data, err := web.RequestDataWith(web.NewDefaultClient(), fmt.Sprintf(userDynamicURL, buid), "GET", referer, ua)
 	if err != nil {
 		log.Errorln("[bilibilipush]:", err)
 	}
@@ -301,20 +297,7 @@ func getLiveList(uids ...int64) string {
 	m := make(map[string]interface{})
 	m["uids"] = uids
 	b, _ := json.Marshal(m)
-	client := &http.Client{}
-	// 提交请求
-	request, err := http.NewRequest("POST", liveListURL, bytes.NewBuffer(b))
-	if err != nil {
-		log.Errorln("[bilibilipush]:", err)
-	}
-	request.Header.Add("Referer", referer)
-	request.Header.Add("User-Agent", ua)
-	response, err := client.Do(request)
-	if err != nil {
-		log.Errorln("[bilibilipush]:", err)
-	}
-	defer response.Body.Close()
-	data, err := io.ReadAll(response.Body)
+	data, err := web.PostData(liveListURL, "application/json", bytes.NewReader(b))
 	if err != nil {
 		log.Errorln("[bilibilipush]:", err)
 	}

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",
@@ -45,7 +44,7 @@ func init() {
 				log.Println("err:", err)
 			}
 			if id := ctx.SendChain(message.Image("base64://" + binary.BytesToString(data))); id.ID() == 0 {
-				ctx.SendChain(message.Text("ERROR: 可能被风控了"))
+				ctx.SendChain(message.Text("ERROR:可能被风控了"))
 			}
 		})
 
@@ -57,7 +56,7 @@ func init() {
 				log.Println("err:", err)
 			}
 			if id := ctx.SendChain(message.Image("base64://" + binary.BytesToString(data))); id.ID() == 0 {
-				ctx.SendChain(message.Text("ERROR: 可能被风控了"))
+				ctx.SendChain(message.Text("ERROR:可能被风控了"))
 			}
 		})
 }

plugin/cangtoushi/cangtoushi.go

@@ -15,8 +15,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 (
@@ -32,7 +30,7 @@ var (
 )
 
 func init() {
-	engine := control.Register("cangtoushi", order.AcquirePrio(), &control.Options{
+	engine := control.Register("cangtoushi", &control.Options{
 		DisableOnDefault: false,
 		Help: "藏头诗\n" +
 			"- 藏头诗[xxx]\n- 藏尾诗[xxx]",

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{
+	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

@@ -2,6 +2,8 @@
 package coser
 
 import (
+	"regexp"
+
 	"github.com/tidwall/gjson"
 
 	log "github.com/sirupsen/logrus"
@@ -12,30 +14,35 @@ import (
 	control "github.com/FloatTech/zbputils/control"
 	"github.com/FloatTech/zbputils/ctxext"
 	"github.com/FloatTech/zbputils/web"
-
-	"github.com/FloatTech/zbputils/control/order"
 )
 
 var (
 	ua       = "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/96.0.4664.93 Safari/537.36"
 	coserURL = "http://ovooa.com/API/cosplay/api.php"
+	datestr  = regexp.MustCompile(`/\d{4}-\d{2}-\d{2}/`)
 )
 
 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).
 		Handle(func(ctx *zero.Ctx) {
 			ctx.SendChain(message.Text("少女祈祷中......"))
-			data, err := web.GetDataWith(web.NewDefaultClient(), coserURL, "GET", "", ua)
+			data, err := web.RequestDataWith(web.NewDefaultClient(), coserURL, "GET", "", ua)
 			if err != nil {
 				log.Println("err为:", err)
 			}
 
 			text := gjson.Get(helper.BytesToString(data), "data.Title").String()
 			m := message.Message{ctxext.FakeSenderForwardNode(ctx, message.Text(text))}
+			ds := ""
 			gjson.Get(helper.BytesToString(data), "data.data").ForEach(func(_, value gjson.Result) bool {
+				if ds == "" {
+					ds = datestr.FindString(value.String())
+				} else if ds != datestr.FindString(value.String()) {
+					return false
+				}
 				m = append(m, ctxext.FakeSenderForwardNode(ctx, message.Image(value.String())))
 				return true
 			})
@@ -43,7 +50,7 @@ func init() {
 			if id := ctx.SendGroupForwardMessage(
 				ctx.Event.GroupID,
 				m).Get("message_id").Int(); id == 0 {
-				ctx.SendChain(message.Text("ERROR: 可能被风控了"))
+				ctx.SendChain(message.Text("ERROR:可能被风控或下载图片用时过长，请耐心等待"))
 			}
 		})
 }

plugin/cpstory/cpstory.go

@@ -9,15 +9,12 @@ import (
 	"github.com/wdvxdr1123/ZeroBot/message"
 
 	control "github.com/FloatTech/zbputils/control"
-	"github.com/FloatTech/zbputils/ctxext"
 	"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",
@@ -41,8 +38,8 @@ func init() {
 
 	engine.OnRegex("^组cp.*?(\\d+).*?(\\d+)", zero.OnlyGroup).SetBlock(true).Handle(func(ctx *zero.Ctx) {
 		cs := getRandomCpStory()
-		gong := ctxext.CardOrNickName(ctx, math.Str2Int64(ctx.State["regex_matched"].([]string)[1]))
-		shou := ctxext.CardOrNickName(ctx, math.Str2Int64(ctx.State["regex_matched"].([]string)[2]))
+		gong := ctx.CardOrNickName(math.Str2Int64(ctx.State["regex_matched"].([]string)[1]))
+		shou := ctx.CardOrNickName(math.Str2Int64(ctx.State["regex_matched"].([]string)[2]))
 		text := strings.ReplaceAll(cs.Story, "<攻>", gong)
 		text = strings.ReplaceAll(text, "<受>", shou)
 		text = strings.ReplaceAll(text, cs.Gong, gong)

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

@@ -8,18 +8,15 @@ import (
 	"github.com/FloatTech/AnimeAPI/danbooru"
 	"github.com/FloatTech/AnimeAPI/saucenao"
 	"github.com/FloatTech/zbputils/control"
-	"github.com/FloatTech/zbputils/ctxext"
 	"github.com/FloatTech/zbputils/file"
 	"github.com/FloatTech/zbputils/img/writer"
 	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" +
 			"- 鉴赏图片[图片]",
@@ -29,7 +26,7 @@ func init() { // 插件主体
 	cachefolder := engine.DataFolder()
 
 	// 上传一张图进行评价
-	engine.OnKeywordGroup([]string{"鉴赏图片"}, zero.OnlyGroup, ctxext.MustProvidePicture).SetBlock(true).
+	engine.OnKeywordGroup([]string{"鉴赏图片"}, zero.OnlyGroup, zero.MustProvidePicture).SetBlock(true).
 		Handle(func(ctx *zero.Ctx) {
 			ctx.SendChain(message.Text("少女祈祷中..."))
 			for _, url := range ctx.State["image_url"].([]string) {

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" +
@@ -46,7 +44,7 @@ func init() {
 		Handle(func(ctx *zero.Ctx) {
 			err := data.AddText(ctx.State["regex_matched"].([]string)[1])
 			if err != nil {
-				ctx.SendChain(message.Text("ERROR: ", err))
+				ctx.SendChain(message.Text("ERROR:", err))
 			} else {
 				ctx.SendChain(message.Text("记住啦!"))
 			}

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.NewMessageID(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,15 +7,13 @@ import (
 	"sync"
 
 	"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"
 	"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",
@@ -51,7 +49,7 @@ func init() {
 			err = newBottle(
 				ctx.Event.UserID,
 				grp,
-				ctxext.CardOrNickName(ctx, ctx.Event.UserID),
+				ctx.CardOrNickName(ctx.Event.UserID),
 				msg,
 			).throw(sea, channel)
 			if err != nil {

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

@@ -0,0 +1,126 @@
+// Package epidemic 城市疫情查询
+package epidemic
+
+import (
+	"encoding/json"
+
+	zero "github.com/wdvxdr1123/ZeroBot"
+	"github.com/wdvxdr1123/ZeroBot/message"
+
+	"github.com/FloatTech/zbputils/binary"
+	"github.com/FloatTech/zbputils/control"
+	"github.com/FloatTech/zbputils/ctxext"
+	"github.com/FloatTech/zbputils/web"
+)
+
+const (
+	servicename = "epidemic"
+	txurl       = "https://view.inews.qq.com/g2/getOnsInfo?name=disease_h5"
+)
+
+// result 疫情查询结果
+type result struct {
+	Data string `json:"data"`
+}
+
+// epidemic 疫情数据
+type epidemic struct {
+	LastUpdateTime string  `json:"lastUpdateTime"`
+	AreaTree       []*area `json:"areaTree"`
+}
+
+// area 城市疫情数据
+type area struct {
+	Name  string `json:"name"`
+	Today struct {
+		Confirm int `json:"confirm"`
+		Wzzadd  int `json:"wzz_add"`
+	} `json:"today"`
+	Total struct {
+		NowConfirm int    `json:"nowConfirm"`
+		Confirm    int    `json:"confirm"`
+		Dead       int    `json:"dead"`
+		Heal       int    `json:"heal"`
+		Grade      string `json:"grade"`
+		Wzz        int    `json:"wzz"`
+	} `json:"total"`
+	Children []*area `json:"children"`
+}
+
+func init() {
+	engine := control.Register(servicename, &control.Options{
+		DisableOnDefault: false,
+		Help: "城市疫情查询\n" +
+			"- xxx疫情\n",
+	})
+	engine.OnSuffix("疫情").SetBlock(true).Limit(ctxext.LimitByUser).
+		Handle(func(ctx *zero.Ctx) {
+			city := ctx.State["args"].(string)
+			if city == "" {
+				ctx.SendChain(message.Text("你还没有输入城市名字呢！"))
+				return
+			}
+			data, time, err := queryEpidemic(city)
+			if err != nil {
+				ctx.SendChain(message.Text("ERROR:", err))
+				return
+			}
+			if data == nil {
+				ctx.SendChain(message.Text("没有找到【", city, "】城市的疫情数据."))
+				return
+			}
+			ctx.SendChain(
+				message.Text(
+					"【", data.Name, "】疫情数据\n",
+					"新增人数：", data.Today.Confirm, "\n",
+					"现有确诊：", data.Total.NowConfirm, "\n",
+					"累计确诊：", data.Total.Confirm, "\n",
+					"治愈人数：", data.Total.Heal, "\n",
+					"死亡人数：", data.Total.Dead, "\n",
+					"无症状人数：", data.Total.Wzz, "\n",
+					"新增无症状：", data.Today.Wzzadd, "\n",
+					"更新时间：\n『", time, "』",
+				),
+			)
+		})
+}
+
+// rcity 查找城市
+func rcity(a *area, cityName string) *area {
+	if a == nil {
+		return nil
+	}
+	if a.Name == cityName {
+		return a
+	}
+	for _, v := range a.Children {
+		if v.Name == cityName {
+			return v
+		}
+		c := rcity(v, cityName)
+		if c != nil {
+			return c
+		}
+	}
+	return nil
+}
+
+// queryEpidemic 查询城市疫情
+func queryEpidemic(findCityName string) (citydata *area, times string, err error) {
+	data, err := web.GetData(txurl)
+	if err != nil {
+		return
+	}
+	var r result
+	err = json.Unmarshal(data, &r)
+	if err != nil {
+		return
+	}
+	var e epidemic
+	err = json.Unmarshal(binary.StringToBytes(r.Data), &e)
+	if err != nil {
+		return
+	}
+	citydata = rcity(e.AreaTree[0], findCityName)
+	return citydata, e.LastUpdateTime, nil
+}

plugin/font/main.go

@@ -0,0 +1,42 @@
+// Package font 渲染任意文字到图片
+package font
+
+import (
+	"github.com/FloatTech/zbputils/binary"
+	"github.com/FloatTech/zbputils/control"
+	"github.com/FloatTech/zbputils/ctxext"
+	"github.com/FloatTech/zbputils/img/text"
+	zero "github.com/wdvxdr1123/ZeroBot"
+	"github.com/wdvxdr1123/ZeroBot/message"
+)
+
+func init() {
+	control.Register("font", &control.Options{
+		DisableOnDefault: false,
+		Help:             "渲染任意文字到图片\n- (用[终末体|终末变体|紫罗兰体|樱酥体|Consolas体|苹方体])渲染文字xxx",
+	}).OnRegex(`^(用.+)?渲染文字([\s\S]+)$`).SetBlock(true).Limit(ctxext.LimitByUser).Handle(func(ctx *zero.Ctx) {
+		fnt := ctx.State["regex_matched"].([]string)[1]
+		txt := ctx.State["regex_matched"].([]string)[2]
+		switch fnt {
+		case "用终末体":
+			fnt = text.SyumatuFontFile
+		case "用终末变体":
+			fnt = text.NisiFontFile
+		case "用紫罗兰体":
+			fnt = text.VioletEvergardenFontFile
+		case "用樱酥体":
+			fnt = text.SakuraFontFile
+		case "用Consolas体":
+			fnt = text.ConsolasFontFile
+		case "用苹方体":
+		default:
+			fnt = text.FontFile
+		}
+		b, err := text.RenderToBase64(txt, fnt, 400, 20)
+		if err != nil {
+			ctx.SendChain(message.Text("ERROR:", err))
+			return
+		}
+		ctx.SendChain(message.Image("base64://" + binary.BytesToString(b)))
+	})
+}

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,22 +49,22 @@ 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)
+	err := os.MkdirAll(cache, 0755)
+	if err != nil {
+		panic(err)
+	}
 	go func() {
 		for i, s := range table {
 			index[s] = uint8(i)
 		}
-		_ = os.RemoveAll(cache)
-		err := os.MkdirAll(cache, 0755)
-		if err != nil {
-			panic(err)
-		}
 		data, err := file.GetLazyData(omikujson, true, false)
 		if err != nil {
 			panic(err)
@@ -75,7 +73,9 @@ func init() {
 		if err != nil {
 			panic(err)
 		}
-		_, err = file.GetLazyData(font, false, true)
+	}()
+	go func() {
+		_, err := file.GetLazyData(font, false, true)
 		if err != nil {
 			panic(err)
 		}
@@ -125,7 +125,7 @@ func init() {
 			zipfile := images + kind + ".zip"
 			_, err := file.GetLazyData(zipfile, false, false)
 			if err != nil {
-				ctx.SendChain(message.Text("ERROR: ", err))
+				ctx.SendChain(message.Text("ERROR:", err))
 				return
 			}
 
@@ -136,7 +136,7 @@ func init() {
 			// 随机获取背景
 			background, index, err := randimage(zipfile, seed)
 			if err != nil {
-				ctx.SendChain(message.Text("ERROR: ", err))
+				ctx.SendChain(message.Text("ERROR:", err))
 				return
 			}
 
@@ -155,7 +155,7 @@ func init() {
 				return err
 			}, ctxext.Send(ctx), ctxext.GetMessage(ctx))
 			if err != nil {
-				ctx.SendChain(message.Text("ERROR: ", err))
+				ctx.SendChain(message.Text("ERROR:", err))
 				return
 			}
 		})

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号]",
@@ -48,7 +46,7 @@ func init() {
 
 	en.OnPrefix("讲个笑话").SetBlock(true).Limit(ctxext.LimitByUser).Handle(func(ctx *zero.Ctx) {
 		// 获取名字
-		name := ctxext.NickName(ctx)
+		name := ctx.NickName()
 		var j joke
 		err := db.Pick("jokes", &j)
 		if err != nil {

plugin/genshin/data.go

@@ -0,0 +1,16 @@
+package genshin
+
+type storage uint64
+
+func (s *storage) is5starsmode() bool {
+	return *s&1 == 1
+}
+
+func (s *storage) setmode(is5stars bool) bool {
+	if is5stars {
+		*s |= 1
+	} else {
+		*s &= 0xffffffff_fffffffe
+	}
+	return is5stars
+}

plugin/genshin/ys.go

@@ -0,0 +1,342 @@
+// Package genshin 原神抽卡
+package genshin
+
+import (
+	"archive/zip"
+	"image"
+	"image/color"
+	"image/draw"
+	"image/jpeg"
+	"image/png"
+	"math/rand"
+	"strings"
+	"sync/atomic"
+
+	"github.com/FloatTech/zbputils/control"
+	"github.com/FloatTech/zbputils/ctxext"
+	"github.com/FloatTech/zbputils/file"
+	"github.com/FloatTech/zbputils/img/writer"
+	"github.com/FloatTech/zbputils/process"
+	"github.com/golang/freetype"
+	"github.com/sirupsen/logrus"
+	zero "github.com/wdvxdr1123/ZeroBot"
+	"github.com/wdvxdr1123/ZeroBot/message"
+)
+
+type zipfilestructure map[string][]*zip.File
+
+var (
+	totl                   uint64 // 累计抽奖次数
+	filetree               = make(zipfilestructure, 32)
+	starN3, starN4, starN5 *zip.File
+)
+
+func init() {
+	engine := control.Register("genshin", &control.Options{
+		DisableOnDefault: false,
+		Help:             "原神抽卡\n- 原神十连\n- 切换原神卡池",
+		PublicDataFolder: "Genshin",
+	}).ApplySingle(ctxext.DefaultSingle)
+
+	go func() {
+		zipfile := engine.DataFolder() + "Genshin.zip"
+		_, err := file.GetLazyData(zipfile, false, false)
+		if err != nil {
+			panic(err)
+		}
+		err = parsezip(zipfile)
+		if err != nil {
+			panic(err)
+		}
+	}()
+
+	engine.OnFullMatch("切换原神卡池").SetBlock(true).Limit(ctxext.LimitByUser).
+		Handle(func(ctx *zero.Ctx) {
+			c, ok := control.Lookup("genshin")
+			if !ok {
+				ctx.SendChain(message.Text("找不到服务!"))
+				return
+			}
+			gid := ctx.Event.GroupID
+			if gid == 0 {
+				gid = -ctx.Event.UserID
+			}
+			store := (storage)(c.GetData(gid))
+			if store.setmode(!store.is5starsmode()) {
+				process.SleepAbout1sTo2s()
+				ctx.SendChain(message.Text("切换到五星卡池~"))
+			} else {
+				process.SleepAbout1sTo2s()
+				ctx.SendChain(message.Text("切换到普通卡池~"))
+			}
+			err := c.SetData(gid, int64(store))
+			if err != nil {
+				process.SleepAbout1sTo2s()
+				ctx.SendChain(message.Text("ERROR:", err))
+			}
+		})
+
+	engine.OnFullMatch("原神十连").SetBlock(true).Limit(ctxext.LimitByUser).
+		Handle(func(ctx *zero.Ctx) {
+			c, ok := control.Lookup("genshin")
+			if !ok {
+				ctx.SendChain(message.Text("找不到服务!"))
+				return
+			}
+			gid := ctx.Event.GroupID
+			if gid == 0 {
+				gid = -ctx.Event.UserID
+			}
+			store := (storage)(c.GetData(gid))
+			img, err := randnums(10, store)
+			if err != nil {
+				ctx.SendChain(message.Text("ERROR:", err))
+				return
+			}
+			b, cl := writer.ToBytes(img)
+			ctx.Send(message.ReplyWithMessage(ctx.Event.MessageID, message.ImageBytes(b)))
+			cl()
+		})
+}
+
+func randnums(nums int, store storage) (rgba *image.RGBA, err error) {
+	var (
+		fours, fives                  = make([]*zip.File, 0, 10), make([]*zip.File, 0, 10)                           // 抽到 四, 五星角色
+		threeArms, fourArms, fiveArms = make([]*zip.File, 0, 10), make([]*zip.File, 0, 10), make([]*zip.File, 0, 10) // 抽到 三 , 四, 五星武器
+		fourN, fiveN                  = 0, 0                                                                         // 抽到 四, 五星角色的数量
+		bgs                           = make([]*zip.File, 0, 10)                                                     // 背景图片名
+		threeN2, fourN2, fiveN2       = 0, 0, 0                                                                      // 抽到 三 , 四, 五星武器的数量
+		hero, stars                   = make([]*zip.File, 0, 10), make([]*zip.File, 0, 10)                           // 角色武器名, 储存星级图标
+
+		cicon                   = make([]*zip.File, 0, 10)                                                            // 元素图标
+		fivebg, fourbg, threebg = filetree["five_bg.jpg"][0], filetree["four_bg.jpg"][0], filetree["three_bg.jpg"][0] // 背景图片名
+		fivelen                 = len(filetree["five"])
+		five2len                = len(filetree["five2"])
+		threelen                = len(filetree["Three"])
+		fourlen                 = len(filetree["four"])
+		four2len                = len(filetree["four2"])
+	)
+
+	if totl%9 == 0 { // 累计9次加入一个五星
+		switch rand.Intn(2) {
+		case 0:
+			fiveN++
+			fives = append(fives, filetree["five"][rand.Intn(fivelen)])
+		case 1:
+			fiveN2++
+			fiveArms = append(fiveArms, filetree["five2"][rand.Intn(five2len)])
+		}
+		nums--
+	}
+
+	if store.is5starsmode() { // 5星模式
+		for i := 0; i < nums; i++ {
+			switch rand.Intn(2) {
+			case 0:
+				fiveN++
+				fives = append(fives, filetree["five"][rand.Intn(fivelen)])
+			case 1:
+				fiveN2++
+				fiveArms = append(fiveArms, filetree["five2"][rand.Intn(five2len)])
+			}
+		}
+	} else { // 默认模式
+		for i := 0; i < nums; i++ {
+			a := rand.Intn(1000)
+			switch { // 抽卡几率 三星75% 四星18% 五星7%
+			case a >= 0 && a <= 750:
+				threeN2++
+				threeArms = append(threeArms, filetree["Three"][rand.Intn(threelen)])
+			case a > 750 && a <= 840:
+				fourN++
+				fours = append(fours, filetree["four"][rand.Intn(fourlen)]) // 随机角色
+			case a > 840 && a <= 930:
+				fourN2++
+				fourArms = append(fourArms, filetree["four2"][rand.Intn(four2len)]) // 随机武器
+			case a > 930 && a <= 965:
+				fiveN++
+				fives = append(fives, filetree["five"][rand.Intn(fivelen)])
+			default:
+				fiveN2++
+				fiveArms = append(fiveArms, filetree["five2"][rand.Intn(five2len)])
+			}
+		}
+		if fourN+fourN2 == 0 && threeN2 > 0 { // 没有四星时自动加入
+			threeN2--
+			threeArms = threeArms[:len(threeArms)-1]
+			switch rand.Intn(2) {
+			case 0:
+				fourN++
+				fours = append(fours, filetree["four"][rand.Intn(fourlen)]) // 随机角色
+			case 1:
+				fourN2++
+				fourArms = append(fourArms, filetree["four2"][rand.Intn(four2len)]) // 随机武器
+			}
+		}
+		_ = atomic.AddUint64(&totl, 1)
+	}
+
+	icon := func(f *zip.File) *zip.File {
+		name := f.Name
+		name = name[strings.LastIndex(name, "/")+1:strings.Index(name, "_")] + ".png"
+		logrus.Debugln("[genshin]get named file", name)
+		return filetree[name][0]
+	}
+
+	he := func(cnt int, id int, f *zip.File, bg *zip.File) {
+		var hen *[]*zip.File
+		for i := 0; i < cnt; i++ {
+			switch id {
+			case 1:
+				hen = &threeArms
+			case 2:
+				hen = &fourArms
+			case 3:
+				hen = &fours
+			case 4:
+				hen = &fiveArms
+			case 5:
+				hen = &fives
+			}
+			bgs = append(bgs, bg) // 加入颜色背景
+			hero = append(hero, (*hen)[i])
+			stars = append(stars, f)               // 加入星级图标
+			cicon = append(cicon, icon((*hen)[i])) // 加入元素图标
+		}
+	}
+
+	if fiveN > 0 { // 按顺序加入
+		he(fiveN, 5, starN5, fivebg) // 五星角色
+	}
+	if fourN > 0 {
+		he(fourN, 3, starN4, fourbg) // 四星角色
+	}
+	if fiveN2 > 0 {
+		he(fiveN2, 4, starN5, fivebg) // 五星武器
+	}
+	if fourN2 > 0 {
+		he(fourN2, 2, starN4, fourbg) // 四星武器
+	}
+	if threeN2 > 0 {
+		he(threeN2, 1, starN3, threebg) // 三星武器
+	}
+
+	var c1, c2, c3 uint8 = 50, 50, 50 // 背景颜色
+
+	img00, err := filetree["bg0.jpg"][0].Open() // 打开背景图片
+	if err != nil {
+		return
+	}
+
+	rectangle := image.Rect(0, 0, 1920, 1080) // 图片宽度, 图片高度
+	rgba = image.NewRGBA(rectangle)
+	draw.Draw(rgba, rgba.Bounds(), image.NewUniform(color.RGBA{c1, c2, c3, 255}), image.Point{}, draw.Over)
+	context := freetype.NewContext() // 创建一个新的上下文
+	context.SetDPI(72)               // 每英寸 dpi
+	context.SetClip(rgba.Bounds())
+	context.SetDst(rgba)
+
+	defer img00.Close()
+	img0, err := jpeg.Decode(img00) // 读取一个本地图像
+	if err != nil {
+		return
+	}
+
+	offset := image.Pt(0, 0) // 图片在背景上的位置
+	draw.Draw(rgba, img0.Bounds().Add(offset), img0, image.Point{}, draw.Over)
+
+	w1, h1 := 230, 0
+	for i := 0; i < len(hero); i++ {
+		if i > 0 {
+			w1 += 146 // 图片宽度
+		}
+
+		imgs, err := bgs[i].Open() // 取出背景图片
+		if err != nil {
+			return nil, err
+		}
+		defer imgs.Close()
+
+		img, _ := jpeg.Decode(imgs)
+		offset := image.Pt(w1, h1)
+		draw.Draw(rgba, img.Bounds().Add(offset), img, image.Point{}, draw.Over)
+
+		imgs1, err := hero[i].Open() // 取出图片名
+		if err != nil {
+			return nil, err
+		}
+		defer imgs1.Close()
+
+		img1, _ := png.Decode(imgs1)
+		offset1 := image.Pt(w1, h1)
+		draw.Draw(rgba, img1.Bounds().Add(offset1), img1, image.Point{}, draw.Over)
+
+		imgs2, err := stars[i].Open() // 取出星级图标
+		if err != nil {
+			return nil, err
+		}
+		defer imgs2.Close()
+
+		img2, _ := png.Decode(imgs2)
+		offset2 := image.Pt(w1, h1)
+		draw.Draw(rgba, img2.Bounds().Add(offset2), img2, image.Point{}, draw.Over)
+
+		imgs3, err := cicon[i].Open() // 取出类型图标
+		if err != nil {
+			return nil, err
+		}
+		defer imgs3.Close()
+
+		img3, _ := png.Decode(imgs3)
+		offset3 := image.Pt(w1, h1)
+		draw.Draw(rgba, img3.Bounds().Add(offset3), img3, image.Point{}, draw.Over)
+	}
+	imgs4, err := filetree["Reply.png"][0].Open() // "分享" 图标
+	if err != nil {
+		return nil, err
+	}
+	defer imgs4.Close()
+	img4, err := png.Decode(imgs4)
+	if err != nil {
+		return nil, err
+	}
+	offset4 := image.Pt(1270, 945) // 宽, 高
+	draw.Draw(rgba, img4.Bounds().Add(offset4), img4, image.Point{}, draw.Over)
+	return
+}
+
+func parsezip(zipFile string) error {
+	zipReader, err := zip.OpenReader(zipFile) // will not close
+	if err != nil {
+		return err
+	}
+	for _, f := range zipReader.File {
+		if f.FileInfo().IsDir() {
+			filetree[f.Name] = make([]*zip.File, 0, 32)
+			continue
+		}
+		f.Name = f.Name[8:]
+		i := strings.LastIndex(f.Name, "/")
+		if i < 0 {
+			filetree[f.Name] = []*zip.File{f}
+			logrus.Debugln("[genshin]insert file", f.Name)
+			continue
+		}
+		folder := f.Name[:i]
+		if folder != "" {
+			filetree[folder] = append(filetree[folder], f)
+			logrus.Debugln("[genshin]insert file into", folder)
+			if folder == "gacha" {
+				switch f.Name[i+1:] {
+				case "ThreeStar.png":
+					starN3 = f
+				case "FourStar.png":
+					starN4 = f
+				case "FiveStar.png":
+					starN5 = f
+				}
+			}
+		}
+	}
+	return nil
+}

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" +
@@ -36,12 +34,12 @@ func init() { // 插件主体
 			}.Encode()
 			body, err := netGet(api.String(), header)
 			if err != nil {
-				ctx.SendChain(message.Text("ERROR: ", err))
+				ctx.SendChain(message.Text("ERROR:", err))
 			}
 			// 解析请求
 			info := gjson.ParseBytes(body)
 			if info.Get("total_count").Int() == 0 {
-				ctx.SendChain(message.Text("ERROR: 没有找到这样的仓库"))
+				ctx.SendChain(message.Text("ERROR:没有找到这样的仓库"))
 				return
 			}
 			repo := info.Get("items.0")
@@ -97,7 +95,7 @@ func init() { // 插件主体
 }
 
 // notnull 如果传入文本为空，则返回默认值
-//nolint: unparam
+
 func notnull(text, defstr string) string {
 	if text == "" {
 		return defstr

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" +
@@ -66,7 +64,7 @@ func init() {
 			cid := gjson.Get(g, `list.`+strconv.Itoa(i)+`.CardID`).String()
 			cachefile := cachedir + cid
 			if file.IsNotExist(cachefile) {
-				data, err := web.GetDataWith(web.NewDefaultClient(),
+				data, err := web.RequestDataWith(web.NewDefaultClient(),
 					`https://res.fbigame.com/hs/v13/`+cid+`.png?auth_key=`+
 						gjson.Get(g, `list.`+strconv.Itoa(i)+`.auth_key`).String(),
 					reqconf[0], reqconf[1], reqconf[2])
@@ -83,7 +81,7 @@ func init() {
 			ctx.Event.GroupID,
 			sk,
 		).Get("message_id").Int(); id == 0 {
-			ctx.SendChain(message.Text("ERROR: 可能被风控了"))
+			ctx.SendChain(message.Text("ERROR:可能被风控了"))
 		}
 	})
 	// 卡组
@@ -98,10 +96,10 @@ func init() {
 }
 
 func sh(s string) string {
-	data, err := web.GetDataWith(web.NewDefaultClient(), "https://hs.fbigame.com", reqconf[0], reqconf[1], reqconf[2])
+	data, err := web.RequestDataWith(web.NewDefaultClient(), "https://hs.fbigame.com", reqconf[0], reqconf[1], reqconf[2])
 	if err == nil {
 		url := hs + para + "&hash=" + strings.SplitN(strings.SplitN(helper.BytesToString(data), `var hash = "`, 2)[1], `"`, 2)[0] + "&search=" + s
-		r, err := web.GetDataWith(web.NewDefaultClient(), url, reqconf[0], reqconf[1], reqconf[2])
+		r, err := web.RequestDataWith(web.NewDefaultClient(), url, reqconf[0], reqconf[1], reqconf[2])
 		if err == nil {
 			return helper.BytesToString(r)
 		}
@@ -110,10 +108,10 @@ func sh(s string) string {
 }
 
 func kz(s string) string {
-	data, err := web.GetDataWith(web.NewDefaultClient(), "https://hs.fbigame.com", reqconf[0], reqconf[1], reqconf[2])
+	data, err := web.RequestDataWith(web.NewDefaultClient(), "https://hs.fbigame.com", reqconf[0], reqconf[1], reqconf[2])
 	if err == nil {
 		url := hs + para + "mod=general_deck_image&deck_code=" + s + "&deck_text=&hash=" + strings.SplitN(strings.SplitN(helper.BytesToString(data), `var hash = "`, 2)[1], `"`, 2)[0] + "&search=" + s
-		r, err := web.GetDataWith(web.NewDefaultClient(), url, reqconf[0], reqconf[1], reqconf[2])
+		r, err := web.RequestDataWith(web.NewDefaultClient(), url, reqconf[0], reqconf[1], reqconf[2])
 		if err == nil {
 			return "base64://" + gjson.Get(helper.BytesToString(r), "img").String()
 		}

plugin/hyaku/main.go

@@ -0,0 +1,121 @@
+package hyaku
+
+import (
+	"encoding/csv"
+	"fmt"
+	"math/rand"
+	"os"
+	"reflect"
+	"strconv"
+	"unsafe"
+
+	"github.com/FloatTech/zbputils/binary"
+	"github.com/FloatTech/zbputils/control"
+	"github.com/FloatTech/zbputils/ctxext"
+	"github.com/FloatTech/zbputils/file"
+	zero "github.com/wdvxdr1123/ZeroBot"
+	"github.com/wdvxdr1123/ZeroBot/message"
+)
+
+const bed = "https://gitcode.net/u011570312/OguraHyakuninIsshu/-/raw/master/"
+
+//nolint: asciicheck
+type line struct {
+	番号, 歌人, 上の句, 下の句, 上の句ひらがな, 下の句ひらがな string
+}
+
+func (l *line) String() string {
+	b := binary.NewWriterF(func(w *binary.Writer) {
+		r := reflect.ValueOf(l).Elem().Type()
+		for i := 0; i < r.NumField(); i++ {
+			switch i {
+			case 0:
+				w.WriteString("●")
+			case 1:
+				w.WriteString("◉")
+			case 2, 3:
+				w.WriteString("○")
+			case 4, 5:
+				w.WriteString("◎")
+			}
+			w.WriteString(r.Field(i).Name)
+			w.WriteString("：")
+			w.WriteString((*[6]string)(unsafe.Pointer(l))[i])
+			w.WriteString("\n")
+		}
+	})
+	return binary.BytesToString(b)
+}
+
+var lines [100]*line
+
+func init() {
+	engine := control.Register("hyaku", &control.Options{
+		DisableOnDefault: false,
+		Help: "百人一首\n" +
+			"- 百人一首(随机发一首)\n" +
+			"- 百人一首之n",
+		PrivateDataFolder: "hyaku",
+	})
+	csvfile := engine.DataFolder() + "hyaku.csv"
+	go func() {
+		if file.IsNotExist(csvfile) {
+			err := file.DownloadTo(bed+"小倉百人一首.csv", csvfile, true)
+			if err != nil {
+				_ = os.Remove(csvfile)
+				panic(err)
+			}
+		}
+		f, err := os.Open(csvfile)
+		if err != nil {
+			panic(err)
+		}
+		records, err := csv.NewReader(f).ReadAll()
+		if err != nil {
+			panic(err)
+		}
+		_ = f.Close()
+		records = records[1:] // skip title
+		if len(records) != 100 {
+			panic("invalid csvfile")
+		}
+		for j, r := range records {
+			if len(r) != 6 {
+				panic("invalid csvfile")
+			}
+			i, err := strconv.Atoi(r[0])
+			if err != nil {
+				panic(err)
+			}
+			i--
+			if j != i {
+				panic("invalid csvfile")
+			}
+			lines[i] = (*line)(*(*unsafe.Pointer)(unsafe.Pointer(&r)))
+		}
+	}()
+	engine.OnFullMatch("百人一首").SetBlock(true).Limit(ctxext.LimitByUser).Handle(func(ctx *zero.Ctx) {
+		i := rand.Intn(100)
+		ctx.SendChain(
+			message.Image(fmt.Sprintf(bed+"img/%03d.jpg", i+1)),
+			message.Text("\n", lines[i]),
+			message.Image(fmt.Sprintf(bed+"img/%03d.png", i+1)),
+		)
+	})
+	engine.OnRegex(`^百人一首之\s?(\d+)$`).SetBlock(true).Limit(ctxext.LimitByUser).Handle(func(ctx *zero.Ctx) {
+		i, err := strconv.Atoi(ctx.State["regex_matched"].([]string)[1])
+		if err != nil {
+			ctx.SendChain(message.Text("ERROR:", err))
+			return
+		}
+		if i > 100 || i < 1 {
+			ctx.SendChain(message.Text("ERROR:超出范围"))
+			return
+		}
+		ctx.SendChain(
+			message.Image(fmt.Sprintf(bed+"img/%03d.jpg", i)),
+			message.Text("\n", lines[i-1]),
+			message.Image(fmt.Sprintf(bed+"img/%03d.png", i)),
+		)
+	})
+}

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]",
@@ -44,13 +43,13 @@ func init() {
 			keyword := ctx.State["regex_matched"].([]string)[1]
 			soutujson, err := soutuapi(keyword)
 			if err != nil {
-				ctx.SendChain(message.Text("ERROR: ", err))
+				ctx.SendChain(message.Text("ERROR:", err))
 				return
 			}
 			rannum := rand.Intn(len(soutujson.Data.Illusts))
 			illust, err := pixiv.Works(soutujson.Data.Illusts[rannum].ID)
 			if err != nil {
-				ctx.SendChain(message.Text("ERROR: ", err))
+				ctx.SendChain(message.Text("ERROR:", err))
 				return
 			}
 			u := illust.ImageUrls[0]
@@ -62,7 +61,7 @@ func init() {
 				return illust.DownloadToCache(0)
 			}, ctxext.SendFakeForwardToGroup(ctx), ctxext.GetFirstMessageInForward(ctx))
 			if err != nil {
-				ctx.SendChain(message.Text("ERROR: ", err))
+				ctx.SendChain(message.Text("ERROR:", err))
 				return
 			}
 		})

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,9 +21,9 @@ const (
 )
 
 func init() {
-	engine := control.Register("jandan", order.AcquirePrio(), &control.Options{
+	engine := control.Register("jandan", &control.Options{
 		DisableOnDefault: false,
-		Help:             "煎蛋网无聊图\n- 来份屌图\n- 更新屌图\n",
+		Help:             "煎蛋网无聊图\n- 来份[屌|弔|吊]图\n- 更新[屌|弔|吊]图\n",
 		PublicDataFolder: "Jandan",
 	})
 
@@ -44,7 +42,7 @@ func init() {
 		logrus.Printf("[jandan]读取%d张图片", n)
 	}()
 
-	engine.OnFullMatch("来份屌图").SetBlock(true).
+	engine.OnRegex(`来份[屌|弔|吊]图`).SetBlock(true).
 		Handle(func(ctx *zero.Ctx) {
 			u, err := getRandomPicture()
 			if err != nil {
@@ -54,7 +52,7 @@ func init() {
 			ctx.SendChain(message.Image(u))
 		})
 
-	engine.OnFullMatch("更新屌图", zero.SuperUserPermission).SetBlock(true).
+	engine.OnRegex(`更新[屌|弔|吊]图`, zero.SuperUserPermission).SetBlock(true).
 		Handle(func(ctx *zero.Ctx) {
 			ctx.Send("少女更新中...")
 			webpageURL := api

plugin/job/main.go

@@ -1,541 +0,0 @@
-// Package job 定时指令触发器
-package job
-
-import (
-	"encoding/json"
-	"hash/crc64"
-	"strconv"
-	"strings"
-	"sync"
-	"time"
-
-	"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/process"
-	"github.com/FloatTech/zbputils/vevent"
-	"github.com/FloatTech/zbputils/web"
-	"github.com/fumiama/cron"
-	"github.com/sirupsen/logrus"
-	"github.com/tidwall/gjson"
-	zero "github.com/wdvxdr1123/ZeroBot"
-	"github.com/wdvxdr1123/ZeroBot/extension/rate"
-	"github.com/wdvxdr1123/ZeroBot/message"
-)
-
-var (
-	lo       map[int64]vevent.Loop
-	entries  = map[int64]cron.EntryID{} // id entryid
-	matchers = map[int64]*zero.Matcher{}
-	mu       sync.Mutex
-	limit    = rate.NewLimiter(time.Second*2, 1)
-	en       = control.Register("job", order.AcquirePrio(), &control.Options{
-		DisableOnDefault:  false,
-		Help:              "定时指令触发器\n- 记录以\"完全匹配关键词\"触发的指令\n- 取消以\"完全匹配关键词\"触发的指令\n- 记录在\"cron\"触发的指令\n- 取消在\"cron\"触发的指令\n- 查看所有触发指令\n- 查看在\"cron\"触发的指令\n- 查看以\"完全匹配关键词\"触发的指令\n- 注入指令结果：任意指令\n- 执行指令：任意指令",
-		PrivateDataFolder: "job",
-	})
-)
-
-func init() {
-	db.DBPath = en.DataFolder() + "job.db"
-	err := db.Open()
-	if err != nil {
-		panic(err)
-	}
-	go func() {
-		process.GlobalInitMutex.Lock()
-		process.SleepAbout1sTo2s()
-		lo = make(map[int64]vevent.Loop, len(zero.BotConfig.Driver))
-		for _, drv := range zero.BotConfig.Driver {
-			id := drv.SelfID()
-			ids := strconv.FormatInt(id, 36)
-			c := &cmd{}
-			lo[id] = vevent.NewLoop(id)
-			err := db.Create(ids, c)
-			logrus.Infoln("[job]创建表", ids)
-			if err != nil {
-				panic(err)
-			}
-			_ = db.FindFor(ids, c, "", func() error {
-				mu.Lock()
-				defer mu.Unlock()
-				if strings.HasPrefix(c.Cron, "fm:") {
-					m := en.OnFullMatch(c.Cron[3:] /* skip fm: */).SetBlock(true)
-					m.Handle(generalhandler(c))
-					matchers[c.ID] = getmatcher(m)
-					return nil
-				}
-				if strings.HasPrefix(c.Cron, "sm:") {
-					m := en.OnFullMatch(c.Cron[3:] /* skip fm: */).SetBlock(true)
-					m.Handle(superuserhandler(c))
-					matchers[c.ID] = getmatcher(m)
-					return nil
-				}
-				eid, err := process.CronTab.AddFunc(c.Cron, inject(id, []byte(c.Cmd)))
-				if err != nil {
-					return err
-				}
-				entries[c.ID] = eid
-				return nil
-			})
-		}
-		logrus.Infoln("[job]本地环回初始化完成")
-		process.GlobalInitMutex.Unlock()
-	}()
-	en.OnRegex(`^记录在"(.*)"触发的指令$`, ctxext.UserOrGrpAdmin, islonotnil, isfirstregmatchnotnil, logevent).SetBlock(true).Handle(func(ctx *zero.Ctx) {
-		cron := ctx.State["regex_matched"].([]string)[1]
-		command := ctx.State["job_raw_event"].(string)
-		c := &cmd{
-			ID:   idof(cron, command),
-			Cron: cron,
-			Cmd:  command,
-		}
-		err := addcmd(ctx.Event.SelfID, c)
-		if err != nil {
-			ctx.SendChain(message.Text("ERROR:", err))
-			return
-		}
-		ctx.SendChain(message.Text("成功!"))
-	})
-	en.OnRegex(`^记录以"(.*)"触发的指令$`, zero.SuperUserPermission, islonotnil, isfirstregmatchnotnil, logevent).SetBlock(true).Handle(func(ctx *zero.Ctx) {
-		cron := "fm:" + ctx.State["regex_matched"].([]string)[1]
-		command := ctx.State["job_new_event"].(gjson.Result).Get("message").Raw
-		logrus.Debugln("[job] get cmd:", command)
-		c := &cmd{
-			ID:   idof(cron, command),
-			Cron: cron,
-			Cmd:  command,
-		}
-		err := registercmd(ctx.Event.SelfID, c)
-		if err != nil {
-			ctx.SendChain(message.Text("ERROR:", err))
-			return
-		}
-		ctx.SendChain(message.Text("成功!"))
-	})
-	en.OnRegex(`^记录以"(.*)"触发的代表我执行的指令$`, zero.SuperUserPermission, islonotnil, isfirstregmatchnotnil, logevent).SetBlock(true).Handle(func(ctx *zero.Ctx) {
-		cron := "sm:" + ctx.State["regex_matched"].([]string)[1]
-		command := ctx.State["job_raw_event"].(string)
-		logrus.Debugln("[job] get cmd:", command)
-		c := &cmd{
-			ID:   idof(cron, command),
-			Cron: cron,
-			Cmd:  command,
-		}
-		err := registercmd(ctx.Event.SelfID, c)
-		if err != nil {
-			ctx.SendChain(message.Text("ERROR:", err))
-			return
-		}
-		ctx.SendChain(message.Text("成功!"))
-	})
-	en.OnRegex(`^取消在"(.*)"触发的指令$`, ctxext.UserOrGrpAdmin, islonotnil, isfirstregmatchnotnil).SetBlock(true).Handle(func(ctx *zero.Ctx) {
-		cron := ctx.State["regex_matched"].([]string)[1]
-		err := rmcmd(ctx.Event.SelfID, ctx.Event.UserID, cron)
-		if err != nil {
-			ctx.SendChain(message.Text("ERROR:", err))
-			return
-		}
-		ctx.SendChain(message.Text("成功!"))
-	})
-	en.OnRegex(`^取消以"(.*)"触发的(代表我执行的)?指令$`, zero.SuperUserPermission, islonotnil, isfirstregmatchnotnil).SetBlock(true).Handle(func(ctx *zero.Ctx) {
-		issu := ctx.State["regex_matched"].([]string)[2] != ""
-		cron := ""
-		if issu {
-			cron = "sm:"
-		} else {
-			cron = "fm:"
-		}
-		cron += ctx.State["regex_matched"].([]string)[1]
-		err := delcmd(ctx.Event.SelfID, cron)
-		if err != nil {
-			ctx.SendChain(message.Text("ERROR:", err))
-			return
-		}
-		ctx.SendChain(message.Text("成功!"))
-	})
-	en.OnFullMatch("查看所有触发指令", zero.SuperUserPermission, islonotnil).SetBlock(true).Handle(func(ctx *zero.Ctx) {
-		c := &cmd{}
-		ids := strconv.FormatInt(ctx.Event.SelfID, 36)
-		mu.Lock()
-		defer mu.Unlock()
-		n, err := db.Count(ids)
-		if err != nil {
-			ctx.SendChain(message.Text("ERROR:", err))
-			return
-		}
-		lst := make([]string, 0, n)
-		err = db.FindFor(ids, c, "GROUP BY cron", func() error {
-			lst = append(lst, c.Cron+"\n")
-			return nil
-		})
-		if err != nil {
-			ctx.SendChain(message.Text("ERROR:", err))
-			return
-		}
-		ctx.SendChain(message.Text(lst))
-	})
-	en.OnRegex(`^查看在"(.*)"触发的指令$`, zero.SuperUserPermission, islonotnil, isfirstregmatchnotnil).SetBlock(true).Handle(func(ctx *zero.Ctx) {
-		c := &cmd{}
-		ids := strconv.FormatInt(ctx.Event.SelfID, 36)
-		cron := ctx.State["regex_matched"].([]string)[1]
-		mu.Lock()
-		defer mu.Unlock()
-		n, err := db.Count(ids)
-		if err != nil {
-			ctx.SendChain(message.Text("ERROR:", err))
-			return
-		}
-		lst := make([]string, 0, n)
-		err = db.FindFor(ids, c, "WHERE cron='"+cron+"'", func() error {
-			lst = append(lst, c.Cmd+"\n")
-			return nil
-		})
-		if err != nil {
-			ctx.SendChain(message.Text("ERROR:", err))
-			return
-		}
-		ctx.SendChain(message.Text(lst))
-	})
-	en.OnRegex(`^查看以"(.*)"触发的(代表我执行的)?指令$`, zero.SuperUserPermission, islonotnil, isfirstregmatchnotnil).SetBlock(true).Handle(func(ctx *zero.Ctx) {
-		c := &cmd{}
-		ids := strconv.FormatInt(ctx.Event.SelfID, 36)
-		issu := ctx.State["regex_matched"].([]string)[2] != ""
-		cron := ""
-		if issu {
-			cron = "sm:"
-		} else {
-			cron = "fm:"
-		}
-		cron += ctx.State["regex_matched"].([]string)[1]
-		mu.Lock()
-		defer mu.Unlock()
-		n, err := db.Count(ids)
-		if err != nil {
-			ctx.SendChain(message.Text("ERROR:", err))
-			return
-		}
-		lst := make([]string, 0, n)
-		err = db.FindFor(ids, c, "WHERE cron='"+cron+"'", func() error {
-			lst = append(lst, c.Cmd+"\n")
-			return nil
-		})
-		if err != nil {
-			ctx.SendChain(message.Text("ERROR:", err))
-			return
-		}
-		ctx.SendChain(message.Text(lst))
-	})
-	en.OnPrefix("执行指令：", ctxext.UserOrGrpAdmin, islonotnil, func(ctx *zero.Ctx) bool {
-		return ctx.State["args"].(string) != ""
-	}, parseArgs).SetBlock(true).Handle(func(ctx *zero.Ctx) {
-		ev := strings.ReplaceAll(ctx.Event.RawEvent.Raw, "执行指令：", "")
-		logrus.Debugln("[job] inject:", ev)
-		inject(ctx.Event.SelfID, binary.StringToBytes(ev))()
-	})
-	en.OnPrefix("注入指令结果：", ctxext.UserOrGrpAdmin, islonotnil, func(ctx *zero.Ctx) bool {
-		return ctx.State["args"].(string) != ""
-	}, parseArgs).SetBlock(true).Handle(func(ctx *zero.Ctx) {
-		vevent.NewLoopOf(vevent.NewAPICallerHook(ctx, func(rsp zero.APIResponse, err error) {
-			if err == nil {
-				logrus.Debugln("[job] CallerHook returned")
-				id := message.NewMessageID(rsp.Data.Get("message_id").String())
-				if id.ID() == 0 {
-					ctx.SendChain(message.Text("ERROR:未获取到返回结果"))
-					return
-				}
-				msg := ctx.GetMessage(id)
-				ctx.Event.NativeMessage = json.RawMessage("\"" + msg.Elements.String() + "\"")
-				ctx.Event.RawMessageID = json.RawMessage(msg.MessageId.String())
-				ctx.Event.RawMessage = msg.Elements.String()
-				time.Sleep(time.Second * 5) // 防止风控
-				ctx.Event.Time = time.Now().Unix()
-				ctx.DeleteMessage(id)
-				vev, cl := binary.OpenWriterF(func(w *binary.Writer) {
-					err = json.NewEncoder(w).Encode(ctx.Event)
-				})
-				if err != nil {
-					cl()
-					ctx.SendChain(message.Text("ERROR:", err))
-					return
-				}
-				logrus.Debugln("[job] inject:", binary.BytesToString(vev))
-				inject(ctx.Event.SelfID, vev)()
-				cl()
-			}
-		})).Echo(binary.StringToBytes(strings.ReplaceAll(ctx.Event.RawEvent.Raw, "注入指令结果：", "")))
-	})
-}
-
-func islonotnil(ctx *zero.Ctx) bool {
-	return len(lo) > 0
-}
-
-func isfirstregmatchnotnil(ctx *zero.Ctx) bool {
-	return ctx.State["regex_matched"].([]string)[1] != ""
-}
-
-func inject(bot int64, response []byte) func() {
-	return func() {
-		if limit.Acquire() {
-			lo[bot].Echo(response)
-		}
-	}
-}
-
-func idof(cron, cmd string) int64 {
-	return int64(crc64.Checksum(binary.StringToBytes(cron+cmd), crc64.MakeTable(crc64.ISO)))
-}
-
-func addcmd(bot int64, c *cmd) error {
-	mu.Lock()
-	defer mu.Unlock()
-	eid, err := process.CronTab.AddFunc(c.Cron, inject(bot, []byte(c.Cmd)))
-	if err != nil {
-		return err
-	}
-	entries[c.ID] = eid
-	return db.Insert(strconv.FormatInt(bot, 36), c)
-}
-
-func registercmd(bot int64, c *cmd) error {
-	mu.Lock()
-	defer mu.Unlock()
-	m := en.OnFullMatch(c.Cron[3:] /* skip fm: or sm: */).SetBlock(true)
-	if strings.HasPrefix(c.Cron, "sm:") {
-		m.Handle(superuserhandler(c))
-	} else {
-		m.Handle(generalhandler(c))
-	}
-	matchers[c.ID] = getmatcher(m)
-	return db.Insert(strconv.FormatInt(bot, 36), c)
-}
-
-func generalhandler(c *cmd) zero.Handler {
-	return func(ctx *zero.Ctx) {
-		ctx.Event.NativeMessage = json.RawMessage(c.Cmd) // c.Cmd only have message
-		ctx.Event.Time = time.Now().Unix()
-		var err error
-		vev, cl := binary.OpenWriterF(func(w *binary.Writer) {
-			err = json.NewEncoder(w).Encode(ctx.Event)
-		})
-		if err != nil {
-			cl()
-			ctx.SendChain(message.Text("ERROR:", err))
-			return
-		}
-		logrus.Debugln("[job] inject:", binary.BytesToString(vev))
-		inject(ctx.Event.SelfID, vev)()
-		cl()
-	}
-}
-
-func superuserhandler(c *cmd) zero.Handler {
-	e := &zero.Event{Sender: new(zero.User)}
-	err := json.Unmarshal(binary.StringToBytes(c.Cmd), e)
-	return func(ctx *zero.Ctx) {
-		if err != nil {
-			ctx.SendChain(message.Text("ERROR:", err))
-			return
-		}
-		ctx.Event.UserID = e.UserID
-		ctx.Event.RawMessage = e.RawMessage
-		ctx.Event.Sender = e.Sender
-		ctx.Event.NativeMessage = e.NativeMessage
-		vev, cl := binary.OpenWriterF(func(w *binary.Writer) {
-			err = json.NewEncoder(w).Encode(ctx.Event)
-		})
-		if err != nil {
-			cl()
-			ctx.SendChain(message.Text("ERROR:", err))
-			return
-		}
-		logrus.Debugln("[job] inject:", binary.BytesToString(vev))
-		inject(ctx.Event.SelfID, vev)()
-		cl()
-	}
-}
-
-func rmcmd(bot, caller int64, cron string) error {
-	c := &cmd{}
-	mu.Lock()
-	defer mu.Unlock()
-	bots := strconv.FormatInt(bot, 36)
-	e := new(zero.Event)
-	var delcmd []string
-	err := db.FindFor(bots, c, "WHERE cron='"+cron+"'", func() error {
-		err := json.Unmarshal(binary.StringToBytes(c.Cmd), e)
-		if err != nil {
-			return err
-		}
-		if e.UserID != caller {
-			return nil
-		}
-		eid, ok := entries[c.ID]
-		if ok {
-			process.CronTab.Remove(eid)
-			delete(entries, c.ID)
-			delcmd = append(delcmd, "id="+strconv.FormatInt(c.ID, 10))
-		}
-		return nil
-	})
-	if err != nil {
-		return err
-	}
-	if len(delcmd) > 0 {
-		return db.Del(bots, "WHERE "+strings.Join(delcmd, " or "))
-	}
-	return nil
-}
-
-func delcmd(bot int64, cron string) error {
-	c := &cmd{}
-	mu.Lock()
-	defer mu.Unlock()
-	bots := strconv.FormatInt(bot, 36)
-	var delcmd []string
-	err := db.FindFor(bots, c, "WHERE cron='"+cron+"'", func() error {
-		m, ok := matchers[c.ID]
-		if ok {
-			m.Delete()
-			delete(matchers, c.ID)
-			delcmd = append(delcmd, "id="+strconv.FormatInt(c.ID, 10))
-		}
-		return nil
-	})
-	if err != nil {
-		return err
-	}
-	if len(delcmd) > 0 {
-		return db.Del(bots, "WHERE "+strings.Join(delcmd, " or "))
-	}
-	return nil
-}
-
-func parseArgs(ctx *zero.Ctx) bool {
-	cmds := ctx.State["args"].(string)
-	if !strings.Contains(cmds, "?::") && !strings.Contains(cmds, "!::") {
-		return true
-	}
-	args := make(map[int]string)
-	for strings.Contains(ctx.Event.RawEvent.Raw, "?::") {
-		start := strings.Index(ctx.Event.RawEvent.Raw, "?::")
-		msgend := strings.Index(ctx.Event.RawEvent.Raw[start+3:], "::")
-		if msgend < 0 {
-			ctx.SendChain(message.Text("ERROR:找不到结束的::"))
-			return false
-		}
-		msgend += start + 3
-		numend := strings.Index(ctx.Event.RawEvent.Raw[msgend+2:], "!")
-		if numend <= 0 {
-			ctx.SendChain(message.Text("ERROR:找不到结束的!"))
-			return false
-		}
-		numend += msgend + 2
-		logrus.Debugln("[job]", start, msgend, numend)
-		msg := ctx.Event.RawEvent.Raw[start+3 : msgend]
-		arg, err := strconv.Atoi(ctx.Event.RawEvent.Raw[msgend+2 : numend])
-		if err != nil {
-			ctx.SendChain(message.Text("ERROR:", err))
-			return false
-		}
-		arr, ok := args[arg]
-		if !ok {
-			var id message.MessageID
-			if msg == "" {
-				id = ctx.SendChain(message.At(ctx.Event.UserID), message.Text("请输入参数", arg))
-			} else {
-				id = ctx.SendChain(message.At(ctx.Event.UserID), message.Text("[", arg, "] ", msg))
-			}
-			select {
-			case <-time.After(time.Second * 120):
-				ctx.Send(message.ReplyWithMessage(id, message.Text("参数读取超时")))
-				if msg[0] != '?' {
-					return false
-				}
-			case e := <-zero.NewFutureEvent("message", 0, true, zero.CheckUser(ctx.Event.UserID)).Next():
-				args[arg] = e.Message.String()
-				arr = args[arg]
-				process.SleepAbout1sTo2s()
-				ctx.SendChain(message.Reply(e.MessageID), message.Text("已记录"))
-				process.SleepAbout1sTo2s()
-			}
-		}
-		ctx.Event.RawEvent.Raw = ctx.Event.RawEvent.Raw[:start] + arr + ctx.Event.RawEvent.Raw[numend+1:]
-	}
-	args = make(map[int]string)
-	for strings.Contains(ctx.Event.RawEvent.Raw, "!::") {
-		start := strings.Index(ctx.Event.RawEvent.Raw, "!::")
-		msgend := strings.Index(ctx.Event.RawEvent.Raw[start+3:], "::")
-		if msgend < 0 {
-			ctx.SendChain(message.Text("ERROR:找不到结束的::"))
-			return false
-		}
-		msgend += start + 3
-		numend := strings.Index(ctx.Event.RawEvent.Raw[msgend+2:], "!")
-		if numend <= 0 {
-			ctx.SendChain(message.Text("ERROR:找不到结束的!"))
-			return false
-		}
-		numend += msgend + 2
-		logrus.Debugln("[job]", start, msgend, numend)
-		u := ctx.Event.RawEvent.Raw[start+3 : msgend]
-		if u == "" {
-			return false
-		}
-		arg, err := strconv.Atoi(ctx.Event.RawEvent.Raw[msgend+2 : numend])
-		if err != nil {
-			ctx.SendChain(message.Text("ERROR:", err))
-			return false
-		}
-		arr, ok := args[arg]
-		if !ok {
-			isnilable := u[0] == '?'
-			if isnilable {
-				u = u[1:]
-				if u == "" {
-					return false
-				}
-			}
-			b, err := web.GetData(u)
-			if err != nil {
-				ctx.SendChain(message.Text("ERROR:", err))
-				if !isnilable {
-					return false
-				}
-			}
-			if len(b) > 0 {
-				type fakejson struct {
-					Arg string `json:"arg"`
-				}
-				f := fakejson{Arg: binary.BytesToString(b)}
-				w := binary.SelectWriter()
-				defer binary.PutWriter(w)
-				_ = json.NewEncoder(w).Encode(&f)
-				arr = w.String()[8 : w.Len()-3]
-				args[arg] = arr
-			}
-		}
-		w := binary.SelectWriter()
-		w.WriteString(ctx.Event.RawEvent.Raw[:start])
-		w.WriteString(arr)
-		w.WriteString(ctx.Event.RawEvent.Raw[numend+1:])
-		ctx.Event.RawEvent.Raw = string(w.Bytes())
-		binary.PutWriter(w)
-	}
-	return true
-}
-
-func logevent(ctx *zero.Ctx) bool {
-	ctx.SendChain(message.Text("您的下一条指令将被记录，在", ctx.State["regex_matched"].([]string)[1], "时触发"))
-	select {
-	case <-time.After(time.Second * 120):
-		ctx.SendChain(message.Text("指令记录超时"))
-		return false
-	case e := <-zero.NewFutureEvent("message", 0, true, zero.CheckUser(ctx.Event.UserID)).Next():
-		ctx.State["job_raw_event"] = e.RawEvent.Raw
-		ctx.State["job_new_event"] = e.RawEvent
-		return true
-	}
-}

plugin/job/matcher.go

@@ -1,16 +0,0 @@
-package job
-
-import (
-	"unsafe"
-
-	"github.com/FloatTech/zbputils/control"
-	zero "github.com/wdvxdr1123/ZeroBot"
-)
-
-type matcherinstance struct {
-	m *zero.Matcher
-}
-
-func getmatcher(m control.Matcher) *zero.Matcher {
-	return (*matcherinstance)(unsafe.Pointer(&m)).m
-}

plugin/job/model.go

@@ -1,11 +0,0 @@
-package job
-
-import sql "github.com/FloatTech/sqlite"
-
-type cmd struct {
-	ID   int64  `db:"id"`
-	Cron string `db:"cron"`
-	Cmd  string `db:"cmd"`
-}
-
-var db = &sql.Sqlite{}

plugin/juejuezi/juejuezi.go

@@ -14,8 +14,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 (
@@ -25,7 +23,7 @@ const (
 )
 
 func init() {
-	control.Register("juejuezi", order.AcquirePrio(), &control.Options{
+	control.Register("juejuezi", &control.Options{
 		DisableOnDefault: false,
 		Help: "绝绝子生成器\n" +
 			"- 喝奶茶绝绝子 | 绝绝子吃饭",

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" +
 			"- 来份萝莉",
@@ -39,12 +37,12 @@ func init() {
 				for i := 0; i < math.Min(cap(queue)-len(queue), 2); i++ {
 					data, err := web.GetData(api)
 					if err != nil {
-						ctx.SendChain(message.Text("ERROR: ", err))
+						ctx.SendChain(message.Text("ERROR:", err))
 						continue
 					}
 					json := gjson.ParseBytes(data)
 					if e := json.Get("error").Str; e != "" {
-						ctx.SendChain(message.Text("ERROR: ", e))
+						ctx.SendChain(message.Text("ERROR:", e))
 						continue
 					}
 					url := json.Get("data.0.urls.original").Str
@@ -65,7 +63,7 @@ func init() {
 			}()
 			select {
 			case <-time.After(time.Minute):
-				ctx.SendChain(message.Text("ERROR: 等待填充，请稍后再试......"))
+				ctx.SendChain(message.Text("ERROR:等待填充，请稍后再试......"))
 			case img := <-queue:
 				id := ctx.SendChain(message.Image(img))
 				if id.ID() == 0 {

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"
 )
 
@@ -48,8 +46,10 @@ const (
 		"- 取消在\"cron\"的提醒\n" +
 		"- 列出所有提醒\n" +
 		"- 翻牌\n" +
-		"- 设置欢迎语XXX（可加{at}在欢迎时@对方）\n" +
+		"- 设置欢迎语XXX 可选添加 [{at}] [{nickname}] [{avatar}] [{id}] {at}可在发送时艾特被欢迎者 {nickname}是被欢迎者名字 {avatar}是被欢迎者头像 {id}是被欢迎者QQ号\n" +
 		"- 测试欢迎语\n" +
+		"- 设置告别辞 参数同设置欢迎语\n" +
+		"- 测试告别辞\n" +
 		"- [开启 | 关闭]入群验证"
 )
 
@@ -59,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",
@@ -76,6 +76,10 @@ func init() { // 插件主体
 		if err != nil {
 			panic(err)
 		}
+		err = db.Create("farewell", &welcome{})
+		if err != nil {
+			panic(err)
+		}
 	}()
 
 	// 升为管理
@@ -281,7 +285,7 @@ func init() { // 插件主体
 			dateStrs := ctx.State["regex_matched"].([]string)
 			ts := timer.GetFilledTimer(dateStrs, ctx.Event.SelfID, ctx.Event.GroupID, false)
 			if ts.En() {
-				go clock.RegisterTimer(ts, true)
+				go clock.RegisterTimer(ts, true, false)
 				ctx.SendChain(message.Text("记住了~"))
 			} else {
 				ctx.SendChain(message.Text("参数非法:" + ts.Alert))
@@ -294,7 +298,7 @@ func init() { // 插件主体
 			var url, alert string
 			switch len(dateStrs) {
 			case 4:
-				url = dateStrs[2]
+				url = strings.TrimPrefix(dateStrs[2], "用")
 				alert = dateStrs[3]
 			case 3:
 				alert = dateStrs[2]
@@ -304,7 +308,7 @@ func init() { // 插件主体
 			}
 			logrus.Debugln("[manager] cron:", dateStrs[1])
 			ts := timer.GetFilledCronTimer(dateStrs[1], alert, url, ctx.Event.SelfID, ctx.Event.GroupID)
-			if clock.RegisterTimer(ts, true) {
+			if clock.RegisterTimer(ts, true, false) {
 				ctx.SendChain(message.Text("记住了~"))
 			} else {
 				ctx.SendChain(message.Text("参数非法:" + ts.Alert))
@@ -381,7 +385,7 @@ func init() { // 插件主体
 				var w welcome
 				err := db.Find("welcome", &w, "where gid = "+strconv.FormatInt(ctx.Event.GroupID, 10))
 				if err == nil {
-					ctx.SendGroupMessage(ctx.Event.GroupID, message.ParseMessageFromString(strings.ReplaceAll(w.Msg, "{at}", "[CQ:at,qq="+strconv.FormatInt(ctx.Event.UserID, 10)+"]")))
+					ctx.SendGroupMessage(ctx.Event.GroupID, message.ParseMessageFromString(welcometocq(ctx, w.Msg)))
 				} else {
 					ctx.SendChain(message.Text("欢迎~"))
 				}
@@ -411,13 +415,13 @@ func init() { // 插件主体
 							}
 							return false
 						}
-						next := zero.NewFutureEvent("message", 999, false, zero.CheckUser(ctx.Event.UserID), rule)
+						next := zero.NewFutureEvent("message", 999, false, ctx.CheckSession(), rule)
 						recv, cancel := next.Repeat()
 						select {
 						case <-time.After(time.Minute):
+							cancel()
 							ctx.SendChain(message.Text("拜拜啦~"))
 							ctx.SetGroupKick(ctx.Event.GroupID, uid, false)
-							cancel()
 						case <-recv:
 							cancel()
 							ctx.SendChain(message.Text("答对啦~"))
@@ -430,8 +434,14 @@ func init() { // 插件主体
 	engine.OnNotice().SetBlock(false).
 		Handle(func(ctx *zero.Ctx) {
 			if ctx.Event.NoticeType == "group_decrease" {
-				userid := ctx.Event.UserID
-				ctx.SendChain(message.Text(ctxext.CardOrNickName(ctx, userid), "(", userid, ")", "离开了我们..."))
+				var w welcome
+				err := db.Find("farewell", &w, "where gid = "+strconv.FormatInt(ctx.Event.GroupID, 10))
+				if err == nil {
+					ctx.SendGroupMessage(ctx.Event.GroupID, message.ParseMessageFromString(welcometocq(ctx, w.Msg)))
+				} else {
+					userid := ctx.Event.UserID
+					ctx.SendChain(message.Text(ctx.CardOrNickName(userid), "(", userid, ")", "离开了我们..."))
+				}
 			}
 		})
 	// 设置欢迎语
@@ -454,11 +464,37 @@ func init() { // 插件主体
 			var w welcome
 			err := db.Find("welcome", &w, "where gid = "+strconv.FormatInt(ctx.Event.GroupID, 10))
 			if err == nil {
-				ctx.SendGroupMessage(ctx.Event.GroupID, message.ParseMessageFromString(strings.ReplaceAll(w.Msg, "{at}", "[CQ:at,qq="+strconv.FormatInt(ctx.Event.UserID, 10)+"]")))
+				ctx.SendGroupMessage(ctx.Event.GroupID, message.ParseMessageFromString(welcometocq(ctx, w.Msg)))
 			} else {
 				ctx.SendChain(message.Text("欢迎~"))
 			}
 		})
+	// 设置告别辞
+	engine.OnRegex(`^设置告别辞([\s\S]*)$`, zero.OnlyGroup, zero.AdminPermission).SetBlock(true).
+		Handle(func(ctx *zero.Ctx) {
+			w := &welcome{
+				GrpID: ctx.Event.GroupID,
+				Msg:   ctx.State["regex_matched"].([]string)[1],
+			}
+			err := db.Insert("farewell", w)
+			if err == nil {
+				ctx.SendChain(message.Text("记住啦!"))
+			} else {
+				ctx.SendChain(message.Text("出错啦: ", err))
+			}
+		})
+	// 测试告别辞
+	engine.OnFullMatch("测试告别辞", zero.OnlyGroup, zero.AdminPermission).SetBlock(true).
+		Handle(func(ctx *zero.Ctx) {
+			var w welcome
+			err := db.Find("farewell", &w, "where gid = "+strconv.FormatInt(ctx.Event.GroupID, 10))
+			if err == nil {
+				ctx.SendGroupMessage(ctx.Event.GroupID, message.ParseMessageFromString(welcometocq(ctx, w.Msg)))
+			} else {
+				userid := ctx.Event.UserID
+				ctx.SendChain(message.Text(ctx.CardOrNickName(userid), "(", userid, ")", "离开了我们..."))
+			}
+		})
 	// 入群后验证开关
 	engine.OnRegex(`^(.*)入群验证$`, zero.OnlyGroup, zero.AdminPermission).SetBlock(true).
 		Handle(func(ctx *zero.Ctx) {
@@ -540,3 +576,16 @@ 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)
+	cqstring := strings.ReplaceAll(welcome, "{at}", at)
+	cqstring = strings.ReplaceAll(cqstring, "{nickname}", nickname)
+	cqstring = strings.ReplaceAll(cqstring, "{avatar}", avatar)
+	cqstring = strings.ReplaceAll(cqstring, "{id}", id)
+	return cqstring
+}

plugin/manager/timer/timer.go

@@ -8,6 +8,7 @@ import (
 	"time"
 
 	sql "github.com/FloatTech/sqlite"
+	"github.com/FloatTech/zbputils/process"
 	"github.com/fumiama/cron"
 	"github.com/sirupsen/logrus"
 	zero "github.com/wdvxdr1123/ZeroBot"
@@ -47,7 +48,7 @@ func NewClock(db *sql.Sqlite) (c Clock) {
 }
 
 // RegisterTimer 注册计时器
-func (c *Clock) RegisterTimer(ts *Timer, save bool) bool {
+func (c *Clock) RegisterTimer(ts *Timer, save, isinit bool) bool {
 	var key uint32
 	if save {
 		key = ts.GetTimerID()
@@ -62,6 +63,9 @@ func (c *Clock) RegisterTimer(ts *Timer, save bool) bool {
 	logrus.Println("[群管]注册计时器", key)
 	if ts.Cron != "" {
 		var ctx *zero.Ctx
+		if isinit {
+			process.GlobalInitMutex.Lock()
+		}
 		if ts.SelfID != 0 {
 			ctx = zero.GetBot(ts.SelfID)
 		} else {
@@ -71,6 +75,9 @@ func (c *Clock) RegisterTimer(ts *Timer, save bool) bool {
 				return false
 			})
 		}
+		if isinit {
+			process.GlobalInitMutex.Unlock()
+		}
 		eid, err := c.cron.AddFunc(ts.Cron, func() { ts.sendmsg(ts.GrpID, ctx) })
 		if err == nil {
 			c.entmu.Lock()
@@ -187,7 +194,7 @@ func (c *Clock) loadTimers(db *sql.Sqlite) {
 		var t Timer
 		_ = c.db.FindFor("timer", &t, "", func() error {
 			tescape := t
-			go c.RegisterTimer(&tescape, false)
+			go c.RegisterTimer(&tescape, false, true)
 			return nil
 		})
 	}

plugin/moyu/run.go

@@ -2,68 +2,60 @@
 package moyu
 
 import (
+	"sync"
 	"time"
 
 	control "github.com/FloatTech/zbputils/control"
-	"github.com/FloatTech/zbputils/process"
 	zero "github.com/wdvxdr1123/ZeroBot"
 	"github.com/wdvxdr1123/ZeroBot/message"
+)
 
-	"github.com/FloatTech/zbputils/control/order"
+var (
+	msg        message.Message
+	mu         sync.Mutex
+	lastupdate time.Time
 )
 
 func init() { // 插件主体
-	control.Register("moyu", order.AcquirePrio(), &control.Options{
+	control.Register("moyu", &control.Options{
 		DisableOnDefault: true,
 		Help: "moyu\n" +
 			"- /启用 moyu\n" +
-			"- /禁用 moyu",
-	})
-
-	// 定时任务每天10点执行一次
-	_, err := process.CronTab.AddFunc("0 10 * * *", func() { sendNotice() })
-	if err != nil {
-		panic(err)
-	}
-}
-
-// 获取数据拼接消息链并发送
-func sendNotice() {
-	m, ok := control.Lookup("moyu")
-	if ok {
-		if registry.Connect() != nil {
-			return
-		}
-		msg := message.Message{
-			message.Text(time.Now().Format("2006-01-02")),
-			message.Text("上午好，摸鱼人！\n工作再累，一定不要忘记摸鱼哦！有事没事起身去茶水间，去厕所，去廊道走走别老在工位上坐着，钱是老板的,但命是自己的。\n"),
-			message.Text(weekend()),
-			message.Text("\n"),
-			message.Text(GetHoliday("元旦")),
-			message.Text("\n"),
-			message.Text(GetHoliday("春节")),
-			message.Text("\n"),
-			message.Text(GetHoliday("清明节")),
-			message.Text("\n"),
-			message.Text(GetHoliday("劳动节")),
-			message.Text("\n"),
-			message.Text(GetHoliday("端午节")),
-			message.Text("\n"),
-			message.Text(GetHoliday("中秋节")),
-			message.Text("\n"),
-			message.Text(GetHoliday("国庆节")),
-			message.Text("\n"),
-			message.Text("上班是帮老板赚钱，摸鱼是赚老板的钱！最后，祝愿天下所有摸鱼人，都能愉快的渡过每一天…"),
-		}
-		_ = registry.Close()
-		zero.RangeBot(func(id int64, ctx *zero.Ctx) bool {
-			for _, g := range ctx.GetGroupList().Array() {
-				grp := g.Get("group_id").Int()
-				if m.IsEnabledIn(grp) {
-					ctx.SendGroupMessage(grp, msg)
+			"- /禁用 moyu\n" +
+			"- 记录在\"0 10 * * *\"触发的指令\n" +
+			"   - 摸鱼提醒",
+	}).OnFullMatch("摸鱼提醒").SetBlock(true).
+		Handle(func(ctx *zero.Ctx) {
+			mu.Lock()
+			defer mu.Unlock()
+			if msg == nil || time.Since(lastupdate) > time.Hour*20 {
+				if registry.Connect() != nil {
+					return
 				}
+				msg = message.Message{
+					message.Text(time.Now().Format("2006-01-02")),
+					message.Text("上午好，摸鱼人！\n工作再累，一定不要忘记摸鱼哦！有事没事起身去茶水间，去厕所，去廊道走走别老在工位上坐着，钱是老板的,但命是自己的。\n"),
+					message.Text(weekend()),
+					message.Text("\n"),
+					message.Text(GetHoliday("元旦")),
+					message.Text("\n"),
+					message.Text(GetHoliday("春节")),
+					message.Text("\n"),
+					message.Text(GetHoliday("清明节")),
+					message.Text("\n"),
+					message.Text(GetHoliday("劳动节")),
+					message.Text("\n"),
+					message.Text(GetHoliday("端午节")),
+					message.Text("\n"),
+					message.Text(GetHoliday("中秋节")),
+					message.Text("\n"),
+					message.Text(GetHoliday("国庆节")),
+					message.Text("\n"),
+					message.Text("上班是帮老板赚钱，摸鱼是赚老板的钱！最后，祝愿天下所有摸鱼人，都能愉快的渡过每一天…"),
+				}
+				_ = registry.Close()
+				lastupdate = time.Now()
 			}
-			return true
+			ctx.Send(msg)
 		})
-	}
 }

plugin/moyu_calendar/calendar.go

@@ -13,8 +13,6 @@ import (
 	"time"
 
 	control "github.com/FloatTech/zbputils/control"
-	"github.com/FloatTech/zbputils/control/order"
-	"github.com/FloatTech/zbputils/process"
 	zero "github.com/wdvxdr1123/ZeroBot"
 	"github.com/wdvxdr1123/ZeroBot/message"
 
@@ -27,65 +25,33 @@ 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" +
-			"- /禁用 moyucalendar",
+			"- /禁用 moyucalendar\n" +
+			"- 记录在\"30 8 * * *\"触发的指令\n" +
+			"   - 摸鱼人日历",
 	}).OnFullMatch("摸鱼人日历").SetBlock(true).
 		Handle(func(ctx *zero.Ctx) {
 			title := fmt.Sprintf("摸鱼人日历 %d月%d日", time.Now().Month(), time.Now().Day())
 			sg, cookies, err := sougou(title, "摸鱼人日历", ua)
 			if err != nil {
-				ctx.SendChain(message.Text("ERROR: ", err))
+				ctx.SendChain(message.Text("ERROR:", err))
 				return
 			}
 			wx, err := redirect(sg, cookies, ua)
 			if err != nil {
-				ctx.SendChain(message.Text("ERROR: ", err))
+				ctx.SendChain(message.Text("ERROR:", err))
 				return
 			}
 			image, err := calendar(wx, ua)
 			if err != nil {
-				ctx.SendChain(message.Text("ERROR: ", err))
+				ctx.SendChain(message.Text("ERROR:", err))
 				return
 			}
 			ctx.SendChain(message.Image(image))
 		})
-
-	// 定时任务每天8点30分执行一次
-	_, err := process.CronTab.AddFunc("30 8 * * *", func() {
-		m, ok := control.Lookup("moyucalendar")
-		if !ok {
-			return
-		}
-		title := fmt.Sprintf("摸鱼人日历 %d月%d日", time.Now().Month(), time.Now().Day())
-		sg, cookies, err := sougou(title, "摸鱼人日历", ua)
-		if err != nil {
-			return
-		}
-		wx, err := redirect(sg, cookies, ua)
-		if err != nil {
-			return
-		}
-		image, err := calendar(wx, ua)
-		if err != nil {
-			return
-		}
-		zero.RangeBot(func(id int64, ctx *zero.Ctx) bool {
-			for _, g := range ctx.GetGroupList().Array() {
-				grp := g.Get("group_id").Int()
-				if m.IsEnabledIn(grp) {
-					ctx.SendGroupMessage(grp, message.Message{message.Image(image)})
-					process.SleepAbout1sTo2s()
-				}
-			}
-			return true
-		})
-	})
-	if err != nil {
-		panic(err)
-	}
 }
 
 func sougou(title, publisher, ua string) (string, []*http.Cookie, error) {

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" +
@@ -51,7 +49,7 @@ func init() {
 			err := ns.db.Pick(imgtype, sc)
 			ns.mu.RUnlock()
 			if err != nil {
-				ctx.SendChain(message.Text("ERROR: ", err))
+				ctx.SendChain(message.Text("ERROR:", err))
 			} else {
 				p := "file:///" + setupath + "/" + sc.Path
 				if ctx.Event.GroupID != 0 {
@@ -71,7 +69,7 @@ func init() {
 			if err == nil {
 				ctx.SendChain(message.Text("成功！"))
 			} else {
-				ctx.SendChain(message.Text("ERROR: ", err))
+				ctx.SendChain(message.Text("ERROR:", err))
 			}
 		})
 	engine.OnRegex(`^设置本地setu绝对路径(.*)$`, zero.SuperUserPermission).SetBlock(true).
@@ -81,7 +79,7 @@ func init() {
 			if err == nil {
 				ctx.SendChain(message.Text("成功！"))
 			} else {
-				ctx.SendChain(message.Text("ERROR: ", err))
+				ctx.SendChain(message.Text("ERROR:", err))
 			}
 		})
 	engine.OnFullMatch("刷新所有本地setu", zero.SuperUserPermission).SetBlock(true).
@@ -90,7 +88,7 @@ func init() {
 			if err == nil {
 				ctx.SendChain(message.Text("成功！"))
 			} else {
-				ctx.SendChain(message.Text("ERROR: ", err))
+				ctx.SendChain(message.Text("ERROR:", err))
 			}
 		})
 	engine.OnFullMatch("所有本地setu分类").SetBlock(true).

plugin/nativewife/main.go

@@ -16,15 +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/ctxext"
 	"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",
@@ -47,7 +44,7 @@ func init() {
 				ctx.SendChain(message.Text("大家的wife都是", wn, "\n"), message.Image(baseuri+"/"+grpf+"/"+wn), message.Text("\n哦~"))
 			default:
 				// 获取名字
-				name := ctxext.NickName(ctx)
+				name := ctx.NickName()
 				now := time.Now()
 				s := md5.Sum(helper.StringToBytes(fmt.Sprintf("%s%d%d%d", name, now.Year(), now.Month(), now.Day())))
 				r := rand.New(rand.NewSource(int64(binary.LittleEndian.Uint64(s[:]))))
@@ -57,7 +54,7 @@ func init() {
 			}
 		})
 	// 上传一张图
-	engine.OnPrefix("添加wife", zero.OnlyGroup, chkAddWifePermission, ctxext.MustProvidePicture).SetBlock(true).
+	engine.OnPrefix("添加wife", zero.OnlyGroup, chkAddWifePermission, zero.MustProvidePicture).SetBlock(true).
 		Handle(func(ctx *zero.Ctx) {
 			name := ""
 			for _, elem := range ctx.Event.Message {

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

@@ -20,19 +20,17 @@ 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 (
-	websiteURL   = "https://www.23qb.net"
+	websiteURL   = "https://www.23qb.com"
 	websiteTitle = "铅笔小说"
 	errorTitle   = "出现错误！"
 	username     = "zerobot"
 	password     = "123456"
 	submit       = "%26%23160%3B%B5%C7%26%23160%3B%26%23160%3B%C2%BC%26%23160%3B"
 	ua           = "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/96.0.4664.110 Safari/537.36"
-	loginURL     = websiteURL + "/login.php?do=submit&jumpurl=https%3A%2F%2Fwww.23qb.net%2F"
+	loginURL     = websiteURL + "/login.php?do=submit&jumpurl=https%3A%2F%2Fwww.23qb.com%2F"
 	searchURL    = websiteURL + "/saerch.php"
 	idReg        = `/(\d+)/`
 )
@@ -40,7 +38,7 @@ 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).
@@ -84,7 +82,7 @@ func init() {
 						log.Println("err:", err)
 					}
 					if id := ctx.SendChain(message.Image("base64://" + helper.BytesToString(data))); id.ID() == 0 {
-						ctx.SendChain(message.Text("ERROR: 可能被风控了"))
+						ctx.SendChain(message.Text("ERROR:可能被风控了"))
 					}
 				} else {
 					text := htmlquery.InnerText(htmlquery.FindOne(doc, "//div[@id='tipss']"))

plugin/nsfw/main.go

@@ -8,17 +8,17 @@ 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)
 	// 上传一张图进行评价
-	engine.OnKeywordGroup([]string{"nsfw打分"}, zero.OnlyGroup, ctxext.MustProvidePicture).SetBlock(true).
+	engine.OnKeywordGroup([]string{"nsfw打分"}, zero.OnlyGroup, zero.MustProvidePicture).SetBlock(true).
 		Handle(func(ctx *zero.Ctx) {
 			url := ctx.State["image_url"].([]string)
 			if len(url) > 0 {
@@ -31,11 +31,10 @@ func init() {
 				ctx.Send(message.ReplyWithMessage(ctx.Event.MessageID, message.Text(judge(p[0]))))
 			}
 		})
-	en := control.Register("nsfwauto", order.AcquirePrio(), &control.Options{
+	control.Register("nsfwauto", &control.Options{
 		DisableOnDefault: true,
 		Help:             "nsfw图片自动识别\n- 当图片属于非 neutral 类别时自动发送评价",
-	})
-	en.OnMessage(ctxext.IsPicExists).SetBlock(false).
+	}).OnMessage(zero.HasPicture).SetBlock(false).
 		Handle(func(ctx *zero.Ctx) {
 			url := ctx.State["image_url"].([]string)
 			if len(url) > 0 {
@@ -96,6 +95,6 @@ func autojudge(ctx *zero.Ctx, p nsfw.Picture) {
 		i++
 	}
 	if i > 0 {
-		ctx.Send(message.ReplyWithMessage(ctx.Event.MessageID, message.Text(c)))
+		ctx.Send(message.ReplyWithMessage(ctx.Event.MessageID, message.Text(c, "\n"), message.Image(hso)))
 	}
 }

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- 解签",
@@ -61,7 +59,7 @@ func init() { // 插件主体
 				log.Errorln("[omikuji]:", err)
 			}
 			if id := ctx.SendChain(message.At(ctx.Event.UserID), message.Image("base64://"+helper.BytesToString(kujiBytes))); id.ID() == 0 {
-				ctx.SendChain(message.Text("ERROR: 可能被风控了"))
+				ctx.SendChain(message.Text("ERROR:可能被风控了"))
 			}
 		})
 }

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" +
@@ -132,7 +130,7 @@ func init() {
 						// 运行失败
 						ctx.SendChain(
 							message.Text("> ", ctx.Event.Sender.NickName, "\n"),
-							message.Text("ERROR: ", err),
+							message.Text("ERROR:", err),
 						)
 					} else {
 						// 运行成功

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" +
@@ -36,7 +35,7 @@ func init() { // 插件主体
 			// 获取P站插图信息
 			illust, err := pixiv.Works(id)
 			if err != nil {
-				ctx.SendChain(message.Text("ERROR: ", err))
+				ctx.SendChain(message.Text("ERROR:", err))
 				return
 			}
 			if illust.Pid > 0 {
@@ -53,6 +52,7 @@ func init() { // 插件主体
 							continue
 						}
 						logrus.Debugln("[sausenao]开始下载", n)
+						logrus.Debugln("[sausenao]urls:", illust.ImageUrls)
 						err1 := illust.DownloadToCache(i)
 						if err1 == nil {
 							m.SetFile(f)
@@ -83,14 +83,14 @@ func init() { // 插件主体
 			}
 		})
 	// 以图搜图
-	engine.OnKeywordGroup([]string{"以图搜图", "搜索图片", "以图识图"}, zero.OnlyGroup, ctxext.MustProvidePicture).SetBlock(true).
+	engine.OnKeywordGroup([]string{"以图搜图", "搜索图片", "以图识图"}, zero.OnlyGroup, zero.MustProvidePicture).SetBlock(true).
 		Handle(func(ctx *zero.Ctx) {
 			// 开始搜索图片
 			ctx.SendChain(message.Text("少女祈祷中......"))
 			for _, pic := range ctx.State["image_url"].([]string) {
 				fmt.Println(pic)
 				if result, err := saucenao.SauceNAO(pic); err != nil {
-					ctx.SendChain(message.Text("ERROR: ", err))
+					ctx.SendChain(message.Text("ERROR:", err))
 				} else {
 					// 返回SauceNAO的结果
 					ctx.SendChain(
@@ -109,7 +109,7 @@ func init() { // 插件主体
 					continue
 				}
 				if result, err := yandex.Yandex(pic); err != nil {
-					ctx.SendChain(message.Text("ERROR: ", err))
+					ctx.SendChain(message.Text("ERROR:", err))
 				} else {
 					ctx.SendChain(
 						message.Text("也许是这个？"),
@@ -125,7 +125,7 @@ func init() { // 插件主体
 				}
 				// 不论结果如何都执行 ascii2d 搜索
 				if result, err := ascii2d.Ascii2d(pic); err != nil {
-					ctx.SendChain(message.Text("ERROR: ", err))
+					ctx.SendChain(message.Text("ERROR:", err))
 					continue
 				} else {
 					msg := message.Message{ctxext.FakeSenderForwardNode(ctx, message.Text("ascii2d搜图结果"))}
@@ -146,7 +146,7 @@ func init() { // 插件主体
 						ctx.Event.GroupID,
 						msg,
 					).Get("message_id").Int(); id == 0 {
-						ctx.SendChain(message.Text("ERROR: 可能被风控了"))
+						ctx.SendChain(message.Text("ERROR:可能被风控了"))
 					}
 				}
 			}

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,14 +31,14 @@ import (
 )
 
 func init() {
-	engine := control.Register("scale", order.AcquirePrio(), &control.Options{
+	engine := control.Register("scale", &control.Options{
 		DisableOnDefault:  false,
 		Help:              "叔叔的AI二次元图片放大\n- 放大图片[图片]",
 		PrivateDataFolder: "scale",
 	}).ApplySingle(ctxext.DefaultSingle)
 	cachedir := engine.DataFolder()
 	// 上传一张图进行评价
-	engine.OnKeywordGroup([]string{"放大图片"}, zero.OnlyGroup, ctxext.MustProvidePicture, getPara).SetBlock(true).
+	engine.OnKeywordGroup([]string{"放大图片"}, zero.OnlyGroup, zero.MustProvidePicture, getPara).SetBlock(true).
 		Handle(func(ctx *zero.Ctx) {
 			url := ctx.State["image_url"].([]string)
 			if len(url) > 0 {
@@ -111,7 +110,7 @@ func init() {
 }
 
 func getPara(ctx *zero.Ctx) bool {
-	next := zero.NewFutureEvent("message", 999, false, zero.CheckUser(ctx.Event.UserID))
+	next := zero.NewFutureEvent("message", 999, false, ctx.CheckSession())
 	recv, cancel := next.Repeat()
 	i := 0
 	paras := [2]int{}
@@ -119,9 +118,10 @@ func getPara(ctx *zero.Ctx) bool {
 	for {
 		select {
 		case <-time.After(time.Second * 120):
+			cancel()
 			return false
-		case e := <-recv:
-			msg := e.Message.ExtractPlainText()
+		case c := <-recv:
+			msg := c.Event.Message.ExtractPlainText()
 			num, err := strconv.Atoi(msg)
 			if err != nil {
 				ctx.SendChain(message.Text("请输入数字!"))

plugin/score/sign_in.go

@@ -14,14 +14,11 @@ import (
 	"github.com/wdvxdr1123/ZeroBot/message"
 
 	control "github.com/FloatTech/zbputils/control"
-	"github.com/FloatTech/zbputils/ctxext"
 	"github.com/FloatTech/zbputils/file"
 	"github.com/FloatTech/zbputils/img"
 	"github.com/FloatTech/zbputils/img/text"
 	"github.com/FloatTech/zbputils/img/writer"
 	"github.com/FloatTech/zbputils/web"
-
-	"github.com/FloatTech/zbputils/control/order"
 )
 
 const (
@@ -36,7 +33,7 @@ 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] | 获得签到背景",
 		PrivateDataFolder: "score",
@@ -48,14 +45,6 @@ func init() {
 		if err != nil {
 			panic(err)
 		}
-		_, err = file.GetLazyData(text.BoldFontFile, false, true)
-		if err != nil {
-			panic(err)
-		}
-		_, err = file.GetLazyData(text.FontFile, false, true)
-		if err != nil {
-			panic(err)
-		}
 		sdb = initialize(engine.DataFolder() + "score.db")
 		log.Println("[score]加载score数据库")
 	}()
@@ -100,6 +89,11 @@ func init() {
 
 			monthWord := now.Format("01/02")
 			hourWord := getHourWord(now)
+			_, err = file.GetLazyData(text.BoldFontFile, false, true)
+			if err != nil {
+				ctx.SendChain(message.Text("ERROR:", err))
+				return
+			}
 			if err = canvas.LoadFontFace(text.BoldFontFile, float64(back.Bounds().Size().X)*0.1); err != nil {
 				ctx.SendChain(message.Text("ERROR:", err))
 				return
@@ -107,7 +101,12 @@ func init() {
 			canvas.SetRGB(0, 0, 0)
 			canvas.DrawString(hourWord, float64(back.Bounds().Size().X)*0.1, float64(back.Bounds().Size().Y)*1.2)
 			canvas.DrawString(monthWord, float64(back.Bounds().Size().X)*0.6, float64(back.Bounds().Size().Y)*1.2)
-			nickName := ctxext.CardOrNickName(ctx, uid)
+			nickName := ctx.CardOrNickName(uid)
+			_, err = file.GetLazyData(text.FontFile, false, true)
+			if err != nil {
+				ctx.SendChain(message.Text("ERROR:", err))
+				return
+			}
 			if err = canvas.LoadFontFace(text.FontFile, float64(back.Bounds().Size().X)*0.04); err != nil {
 				ctx.SendChain(message.Text("ERROR:", err))
 				return
@@ -203,12 +202,12 @@ func getLevel(count int) int {
 
 func initPic(picFile string) {
 	if file.IsNotExist(picFile) {
-		data, err := web.GetDataWith(web.NewDefaultClient(), backgroundURL, "GET", referer, ua)
+		data, err := web.RequestDataWith(web.NewDefaultClient(), backgroundURL, "GET", referer, ua)
 		if err != nil {
 			log.Errorln("[score]", err)
 		}
 		picURL := gjson.Get(string(data), "pic").String()
-		data, err = web.GetDataWith(web.NewDefaultClient(), picURL, "GET", "", ua)
+		data, err = web.RequestDataWith(web.NewDefaultClient(), picURL, "GET", "", ua)
 		if err != nil {
 			log.Errorln("[score]", err)
 		}

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]
 			// 补充池子
@@ -86,17 +84,17 @@ func init() { // 插件主体
 				ctx.SendChain(message.Text("INFO: 正在填充弹药......"))
 				time.Sleep(time.Second * 10)
 				if pool.size(imgtype) == 0 {
-					ctx.SendChain(message.Text("ERROR: 等待填充，请稍后再试......"))
+					ctx.SendChain(message.Text("ERROR:等待填充，请稍后再试......"))
 					return
 				}
 			}
 			// 从缓冲池里抽一张
 			if id := ctx.SendChain(*pool.pop(imgtype)); id.ID() == 0 {
-				ctx.SendChain(message.Text("ERROR: 可能被风控了"))
+				ctx.SendChain(message.Text("ERROR:可能被风控了"))
 			}
 		})
 
-	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]
@@ -118,7 +116,7 @@ func init() { // 插件主体
 			)
 			// 查询数据库
 			if err := pool.remove(imgtype, id); err != nil {
-				ctx.SendChain(message.Text("ERROR: ", err))
+				ctx.SendChain(message.Text("ERROR:", err))
 				return
 			}
 			ctx.SendChain(message.Text("删除成功"))
@@ -159,7 +157,7 @@ func (p *imgpool) push(ctx *zero.Ctx, imgtype string, illust *pixiv.Illust) {
 		if fileutil.IsNotExist(f) {
 			// 下载图片
 			if err := illust.DownloadToCache(0); err != nil {
-				ctx.SendChain(message.Text("ERROR: ", err))
+				ctx.SendChain(message.Text("ERROR:", err))
 				return
 			}
 		}
@@ -197,7 +195,7 @@ func (p *imgpool) fill(ctx *zero.Ctx, imgtype string) {
 		illust := &pixiv.Illust{}
 		// 查询出一张图片
 		if err := p.db.Pick(imgtype, illust); err != nil {
-			ctx.SendChain(message.Text("ERROR: ", err))
+			ctx.SendChain(message.Text("ERROR:", err))
 			continue
 		}
 		// 向缓冲池添加一张图片

plugin/shadiao/caihongpi.go

@@ -11,7 +11,7 @@ import (
 
 func init() {
 	engine.OnFullMatch("哄我").SetBlock(true).Limit(ctxext.LimitByUser).Handle(func(ctx *zero.Ctx) {
-		data, err := web.GetDataWith(web.NewDefaultClient(), chpURL, "GET", chpReferer, ua)
+		data, err := web.RequestDataWith(web.NewDefaultClient(), chpURL, "GET", chpReferer, ua)
 		if err != nil {
 			ctx.SendChain(message.Text("ERROR:", err))
 			return

plugin/shadiao/dujitang.go

@@ -11,7 +11,7 @@ import (
 
 func init() {
 	engine.OnFullMatch("来碗毒鸡汤").SetBlock(true).Limit(ctxext.LimitByUser).Handle(func(ctx *zero.Ctx) {
-		data, err := web.GetDataWith(web.NewDefaultClient(), duURL, "GET", duReferer, ua)
+		data, err := web.RequestDataWith(web.NewDefaultClient(), duURL, "GET", duReferer, ua)
 		if err != nil {
 			ctx.SendChain(message.Text("ERROR:", err))
 			return

plugin/shadiao/pengyouquan.go

@@ -11,7 +11,7 @@ import (
 
 func init() {
 	engine.OnFullMatch("发个朋友圈").SetBlock(true).Limit(ctxext.LimitByUser).Handle(func(ctx *zero.Ctx) {
-		data, err := web.GetDataWith(web.NewDefaultClient(), pyqURL, "GET", pyqReferer, ua)
+		data, err := web.RequestDataWith(web.NewDefaultClient(), pyqURL, "GET", pyqReferer, ua)
 		if err != nil {
 			ctx.SendChain(message.Text("ERROR:", err))
 			return

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/shadiao/sweetnothings.go

@@ -12,7 +12,7 @@ import (
 
 func init() {
 	engine.OnFullMatch("来碗绿茶").SetBlock(true).Limit(ctxext.LimitByUser).Handle(func(ctx *zero.Ctx) {
-		data, err := web.GetDataWith(web.NewDefaultClient(), chayiURL, "GET", loveliveReferer, ua)
+		data, err := web.RequestDataWith(web.NewDefaultClient(), chayiURL, "GET", loveliveReferer, ua)
 		if err != nil {
 			ctx.SendChain(message.Text("ERROR:", err))
 			return
@@ -22,7 +22,7 @@ func init() {
 	})
 
 	engine.OnFullMatch("渣我").SetBlock(true).Limit(ctxext.LimitByUser).Handle(func(ctx *zero.Ctx) {
-		data, err := web.GetDataWith(web.NewDefaultClient(), ganhaiURL, "GET", loveliveReferer, ua)
+		data, err := web.RequestDataWith(web.NewDefaultClient(), ganhaiURL, "GET", loveliveReferer, ua)
 		if err != nil {
 			ctx.SendChain(message.Text("ERROR:", err))
 			return

plugin/shadiao/yduanzi.go

@@ -14,7 +14,7 @@ import (
 
 func init() {
 	engine.OnFullMatch("讲个段子").SetBlock(true).Limit(ctxext.LimitByUser).Handle(func(ctx *zero.Ctx) {
-		data, err := web.GetDataWith(web.NewDefaultClient(), yduanziURL, "POST", yduanziReferer, ua)
+		data, err := web.RequestDataWith(web.NewDefaultClient(), yduanziURL, "POST", yduanziReferer, ua)
 		if err != nil {
 			ctx.SendChain(message.Text("ERROR:", err))
 			return

plugin/shindan/shindan.go

@@ -8,15 +8,13 @@ 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/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" +
@@ -24,33 +22,52 @@ func init() {
 			"- 卖萌[@xxx]\n" +
 			"- 抽老婆[@xxx]",
 	})
-	engine.OnPrefix("异世界转生", number(587874)).SetBlock(true).Limit(ctxext.LimitByUser).Handle(handle)
-	engine.OnPrefix("今天是什么少女", number(162207)).SetBlock(true).Limit(ctxext.LimitByUser).Handle(handle)
-	engine.OnPrefix("卖萌", number(360578)).SetBlock(true).Limit(ctxext.LimitByUser).Handle(handle)
-	engine.OnPrefix("抽老婆", number(1075116)).SetBlock(true).Limit(ctxext.LimitByUser).Handle(handle)
+	engine.OnPrefix("异世界转生", number(587874)).SetBlock(true).Limit(ctxext.LimitByUser).Handle(handlepic)
+	engine.OnPrefix("今天是什么少女", number(162207)).SetBlock(true).Limit(ctxext.LimitByUser).Handle(handlepic)
+	engine.OnPrefix("卖萌", number(360578)).SetBlock(true).Limit(ctxext.LimitByUser).Handle(handletxt)
+	engine.OnPrefix("抽老婆", number(1075116)).SetBlock(true).Limit(ctxext.LimitByUser).Handle(handlecq)
+	engine.OnPrefix("黄油角色", number(1115465)).SetBlock(true).Limit(ctxext.LimitByUser).Handle(handlepic)
 }
 
-// shindanmaker 处理函数
-func handle(ctx *zero.Ctx) {
+func handletxt(ctx *zero.Ctx) {
 	// 获取名字
-	name := ctxext.NickName(ctx)
+	name := ctx.NickName()
 	// 调用接口
 	txt, err := shindanmaker.Shindanmaker(ctx.State["id"].(int64), name)
 	if err != nil {
-		ctx.SendChain(message.Text("ERROR: ", err))
+		ctx.SendChain(message.Text("ERROR:", err))
+		return
 	}
-	// TODO: 可注入
-	switch ctx.State["id"].(int64) {
-	case 587874, 162207:
-		data, err := text.RenderToBase64(txt, text.FontFile, 400, 20)
-		if err != nil {
-			log.Errorln("[shindan]:", err)
-		}
-		if id := ctx.SendChain(message.Image("base64://" + helper.BytesToString(data))); id.ID() == 0 {
-			ctx.SendChain(message.Text("ERROR: 可能被风控了"))
-		}
-	default:
-		ctx.Send(txt)
+	ctx.SendChain(message.Text(txt))
+}
+
+func handlecq(ctx *zero.Ctx) {
+	// 获取名字
+	name := ctx.NickName()
+	// 调用接口
+	txt, err := shindanmaker.Shindanmaker(ctx.State["id"].(int64), name)
+	if err != nil {
+		ctx.SendChain(message.Text("ERROR:", err))
+		return
+	}
+	ctx.Send(txt)
+}
+
+func handlepic(ctx *zero.Ctx) {
+	// 获取名字
+	name := ctx.NickName()
+	// 调用接口
+	txt, err := shindanmaker.Shindanmaker(ctx.State["id"].(int64), name)
+	if err != nil {
+		ctx.SendChain(message.Text("ERROR:", err))
+		return
+	}
+	data, err := text.RenderToBase64(txt, text.FontFile, 400, 20)
+	if err != nil {
+		log.Errorln("[shindan]:", err)
+	}
+	if id := ctx.SendChain(message.Image("base64://" + helper.BytesToString(data))); id.ID() == 0 {
+		ctx.SendChain(message.Text("ERROR:可能被风控了"))
 	}
 }
 

plugin/sleep_manage/model.go

@@ -1,5 +1,4 @@
-// Package model 睡眠管理数据库
-package model
+package sleepmanage
 
 import (
 	"os"
@@ -10,11 +9,14 @@ import (
 	log "github.com/sirupsen/logrus"
 )
 
-// SleepDB 睡眠数据库
-type SleepDB gorm.DB
+// sdb 睡眠数据库全局变量
+var sdb *sleepdb
 
-// Initialize 初始化
-func Initialize(dbpath string) *SleepDB {
+// sleepdb 睡眠数据库结构体
+type sleepdb gorm.DB
+
+// initialize 初始化
+func initialize(dbpath string) *sleepdb {
 	var err error
 	if _, err = os.Stat(dbpath); err != nil || os.IsNotExist(err) {
 		// 生成文件
@@ -29,27 +31,18 @@ func Initialize(dbpath string) *SleepDB {
 		panic(err)
 	}
 	gdb.AutoMigrate(&SleepManage{})
-	return (*SleepDB)(gdb)
-}
-
-// Open 打开
-func Open(dbpath string) (*SleepDB, error) {
-	db, err := gorm.Open("sqlite3", dbpath)
-	if err != nil {
-		return nil, err
-	}
-	return (*SleepDB)(db), nil
+	return (*sleepdb)(gdb)
 }
 
 // Close 关闭
-func (sdb *SleepDB) Close() error {
+func (sdb *sleepdb) Close() error {
 	db := (*gorm.DB)(sdb)
 	return db.Close()
 }
 
 // SleepManage 睡眠信息
 type SleepManage struct {
-	gorm.Model
+	ID        uint      `gorm:"primary_key"`
 	GroupID   int64     `gorm:"column:group_id"`
 	UserID    int64     `gorm:"column:user_id"`
 	SleepTime time.Time `gorm:"column:sleep_time"`
@@ -60,8 +53,8 @@ func (SleepManage) TableName() string {
 	return "sleep_manage"
 }
 
-// Sleep 更新睡眠时间
-func (sdb *SleepDB) Sleep(gid, uid int64) (position int, awakeTime time.Duration) {
+// sleep 更新睡眠时间
+func (sdb *sleepdb) sleep(gid, uid int64) (position int, awakeTime time.Duration) {
 	db := (*gorm.DB)(sdb)
 	now := time.Now()
 	var today time.Time
@@ -92,8 +85,8 @@ func (sdb *SleepDB) Sleep(gid, uid int64) (position int, awakeTime time.Duration
 	return position, awakeTime
 }
 
-// GetUp 更新起床时间
-func (sdb *SleepDB) GetUp(gid, uid int64) (position int, sleepTime time.Duration) {
+// getUp 更新起床时间
+func (sdb *sleepdb) getUp(gid, uid int64) (position int, sleepTime time.Duration) {
 	db := (*gorm.DB)(sdb)
 	now := time.Now()
 	today := now.Add(-time.Hour*time.Duration(-6+now.Hour()) - time.Minute*time.Duration(now.Minute()) - time.Second*time.Duration(now.Second()))

plugin/sleep_manage/sleep_manage.go

@@ -10,27 +10,21 @@ import (
 	"github.com/wdvxdr1123/ZeroBot/message"
 
 	control "github.com/FloatTech/zbputils/control"
-
-	"github.com/FloatTech/zbputils/control/order"
-
-	"github.com/FloatTech/ZeroBot-Plugin/plugin/sleep_manage/model"
 )
 
 func init() {
-	engine := control.Register("sleepmanage", order.AcquirePrio(), &control.Options{
+	engine := control.Register("sleepmanage", &control.Options{
 		DisableOnDefault:  false,
 		Help:              "sleepmanage\n- 早安\n- 晚安",
 		PrivateDataFolder: "sleep",
 	})
-	dbfile := engine.DataFolder() + "manage.db"
+	go func() {
+		sdb = initialize(engine.DataFolder() + "manage.db")
+		log.Println("[sleepmanage]加载sleepmanage数据库")
+	}()
 	engine.OnFullMatch("早安", isMorning, zero.OnlyGroup).SetBlock(true).
 		Handle(func(ctx *zero.Ctx) {
-			db, err := model.Open(dbfile)
-			if err != nil {
-				log.Errorln(err)
-				return
-			}
-			position, getUpTime := db.GetUp(ctx.Event.GroupID, ctx.Event.UserID)
+			position, getUpTime := sdb.getUp(ctx.Event.GroupID, ctx.Event.UserID)
 			log.Println(position, getUpTime)
 			hour, minute, second := timeDuration(getUpTime)
 			if (hour == 0 && minute == 0 && second == 0) || hour >= 24 {
@@ -38,16 +32,10 @@ func init() {
 			} else {
 				ctx.SendChain(message.Reply(ctx.Event.MessageID), message.Text(fmt.Sprintf("早安成功！你的睡眠时长为%d时%d分%d秒,你是今天第%d个起床的", hour, minute, second, position)))
 			}
-			db.Close()
 		})
 	engine.OnFullMatch("晚安", isEvening, zero.OnlyGroup).SetBlock(true).
 		Handle(func(ctx *zero.Ctx) {
-			db, err := model.Open(dbfile)
-			if err != nil {
-				log.Errorln(err)
-				return
-			}
-			position, sleepTime := db.Sleep(ctx.Event.GroupID, ctx.Event.UserID)
+			position, sleepTime := sdb.sleep(ctx.Event.GroupID, ctx.Event.UserID)
 			log.Println(position, sleepTime)
 			hour, minute, second := timeDuration(sleepTime)
 			if (hour == 0 && minute == 0 && second == 0) || hour >= 24 {
@@ -55,7 +43,6 @@ func init() {
 			} else {
 				ctx.SendChain(message.Reply(ctx.Event.MessageID), message.Text(fmt.Sprintf("晚安成功！你的清醒时长为%d时%d分%d秒,你是今天第%d个睡觉的", hour, minute, second, position)))
 			}
-			db.Close()
 		})
 }
 

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

@@ -0,0 +1,53 @@
+// Package tiangou 舔狗日记
+package tiangou
+
+import (
+	sql "github.com/FloatTech/sqlite"
+	"github.com/FloatTech/zbputils/control"
+	"github.com/FloatTech/zbputils/ctxext"
+	"github.com/FloatTech/zbputils/file"
+	"github.com/sirupsen/logrus"
+	zero "github.com/wdvxdr1123/ZeroBot"
+	"github.com/wdvxdr1123/ZeroBot/message"
+)
+
+type tiangou struct {
+	ID   uint32 `db:"id"`
+	Text string `db:"text"`
+}
+
+var db = &sql.Sqlite{}
+
+func init() {
+	en := control.Register("tiangou", &control.Options{
+		DisableOnDefault: false,
+		Help: "舔狗日记\n" +
+			"- 舔狗日记",
+		PublicDataFolder: "Tiangou",
+	})
+
+	go func() {
+		dbpath := en.DataFolder()
+		db.DBPath = dbpath + "tiangou.db"
+		_, err := file.GetLazyData(db.DBPath, false, true)
+		if err != nil {
+			panic(err)
+		}
+		err = db.Create("tiangou", &tiangou{})
+		if err != nil {
+			panic(err)
+		}
+		c, _ := db.Count("tiangou")
+		logrus.Infoln("[tiangou]加载", c, "条舔狗日记")
+	}()
+
+	en.OnFullMatch("舔狗日记").SetBlock(true).Limit(ctxext.LimitByUser).Handle(func(ctx *zero.Ctx) {
+		var t tiangou
+		err := db.Pick("tiangou", &t)
+		if err != nil {
+			ctx.SendChain(message.Text("ERROR:", err))
+			return
+		}
+		ctx.SendChain(message.Text(t.Text))
+	})
+}

plugin/tracemoe/moe.go

@@ -5,12 +5,9 @@ import (
 	"fmt"
 
 	control "github.com/FloatTech/zbputils/control"
-	"github.com/FloatTech/zbputils/ctxext"
 	trmoe "github.com/fumiama/gotracemoe"
 	zero "github.com/wdvxdr1123/ZeroBot"
 	"github.com/wdvxdr1123/ZeroBot/message"
-
-	"github.com/FloatTech/zbputils/control/order"
 )
 
 var (
@@ -18,19 +15,19 @@ var (
 )
 
 func init() { // 插件主体
-	engine := control.Register("tracemoe", order.AcquirePrio(), &control.Options{
+	engine := control.Register("tracemoe", &control.Options{
 		DisableOnDefault: false,
 		Help:             "tracemoe\n- 搜番 | 搜索番剧[图片]",
 	})
 	// 以图搜图
-	engine.OnKeywordGroup([]string{"搜番", "搜索番剧"}, ctxext.MustProvidePicture).SetBlock(true).
+	engine.OnKeywordGroup([]string{"搜番", "搜索番剧"}, zero.MustProvidePicture).SetBlock(true).
 		Handle(func(ctx *zero.Ctx) {
 			// 开始搜索图片
 			ctx.SendChain(message.Text("少女祈祷中......"))
 			for _, pic := range ctx.State["image_url"].([]string) {
 				fmt.Println(pic)
 				if result, err := moe.Search(pic, true, true); err != nil {
-					ctx.SendChain(message.Text("ERROR: ", err))
+					ctx.SendChain(message.Text("ERROR:", err))
 				} else if len(result.Result) > 0 {
 					r := result.Result[0]
 					hint := "我有把握是这个！"

plugin/translation/tl.go

@@ -10,12 +10,10 @@ import (
 	"github.com/FloatTech/zbputils/ctxext"
 	"github.com/FloatTech/zbputils/process"
 	"github.com/FloatTech/zbputils/web"
-
-	"github.com/FloatTech/zbputils/control/order"
 )
 
 func init() {
-	control.Register("translation", order.AcquirePrio(), &control.Options{
+	control.Register("translation", &control.Options{
 		DisableOnDefault: false,
 		Help: "翻译\n" +
 			">TL 你好",
@@ -24,7 +22,7 @@ func init() {
 			msg := []string{ctx.State["regex_matched"].([]string)[2]}
 			data, err := web.GetData("https://api.cloolc.club/fanyi?data=" + msg[0])
 			if err != nil {
-				ctx.SendChain(message.Text("ERROR: ", err))
+				ctx.SendChain(message.Text("ERROR:", err))
 			}
 			info := gjson.ParseBytes(data)
 			repo := info.Get("data.0")

plugin/vtb_quotation/vtb_quotation.go

@@ -23,8 +23,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 +34,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",
@@ -70,7 +68,7 @@ func init() {
 				log.Errorln("[vtb]:", err)
 			}
 			if id := ctx.SendChain(message.Reply(ctx.Event.MessageID), message.Image("base64://"+helper.BytesToString(firstStepImageBytes))); id.ID() == 0 {
-				ctx.SendChain(message.Text("ERROR: 可能被风控了"))
+				ctx.SendChain(message.Text("ERROR:可能被风控了"))
 			}
 			// 步骤0，1，2，依次选择3个类别
 			step := 0
@@ -78,31 +76,31 @@ func init() {
 			errorCount := 0
 			for {
 				select {
-				case e := <-echo: // 接收到需要复读的消息
+				case c := <-echo: // 接收到需要复读的消息
 					// 错误次数达到3次，结束命令
 					if errorCount >= 3 {
-						ctx.SendChain(message.Reply(e.MessageID), message.Text("输入错误太多,请重新发指令"))
+						ctx.SendChain(message.Reply(c.Event.MessageID), message.Text("输入错误太多,请重新发指令"))
 						return
 					}
 					switch step {
 					case 0:
-						firstIndex, err = strconv.Atoi(e.RawMessage)
+						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))
 						if err != nil {
-							ctx.SendChain(message.Reply(e.MessageID), message.Text("请输入正确的序号,三次输入错误，指令可退出重输"))
+							ctx.SendChain(message.Reply(c.Event.MessageID), message.Text("请输入正确的序号,三次输入错误，指令可退出重输"))
 							errorCount++
 						} else {
 							secondStepMessage := db.GetAllSecondCategoryMessageByFirstIndex(firstIndex)
 							// log.Println(secondStepMessage)
 							if secondStepMessage == "" {
-								ctx.SendChain(message.Reply(e.MessageID), message.Text("你选择的序号没有内容，请重新选择，三次输入错误，指令可退出重输"))
+								ctx.SendChain(message.Reply(c.Event.MessageID), message.Text("你选择的序号没有内容，请重新选择，三次输入错误，指令可退出重输"))
 								firstStepImageBytes, err := text.RenderToBase64(db.GetAllFirstCategoryMessage(), text.FontFile, 400, 20)
 								if err != nil {
 									log.Errorln("[vtb]:", err)
 								}
 								if id := ctx.SendChain(message.Reply(ctx.Event.MessageID), message.Image("base64://"+helper.BytesToString(firstStepImageBytes))); id.ID() == 0 {
-									ctx.SendChain(message.Text("ERROR: 可能被风控了"))
+									ctx.SendChain(message.Text("ERROR:可能被风控了"))
 								}
 								errorCount++
 							} else {
@@ -111,29 +109,29 @@ func init() {
 									log.Errorln("[vtb]:", err)
 								}
 								if id := ctx.SendChain(message.Reply(ctx.Event.MessageID), message.Image("base64://"+helper.BytesToString(secondStepMessageBytes))); id.ID() == 0 {
-									ctx.SendChain(message.Text("ERROR: 可能被风控了"))
+									ctx.SendChain(message.Text("ERROR:可能被风控了"))
 								}
 								step++
 							}
 						}
 					case 1:
-						secondIndex, err = strconv.Atoi(e.RawMessage)
+						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))
 						if err != nil {
-							ctx.SendChain(message.Reply(e.MessageID), message.Text("请输入正确的序号，三次输入错误，指令可退出重输"))
+							ctx.SendChain(message.Reply(c.Event.MessageID), message.Text("请输入正确的序号，三次输入错误，指令可退出重输"))
 							errorCount++
 						} else {
 							thirdStepMessage := db.GetAllThirdCategoryMessageByFirstIndexAndSecondIndex(firstIndex, secondIndex)
 							// log.Println(thirdStepMessage)
 							if thirdStepMessage == "" {
-								ctx.SendChain(message.Reply(e.MessageID), message.Text("你选择的序号没有内容，请重新选择，三次输入错误，指令可退出重输"))
+								ctx.SendChain(message.Reply(c.Event.MessageID), message.Text("你选择的序号没有内容，请重新选择，三次输入错误，指令可退出重输"))
 								secondStepMessageBytes, err := text.RenderToBase64(db.GetAllSecondCategoryMessageByFirstIndex(firstIndex), text.FontFile, 400, 20)
 								if err != nil {
 									log.Errorln("[vtb]:", err)
 								}
 								if id := ctx.SendChain(message.Reply(ctx.Event.MessageID), message.Image("base64://"+helper.BytesToString(secondStepMessageBytes))); id.ID() == 0 {
-									ctx.SendChain(message.Text("ERROR: 可能被风控了"))
+									ctx.SendChain(message.Text("ERROR:可能被风控了"))
 								}
 								errorCount++
 							} else {
@@ -142,30 +140,30 @@ func init() {
 									log.Errorln("[vtb]:", err)
 								}
 								if id := ctx.SendChain(message.Reply(ctx.Event.MessageID), message.Image("base64://"+helper.BytesToString(thirdStepMessageBytes))); id.ID() == 0 {
-									ctx.SendChain(message.Text("ERROR: 可能被风控了"))
+									ctx.SendChain(message.Text("ERROR:可能被风控了"))
 								}
 								step++
 							}
 						}
 					case 2:
-						thirdIndex, err = strconv.Atoi(e.RawMessage)
+						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))
 						if err != nil {
-							ctx.SendChain(message.Reply(e.MessageID), message.Text("请输入正确的序号，三次输入错误，指令可退出重输"))
+							ctx.SendChain(message.Reply(c.Event.MessageID), message.Text("请输入正确的序号，三次输入错误，指令可退出重输"))
 							errorCount++
 						} else {
 							tc := db.GetThirdCategory(firstIndex, secondIndex, thirdIndex)
 							reg := regexp.MustCompile(regStr)
 							recURL := tc.ThirdCategoryPath
 							if recURL == "" {
-								ctx.SendChain(message.Reply(e.MessageID), message.Text("没有内容请重新选择，三次输入错误，指令可退出重输"))
+								ctx.SendChain(message.Reply(c.Event.MessageID), message.Text("没有内容请重新选择，三次输入错误，指令可退出重输"))
 								firstStepImageBytes, err := text.RenderToBase64(db.GetAllFirstCategoryMessage(), text.FontFile, 400, 20)
 								if err != nil {
 									log.Errorln("[vtb]:", err)
 								}
 								if id := ctx.SendChain(message.Reply(ctx.Event.MessageID), message.Image("base64://"+helper.BytesToString(firstStepImageBytes))); id.ID() == 0 {
-									ctx.SendChain(message.Text("ERROR: 可能被风控了"))
+									ctx.SendChain(message.Text("ERROR:可能被风控了"))
 								}
 								errorCount++
 								step = 1
@@ -177,7 +175,7 @@ func init() {
 									recURL = strings.ReplaceAll(recURL, "+", "%20")
 									// log.Println(recordUrl)
 								}
-								ctx.SendChain(message.Reply(e.MessageID), message.Text("请欣赏《"+tc.ThirdCategoryName+"》"))
+								ctx.SendChain(message.Reply(c.Event.MessageID), message.Text("请欣赏《"+tc.ThirdCategoryName+"》"))
 
 								if !re.MatchString(recURL) {
 									log.Errorln("[vtb]:文件格式不匹配")

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,12 +17,12 @@ 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).
 		Handle(func(ctx *zero.Ctx) {
-			data, err := web.GetDataWith(web.NewDefaultClient(), wangyiyunURL, "GET", wangyiyunReferer, ua)
+			data, err := web.RequestDataWith(web.NewDefaultClient(), wangyiyunURL, "GET", wangyiyunReferer, ua)
 			if err != nil {
 				ctx.SendChain(message.Text("ERROR:", err))
 				return

plugin/wordle/wordle.go

@@ -8,10 +8,10 @@ import (
 	"math/rand"
 	"sort"
 	"strings"
+	"sync"
 	"time"
 
 	"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"
@@ -53,10 +53,13 @@ type dictionary map[int]struct {
 	cet4 []string
 }
 
-var words = make(dictionary)
+var (
+	words   = make(dictionary)
+	wordsmu sync.Mutex
+)
 
 func init() {
-	en := control.Register("wordle", order.AcquirePrio(), &control.Options{
+	en := control.Register("wordle", &control.Options{
 		DisableOnDefault: false,
 		Help: "猜单词\n" +
 			"- 个人猜单词" +
@@ -72,26 +75,34 @@ func init() {
 			)
 		}),
 	))
-	go func() {
-		for i := 5; i <= 7; i++ {
+	for i := 5; i <= 7; i++ {
+		go func(i int) {
 			dc, err := file.GetLazyData(fmt.Sprintf("%scet-4_%d.txt", en.DataFolder(), i), true, true)
 			if err != nil {
 				panic(err)
 			}
 			c := strings.Split(string(dc), "\n")
 			sort.Strings(c)
+			wordsmu.Lock()
+			tmp := words[i]
+			tmp.cet4 = c
+			words[i] = tmp
+			wordsmu.Unlock()
+		}(i)
+		go func(i int) {
 			dd, err := file.GetLazyData(fmt.Sprintf("%sdict_%d.txt", en.DataFolder(), i), true, true)
 			if err != nil {
 				panic(err)
 			}
 			d := strings.Split(string(dd), "\n")
 			sort.Strings(d)
-			words[i] = struct {
-				dict []string
-				cet4 []string
-			}{d, c}
-		}
-	}()
+			wordsmu.Lock()
+			tmp := words[i]
+			tmp.dict = d
+			words[i] = tmp
+			wordsmu.Unlock()
+		}(i)
+	}
 	en.OnRegex(`(个人|团队)(五阶|六阶|七阶)?猜单词`, zero.OnlyGroup).SetBlock(true).Limit(ctxext.LimitByUser).
 		Handle(func(ctx *zero.Ctx) {
 			class := classdict[ctx.State["regex_matched"].([]string)[2]]
@@ -108,7 +119,7 @@ func init() {
 			var next *zero.FutureEvent
 			if ctx.State["regex_matched"].([]string)[1] == "个人" {
 				next = zero.NewFutureEvent("message", 999, false, zero.RegexRule(fmt.Sprintf(`^([A-Z]|[a-z]){%d}$`, class)),
-					zero.OnlyGroup, zero.CheckUser(ctx.Event.UserID))
+					zero.OnlyGroup, ctx.CheckSession())
 			} else {
 				next = zero.NewFutureEvent("message", 999, false, zero.RegexRule(fmt.Sprintf(`^([A-Z]|[a-z]){%d}$`, class)),
 					zero.OnlyGroup, zero.CheckGroup(ctx.Event.GroupID))
@@ -126,12 +137,12 @@ func init() {
 						),
 					)
 					return
-				case e := <-recv:
-					win, img, cl, err = game(e.Message.String())
+				case c := <-recv:
+					win, img, cl, err = game(c.Event.Message.String())
 					switch {
 					case win:
 						ctx.Send(
-							message.ReplyWithMessage(e.MessageID,
+							message.ReplyWithMessage(c.Event.MessageID,
 								message.ImageBytes(img),
 								message.Text("太棒了，你猜出来了！"),
 							),
@@ -140,7 +151,7 @@ func init() {
 						return
 					case err == errTimesRunOut:
 						ctx.Send(
-							message.ReplyWithMessage(e.MessageID,
+							message.ReplyWithMessage(c.Event.MessageID,
 								message.ImageBytes(img),
 								message.Text("游戏结束...答案是: ", target),
 							),
@@ -149,19 +160,19 @@ func init() {
 						return
 					case err == errLengthNotEnough:
 						ctx.Send(
-							message.ReplyWithMessage(e.MessageID,
+							message.ReplyWithMessage(c.Event.MessageID,
 								message.Text("单词长度错误"),
 							),
 						)
 					case err == errUnknownWord:
 						ctx.Send(
-							message.ReplyWithMessage(e.MessageID,
+							message.ReplyWithMessage(c.Event.MessageID,
 								message.Text("你确定存在这样的单词吗？"),
 							),
 						)
 					default:
 						ctx.Send(
-							message.ReplyWithMessage(e.MessageID,
+							message.ReplyWithMessage(c.Event.MessageID,
 								message.ImageBytes(img),
 							),
 						)

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]",
 	})
@@ -31,7 +29,7 @@ func init() {
 			// 调用接口
 			i, err := strconv.Atoi(ctx.State["regex_matched"].([]string)[1])
 			if err != nil {
-				ctx.SendChain(message.Text("ERROR: ", err))
+				ctx.SendChain(message.Text("ERROR:", err))
 				return
 			}
 			w := newWtf(i)
@@ -54,7 +52,7 @@ func init() {
 				text, err = w.predict(name)
 			}
 			if err != nil {
-				ctx.SendChain(message.Text("ERROR: ", err))
+				ctx.SendChain(message.Text("ERROR:", err))
 				return
 			}
 			// TODO: 可注入

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",
@@ -71,6 +70,6 @@ func sendYmgal(y ymgal, ctx *zero.Ctx) {
 	if id := ctx.SendGroupForwardMessage(
 		ctx.Event.GroupID,
 		m).Get("message_id").Int(); id == 0 {
-		ctx.SendChain(message.Text("ERROR: 可能被风控了"))
+		ctx.SendChain(message.Text("ERROR:可能被风控了"))
 	}
 }

plugin/zaobao/zaobao.go

@@ -0,0 +1,65 @@
+// Package zaobao 易即今日公众号api的今日早报
+package zaobao
+
+import (
+	"sync"
+	"time"
+
+	"github.com/tidwall/gjson"
+	zero "github.com/wdvxdr1123/ZeroBot"
+	"github.com/wdvxdr1123/ZeroBot/message"
+
+	"github.com/FloatTech/zbputils/binary"
+	control "github.com/FloatTech/zbputils/control"
+	"github.com/FloatTech/zbputils/web"
+)
+
+const (
+	api     = "http://api.soyiji.com/news_jpg"
+	referer = "safe.soyiji.com"
+	ua      = "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/87.0.4280.88 Safari/537.36 Edg/87.0.664.66"
+)
+
+var (
+	picdata []byte
+	mu      sync.Mutex
+	pictime time.Time
+)
+
+func init() { // 插件主体
+	engine := control.Register("zaobao", &control.Options{
+		DisableOnDefault: true,
+		Help: "易即今日公众号api的今日早报\n" +
+			"api早上8点更新，推荐定时在8点30后\n" +
+			"配合插件job中的记录在\"cron\"触发的指令使用\n" +
+			"- 记录在\"0 9 * * *\"触发的指令\n" +
+			"   - 今日早报",
+	})
+	engine.OnFullMatch("今日早报", zero.OnlyGroup).SetBlock(false).
+		Handle(func(ctx *zero.Ctx) {
+			err := getdata()
+			if err != nil {
+				ctx.SendChain(message.Text("ERROR:", err))
+				return
+			}
+			ctx.SendChain(message.ImageBytes(picdata))
+		})
+}
+
+func getdata() error { // 获取图片链接并且下载
+	mu.Lock()
+	defer mu.Unlock()
+	if picdata != nil && time.Since(pictime) <= time.Hour*20 {
+		return nil
+	}
+	data, err := web.RequestDataWith(web.NewDefaultClient(), api, "GET", "", ua)
+	if err != nil {
+		return err
+	}
+	picdata, err = web.RequestDataWith(web.NewDefaultClient(), gjson.Get(binary.BytesToString(data), "url").String(), "GET", referer, ua)
+	if err != nil {
+		return err
+	}
+	pictime = time.Now()
+	return nil
+}