🔖 v1.6.1

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>

README.md

@@ -18,7 +18,7 @@
 
   [![go](https://goreportcard.com/badge/github.com/FloatTech/ZeroBot-Plugin?style=flat-square&logo=go)](https://goreportcard.com/badge/github.com/FloatTech/ZeroBot-Plugin)
   [![onebot](https://img.shields.io/badge/onebot-v11-black?style=flat-square&logo=data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAHAAAABwCAMAAADxPgR5AAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAAAxQTFRF////29vbr6+vAAAAk1hCcwAAAAR0Uk5T////AEAqqfQAAAKcSURBVHja7NrbctswDATQXfD//zlpO7FlmwAWIOnOtNaTM5JwDMa8E+PNFz7g3waJ24fviyDPgfhz8fHP39cBcBL9KoJbQUxjA2iYqHL3FAnvzhL4GtVNUcoSZe6eSHizBcK5LL7dBr2AUZlev1ARRHCljzRALIEog6H3U6bCIyqIZdAT0eBuJYaGiJaHSjmkYIZd+qSGWAQnIaz2OArVnX6vrItQvbhZJtVGB5qX9wKqCMkb9W7aexfCO/rwQRBzsDIsYx4AOz0nhAtWu7bqkEQBO0Pr+Ftjt5fFCUEbm0Sbgdu8WSgJ5NgH2iu46R/o1UcBXJsFusWF/QUaz3RwJMEgngfaGGdSxJkE/Yg4lOBryBiMwvAhZrVMUUvwqU7F05b5WLaUIN4M4hRocQQRnEedgsn7TZB3UCpRrIJwQfqvGwsg18EnI2uSVNC8t+0QmMXogvbPg/xk+Mnw/6kW/rraUlvqgmFreAA09xW5t0AFlHrQZ3CsgvZm0FbHNKyBmheBKIF2cCA8A600aHPmFtRB1XvMsJAiza7LpPog0UJwccKdzw8rdf8MyN2ePYF896LC5hTzdZqxb6VNXInaupARLDNBWgI8spq4T0Qb5H4vWfPmHo8OyB1ito+AysNNz0oglj1U955sjUN9d41LnrX2D/u7eRwxyOaOpfyevCWbTgDEoilsOnu7zsKhjRCsnD/QzhdkYLBLXjiK4f3UWmcx2M7PO21CKVTH84638NTplt6JIQH0ZwCNuiWAfvuLhdrcOYPVO9eW3A67l7hZtgaY9GZo9AFc6cryjoeFBIWeU+npnk/nLE0OxCHL1eQsc1IciehjpJv5mqCsjeopaH6r15/MrxNnVhu7tmcslay2gO2Z1QfcfX0JMACG41/u0RrI9QAAAABJRU5ErkJggg==)](https://t.me/zerobotplugin)
-  [![zerobot](https://img.shields.io/badge/zerobot-v1.6.6-black?style=flat-square&logo=go)](https://github.com/wdvxdr1123/ZeroBot)
+  [![zerobot](https://img.shields.io/badge/zerobot-v1.6.7-black?style=flat-square&logo=go)](https://github.com/wdvxdr1123/ZeroBot)
   [![license](https://img.shields.io/github/license/FloatTech/ZeroBot-Plugin.svg?style=flat-square&logo=gnu)](https://raw.githubusercontent.com/FloatTech/ZeroBot-Plugin/master/LICENSE)
   [![tencent-qq](https://img.shields.io/badge/group-1048452984-red?style=flat-square&logo=tencent-qq)](https://jq.qq.com/?_wv=1027&k=QMb7x1mM)
   [![telegram](https://img.shields.io/badge/Telegram-click%20me-informational?style=flat-square&logo=telegram)](https://t.me/zerobotplugin)
@@ -249,15 +249,6 @@ zerobot [-h] [-n nickname] [-t token] [-u url] [-p prefix] [-d|w] [-c|s config.j
 
   - 设置欢迎语可选添加参数说明：{at}可在发送时艾特被欢迎者 {nickname}是被欢迎者名字 {avatar}是被欢迎者头像 {uid}是被欢迎者QQ号 {gid}是当前群群号 {groupname} 是当前群群名
 
-</details>
-<details>
-  <summary>词典匹配回复</summary>
-
-  `import _ "github.com/FloatTech/ZeroBot-Plugin/plugin/thesaurus"`
-
-  - [x] 切换[kimo|傲娇|可爱]词库
-  - [x] 设置词库触发概率0.x (0<x<9)
-
 </details>
 <details>
   <summary>定时指令触发器</summary>
@@ -406,6 +397,14 @@ print("run[CQ:image,file="+j["img"]+"]")
 
   - [x] 支付宝到账 1
 
+</details>
+<details>
+  <summary>触发者撤回时也自动撤回</summary>
+
+  `import _ "github.com/FloatTech/ZeroBot-Plugin/plugin/autowithdraw"`
+
+  - [x] 撤回一条消息
+
 </details>
 <details>
   <summary>base16384加解密</summary>
@@ -1389,6 +1388,17 @@ print("run[CQ:image,file="+j["img"]+"]")
   - [x] 查卡店  [卡名] -r [稀有度]
   - 注：卡店只支持单个稀有度查询
 	
+</details>
+<details>
+  <summary>词典匹配回复</summary>
+
+  `import _ "github.com/FloatTech/ZeroBot-Plugin/plugin/thesaurus"`
+
+  - [x] 切换[kimo|傲娇|可爱]词库
+  - [x] 设置词库触发概率0.x (0<x<9)
+
+  - 注：由于占用资源较大，默认注释。
+
 </details>
 <details>
   <summary>鬼东西</summary>
@@ -1422,15 +1432,7 @@ print("run[CQ:image,file="+j["img"]+"]")
 
   - [x] @Bot 任意文本(任意一句话回复)
 
-  - [x] 设置回复模式[青云客 | 小爱 | ChatGPT]
-
-  - [x] 设置 ChatGPT SessionToken xxx
-
-  - [x] 重置ChatGPT连接
-  
-  - 注:
-    - 注册和获取 token 可以参见这两篇文章：[注册](https://www.cnblogs.com/ranxi169/p/16954797.html) [获取token](https://juejin.cn/post/7174088036035067917)
-    - 设置 SessionToken 时，请确保自己为超级管理员，然后私聊`/响应` `/禁用atri` `/禁用tts` `/启用aireply`，再发送`设置 ChatGPT SessionToken xxx`
+  - [x] 设置回复模式[青云客 | 小爱]
 
 </details>
 

go.mod

@@ -5,20 +5,20 @@ go 1.19
 require (
 	github.com/Baidu-AIP/golang-sdk v1.1.1
 	github.com/Coloured-glaze/gg v1.3.4
-	github.com/FloatTech/AnimeAPI v1.6.1-0.20230107074849-392b0b10b149
-	github.com/FloatTech/floatbox v0.0.0-20230107061309-dcd5c0012dd3
+	github.com/FloatTech/AnimeAPI v1.6.1-0.20230111055153-4d8aebd3eab9
+	github.com/FloatTech/floatbox v0.0.0-20230111053652-a03d6334fadf
 	github.com/FloatTech/sqlite v1.5.7
 	github.com/FloatTech/ttl v0.0.0-20220715042055-15612be72f5b
-	github.com/FloatTech/zbpctrl v1.5.3-0.20221210051848-740ab7bd6ec3
-	github.com/FloatTech/zbputils v1.6.1-0.20230107061700-dadcf8500e7a
+	github.com/FloatTech/zbpctrl v1.5.3-0.20230109124217-41203036b80a
+	github.com/FloatTech/zbputils v1.6.2-0.20230112162135-c326104c37e6
 	github.com/RomiChan/syncx v0.0.0-20221202055724-5f842c53020e
 	github.com/RomiChan/websocket v1.4.3-0.20220227141055-9b2c6168c9c5
 	github.com/antchfx/htmlquery v1.2.5
 	github.com/corona10/goimagehash v1.1.0
 	github.com/fumiama/ahsai v0.1.0
 	github.com/fumiama/cron v1.3.0
-	github.com/fumiama/go-base16384 v1.6.1
-	github.com/fumiama/go-registry v0.2.5-0.20221121111817-44b0846bdce6
+	github.com/fumiama/go-base16384 v1.6.4
+	github.com/fumiama/go-registry v0.2.5
 	github.com/fumiama/gotracemoe v0.0.3
 	github.com/fumiama/jieba v0.0.0-20221203025406-36c17a10b565
 	github.com/fumiama/unibase2n v0.0.0-20221020155353-02876e777430
@@ -32,14 +32,14 @@ require (
 	github.com/sirupsen/logrus v1.9.0
 	github.com/tidwall/gjson v1.14.4
 	github.com/wcharczuk/go-chart/v2 v2.1.0
-	github.com/wdvxdr1123/ZeroBot v1.6.6
+	github.com/wdvxdr1123/ZeroBot v1.6.7
 	gitlab.com/gomidi/midi/v2 v2.0.25
 	golang.org/x/image v0.3.0
 	gopkg.in/yaml.v3 v3.0.1
 )
 
 require (
-	github.com/FloatTech/rendercard v0.0.3 // indirect
+	github.com/FloatTech/rendercard v0.0.8 // indirect
 	github.com/antchfx/xpath v1.2.1 // indirect
 	github.com/disintegration/imaging v1.6.2 // indirect
 	github.com/ericpauley/go-quantize v0.0.0-20200331213906-ae555eb2afa4 // indirect

go.sum

@@ -4,20 +4,20 @@ github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802/go.mod h1:IVnqGOEym
 github.com/Coloured-glaze/gg v1.3.4 h1:l31zIF/HaVwkzjrj+A56RGQoSKyKuR1IWtIrqXGFStI=
 github.com/Coloured-glaze/gg v1.3.4/go.mod h1:Ih5NLNNDHOy3RJbB0EPqGTreIzq/H02TGThIagh8HJg=
 github.com/DATA-DOG/go-sqlmock v1.3.3/go.mod h1:f/Ixk793poVmq4qj/V1dPUg2JEAKC73Q5eFN3EC/SaM=
-github.com/FloatTech/AnimeAPI v1.6.1-0.20230107074849-392b0b10b149 h1:luwPT3dGLRYLjRfLlz4Uo1r4Us7UkrCL9tz9cFUuuJs=
-github.com/FloatTech/AnimeAPI v1.6.1-0.20230107074849-392b0b10b149/go.mod h1:Kg0LSMN9KjqbAGzcd4T6xvL/hvlnzlOU/nWJ63we3oo=
-github.com/FloatTech/floatbox v0.0.0-20230107061309-dcd5c0012dd3 h1:LSuKljwLeoW/jFrIprWpD0yUT0YUTKqukK/fPrS5BGw=
-github.com/FloatTech/floatbox v0.0.0-20230107061309-dcd5c0012dd3/go.mod h1:/k2zxRJtAJ17w9fSpc7xf2QjPDTUBmqhBsOGyHVyX0U=
-github.com/FloatTech/rendercard v0.0.3 h1:eKOKlmotlDq/YbAcJKe0GMzBjGTsT5eSsyEfjT+hy10=
-github.com/FloatTech/rendercard v0.0.3/go.mod h1:FwwKoWpv1fW7AZ1mwBVWF8GCH9mEqYYIE9LzdmozCZQ=
+github.com/FloatTech/AnimeAPI v1.6.1-0.20230111055153-4d8aebd3eab9 h1:TOd10BBqoHPwbOmULK4a6imdaljkOxKIZFyFKbQqTEA=
+github.com/FloatTech/AnimeAPI v1.6.1-0.20230111055153-4d8aebd3eab9/go.mod h1:aOU5EVMvflX5Btv0jGLgB6gcSYeR/FNiR2cJG07vd4U=
+github.com/FloatTech/floatbox v0.0.0-20230111053652-a03d6334fadf h1:aVmgzw9hJA39/2iR800qq1dU682LpW9/czIkoshDzKw=
+github.com/FloatTech/floatbox v0.0.0-20230111053652-a03d6334fadf/go.mod h1:0+3iDgifrdiEoEsmYe+yiAlUQcmnudhTiiBdSkam2XY=
+github.com/FloatTech/rendercard v0.0.8 h1:IOZ757RKJGj4EAQj7XoW8iSNl6yVS98z0DK9LDup+Yo=
+github.com/FloatTech/rendercard v0.0.8/go.mod h1:hDqmlGgXBPI3QAvkE2kKjdPFAIB5cFQ55QnmXapAr3I=
 github.com/FloatTech/sqlite v1.5.7 h1:Bvo4LSojcZ6dVtbHrkqvt6z4v8e+sj0G5PSUIvdawsk=
 github.com/FloatTech/sqlite v1.5.7/go.mod h1:zFbHzRfB+CJ+VidfjuVbrcin3DAz283F7hF1hIeHzpY=
 github.com/FloatTech/ttl v0.0.0-20220715042055-15612be72f5b h1:tvciXWq2nuvTbFeJGLDNIdRX3BI546D3O7k7vrVueZw=
 github.com/FloatTech/ttl v0.0.0-20220715042055-15612be72f5b/go.mod h1:fHZFWGquNXuHttu9dUYoKuNbm3dzLETnIOnm1muSfDs=
-github.com/FloatTech/zbpctrl v1.5.3-0.20221210051848-740ab7bd6ec3 h1:dxARTVta2i48OOYa0xMRzWTO0lr6bM4M6JmQWLkHdNE=
-github.com/FloatTech/zbpctrl v1.5.3-0.20221210051848-740ab7bd6ec3/go.mod h1:KFfMTzItP5usfnUYs7cFWjk89dzjtdO1eI+B1BVQNig=
-github.com/FloatTech/zbputils v1.6.1-0.20230107061700-dadcf8500e7a h1:nv3+ss6kID+nn1ZC5e3DJC59aHljeXPb0Tx0xMpbmQI=
-github.com/FloatTech/zbputils v1.6.1-0.20230107061700-dadcf8500e7a/go.mod h1:cbIXoOF4IEBSUiI175cpfiC7XV70+TMQpbLGuTrRoLA=
+github.com/FloatTech/zbpctrl v1.5.3-0.20230109124217-41203036b80a h1:O+GS8J1pEM4E8q05EcopHBK6kfIr0BJJ/cHuPa8yWLM=
+github.com/FloatTech/zbpctrl v1.5.3-0.20230109124217-41203036b80a/go.mod h1:UT3bZNKMF/+r2XzSvIVXWudnTgmWsQrRPOJ3bmBfjFI=
+github.com/FloatTech/zbputils v1.6.2-0.20230112162135-c326104c37e6 h1:ZVpK24lgc6O2K2JBWk+NwOnMHzfotz7+EPkjHr6flrE=
+github.com/FloatTech/zbputils v1.6.2-0.20230112162135-c326104c37e6/go.mod h1:A43VDRGxLk0nV8jv0ONMErudXRn58W/JQTg7S9RpbfU=
 github.com/PuerkitoBio/goquery v1.5.1/go.mod h1:GsLWisAFVj4WgDibEWF4pvYnkVQBpKBKeU+7zCJoLcc=
 github.com/RomiChan/syncx v0.0.0-20221202055724-5f842c53020e h1:wR3MXQ3VbUlPKOOUwLOYgh/QaJThBTYtsl673O3lqSA=
 github.com/RomiChan/syncx v0.0.0-20221202055724-5f842c53020e/go.mod h1:vD7Ra3Q9onRtojoY5sMCLQ7JBgjUsrXDnDKyFxqpf9w=
@@ -54,10 +54,10 @@ github.com/fumiama/bigfft v0.0.0-20211011143303-6e0bfa3c836b h1:Zt3pFQditAdWTHCO
 github.com/fumiama/bigfft v0.0.0-20211011143303-6e0bfa3c836b/go.mod h1:qqbHyh8v60DhA7CoWK5oRCqLrMHRGoxYCSS9EjAz6Eo=
 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.6.1 h1:4yb4JgmBJDnQtq3XGXXdLrVwEnRpjhMUt4eAcsNeA30=
-github.com/fumiama/go-base16384 v1.6.1/go.mod h1:OEn+947GV5gsbTAnyuUW/SrfxJYUdYupSIQXOuGOcXM=
-github.com/fumiama/go-registry v0.2.5-0.20221121111817-44b0846bdce6 h1:rCvtE5Qcj6HVJICbDC7SOmIl4QnkAKSNt5/wJ/AO4wo=
-github.com/fumiama/go-registry v0.2.5-0.20221121111817-44b0846bdce6/go.mod h1:GP45kejHuDLFxcWdksrt75r5rHBqYwtfeUl3JzGWxfQ=
+github.com/fumiama/go-base16384 v1.6.4 h1:rYDRwD/th2cG4U7QLokpzmST1cCxZGXtHmolOUePt5o=
+github.com/fumiama/go-base16384 v1.6.4/go.mod h1:OEn+947GV5gsbTAnyuUW/SrfxJYUdYupSIQXOuGOcXM=
+github.com/fumiama/go-registry v0.2.5 h1:Y6tnHnTThQPv7E4JPM2vBprU+4EQw/LEDO33HCmxgI4=
+github.com/fumiama/go-registry v0.2.5/go.mod h1:GP45kejHuDLFxcWdksrt75r5rHBqYwtfeUl3JzGWxfQ=
 github.com/fumiama/go-simple-protobuf v0.1.0 h1:rLzJgNqB6LHNDVMl81yyNt6ZKziWtVfu+ioF0edlEVw=
 github.com/fumiama/go-simple-protobuf v0.1.0/go.mod h1:5yYNapXq1tQMOZg9bOIVhQlZk9pQqpuFIO4DZLbsdy4=
 github.com/fumiama/gofastTEA v0.0.10 h1:JJJ+brWD4kie+mmK2TkspDXKzqq0IjXm89aGYfoGhhQ=
@@ -188,8 +188,8 @@ github.com/tklauser/numcpus v0.6.0 h1:kebhY2Qt+3U6RNK7UqpYNA+tJ23IBEGKkB7JQBfDYm
 github.com/tklauser/numcpus v0.6.0/go.mod h1:FEZLMke0lhOUG6w2JadTzp0a+Nl8PF/GFkQ5UVIcaL4=
 github.com/wcharczuk/go-chart/v2 v2.1.0 h1:tY2slqVQ6bN+yHSnDYwZebLQFkphK4WNrVwnt7CJZ2I=
 github.com/wcharczuk/go-chart/v2 v2.1.0/go.mod h1:yx7MvAVNcP/kN9lKXM/NTce4au4DFN99j6i1OwDclNA=
-github.com/wdvxdr1123/ZeroBot v1.6.6 h1:UG5OKh3POo6JID4I3/Qab94aQFgqP2rA5nIswwHke58=
-github.com/wdvxdr1123/ZeroBot v1.6.6/go.mod h1:T5kD5vLi/YxL/fyDOCOaawi96LRBdJjcXh2CIjDyFfg=
+github.com/wdvxdr1123/ZeroBot v1.6.7 h1:JK29W0j9k82X4FdGcbgqP5IFikUYMaUysUOIALGfQrw=
+github.com/wdvxdr1123/ZeroBot v1.6.7/go.mod h1:T5kD5vLi/YxL/fyDOCOaawi96LRBdJjcXh2CIjDyFfg=
 github.com/yuin/goldmark v1.3.5/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k=
 github.com/yuin/goldmark v1.4.13/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY=
 github.com/yusufpapurcu/wmi v1.2.2 h1:KBNDSne4vP5mbSWnJbO+51IMOXJB67QiYCSBrubbPRg=

kanban/banner.go

@@ -1,7 +1,10 @@
 package kanban
 
+// Version ...
+var Version = "v1.6.1"
+
 // Banner ...
 var Banner = "* OneBot + ZeroBot + Golang\n" +
-	"* Version v1.6.1-beta3 - 2022-12-26 13:45:09 +0800 CST\n" +
-	"* Copyright © 2020 - 2022 FloatTech. All Rights Reserved.\n" +
+	"* Version " + Version + " - 2023-01-13 00:49:39 +0800 CST\n" +
+	"* Copyright © 2020 - 2023 FloatTech. All Rights Reserved.\n" +
 	"* Project: https://github.com/FloatTech/ZeroBot-Plugin"

kanban/gen/banner.go

@@ -12,9 +12,12 @@ import (
 
 const banner = `package kanban
 
+// Version ...
+var Version = "%s"
+
 // Banner ...
 var Banner = "* OneBot + ZeroBot + Golang\n" +
-	"* Version %s - %s\n" +
+	"* Version " + Version + " - %s\n" +
 	"* Copyright © 2020 - %d FloatTech. All Rights Reserved.\n" +
 	"* Project: https://github.com/FloatTech/ZeroBot-Plugin"
 `

main.go

@@ -36,8 +36,6 @@ import (
 
 	_ "github.com/FloatTech/ZeroBot-Plugin/plugin/manager" // 群管
 
-	_ "github.com/FloatTech/ZeroBot-Plugin/plugin/thesaurus" // 词典匹配回复
-
 	_ "github.com/FloatTech/zbputils/job" // 定时指令触发器
 
 	//                               ^^^^                               //
@@ -63,6 +61,7 @@ import (
 	_ "github.com/FloatTech/ZeroBot-Plugin/plugin/aipaint"       // ai绘图
 	_ "github.com/FloatTech/ZeroBot-Plugin/plugin/aiwife"        // 随机老婆
 	_ "github.com/FloatTech/ZeroBot-Plugin/plugin/alipayvoice"   // 支付宝到账语音
+	_ "github.com/FloatTech/ZeroBot-Plugin/plugin/autowithdraw"  // 触发者撤回时也自动撤回
 	_ "github.com/FloatTech/ZeroBot-Plugin/plugin/b14"           // base16384加解密
 	_ "github.com/FloatTech/ZeroBot-Plugin/plugin/baidu"         // 百度一下
 	_ "github.com/FloatTech/ZeroBot-Plugin/plugin/baiduaudit"    // 百度内容审核
@@ -140,7 +139,8 @@ import (
 	_ "github.com/FloatTech/ZeroBot-Plugin/plugin/ygo"           // 游戏王相关插件
 	_ "github.com/FloatTech/ZeroBot-Plugin/plugin/ymgal"         // 月幕galgame
 
-	// _ "github.com/FloatTech/ZeroBot-Plugin/plugin/wtf"            // 鬼东西
+	// _ "github.com/FloatTech/ZeroBot-Plugin/plugin/thesaurus"     // 词典匹配回复
+	// _ "github.com/FloatTech/ZeroBot-Plugin/plugin/wtf"           // 鬼东西
 
 	//                               ^^^^                               //
 	//                          ^^^^^^^^^^^^^^                          //

plugin/ai_reply/ai_tts.go

@@ -36,7 +36,7 @@ const (
 	defaultttsindexkey = -2905
 )
 
-var replyModes = [...]string{"青云客", "小爱", "ChatGPT"}
+var replyModes = [...]string{"青云客", "小爱"}
 
 func setReplyMode(ctx *zero.Ctx, name string) error {
 	gid := ctx.Event.GroupID
@@ -62,8 +62,6 @@ func setReplyMode(ctx *zero.Ctx, name string) error {
 	return m.SetData(gid, (m.GetData(index)&^0xff)|(index&0xff))
 }
 
-var chats *aireply.ChatGPT
-
 func getReplyMode(ctx *zero.Ctx) aireply.AIReply {
 	gid := ctx.Event.GroupID
 	if gid == 0 {
@@ -71,16 +69,10 @@ func getReplyMode(ctx *zero.Ctx) aireply.AIReply {
 	}
 	m, ok := ctx.State["manager"].(*ctrl.Control[*zero.Ctx])
 	if ok {
-		switch m.GetData(gid) & 0xff {
-		case 0:
-			return aireply.NewQYK(aireply.QYKURL, aireply.QYKBotName)
-		case 1:
+		if m.GetData(gid)&0xff == 1 {
 			return aireply.NewXiaoAi(aireply.XiaoAiURL, aireply.XiaoAiBotName)
-		case 2:
-			if chats != nil {
-				return chats
-			}
 		}
+		return aireply.NewQYK(aireply.QYKURL, aireply.QYKBotName)
 	}
 	return aireply.NewQYK(aireply.QYKURL, aireply.QYKBotName)
 }

plugin/ai_reply/main.go

@@ -2,14 +2,10 @@
 package aireply
 
 import (
-	"os"
 	"strconv"
 	"time"
 
-	"github.com/FloatTech/AnimeAPI/aireply"
-	"github.com/FloatTech/AnimeAPI/chatgpt"
 	"github.com/FloatTech/AnimeAPI/tts/genshin"
-	"github.com/FloatTech/floatbox/binary"
 	ctrl "github.com/FloatTech/zbpctrl"
 	"github.com/FloatTech/zbputils/control"
 	"github.com/FloatTech/zbputils/ctxext"
@@ -35,7 +31,7 @@ func init() { // 插件主体
 	enr := control.Register("aireply", &ctrl.Options[*zero.Ctx]{
 		DisableOnDefault:  false,
 		Brief:             "人工智能回复",
-		Help:              "- @Bot 任意文本(任意一句话回复)\n- 设置回复模式[青云客|小爱|ChatGPT]\n- 设置 ChatGPT SessionToken xxx\n- 设置 ChatGPT UA xxx\n- 设置 ChatGPT CF xxx\n- 重置ChatGPT连接",
+		Help:              "- @Bot 任意文本(任意一句话回复)\n- 设置回复模式[青云客|小爱]",
 		PrivateDataFolder: "aireply",
 	})
 
@@ -63,102 +59,6 @@ func init() { // 插件主体
 		ctx.SendChain(message.Reply(ctx.Event.MessageID), message.Text("成功"))
 	})
 
-	chatgptfile := enr.DataFolder() + "chatgpt.txt"
-	uafile := enr.DataFolder() + "ua.txt"
-	cffile := enr.DataFolder() + "cf.txt"
-	cfg := &chatgpt.Config{
-		RefreshInterval: time.Hour,
-		Timeout:         time.Minute,
-	}
-	data, err := os.ReadFile(chatgptfile)
-	if err == nil {
-		cfg.SessionToken = binary.BytesToString(data)
-		data, err = os.ReadFile(uafile)
-		if err == nil {
-			cfg.UA = binary.BytesToString(data)
-			data, err = os.ReadFile(cffile)
-			if err == nil {
-				cfg.CFClearance = binary.BytesToString(data)
-			}
-		}
-	}
-	chats = aireply.NewChatGPT(cfg)
-	go func() {
-		for range time.NewTicker(time.Hour).C {
-			if chats == nil || cfg.SessionToken == "" {
-				continue
-			}
-			err := os.WriteFile(chatgptfile, binary.StringToBytes(cfg.SessionToken), 0644)
-			if err != nil {
-				logrus.Warnln("[aireply] 保存 chatgpt session token 到", chatgptfile, "失败:", err)
-			}
-		}
-	}()
-
-	enr.OnRegex(`^设置\s*ChatGPT\s*SessionToken\s*(.*)$`, zero.OnlyPrivate, zero.SuperUserPermission).SetBlock(true).Handle(func(ctx *zero.Ctx) {
-		token := ctx.State["regex_matched"].([]string)[1]
-		f, err := os.Create(chatgptfile)
-		if err != nil {
-			ctx.SendChain(message.Text("ERROR: ", err))
-			return
-		}
-		defer f.Close()
-		_, err = f.WriteString(token)
-		if err != nil {
-			ctx.SendChain(message.Text("ERROR: ", err))
-			return
-		}
-		cfg.SessionToken = token
-		ctx.SendChain(message.Text("设置成功"))
-	})
-
-	enr.OnRegex(`^设置\s*ChatGPT\s*UA\s*(.*)$`, zero.OnlyPrivate, zero.SuperUserPermission).SetBlock(true).Handle(func(ctx *zero.Ctx) {
-		ua := ctx.State["regex_matched"].([]string)[1]
-		f, err := os.Create(uafile)
-		if err != nil {
-			ctx.SendChain(message.Text("ERROR: ", err))
-			return
-		}
-		defer f.Close()
-		_, err = f.WriteString(ua)
-		if err != nil {
-			ctx.SendChain(message.Text("ERROR: ", err))
-			return
-		}
-		cfg.UA = ua
-		ctx.SendChain(message.Text("设置成功"))
-	})
-
-	enr.OnRegex(`^设置\s*ChatGPT\s*CF\s*(.*)$`, zero.OnlyPrivate, zero.SuperUserPermission).SetBlock(true).Handle(func(ctx *zero.Ctx) {
-		cf := ctx.State["regex_matched"].([]string)[1]
-		f, err := os.Create(cffile)
-		if err != nil {
-			ctx.SendChain(message.Text("ERROR: ", err))
-			return
-		}
-		defer f.Close()
-		_, err = f.WriteString(cf)
-		if err != nil {
-			ctx.SendChain(message.Text("ERROR: ", err))
-			return
-		}
-		cfg.CFClearance = cf
-		ctx.SendChain(message.Text("设置成功"))
-	})
-
-	enr.OnFullMatch("重置ChatGPT连接").SetBlock(true).Handle(func(ctx *zero.Ctx) {
-		if chats == nil {
-			ctx.SendChain(message.Text("ERROR: chats 为空"))
-			return
-		}
-		err := chats.Reset(ctx.Event.UserID)
-		if err != nil {
-			ctx.SendChain(message.Text("ERROR: ", err))
-			return
-		}
-		ctx.SendChain(message.Text("成功"))
-	})
-
 	ent.OnMessage(zero.OnlyToMe).SetBlock(true).Limit(ctxext.LimitByUser).
 		Handle(func(ctx *zero.Ctx) {
 			msg := ctx.ExtractPlainText()

plugin/atri/atri.go

@@ -6,18 +6,46 @@ Package atri 本文件基于 https://github.com/Kyomotoi/ATRI
 package atri
 
 import (
+	"encoding/base64"
 	"math/rand"
 	"time"
 
 	zero "github.com/wdvxdr1123/ZeroBot"
 	"github.com/wdvxdr1123/ZeroBot/message"
 
-	"github.com/FloatTech/floatbox/process"
 	ctrl "github.com/FloatTech/zbpctrl"
 	"github.com/FloatTech/zbputils/control"
 )
 
-const res = "https://gitcode.net/u011570312/zbpdata/-/raw/main/Atri/"
+type datagetter func(string, bool) ([]byte, error)
+
+func (dgtr datagetter) randImage(file ...string) message.MessageSegment {
+	data, err := dgtr(file[rand.Intn(len(file))], true)
+	if err != nil {
+		return message.Text("ERROR: ", err)
+	}
+	return message.ImageBytes(data)
+}
+
+func (dgtr datagetter) randRecord(file ...string) message.MessageSegment {
+	data, err := dgtr(file[rand.Intn(len(file))], true)
+	if err != nil {
+		return message.Text("ERROR: ", err)
+	}
+	return message.Record("base64://" + base64.StdEncoding.EncodeToString(data))
+}
+
+func randText(text ...string) message.MessageSegment {
+	return message.Text(text[rand.Intn(len(text))])
+}
+
+// isAtriSleeping 凌晨0点到6点，ATRI 在睡觉，不回应任何请求
+func isAtriSleeping(ctx *zero.Ctx) bool {
+	if now := time.Now().Hour(); now >= 1 && now < 6 {
+		return false
+	}
+	return true
+}
 
 func init() { // 插件主体
 	engine := control.Register("atri", &ctrl.Options[*zero.Ctx]{
@@ -29,39 +57,36 @@ func init() { // 插件主体
 			"- 中午好 | 午安 | 午好\n- 晚安 | oyasuminasai | おやすみなさい | 晚好 | 晚上好\n- 高性能 | 太棒了 | すごい | sugoi | 斯国一 | よかった\n" +
 			"- 没事 | 没关系 | 大丈夫 | 还好 | 不要紧 | 没出大问题 | 没伤到哪\n- 好吗 | 是吗 | 行不行 | 能不能 | 可不可以\n- 啊这\n- 我好了\n- ？ | ? | ¿\n" +
 			"- 离谱\n- 答应我",
+		PublicDataFolder: "Atri",
 		OnEnable: func(ctx *zero.Ctx) {
-			process.SleepAbout1sTo2s()
 			ctx.SendChain(message.Text("嗯呜呜……夏生先生……？"))
 		},
 		OnDisable: func(ctx *zero.Ctx) {
-			process.SleepAbout1sTo2s()
 			ctx.SendChain(message.Text("Zzz……Zzz……"))
 		},
 	})
-	engine.OnFullMatch("萝卜子", isAtriSleeping).SetBlock(true).
+	engine.UsePreHandler(isAtriSleeping)
+	var dgtr datagetter = engine.GetLazyData
+	engine.OnFullMatch("萝卜子").SetBlock(true).
 		Handle(func(ctx *zero.Ctx) {
-			process.SleepAbout1sTo2s()
 			switch rand.Intn(2) {
 			case 0:
 				ctx.SendChain(randText("萝卜子是对机器人的蔑称！", "是亚托莉......萝卜子可是对机器人的蔑称"))
 			case 1:
-				ctx.SendChain(randRecord("RocketPunch.amr"))
+				ctx.SendChain(dgtr.randRecord("RocketPunch.amr"))
 			}
 		})
-	engine.OnFullMatchGroup([]string{"喜欢", "爱你", "爱", "suki", "daisuki", "すき", "好き", "贴贴", "老婆", "亲一个", "mua"}, isAtriSleeping, zero.OnlyToMe).SetBlock(true).
+	engine.OnFullMatchGroup([]string{"喜欢", "爱你", "爱", "suki", "daisuki", "すき", "好き", "贴贴", "老婆", "亲一个", "mua"}, zero.OnlyToMe).SetBlock(true).
 		Handle(func(ctx *zero.Ctx) {
-			process.SleepAbout1sTo2s()
-			ctx.SendChain(randImage("SUKI.jpg", "SUKI1.jpg", "SUKI2.png"))
+			ctx.SendChain(dgtr.randImage("SUKI.jpg", "SUKI1.jpg", "SUKI2.png"))
 		})
-	engine.OnKeywordGroup([]string{"草你妈", "操你妈", "脑瘫", "废柴", "fw", "five", "废物", "战斗", "爬", "爪巴", "sb", "SB", "傻B"}, isAtriSleeping, zero.OnlyToMe).SetBlock(true).
+	engine.OnKeywordGroup([]string{"草你妈", "操你妈", "脑瘫", "废柴", "fw", "five", "废物", "战斗", "爬", "爪巴", "sb", "SB", "傻B"}, zero.OnlyToMe).SetBlock(true).
 		Handle(func(ctx *zero.Ctx) {
-			process.SleepAbout1sTo2s()
-			ctx.SendChain(randImage("FN.jpg", "WQ.jpg", "WQ1.jpg"))
+			ctx.SendChain(dgtr.randImage("FN.jpg", "WQ.jpg", "WQ1.jpg"))
 		})
 	engine.OnFullMatchGroup([]string{"早安", "早哇", "早上好", "ohayo", "哦哈哟", "お早う", "早好", "早", "早早早"}).SetBlock(true).
 		Handle(func(ctx *zero.Ctx) {
 			now := time.Now().Hour()
-			process.SleepAbout1sTo2s()
 			switch {
 			case now < 6: // 凌晨
 				ctx.SendChain(message.Reply(ctx.Event.MessageID), randText(
@@ -102,7 +127,6 @@ func init() { // 插件主体
 		Handle(func(ctx *zero.Ctx) {
 			now := time.Now().Hour()
 			if now > 11 && now < 15 { // 中午
-				process.SleepAbout1sTo2s()
 				ctx.SendChain(message.Reply(ctx.Event.MessageID), randText(
 					"午安w",
 					"午觉要好好睡哦，ATRI会陪伴在你身旁的w",
@@ -114,7 +138,6 @@ func init() { // 插件主体
 	engine.OnFullMatchGroup([]string{"晚安", "oyasuminasai", "おやすみなさい", "晚好", "晚上好"}).SetBlock(true).
 		Handle(func(ctx *zero.Ctx) {
 			now := time.Now().Hour()
-			process.SleepAbout1sTo2s()
 			switch {
 			case now < 6: // 凌晨
 				ctx.SendChain(message.Reply(ctx.Event.MessageID), randText(
@@ -154,9 +177,8 @@ func init() { // 插件主体
 				))
 			}
 		})
-	engine.OnKeywordGroup([]string{"高性能", "太棒了", "すごい", "sugoi", "斯国一", "よかった"}, isAtriSleeping, zero.OnlyToMe).SetBlock(true).
+	engine.OnKeywordGroup([]string{"高性能", "太棒了", "すごい", "sugoi", "斯国一", "よかった"}, zero.OnlyToMe).SetBlock(true).
 		Handle(func(ctx *zero.Ctx) {
-			process.SleepAbout1sTo2s()
 			ctx.SendChain(randText(
 				"当然，我是高性能的嘛~！",
 				"小事一桩，我是高性能的嘛",
@@ -175,9 +197,8 @@ func init() { // 插件主体
 				"呣......我的高性能，毫无遗憾地施展出来了......",
 			))
 		})
-	engine.OnKeywordGroup([]string{"没事", "没关系", "大丈夫", "还好", "不要紧", "没出大问题", "没伤到哪"}, isAtriSleeping, zero.OnlyToMe).SetBlock(true).
+	engine.OnKeywordGroup([]string{"没事", "没关系", "大丈夫", "还好", "不要紧", "没出大问题", "没伤到哪"}, zero.OnlyToMe).SetBlock(true).
 		Handle(func(ctx *zero.Ctx) {
-			process.SleepAbout1sTo2s()
 			ctx.SendChain(randText(
 				"当然，我是高性能的嘛~！",
 				"没事没事，因为我是高性能的嘛！嗯哼！",
@@ -190,67 +211,42 @@ func init() { // 插件主体
 			))
 		})
 
-	engine.OnKeywordGroup([]string{"好吗", "是吗", "行不行", "能不能", "可不可以"}, isAtriSleeping).SetBlock(true).
+	engine.OnKeywordGroup([]string{"好吗", "是吗", "行不行", "能不能", "可不可以"}).SetBlock(true).
 		Handle(func(ctx *zero.Ctx) {
-			process.SleepAbout1sTo2s()
 			if rand.Intn(2) == 0 {
-				ctx.SendChain(randImage("YES.png", "NO.jpg"))
+				ctx.SendChain(dgtr.randImage("YES.png", "NO.jpg"))
 			}
 		})
-	engine.OnKeywordGroup([]string{"啊这"}, isAtriSleeping).SetBlock(true).
+	engine.OnKeywordGroup([]string{"啊这"}).SetBlock(true).
 		Handle(func(ctx *zero.Ctx) {
-			process.SleepAbout1sTo2s()
 			if rand.Intn(2) == 0 {
-				ctx.SendChain(randImage("AZ.jpg", "AZ1.jpg"))
+				ctx.SendChain(dgtr.randImage("AZ.jpg", "AZ1.jpg"))
 			}
 		})
-	engine.OnKeywordGroup([]string{"我好了"}, isAtriSleeping).SetBlock(true).
+	engine.OnKeywordGroup([]string{"我好了"}).SetBlock(true).
 		Handle(func(ctx *zero.Ctx) {
-			process.SleepAbout1sTo2s()
 			ctx.SendChain(message.Reply(ctx.Event.MessageID), randText("不许好！", "憋回去！"))
 		})
-	engine.OnFullMatchGroup([]string{"？", "?", "¿"}, isAtriSleeping).SetBlock(true).
-		Handle(func(ctx *zero.Ctx) {
-			process.SleepAbout1sTo2s()
-			switch rand.Intn(5) {
-			case 0:
-				ctx.SendChain(randText("?", "？", "嗯？", "(。´・ω・)ん?", "ん？"))
-			case 1, 2:
-				ctx.SendChain(randImage("WH.jpg", "WH1.jpg", "WH2.jpg", "WH3.jpg"))
-			}
-		})
-	engine.OnKeyword("离谱", isAtriSleeping).SetBlock(true).
+	engine.OnFullMatchGroup([]string{"？", "?", "¿"}).SetBlock(true).
 		Handle(func(ctx *zero.Ctx) {
 			switch rand.Intn(5) {
 			case 0:
 				ctx.SendChain(randText("?", "？", "嗯？", "(。´・ω・)ん?", "ん？"))
 			case 1, 2:
-				ctx.SendChain(randImage("WH.jpg"))
+				ctx.SendChain(dgtr.randImage("WH.jpg", "WH1.jpg", "WH2.jpg", "WH3.jpg"))
 			}
 		})
-	engine.OnKeyword("答应我", isAtriSleeping, zero.OnlyToMe).SetBlock(true).
+	engine.OnKeyword("离谱").SetBlock(true).
+		Handle(func(ctx *zero.Ctx) {
+			switch rand.Intn(5) {
+			case 0:
+				ctx.SendChain(randText("?", "？", "嗯？", "(。´・ω・)ん?", "ん？"))
+			case 1, 2:
+				ctx.SendChain(dgtr.randImage("WH.jpg"))
+			}
+		})
+	engine.OnKeyword("答应我", zero.OnlyToMe).SetBlock(true).
 		Handle(func(ctx *zero.Ctx) {
-			process.SleepAbout1sTo2s()
 			ctx.SendChain(randText("我无法回应你的请求"))
 		})
 }
-
-func randText(text ...string) message.MessageSegment {
-	return message.Text(text[rand.Intn(len(text))])
-}
-
-func randImage(file ...string) message.MessageSegment {
-	return message.Image(res + file[rand.Intn(len(file))])
-}
-
-func randRecord(file ...string) message.MessageSegment {
-	return message.Record(res + file[rand.Intn(len(file))])
-}
-
-// isAtriSleeping 凌晨0点到6点，ATRI 在睡觉，不回应任何请求
-func isAtriSleeping(ctx *zero.Ctx) bool {
-	if now := time.Now().Hour(); now >= 1 && now < 6 {
-		return false
-	}
-	return true
-}

plugin/autowithdraw/main.go

@@ -0,0 +1,29 @@
+// Package autowithdraw 触发者撤回时也自动撤回
+package autowithdraw
+
+import (
+	"github.com/FloatTech/floatbox/process"
+	ctrl "github.com/FloatTech/zbpctrl"
+	"github.com/FloatTech/zbputils/control"
+	zero "github.com/wdvxdr1123/ZeroBot"
+	"github.com/wdvxdr1123/ZeroBot/message"
+)
+
+func init() {
+	control.Register("autowithdraw", &ctrl.Options[*zero.Ctx]{
+		DisableOnDefault: false,
+		Brief:            "触发者撤回时也自动撤回",
+		Help:             "- 撤回一条消息\n",
+	}).OnNotice(func(ctx *zero.Ctx) bool {
+		return ctx.Event.NoticeType == "group_recall" || ctx.Event.NoticeType == "friend_recall"
+	}).SetBlock(false).Handle(func(ctx *zero.Ctx) {
+		id, ok := ctx.Event.MessageID.(int64)
+		if !ok {
+			return
+		}
+		for _, msg := range zero.GetTriggeredMessages(message.NewMessageIDFromInteger(id)) {
+			process.SleepAbout1sTo2s()
+			ctx.DeleteMessage(msg)
+		}
+	})
+}

plugin/bilibili/bilibili.go

@@ -291,7 +291,7 @@ func init() {
 		}
 
 		client := &http.Client{Transport: tr}
-		data, err := web.RequestDataWith(client, fmt.Sprintf(bz.DanmakuAPI, id, pagenum), "GET", "", web.RandUA())
+		data, err := web.RequestDataWith(client, fmt.Sprintf(bz.DanmakuAPI, id, pagenum), "GET", "", web.RandUA(), nil)
 		if err != nil {
 			ctx.SendChain(message.Text("ERROR: ", err))
 			return

plugin/bilibili/bilibili_parse.go

@@ -35,7 +35,7 @@ func init() {
 	en.OnRegex(`((b23|acg).tv|bili2233.cn)/[0-9a-zA-Z]+`).SetBlock(true).Limit(limit.LimitByGroup).
 		Handle(func(ctx *zero.Ctx) {
 			url := ctx.State["regex_matched"].([]string)[0]
-			realurl, err := bz.GetRealUrl("https://" + url)
+			realurl, err := bz.GetRealURL("https://" + url)
 			if err != nil {
 				ctx.SendChain(message.Text("ERROR: ", err))
 				return

plugin/bilibili/bilibilipush.go

@@ -175,7 +175,7 @@ func getName(buid int64) (name string, err error) {
 	var ok bool
 	if name, ok = upMap[buid]; !ok {
 		var data []byte
-		data, err = web.RequestDataWith(web.NewDefaultClient(), fmt.Sprintf(infoURL, buid), "GET", referer, ua)
+		data, err = web.RequestDataWith(web.NewDefaultClient(), fmt.Sprintf(infoURL, buid), "GET", referer, ua, nil)
 		if err != nil {
 			return
 		}
@@ -232,7 +232,7 @@ func unsubscribeLive(buid, groupid int64) (err error) {
 }
 
 func getUserDynamicCard(buid int64) (cardList []gjson.Result, err error) {
-	data, err := web.RequestDataWith(web.NewDefaultClient(), fmt.Sprintf(bz.SpaceHistoryURL, buid, 0), "GET", referer, ua)
+	data, err := web.RequestDataWith(web.NewDefaultClient(), fmt.Sprintf(bz.SpaceHistoryURL, buid, 0), "GET", referer, ua, nil)
 	if err != nil {
 		return
 	}

plugin/coser/coser.go

@@ -39,7 +39,7 @@ func init() {
 					return "", err
 				}
 			}
-			data, err := web.RequestDataWith(web.NewDefaultClient(), coserURL, "GET", "", ua)
+			data, err := web.RequestDataWith(web.NewDefaultClient(), coserURL, "GET", "", ua, nil)
 			if err != nil {
 				return "", err
 			}
@@ -61,7 +61,7 @@ func init() {
 				ctx.SendChain(message.Text("ERROR: ", err))
 				return
 			}
-			if id := ctx.Send(message.Message{ctxext.FakeSenderForwardNode(ctx, message.Image(pic))}).ID(); id == 0 {
+			if id := ctx.Send(message.Message{ctxext.FakeSenderForwardNode(ctx, message.Image("file:///"+file.BOTPATH+"/"+pic))}).ID(); id == 0 {
 				ctx.SendChain(message.Text("ERROR: 可能被风控或下载图片用时过长，请耐心等待"))
 			}
 		})

plugin/gif/context.go

@@ -20,7 +20,7 @@ func dlchan(name string, s *string, wg *sync.WaitGroup, exit func(error)) {
 	defer wg.Done()
 	target := datapath + `materials/` + name
 	if file.IsNotExist(target) {
-		data, err := web.RequestDataWith(web.NewTLS12Client(), `https://gitcode.net/m0_60838134/imagematerials/-/raw/main/`+name, "GET", "gitcode.net", web.RandUA())
+		data, err := web.RequestDataWith(web.NewTLS12Client(), `https://gitcode.net/m0_60838134/imagematerials/-/raw/main/`+name, "GET", "gitcode.net", web.RandUA(), nil)
 		if err != nil {
 			_ = os.Remove(target)
 			exit(err)
@@ -48,7 +48,7 @@ func dlchan(name string, s *string, wg *sync.WaitGroup, exit func(error)) {
 func dlblock(name string) (string, error) {
 	target := datapath + `materials/` + name
 	if file.IsNotExist(target) {
-		data, err := web.RequestDataWith(web.NewTLS12Client(), `https://gitcode.net/m0_60838134/imagematerials/-/raw/main/`+name, "GET", "gitcode.net", web.RandUA())
+		data, err := web.RequestDataWith(web.NewTLS12Client(), `https://gitcode.net/m0_60838134/imagematerials/-/raw/main/`+name, "GET", "gitcode.net", web.RandUA(), nil)
 		if err != nil {
 			_ = os.Remove(target)
 			return "", err

plugin/heisi/heisi.go

@@ -59,7 +59,9 @@ func init() { // 插件主体
 				pic = mcnPic[rand.Intn(len(mcnPic))]
 			}
 			return pic.String(), nil
-		}, web.GetData, time.Minute)
+		}, func(s string) ([]byte, error) {
+			return web.RequestDataWith(web.NewTLS12Client(), s, "GET", "http://hs.heisiwu.com/", web.RandUA(), nil)
+		}, time.Minute)
 	if err != nil {
 		panic(err)
 	}
@@ -109,7 +111,7 @@ func init() { // 插件主体
 				ctx.SendChain(message.Text("ERROR: ", err))
 				return
 			}
-			m := message.Message{ctxext.FakeSenderForwardNode(ctx, message.Image(pic))}
+			m := message.Message{ctxext.FakeSenderForwardNode(ctx, message.Image("file:///"+file.BOTPATH+"/"+pic))}
 			if id := ctx.Send(m).ID(); id == 0 {
 				ctx.SendChain(message.Text("ERROR: 可能被风控或下载图片用时过长，请耐心等待"))
 			}

plugin/hs/run.go

@@ -67,7 +67,7 @@ func init() {
 				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])
+					reqconf[0], reqconf[1], reqconf[2], nil)
 				if err == nil {
 					err = os.WriteFile(cachefile, data, 0644)
 				}
@@ -95,10 +95,10 @@ func init() {
 }
 
 func sh(s string) string {
-	data, err := web.RequestDataWith(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], nil)
 	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.RequestDataWith(web.NewDefaultClient(), url, reqconf[0], reqconf[1], reqconf[2])
+		r, err := web.RequestDataWith(web.NewDefaultClient(), url, reqconf[0], reqconf[1], reqconf[2], nil)
 		if err == nil {
 			return helper.BytesToString(r)
 		}
@@ -107,10 +107,10 @@ func sh(s string) string {
 }
 
 func kz(s string) string {
-	data, err := web.RequestDataWith(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], nil)
 	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.RequestDataWith(web.NewDefaultClient(), url, reqconf[0], reqconf[1], reqconf[2])
+		r, err := web.RequestDataWith(web.NewDefaultClient(), url, reqconf[0], reqconf[1], reqconf[2], nil)
 		if err == nil {
 			return "base64://" + gjson.Get(helper.BytesToString(r), "img").String()
 		}

plugin/hyaku/main.go

@@ -2,9 +2,9 @@
 package hyaku
 
 import (
+	"bytes"
 	"encoding/csv"
 	"fmt"
-	"io"
 	"math/rand"
 	"os"
 	"reflect"
@@ -12,8 +12,6 @@ import (
 	"unsafe"
 
 	"github.com/FloatTech/floatbox/binary"
-	"github.com/FloatTech/floatbox/file"
-	"github.com/FloatTech/floatbox/web"
 	ctrl "github.com/FloatTech/zbpctrl"
 	"github.com/FloatTech/zbputils/control"
 	"github.com/FloatTech/zbputils/ctxext"
@@ -60,56 +58,36 @@ func init() {
 			"- 百人一首之n",
 		PrivateDataFolder: "hyaku",
 	})
-	csvfile := engine.DataFolder() + "hyaku.csv"
 	err := os.MkdirAll(engine.DataFolder()+"img", 0755)
 	if err != nil {
 		panic(err)
 	}
-	go func() {
-		var f *os.File
-		if file.IsNotExist(csvfile) {
-			data, err := web.RequestDataWith(web.NewTLS12Client(), bed+"小倉百人一首.csv", "GET", "gitcode.net", web.RandUA())
-			if err != nil {
-				_ = os.Remove(csvfile)
-				panic(err)
-			}
-			f, err = os.Create(csvfile)
-			if err != nil {
-				panic(err)
-			}
-			_, _ = f.Write(data)
-			_, _ = f.Seek(0, io.SeekStart)
-		} else {
-			var err error
-			f, err = os.Open(csvfile)
-			if err != nil {
-				panic(err)
-			}
+	data, err := engine.GetCustomLazyData(bed, "小倉百人一首.csv")
+	if err != nil {
+		panic(err)
+	}
+	records, err := csv.NewReader(bytes.NewReader(data)).ReadAll()
+	if err != nil {
+		panic(err)
+	}
+	records = records[1:] // skip title
+	if len(records) != 100 {
+		panic("invalid csvfile")
+	}
+	for j, r := range records {
+		if len(r) != 6 {
+			panic("invalid csvfile")
 		}
-		records, err := csv.NewReader(f).ReadAll()
+		i, err := strconv.Atoi(r[0])
 		if err != nil {
 			panic(err)
 		}
-		_ = f.Close()
-		records = records[1:] // skip title
-		if len(records) != 100 {
+		i--
+		if j != i {
 			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)))
-		}
-	}()
+		lines[i] = (*line)(*(*unsafe.Pointer)(unsafe.Pointer(&r)))
+	}
 	engine.OnFullMatch("百人一首").SetBlock(true).Limit(ctxext.LimitByUser).Handle(func(ctx *zero.Ctx) {
 		i := rand.Intn(100)
 		img0, err := engine.GetCustomLazyData(bed, fmt.Sprintf("img/%03d.jpg", i+1))

plugin/image_finder/keyword.go

@@ -98,7 +98,7 @@ func init() {
 					"标题: ", il.Title, "\n",
 					"副标题: ", il.AltTitle, "\n",
 					"ID: ", il.ID, "\n",
-					"画师: ", illust.UserName, " (", illust.UserId, ")", "\n",
+					"画师: ", illust.UserName, " (", illust.UserID, ")", "\n",
 					"分级:", il.Sanity, "\n",
 					hrefre.ReplaceAllString(strings.ReplaceAll(strings.ReplaceAll(il.Description, "<br />", "\n"), "</a>", ""), ""),
 					printtags(reflect.ValueOf(&il.Tags)),
@@ -119,6 +119,7 @@ func soutuapi(keyword string) (r resultjson, err error) {
 		"GET",
 		"https://pixivel.moe/",
 		"Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/94.0.4606.61 Safari/537.36",
+		nil,
 	)
 	if err != nil {
 		return

plugin/music/selecter.go

@@ -177,7 +177,7 @@ func cloud163(keyword string) (msg message.MessageSegment) {
 // qqmusic 返回QQ音乐卡片
 func qqmusic(keyword string) (msg message.MessageSegment) {
 	requestURL := "https://c.y.qq.com/splcloud/fcgi-bin/smartbox_new.fcg?platform=yqq.json&key=" + url.QueryEscape(keyword)
-	data, err := web.RequestDataWith(web.NewDefaultClient(), requestURL, "GET", "", web.RandUA())
+	data, err := web.RequestDataWith(web.NewDefaultClient(), requestURL, "GET", "", web.RandUA(), nil)
 	if err != nil {
 		msg = message.Text("ERROR: ", err)
 		return

plugin/qzone/qzone.go

@@ -311,12 +311,11 @@ func renderForwardMsg(qq int64, raw string) (base64Bytes []byte, err error) {
 		imgdata   []byte
 		msgImg    image.Image
 		faceImg   image.Image
-		t         text.Text
 	)
 	if qq != 0 {
 		face, err = web.GetData(fmt.Sprintf(faceURL, qq))
 	} else {
-		face, err = web.RequestDataWith(web.NewTLS12Client(), fmt.Sprintf(anonymousURL, rand.Intn(4)+1), "GET", "gitcode.net", web.RandUA())
+		face, err = web.RequestDataWith(web.NewTLS12Client(), fmt.Sprintf(anonymousURL, rand.Intn(4)+1), "GET", "gitcode.net", web.RandUA(), nil)
 	}
 	if err != nil {
 		return
@@ -332,11 +331,10 @@ func renderForwardMsg(qq int64, raw string) (base64Bytes []byte, err error) {
 	for _, v := range m {
 		switch {
 		case v.Type == "text" && strings.TrimSpace(v.Data["text"]) != "":
-			t, err = text.Render(strings.TrimSuffix(v.Data["text"], "\r\n"), text.FontFile, 400, 40)
+			msgImg, err = text.Render(strings.TrimSuffix(v.Data["text"], "\r\n"), text.FontFile, 400, 40)
 			if err != nil {
 				return
 			}
-			msgImg = t.Image()
 		case v.Type == "image" && v.Data["url"] != "":
 			imgdata, err = web.GetData(v.Data["url"])
 			if err != nil {

plugin/saucenao/searcher.go

@@ -91,7 +91,7 @@ func init() { // 插件主体
 					"标题: ", illust.Title, "\n",
 					"插画ID: ", illust.Pid, "\n",
 					"画师: ", illust.UserName, "\n",
-					"画师ID: ", illust.UserId, "\n",
+					"画师ID: ", illust.UserID, "\n",
 					"直链: ", "https://pixivel.moe/detail?id=", illust.Pid,
 				)
 				if imgs != nil {
@@ -157,7 +157,7 @@ func init() { // 插件主体
 					ctx.SendChain(message.Text("请私聊发送 设置 saucenao api key [apikey] 以启用 saucenao 搜图 (方括号不需要输入), key 请前往 https://saucenao.com/user.php?page=search-api 获取"))
 				}
 				// ascii2d 搜索
-				if result, err := ascii2d.Ascii2d(pic); err != nil {
+				if result, err := ascii2d.ASCII2d(pic); err != nil {
 					ctx.SendChain(message.Text("ERROR: ", err))
 					continue
 				} else {

plugin/shadiao/shadiao.go

@@ -38,7 +38,7 @@ var (
 func init() {
 	engine.OnFullMatchGroup([]string{"哄我", "来碗毒鸡汤", "发个朋友圈"}).SetBlock(true).Limit(ctxext.LimitByUser).Handle(func(ctx *zero.Ctx) {
 		requestURL := sdMap[ctx.State["matched"].(string)]
-		data, err := web.RequestDataWith(web.NewDefaultClient(), requestURL, "GET", sdReferer, ua)
+		data, err := web.RequestDataWith(web.NewDefaultClient(), requestURL, "GET", sdReferer, ua, nil)
 		if err != nil {
 			ctx.SendChain(message.Text("ERROR: ", err))
 			return

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.RequestDataWith(web.NewDefaultClient(), chayiURL, "GET", loveliveReferer, ua)
+		data, err := web.RequestDataWith(web.NewDefaultClient(), chayiURL, "GET", loveliveReferer, ua, nil)
 		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.RequestDataWith(web.NewDefaultClient(), ganhaiURL, "GET", loveliveReferer, ua)
+		data, err := web.RequestDataWith(web.NewDefaultClient(), ganhaiURL, "GET", loveliveReferer, ua, nil)
 		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.RequestDataWith(web.NewDefaultClient(), yduanziURL, "POST", yduanziReferer, ua)
+		data, err := web.RequestDataWith(web.NewDefaultClient(), yduanziURL, "POST", yduanziReferer, ua, nil)
 		if err != nil {
 			ctx.SendChain(message.Text("ERROR: ", err))
 			return

plugin/tarot/tarot.go

@@ -153,7 +153,7 @@ func init() {
 			}
 			imgpath := cache + "/" + imgname + ".png"
 			err := pool.SendImageFromPool("pool"+imgname, imgpath, func() error {
-				data, err := web.RequestDataWith(web.NewTLS12Client(), imgurl, "GET", "gitcode.net", web.RandUA())
+				data, err := web.RequestDataWith(web.NewTLS12Client(), imgurl, "GET", "gitcode.net", web.RandUA(), nil)
 				if err != nil {
 					return err
 				}
@@ -336,7 +336,7 @@ func poolimg(ctx *zero.Ctx, imgurl, imgname, cache string) (msg message.MessageS
 	}
 	if file.IsNotExist(aimgfile) {
 		var data []byte
-		data, err = web.RequestDataWith(web.NewTLS12Client(), imgurl, "GET", "gitcode.net", web.RandUA())
+		data, err = web.RequestDataWith(web.NewTLS12Client(), imgurl, "GET", "gitcode.net", web.RandUA(), nil)
 		if err != nil {
 			return
 		}

plugin/wangyiyun/main.go

@@ -24,7 +24,7 @@ func init() {
 		Help:             "- 来份网易云热评",
 	}).OnFullMatch("来份网易云热评").SetBlock(true).Limit(ctxext.LimitByUser).
 		Handle(func(ctx *zero.Ctx) {
-			data, err := web.RequestDataWith(web.NewDefaultClient(), wangyiyunURL, "GET", wangyiyunReferer, ua)
+			data, err := web.RequestDataWith(web.NewDefaultClient(), wangyiyunURL, "GET", wangyiyunReferer, ua, nil)
 			if err != nil {
 				ctx.SendChain(message.Text("ERROR: ", err))
 				return