🎨 优化代码结构

* :sparkles:添加查成分功能

* :rotating_light:修lint

* :rotating_light:减少空格

* :bug:修改网址

* :bug:修改vup数量错误问题

* :bug:图片读取不了,就不读了

* 🐛 固定头像大小，bilibilipush调公有库

* 🎨 修改json转换

Co-authored-by: Guohuiyuan <haibaraguo@yeahka.com>

.github/workflows/pull.yml

@@ -25,9 +25,6 @@ jobs:
           # Optional: golangci-lint command line arguments.
           # args: --issues-exit-code=0
 
-          # Optional: if set to true then the action will use pre-installed Go.
-          skip-go-installation: true
-
           # Optional: show only new issues if it's a pull request. The default value is `false`.
           # only-new-issues: true
 

.github/workflows/push.yml

@@ -18,8 +18,6 @@ jobs:
         with:
           version: latest
           args: --issues-exit-code=0
-          # Optional: if set to true then the action will use pre-installed Go.
-          skip-go-installation: true
       - name: Commit back
         continue-on-error: true
         run: |

.golangci.yml

@@ -62,6 +62,7 @@ run:
   tests: false
   skip-dirs:
     - order
+  go: '1.18'
 
 # output configuration options
 output:

README.md

@@ -67,6 +67,7 @@ zerobot [-h] [-t token] [-u url] [-n nickname] [-p prefix] [-d|w] [-g 监听地
     - [x] /服务详情
     - [x] @Bot 插件冲突检测 (会在本群发送一条消息并在约 1s 后撤回以检测其它同类 bot 中已启用的插件并禁用)
 - **定时指令触发器** `import _ "github.com/FloatTech/zbputils/job"`
+    - 注意：触发器具有限速，每 2s 仅允许最多一次触发
     - [x] 记录以"完全匹配关键词"触发的(代表我执行的)指令
     - [x] 取消以"完全匹配关键词"触发的(代表我执行的)指令
     - [x] 记录在"cron"触发的指令
@@ -118,6 +119,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]
@@ -180,6 +183,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"`
@@ -230,6 +234,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检测，务必小心，仅管理可用)
@@ -261,8 +268,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] 发大病
@@ -364,12 +374,12 @@ print("run[CQ:image,file="+j["img"]+"]")
     - api早上8点更新，推荐定时在8点30后。配合插件`job`中的记录在"cron"触发的指令使用
     - [x] /启用 zaobao
     - [x] /禁用 zaobao
-- **舔狗日记** `import _ "github.com/FloatTech/ZeroBot-Plugin/plugin/tiangou"`
-    - [x] 舔狗日记
 ```
 记录在"00 9 * * *"触发的指令
 今日早报
 ```
+- **舔狗日记** `import _ "github.com/FloatTech/ZeroBot-Plugin/plugin/tiangou"`
+    - [x] 舔狗日记
 - **TODO...**
 
 ## 使用方法

go.mod

@@ -3,15 +3,15 @@ module github.com/FloatTech/ZeroBot-Plugin
 go 1.18
 
 require (
-	github.com/FloatTech/AnimeAPI v1.3.2-0.20220319114940-c6c7d308c43b
+	github.com/FloatTech/AnimeAPI v1.3.2-0.20220329082710-181759e71c95
 	github.com/FloatTech/sqlite v0.2.1
-	github.com/FloatTech/zbputils v1.3.2-0.20220326140053-3c3626865d29
+	github.com/FloatTech/zbputils v1.3.2-0.20220329082434-351642935868
 	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.4.0
-	github.com/fumiama/go-registry v0.1.1
+	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
@@ -22,8 +22,8 @@ require (
 	github.com/shirou/gopsutil/v3 v3.22.2
 	github.com/sirupsen/logrus v1.8.1
 	github.com/tidwall/gjson v1.14.0
-	github.com/wdvxdr1123/ZeroBot v1.4.2-0.20220314043738-2ff63b4ac217
-	golang.org/x/image v0.0.0-20220302094943-723b81ca9867
+	github.com/wdvxdr1123/ZeroBot v1.4.2-0.20220326160643-893d4e910785
+	golang.org/x/image v0.0.0-20220321031419-a8550c1d254a
 )
 
 require (
@@ -47,9 +47,9 @@ require (
 	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-20220310020820-b874c991c1a5 // indirect
+	golang.org/x/sys v0.0.0-20220327210214-530d0810a4d0 // indirect
 	golang.org/x/text v0.3.7 // indirect
-	modernc.org/libc v1.14.11 // indirect
+	modernc.org/libc v1.14.12 // indirect
 	modernc.org/mathutil v1.4.1 // indirect
-	modernc.org/memory v1.0.6 // indirect
+	modernc.org/memory v1.0.7 // indirect
 )

go.sum

@@ -1,9 +1,9 @@
-github.com/FloatTech/AnimeAPI v1.3.2-0.20220319114940-c6c7d308c43b h1:lgYo6Q8s9yf/mkb2AeXS2d6mVrzNSLrDKf/FeNM5oxg=
-github.com/FloatTech/AnimeAPI v1.3.2-0.20220319114940-c6c7d308c43b/go.mod h1:VgjXeR2M2wxs43Rmh9/3ybn+gAtzSFRwBmb/rXFEwsM=
+github.com/FloatTech/AnimeAPI v1.3.2-0.20220329082710-181759e71c95 h1:1bNeUwC/oMNEK9Kt9e0S+W1V0c//jlg651ykRKTqH1U=
+github.com/FloatTech/AnimeAPI v1.3.2-0.20220329082710-181759e71c95/go.mod h1:zP2TWTKsYBDZA4gWSDfMdadrXXCxmKwpLs958XeSACk=
 github.com/FloatTech/sqlite v0.2.1 h1:9t6Me48XJJCIoPy4nLRvcdhcVKfT0c2lilp7SEKROG8=
 github.com/FloatTech/sqlite v0.2.1/go.mod h1:6NfHRzqOo9RWeMJEoAQVuo51Omd5LFNxCNQhMF02/9U=
-github.com/FloatTech/zbputils v1.3.2-0.20220326140053-3c3626865d29 h1:+Sk3cj+1xckSJJ/woLAjOzWKu9YpBRGNTUjcT6W7nLQ=
-github.com/FloatTech/zbputils v1.3.2-0.20220326140053-3c3626865d29/go.mod h1:Z4pVG8bHlDgVuPjgPvMyylPOBrroFq6x3a5QSVK1V08=
+github.com/FloatTech/zbputils v1.3.2-0.20220329082434-351642935868 h1:hTAZW9UD80qjx7SuSkSP/LPFvv7VEhs+HtltzZowaAU=
+github.com/FloatTech/zbputils v1.3.2-0.20220329082434-351642935868/go.mod h1:9td8KcHVrvHMoHJZNVkoKyq8906/rmVAhyfvPMgSwCY=
 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=
@@ -33,8 +33,8 @@ github.com/fumiama/cron v1.3.0 h1:ZWlwuexF+HQHl3cYytEE5HNwD99q+3vNZF1GrEiXCFo=
 github.com/fumiama/cron v1.3.0/go.mod h1:bz5Izvgi/xEUI8tlBN8BI2jr9Moo8N4or0KV8xXuPDY=
 github.com/fumiama/go-base16384 v1.4.0 h1:4KrtewnmAChrZjPA7/QYc72t+vvsKF+DYB0q1iRPdpo=
 github.com/fumiama/go-base16384 v1.4.0/go.mod h1:OEn+947GV5gsbTAnyuUW/SrfxJYUdYupSIQXOuGOcXM=
-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/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=
@@ -122,8 +122,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/wdvxdr1123/ZeroBot v1.4.2-0.20220314043738-2ff63b4ac217 h1:mJPi1JVivQ3F9fDZUiGE8pW9ShNct01C8yqBPcbcepI=
-github.com/wdvxdr1123/ZeroBot v1.4.2-0.20220314043738-2ff63b4ac217/go.mod h1:NwXIp7PgjV+kUALMXJ4v4/3QcsRSOodtjhLekuPXFog=
+github.com/wdvxdr1123/ZeroBot v1.4.2-0.20220326160643-893d4e910785 h1:alVsiLOu9H0GCriAkTMqn310izMNEzg9y1Z9FqAV1DY=
+github.com/wdvxdr1123/ZeroBot v1.4.2-0.20220326160643-893d4e910785/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=
@@ -132,10 +132,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-20220314234724-5d542ad81a58 h1:L8CkJyVoa0/NslN3RUMLgasK5+KatNvyRGQ9QyCYAfc=
+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=
@@ -168,8 +168,8 @@ golang.org/x/sys v0.0.0-20211007075335-d3039528d8ac/go.mod h1:oPkhp1MJrh7nUepCBc
 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-20220310020820-b874c991c1a5 h1:y/woIyUBFbpQGKS0u1aHF/40WUDnek3fPOyD08H5Vng=
-golang.org/x/sys v0.0.0-20220310020820-b874c991c1a5/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.0.0-20220327210214-530d0810a4d0 h1:G6WAvvcMaaFYQhMbC0L5ZWNExEcJ3j3yFTxx4mwOHtM=
+golang.org/x/sys v0.0.0-20220327210214-530d0810a4d0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
 golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
 golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
@@ -301,8 +301,8 @@ 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.11 h1:ivxNmUkfp5iSGAGMIjylvx5R53s6QTJW9qUru1yrnk4=
-modernc.org/libc v1.14.11/go.mod h1:l5/Mz/GrZwOqzwRHA3abgSCnSeJzzTl+Ify0bAwKbAw=
+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=
@@ -310,8 +310,9 @@ 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/go.mod h1:B7OYswTRnfGg+4tDH1t1OeUNnsy2viGTdME4tzd+IjM=
-modernc.org/memory v1.0.6 h1:5IaT/LChMrMdxLCy/a4qmb+7SzGiU8/ozPgkEOrfvFw=
 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=

main.go

@@ -73,12 +73,14 @@ import (
 	_ "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"         // 煎蛋网无聊图

plugin/ai_reply/ai_tts.go

@@ -23,20 +23,7 @@ import (
 
 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,6 +40,17 @@ func (t *ttsInstances) List() []string {
 }
 
 func init() {
+	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, order.AcquirePrio(), &control.Options{
 		DisableOnDefault: true,
 		Help: "语音回复(包括拟声鸟和百度)\n" +
@@ -65,19 +63,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 +98,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/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,290 @@
 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/control/order"
+	"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{
 	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_push/bilibili_push.go

@@ -5,8 +5,6 @@ import (
 	"bytes"
 	"encoding/json"
 	"fmt"
-	"io"
-	"net/http"
 	"strconv"
 	"time"
 
@@ -214,7 +212,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:可能被风控了"))
 		}
 	})
 }
@@ -300,20 +298,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

@@ -45,7 +45,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 +57,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/coser/coser.go

@@ -2,6 +2,8 @@
 package coser
 
 import (
+	"regexp"
+
 	"github.com/tidwall/gjson"
 
 	log "github.com/sirupsen/logrus"
@@ -19,6 +21,7 @@ import (
 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() {
@@ -35,7 +38,13 @@ func init() {
 
 			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 +52,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/diana/bing.go

@@ -46,7 +46,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/epidemic/epidemic.go

@@ -63,7 +63,7 @@ func init() {
 			}
 			data, time, err := queryEpidemic(city)
 			if err != nil {
-				ctx.SendChain(message.Text("ERROR: ", err))
+				ctx.SendChain(message.Text("ERROR:", err))
 				return
 			}
 			if data == nil {

plugin/font/main.go

@@ -0,0 +1,43 @@
+// Package font 渲染任意文字到图片
+package font
+
+import (
+	"github.com/FloatTech/zbputils/binary"
+	"github.com/FloatTech/zbputils/control"
+	"github.com/FloatTech/zbputils/control/order"
+	"github.com/FloatTech/zbputils/ctxext"
+	"github.com/FloatTech/zbputils/img/text"
+	zero "github.com/wdvxdr1123/ZeroBot"
+	"github.com/wdvxdr1123/ZeroBot/message"
+)
+
+func init() {
+	control.Register("font", order.AcquirePrio(), &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

@@ -58,15 +58,15 @@ func init() {
 			"- 设置底图[车万 | 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 +75,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 +127,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 +138,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 +157,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/genshin/ys.go

@@ -109,13 +109,13 @@ func randnums(nums int, store storage) (rgba *image.RGBA, err error) {
 		threeN2, fourN2, fiveN2       = 0, 0, 0                                                                      // 抽到 三 , 四, 五星武器的数量
 		hero, stars                   = make([]*zip.File, 0, 10), make([]*zip.File, 0, 10)                           // 角色武器名, 储存星级图标
 
-		cicon                      = make([]*zip.File, 0, 10)                                                            // 元素图标
-		five_bg, four_bg, three_bg = 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"])
+		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次加入一个五星
@@ -168,10 +168,10 @@ func randnums(nums int, store storage) (rgba *image.RGBA, err error) {
 			switch rand.Intn(2) {
 			case 0:
 				fourN++
-				fours = append(fours, filetree["four"][rand.Intn(fourlen)]) //随机角色
+				fours = append(fours, filetree["four"][rand.Intn(fourlen)]) // 随机角色
 			case 1:
 				fourN2++
-				fourArms = append(fourArms, filetree["four2"][rand.Intn(four2len)]) //随机武器
+				fourArms = append(fourArms, filetree["four2"][rand.Intn(four2len)]) // 随机武器
 			}
 		}
 		_ = atomic.AddUint64(&totl, 1)
@@ -207,19 +207,19 @@ func randnums(nums int, store storage) (rgba *image.RGBA, err error) {
 	}
 
 	if fiveN > 0 { // 按顺序加入
-		he(fiveN, 5, starN5, five_bg) // 五星角色
+		he(fiveN, 5, starN5, fivebg) // 五星角色
 	}
 	if fourN > 0 {
-		he(fourN, 3, starN4, four_bg) // 四星角色
+		he(fourN, 3, starN4, fourbg) // 四星角色
 	}
 	if fiveN2 > 0 {
-		he(fiveN2, 4, starN5, five_bg) // 五星武器
+		he(fiveN2, 4, starN5, fivebg) // 五星武器
 	}
 	if fourN2 > 0 {
-		he(fourN2, 2, starN4, four_bg) // 四星武器
+		he(fourN2, 2, starN4, fourbg) // 四星武器
 	}
 	if threeN2 > 0 {
-		he(threeN2, 1, starN3, three_bg) // 三星武器
+		he(threeN2, 1, starN3, threebg) // 三星武器
 	}
 
 	var c1, c2, c3 uint8 = 50, 50, 50 // 背景颜色

plugin/github/repo_searcher.go

@@ -36,12 +36,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 +97,7 @@ func init() { // 插件主体
 }
 
 // notnull 如果传入文本为空，则返回默认值
-//nolint: unparam
+
 func notnull(text, defstr string) string {
 	if text == "" {
 		return defstr

plugin/hs/run.go

@@ -83,7 +83,7 @@ func init() {
 			ctx.Event.GroupID,
 			sk,
 		).Get("message_id").Int(); id == 0 {
-			ctx.SendChain(message.Text("ERROR: 可能被风控了"))
+			ctx.SendChain(message.Text("ERROR:可能被风控了"))
 		}
 	})
 	// 卡组

plugin/hyaku/main.go

@@ -0,0 +1,122 @@
+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/control/order"
+	"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", order.AcquirePrio(), &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

@@ -44,13 +44,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 +62,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/lolicon/lolicon.go

@@ -39,12 +39,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 +65,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

@@ -417,13 +417,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("答对啦~"))

plugin/moyu_calendar/calendar.go

@@ -38,17 +38,17 @@ func init() {
 			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))

plugin/nativesetu/main.go

@@ -51,7 +51,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 +71,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 +81,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 +90,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/novel/qianbi.go

@@ -84,7 +84,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/omikuji/sensou.go

@@ -61,7 +61,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/runcode/code_runner.go

@@ -132,7 +132,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

@@ -36,7 +36,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 {
@@ -91,7 +91,7 @@ func init() { // 插件主体
 			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(
@@ -110,7 +110,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("也许是这个？"),
@@ -126,7 +126,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搜图结果"))}
@@ -147,7 +147,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

@@ -111,7 +111,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 +119,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

@@ -47,14 +47,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数据库")
 	}()
@@ -99,6 +91,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,6 +104,11 @@ func init() {
 			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 := 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

plugin/setutime/setu_geter.go

@@ -86,13 +86,13 @@ 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:可能被风控了"))
 			}
 		})
 
@@ -118,7 +118,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 +159,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 +197,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/shindan/shindan.go

@@ -24,33 +24,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 := 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/tracemoe/moe.go

@@ -29,7 +29,7 @@ func init() { // 插件主体
 			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

@@ -24,7 +24,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

@@ -70,7 +70,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 +78,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 +111,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 +142,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 +177,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/wordle/wordle.go

@@ -8,6 +8,7 @@ import (
 	"math/rand"
 	"sort"
 	"strings"
+	"sync"
 	"time"
 
 	"github.com/FloatTech/zbputils/control"
@@ -53,7 +54,10 @@ 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{
@@ -72,26 +76,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 +120,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 +138,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 +152,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 +161,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

@@ -31,7 +31,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 +54,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

@@ -71,6 +71,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:可能被风控了"))
 	}
 }