🎨 改进代码样式

* feat:添加煎蛋网无聊图

* fix:修lint

* fix:修改model和名称

* fix:删除不要的驱动

* fix:修改日志错误的地方

* fix:修改权限

* fix:去掉数据库

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

README.md

@@ -58,6 +58,8 @@ zerobot [-h] [-t token] [-u url] [-n nickname] [-p prefix] [-d|w] [-g 监听地
     - [x] /还原 xxx (在发送的群/用户还原xxx的开启状态到初始状态)
     - [x] /禁止 service qq1 qq2... (禁止 qqs 使用服务 service)
     - [x] /允许 service qq1 qq2... (重新允许 qqs 使用服务 service)
+    - [x] /封禁 qq1 qq2... (禁止 qqs 使用全部服务)
+    - [x] /解封 qq1 qq2... (允许 qqs 使用全部服务)
     - [x] /用法 xxx
     - [x] /服务列表
     - [x] /服务详情
@@ -147,6 +149,9 @@ zerobot [-h] [-t token] [-u url] [-n nickname] [-p prefix] [-d|w] [-g 监听地
     - [x] 刷新所有本地setu
     - [x] 所有本地setu分类
     - 注：刷新文件夹较慢，请耐心等待刷新完成，会提示“成功”。
+- **nsfw图片识别** `import _ "github.com/FloatTech/ZeroBot-Plugin/plugin_nsfw"`
+    - [x] nsfw打分[图片]
+    - [x] 当图片属于非 neutral 类别时自动发送评价(默认禁用，启用输入 /启用 nsfwauto)
 - **lolicon** `import _ "github.com/FloatTech/ZeroBot-Plugin/plugin_lolicon"`
     - [x] 来份萝莉
 - **搜图** `import _ "github.com/FloatTech/ZeroBot-Plugin/plugin_saucenao"`
@@ -162,6 +167,8 @@ zerobot [-h] [-t token] [-u url] [-n nickname] [-p prefix] [-d|w] [-g 监听地
     - [x] 评价图片(发送一张图片让bot评分)
 - **DeepDanbooru二次元图标签识别** `import _ github.com/FloatTech/ZeroBot-Plugin/plugin_danbooru`
     - [x] 鉴赏图片[图片]
+- **叔叔的AI二次元图片放大** `import _ "github.com/FloatTech/ZeroBot-Plugin/plugin_scale"`
+    - [x] 放大图片[图片]
 - **每日运势** `import _ github.com/FloatTech/ZeroBot-Plugin/plugin_fortune`
     - [x] 运势 | 抽签
     - [x] 设置底图[车万 DC4 爱因斯坦 星空列车 樱云之恋 富婆妹 李清歌 公主连结 原神 明日方舟 碧蓝航线 碧蓝幻想 战双 阴阳师 赛马娘]
@@ -220,6 +227,7 @@ zerobot [-h] [-t token] [-u url] [-n nickname] [-p prefix] [-d|w] [-g 监听地
 - **vtb语录** `import _ "github.com/FloatTech/ZeroBot-Plugin/plugin_vtb_quotation"`
     - [x] vtb语录
     - [x] 随机vtb
+    - [x] 更新vtb
 - **书评** `import _ "github.com/FloatTech/ZeroBot-Plugin/plugin_book_review"`
     - [x] 书评[xxx]
     - [x] 随机书评
@@ -245,7 +253,7 @@ zerobot [-h] [-t token] [-u url] [-n nickname] [-p prefix] [-d|w] [-g 监听地
     - [x] 藏尾诗[xxx]
 - **cp短打** `import _ "github.com/FloatTech/ZeroBot-Plugin/plugin_cpstory"`
     - [x] 组cp[@xxx][@xxx]
-    - [x] 组cp大老师 雪乃
+    - [x] 磕cp大老师 雪乃
 - **签到得分** `import _ "github.com/FloatTech/ZeroBot-Plugin/plugin_score"`
     - [x] 签到
     - [x] 获得签到背景[@xxx] | 获得签到背景
@@ -260,6 +268,11 @@ zerobot [-h] [-t token] [-u url] [-n nickname] [-p prefix] [-d|w] [-g 监听地
     - [x] 推送列表
 - **网易云音乐热评** `import _ "github.com/FloatTech/ZeroBot-Plugin/plugin_wangyiyun"`
     - [x] 来份网易云热评
+- **b站视频链接解析** `import _ "github.com/FloatTech/ZeroBot-Plugin/plugin_bilibili_parse"`
+    - [x] https://www.bilibili.com/video/BV1xx411c7BF | https://www.bilibili.com/video/av1605 | https://b23.tv/I8uzWCA
+- **煎蛋网无聊图** `import _ "github.com/FloatTech/ZeroBot-Plugin/plugin_jandan"`
+    - [x] 来份屌图
+    - [x] 更新屌图
 - **TODO...**
 
 ## 使用方法

go.mod

@@ -3,8 +3,8 @@ module github.com/FloatTech/ZeroBot-Plugin
 go 1.17
 
 require (
-	github.com/FloatTech/AnimeAPI v1.2.4-fix12
-	github.com/FloatTech/zbputils v1.2.4-fix6
+	github.com/FloatTech/AnimeAPI v1.2.5-beta14
+	github.com/FloatTech/zbputils v1.2.5-beta12
 	github.com/antchfx/htmlquery v1.2.4
 	github.com/corona10/goimagehash v1.0.3
 	github.com/fogleman/gg v1.3.0
@@ -19,11 +19,12 @@ require (
 	github.com/shirou/gopsutil/v3 v3.21.12
 	github.com/sirupsen/logrus v1.8.1
 	github.com/tidwall/gjson v1.13.0
-	github.com/wdvxdr1123/ZeroBot v1.4.2-0.20220122162257-bc71c479f3d1
+	github.com/wdvxdr1123/ZeroBot v1.4.2-0.20220208041536-d463c1c92bb4
 	golang.org/x/image v0.0.0-20211028202545-6944b10bf410
 )
 
 require (
+	github.com/RomiChan/websocket v1.4.3-0.20220123145318-307a86b127bc // indirect
 	github.com/antchfx/xpath v1.2.0 // indirect
 	github.com/disintegration/imaging v1.6.2 // indirect
 	github.com/ericpauley/go-quantize v0.0.0-20200331213906-ae555eb2afa4 // indirect
@@ -31,7 +32,6 @@ require (
 	github.com/golang/freetype v0.0.0-20170609003504-e2365dfdc4a0 // indirect
 	github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
 	github.com/google/uuid v1.3.0 // indirect
-	github.com/gorilla/websocket v1.4.2 // indirect
 	github.com/jinzhu/inflection v1.0.0 // indirect
 	github.com/kballard/go-shellquote v0.0.0-20180428030007-95032a82bc51 // indirect
 	github.com/lufia/plan9stats v0.0.0-20211012122336-39d0f177ccd0 // indirect
@@ -48,12 +48,12 @@ require (
 	golang.org/x/net v0.0.0-20220111093109-d55c255bac03 // indirect
 	golang.org/x/sys v0.0.0-20220114195835-da31bd327af9 // indirect
 	golang.org/x/text v0.3.7 // indirect
-	golang.org/x/tools v0.1.8 // indirect
+	golang.org/x/tools v0.1.9 // indirect
 	golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1 // indirect
 	lukechampine.com/uint128 v1.2.0 // indirect
 	modernc.org/cc/v3 v3.35.22 // indirect
-	modernc.org/ccgo/v3 v3.15.12 // indirect
-	modernc.org/libc v1.14.4 // indirect
+	modernc.org/ccgo/v3 v3.15.13 // indirect
+	modernc.org/libc v1.14.5 // indirect
 	modernc.org/mathutil v1.4.1 // indirect
 	modernc.org/memory v1.0.5 // indirect
 	modernc.org/opt v0.1.1 // indirect

go.sum

@@ -1,11 +1,13 @@
-github.com/FloatTech/AnimeAPI v1.2.4-fix12 h1:MtLPKhoSl6DSiR+nz1W1RD2XP1j2iZTZ4MBwijvfURw=
-github.com/FloatTech/AnimeAPI v1.2.4-fix12/go.mod h1:V+cIUIRxFsKniFqC2zfaT+2rhZQ0fIE0K+fWo+0qEpk=
+github.com/FloatTech/AnimeAPI v1.2.5-beta14 h1:CyP0YTrSkXgOAmunr9s5TpVoZxhc5Nrz6tkKv+avUNk=
+github.com/FloatTech/AnimeAPI v1.2.5-beta14/go.mod h1:jsUR1c9voZPgBZybMEZl+LpnOtKZFhN9NZKMvHjbT6M=
 github.com/FloatTech/bot-manager v1.0.0/go.mod h1:8YYRJ16oroGHQGD2En0oVnmcKJkxR9O/jd5BPSfWfOQ=
-github.com/FloatTech/zbputils v1.2.4-fix6 h1:dEoOyYdCg05XhRivLU1CWNBzvzqv2hrJkv+eHXdOO0A=
-github.com/FloatTech/zbputils v1.2.4-fix6/go.mod h1:ZXKT80QiMNZ2EP9Ga69hzjo3PV+NVrS9zZdJ9njNqWE=
+github.com/FloatTech/zbputils v1.2.5-beta12 h1:+MtcwLP5/IaLAX3dMOzHFbv5cNBLlb5BRk2LNFAfEF0=
+github.com/FloatTech/zbputils v1.2.5-beta12/go.mod h1:1j71Sna0RnprP3ywDNTblRzITNYCb2FGN2yxl1G4zg0=
 github.com/Mrs4s/MiraiGo v0.0.0-20211120033824-43b23f4e6fcb h1:Rkj28fqIwGx/EgBzRYtpmJRfH6wqVn7cNdc7aJ0QE4M=
 github.com/Mrs4s/MiraiGo v0.0.0-20211120033824-43b23f4e6fcb/go.mod h1:imVKbfKqqeit+C/eaWGb4MKQ3z3gN6pRpBU5RMtp5so=
 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=
 github.com/andybalholm/cascadia v1.1.0/go.mod h1:GsXiBklL0woXo1j/WYWtSYYC4ouU9PqHO0sqidkEA4Y=
 github.com/antchfx/htmlquery v1.2.4 h1:qLteofCMe/KGovBI6SQgmou2QNyedFUW+pE+BpeZ494=
 github.com/antchfx/htmlquery v1.2.4/go.mod h1:2xO6iu3EVWs7R2JYqBbp8YzG50gj/ofqs5/0VZoDZLc=
@@ -73,7 +75,6 @@ github.com/google/go-cmp v0.5.7/go.mod h1:n+brtR0CgQNWTVd5ZUFpTBC8YFBDLK/h/bpaJ8
 github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg=
 github.com/google/uuid v1.3.0 h1:t6JiXgmwXMjEs8VusXIJk2BXHsn+wx8BZdTaoZ5fu7I=
 github.com/google/uuid v1.3.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
-github.com/gorilla/websocket v1.4.2 h1:+/TMaTYc4QFitKJxsQ7Yye35DkWvkdLcvGKqM+x0Ufc=
 github.com/gorilla/websocket v1.4.2/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE=
 github.com/hpcloud/tail v1.0.0/go.mod h1:ab1qPbhIpdTxEkNHXyeSf5vhxWSCs/tWer42PpOxQnU=
 github.com/jinzhu/gorm v1.9.16 h1:+IyIjPEABKRpsu/F8OvDPy9fyQlgsg2luMV2ZIH5i5o=
@@ -165,8 +166,8 @@ github.com/ugorji/go/codec v1.1.7/go.mod h1:Ax+UKWsSmolVDwsd+7N3ZtXu+yMGCf907BLY
 github.com/ugorji/go/codec v1.2.6/go.mod h1:V6TCNZ4PHqoHGFZuSG1W8nrCzzdgA2DozYxWFFpvxTw=
 github.com/wdvxdr1123/ZeroBot v1.3.2/go.mod h1:i2DIqQjtjE+3gvVi9r9sc+QpNaUuyTXx/HNXXayIpwI=
 github.com/wdvxdr1123/ZeroBot v1.4.1/go.mod h1:7t9m4vDZPwWAmzKlhP6IvUoisOIiqNdm/3AJgiY3+ew=
-github.com/wdvxdr1123/ZeroBot v1.4.2-0.20220122162257-bc71c479f3d1 h1:x56lA0u6hSRpD1YJ/4BDiLydJ8qp5mF50xYS8ZlbkWU=
-github.com/wdvxdr1123/ZeroBot v1.4.2-0.20220122162257-bc71c479f3d1/go.mod h1:7t9m4vDZPwWAmzKlhP6IvUoisOIiqNdm/3AJgiY3+ew=
+github.com/wdvxdr1123/ZeroBot v1.4.2-0.20220208041536-d463c1c92bb4 h1:T/m7vDUFKdLd0xfSZHVPQGaRZ73nwPzidLW7hTn25mg=
+github.com/wdvxdr1123/ZeroBot v1.4.2-0.20220208041536-d463c1c92bb4/go.mod h1:NwXIp7PgjV+kUALMXJ4v4/3QcsRSOodtjhLekuPXFog=
 github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
 github.com/yuin/goldmark v1.4.1/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k=
 github.com/yusufpapurcu/wmi v1.2.2 h1:KBNDSne4vP5mbSWnJbO+51IMOXJB67QiYCSBrubbPRg=
@@ -177,8 +178,8 @@ golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8U
 golang.org/x/crypto v0.0.0-20191205180655-e7c4368fe9dd/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
 golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
 golang.org/x/crypto v0.0.0-20210711020723-a769d52b0f97/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc=
-golang.org/x/crypto v0.0.0-20220112180741-5e0467b6c7ce h1:Roh6XWxHFKrPgC/EQhVubSAGQ6Ozk6IdxHSzt1mR0EI=
-golang.org/x/crypto v0.0.0-20220112180741-5e0467b6c7ce/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4=
+golang.org/x/crypto v0.0.0-20220126234351-aa10faf2a1f8 h1:kACShD3qhmr/3rLmg1yXyt+N4HcwutKyPRB93s54TIU=
+golang.org/x/crypto v0.0.0-20220126234351-aa10faf2a1f8/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4=
 golang.org/x/image v0.0.0-20191009234506-e7c1f5e7dbb8/go.mod h1:FeLwcggjj3mMvU+oOTbSwawSJRM1uh48EjtB4UJZlP0=
 golang.org/x/image v0.0.0-20211028202545-6944b10bf410 h1:hTftEOvwiOq2+O8k2D5/Q7COC7k5Qcrgc2TFURJYnvQ=
 golang.org/x/image v0.0.0-20211028202545-6944b10bf410/go.mod h1:023OzeP/+EPmXeapQh35lcL3II3LrY8Ic+EFFKVhULM=
@@ -223,6 +224,7 @@ golang.org/x/sys v0.0.0-20210902050250-f475640dd07b/go.mod h1:oPkhp1MJrh7nUepCBc
 golang.org/x/sys v0.0.0-20211007075335-d3039528d8ac/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20211013075003-97ac67df715c/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20211019181941-9d821ace8654/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.0.0-20220111092808-5a964db01320/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20220114195835-da31bd327af9 h1:XfKQ4OlFl8okEOr5UvAqFRVj8pY/4yfcXrddB8qAbU0=
 golang.org/x/sys v0.0.0-20220114195835-da31bd327af9/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
@@ -235,8 +237,8 @@ golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ=
 golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
 golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
 golang.org/x/tools v0.0.0-20201124115921-2c860bdd6e78/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA=
-golang.org/x/tools v0.1.8 h1:P1HhGGuLW4aAclzjtmJdf0mJOjVUZUzOTqkAkWL+l6w=
-golang.org/x/tools v0.1.8/go.mod h1:nABZi5QlRsZVlzPpHl034qft6wpY4eDcsTt5AaioBiU=
+golang.org/x/tools v0.1.9 h1:j9KsMiaP1c3B0OTQGth0/k+miLGTgLsAFUCrF2vLcF8=
+golang.org/x/tools v0.1.9/go.mod h1:nABZi5QlRsZVlzPpHl034qft6wpY4eDcsTt5AaioBiU=
 golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
@@ -320,10 +322,12 @@ modernc.org/ccgo/v3 v3.14.0/go.mod h1:hBrkiBlUwvr5vV/ZH9YzXIp982jKE8Ek8tR1ytoAL6
 modernc.org/ccgo/v3 v3.15.1/go.mod h1:md59wBwDT2LznX/OTCPoVS6KIsdRgY8xqQwBV+hkTH0=
 modernc.org/ccgo/v3 v3.15.9/go.mod h1:md59wBwDT2LznX/OTCPoVS6KIsdRgY8xqQwBV+hkTH0=
 modernc.org/ccgo/v3 v3.15.10/go.mod h1:wQKxoFn0ynxMuCLfFD09c8XPUCc8obfchoVR9Cn0fI8=
-modernc.org/ccgo/v3 v3.15.12 h1:wAQ7FSn02pUf0CeGYDK0x2YEBQBWxcOU7vG2/w7ctAM=
 modernc.org/ccgo/v3 v3.15.12/go.mod h1:VFePOWoCd8uDGRJpq/zfJ29D0EVzMSyID8LCMWYbX6I=
-modernc.org/ccorpus v1.11.1 h1:K0qPfpVG1MJh5BYazccnmhywH4zHuOgJXgbjzyp6dWA=
+modernc.org/ccgo/v3 v3.15.13 h1:hqlCzNJTXLrhS70y1PqWckrF9x1btSQRC7JFuQcBg5c=
+modernc.org/ccgo/v3 v3.15.13/go.mod h1:QHtvdpeODlXjdK3tsbpyK+7U9JV4PQsrPGIbtmc0KfY=
 modernc.org/ccorpus v1.11.1/go.mod h1:2gEUTrWqdpH2pXsmTM1ZkjeSrUWDpjMu2T6m29L/ErQ=
+modernc.org/ccorpus v1.11.4 h1:YOmQBBzE8GC/puUx76D5j/gJYIZQsydrh6VMJVfXF0M=
+modernc.org/ccorpus v1.11.4/go.mod h1:2gEUTrWqdpH2pXsmTM1ZkjeSrUWDpjMu2T6m29L/ErQ=
 modernc.org/httpfs v1.0.6 h1:AAgIpFZRXuYnkjftxTAZwMIiwEqAfk8aVB2/oA6nAeM=
 modernc.org/httpfs v1.0.6/go.mod h1:7dosgurJGp0sPaRanU53W4xZYKh14wfzX420oZADeHM=
 modernc.org/libc v1.9.8/go.mod h1:U1eq8YWr/Kc1RWCMFUWEdkTg8OTcfLw2kY8EDwl039w=
@@ -369,8 +373,8 @@ modernc.org/libc v1.13.2/go.mod h1:npFeGWjmZTjFeWALQLrvklVmAxv4m80jnG3+xI8FdJk=
 modernc.org/libc v1.14.1/go.mod h1:npFeGWjmZTjFeWALQLrvklVmAxv4m80jnG3+xI8FdJk=
 modernc.org/libc v1.14.2/go.mod h1:MX1GBLnRLNdvmK9azU9LCxZ5lMyhrbEMK8rG3X/Fe34=
 modernc.org/libc v1.14.3/go.mod h1:GPIvQVOVPizzlqyRX3l756/3ppsAgg1QgPxjr5Q4agQ=
-modernc.org/libc v1.14.4 h1:Sw2GDhSQbQF75VKC6RSd5//QH2gj9TgBzjLNZTW6m00=
-modernc.org/libc v1.14.4/go.mod h1:GPIvQVOVPizzlqyRX3l756/3ppsAgg1QgPxjr5Q4agQ=
+modernc.org/libc v1.14.5 h1:DAHvwGoVRDZs5iJXnX9RJrgXSsorupCWmJ2ac964Owk=
+modernc.org/libc v1.14.5/go.mod h1:2PJHINagVxO4QW/5OQdRrvMYo+bm5ClpUFfyXCYl9ak=
 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=

main.go

@@ -39,6 +39,7 @@ import (
 	_ "github.com/FloatTech/ZeroBot-Plugin/plugin_funny"        // 笑话
 	_ "github.com/FloatTech/ZeroBot-Plugin/plugin_gif"          // 制图
 	_ "github.com/FloatTech/ZeroBot-Plugin/plugin_hs"           // 炉石
+	_ "github.com/FloatTech/ZeroBot-Plugin/plugin_jandan"       // 煎蛋网无聊图
 	_ "github.com/FloatTech/ZeroBot-Plugin/plugin_juejuezi"     // 绝绝子生成器
 	_ "github.com/FloatTech/ZeroBot-Plugin/plugin_minecraft"    // MCSManager
 	_ "github.com/FloatTech/ZeroBot-Plugin/plugin_moyu"         // 摸鱼
@@ -52,7 +53,9 @@ import (
 	_ "github.com/FloatTech/ZeroBot-Plugin/plugin_wangyiyun"    // 网易云音乐热评
 
 	// b站相关
-	_ "github.com/FloatTech/ZeroBot-Plugin/plugin_bilibili" // 查询b站用户信息
+	_ "github.com/FloatTech/ZeroBot-Plugin/plugin_bilibili"       // 查询b站用户信息
+	_ "github.com/FloatTech/ZeroBot-Plugin/plugin_bilibili_parse" // b站视频链接解析
+
 	// _ "github.com/FloatTech/ZeroBot-Plugin/plugin_bilibili_push" // b站推送
 	_ "github.com/FloatTech/ZeroBot-Plugin/plugin_diana" // 嘉心糖发病
 
@@ -65,7 +68,9 @@ import (
 	_ "github.com/FloatTech/ZeroBot-Plugin/plugin_lolicon"       // lolicon 随机图片
 	_ "github.com/FloatTech/ZeroBot-Plugin/plugin_nativesetu"    // 本地涩图
 	_ "github.com/FloatTech/ZeroBot-Plugin/plugin_nativewife"    // 本地老婆
+	_ "github.com/FloatTech/ZeroBot-Plugin/plugin_nsfw"          // nsfw图片识别
 	_ "github.com/FloatTech/ZeroBot-Plugin/plugin_saucenao"      // 以图搜图
+	_ "github.com/FloatTech/ZeroBot-Plugin/plugin_scale"         // 叔叔的AI二次元图片放大
 	_ "github.com/FloatTech/ZeroBot-Plugin/plugin_setutime"      // 来份涩图
 	_ "github.com/FloatTech/ZeroBot-Plugin/plugin_tracemoe"      // 搜番
 	_ "github.com/FloatTech/ZeroBot-Plugin/plugin_vtb_quotation" // vtb语录
@@ -76,12 +81,14 @@ import (
 	zero "github.com/wdvxdr1123/ZeroBot"
 	"github.com/wdvxdr1123/ZeroBot/driver"
 	"github.com/wdvxdr1123/ZeroBot/message"
+
+	"github.com/FloatTech/ZeroBot-Plugin/order"
 )
 
 var (
 	contents = []string{
 		"* OneBot + ZeroBot + Golang",
-		"* Version 1.2.4 - 2022-01-14 20:05:43 +0800 CST",
+		"* Version 1.2.5 - 2022-01-30 20:06:00 +0800 CST",
 		"* Copyright © 2020 - 2021 FloatTech. All Rights Reserved.",
 		"* Project: https://github.com/FloatTech/ZeroBot-Plugin",
 	}
@@ -153,6 +160,7 @@ func getKanban() string {
 }
 
 func main() {
+	order.Wait()
 	printBanner()
 	// 帮助
 	zero.OnFullMatchGroup([]string{"/help", ".help", "菜单"}, zero.OnlyToMe).SetBlock(true).

order/init.go

@@ -0,0 +1,14 @@
+package order
+
+import "sync"
+
+var wg sync.WaitGroup
+
+// DoneOnExit 在退出时执行 Done
+func DoneOnExit() func() {
+	wg.Add(1)
+	return wg.Done
+}
+
+// Wait 等待
+var Wait = wg.Wait

order/prio.go

@@ -12,6 +12,7 @@ const (
 	PrioAIWife
 	PrioBase14
 	PrioBilibili
+	PrioBiliBiliParse
 	PrioBilibiliPush
 	PrioBookReview
 	PrioCangTouShi
@@ -28,6 +29,7 @@ const (
 	PrioGithub
 	PrioHS
 	PrioImageFinder
+	PrioJandan
 	PrioJueJueZi
 	PrioLolicon
 	PrioMinecraft
@@ -37,10 +39,13 @@ const (
 	PrioNativeWife
 	PrioNBNHHSH
 	PrioNovel
+	PrioNSFW
+	PrioNSFWAuto
 	PrioOmikuji
 	PrioReborn
 	PrioRuncode
 	PrioSauceNao
+	PrioScale
 	PrioScore
 	PrioSetuTime
 	PrioShaDiao
@@ -48,10 +53,10 @@ const (
 	PrioTraceMoe
 	PrioTranslation
 	PrioVtbQuotation
+	PrioWangYiYun
 	PrioWtf
 
 	PrioCurse
 	PrioMockingBird
 	PrioAIReply
-        PrioWangYiYun
 )

plugin_acgimage/classify.go

@@ -4,15 +4,13 @@ package acgimage
 import (
 	"net/url"
 	"strings"
-	"time"
 
 	"github.com/FloatTech/AnimeAPI/classify"
-	"github.com/FloatTech/AnimeAPI/imgpool"
 	control "github.com/FloatTech/zbputils/control"
 	"github.com/FloatTech/zbputils/ctxext"
+	"github.com/FloatTech/zbputils/imgpool"
 	"github.com/FloatTech/zbputils/web"
 	zero "github.com/wdvxdr1123/ZeroBot"
-	"github.com/wdvxdr1123/ZeroBot/extension/rate"
 	"github.com/wdvxdr1123/ZeroBot/message"
 
 	"github.com/FloatTech/ZeroBot-Plugin/order"
@@ -29,7 +27,6 @@ var (
 	randapi = "&loli=true&r18=true"
 	msgof   = make(map[int64]message.MessageID)
 	block   = false
-	limit   = rate.NewManager(time.Minute, 5)
 )
 
 func init() { // 插件主体
@@ -41,7 +38,7 @@ func init() { // 插件主体
 			"- 设置随机图片网址[url]\n" +
 			"- 太涩了(撤回最近发的图)\n" +
 			"- 评价图片(发送一张图片让bot评分)",
-	})
+	}).ApplySingle(ctxext.DefaultSingle)
 	engine.OnRegex(`^设置随机图片网址(.*)$`, zero.OnlyPrivate, zero.SuperUserPermission).SetBlock(true).
 		Handle(func(ctx *zero.Ctx) {
 			url := ctx.State["regex_matched"].([]string)[1]
@@ -53,14 +50,10 @@ func init() { // 插件主体
 			}
 		})
 	// 有保护的随机图片
-	engine.OnFullMatch("随机图片", zero.OnlyGroup).SetBlock(true).
+	engine.OnFullMatch("随机图片", zero.OnlyGroup).Limit(ctxext.LimitByUser).SetBlock(true).
 		Handle(func(ctx *zero.Ctx) {
-			if limit.Load(ctx.Event.UserID).Acquire() {
-				class, dhash, comment, _ := classify.Classify(randapi, true)
-				replyClass(ctx, class, dhash, comment, false)
-				return
-			}
-			ctx.SendChain(message.Text("你太快啦!"))
+			class, dhash, comment, _ := classify.Classify(randapi, true)
+			replyClass(ctx, class, dhash, comment, false)
 		})
 	// 直接随机图片，无r18保护，后果自负。如果出r18图可尽快通过发送"太涩了"撤回
 	engine.OnFullMatch("直接随机", ctxext.UserOrGrpAdmin).SetBlock(true).
@@ -89,7 +82,7 @@ func init() { // 插件主体
 			}
 		})
 	// 上传一张图进行评价
-	engine.OnKeywordGroup([]string{"评价图片"}, zero.OnlyPublic, ctxext.CmdMatch, ctxext.MustGiven).SetBlock(true).
+	engine.OnKeywordGroup([]string{"评价图片"}, zero.OnlyGroup, ctxext.CmdMatch, ctxext.MustGiven).SetBlock(true).
 		Handle(func(ctx *zero.Ctx) {
 			ctx.SendChain(message.Text("少女祈祷中..."))
 			for _, url := range ctx.State["image_url"].([]string) {

plugin_ai_reply/main.go

@@ -7,8 +7,8 @@ import (
 
 	"github.com/FloatTech/AnimeAPI/aireply"
 	control "github.com/FloatTech/zbputils/control"
+	"github.com/FloatTech/zbputils/ctxext"
 	zero "github.com/wdvxdr1123/ZeroBot"
-	"github.com/wdvxdr1123/ZeroBot/extension/rate"
 	"github.com/wdvxdr1123/ZeroBot/message"
 
 	"github.com/FloatTech/ZeroBot-Plugin/order"
@@ -21,21 +21,16 @@ const (
 var modes = [...]string{"青云客", "小爱"}
 
 func init() { // 插件主体
-	bucket := rate.NewManager(time.Minute, 20) // 接口回复限速器
 	engine := control.Register(serviceName, order.PrioAIReply, &control.Options{
 		DisableOnDefault: false,
 		Help: "人工智能回复\n" +
 			"- @Bot 任意文本(任意一句话回复)\n- 设置回复模式[青云客  |  小爱]\n- ",
 	})
 	// 回复 @和包括名字
-	engine.OnMessage(zero.OnlyToMe).SetBlock(true).
+	engine.OnMessage(zero.OnlyToMe).SetBlock(true).Limit(ctxext.LimitByUser).
 		Handle(func(ctx *zero.Ctx) {
 			aireply := aireply.NewAIReply(getReplyMode(ctx))
-			if !bucket.Load(ctx.Event.UserID).Acquire() {
-				// 频繁触发，不回复
-				return
-			}
-			reply := aireply.Talk(ctx.ExtractPlainText())
+			reply := message.ParseMessageFromString(aireply.Talk(ctx.ExtractPlainText(), zero.BotConfig.NickName[0]))
 			// 回复
 			time.Sleep(time.Second * 1)
 			if zero.OnlyPublic(ctx) {

plugin_ai_reply/tts.go

@@ -1,32 +1,27 @@
 package aireply
 
 import (
-	"time"
-
 	zero "github.com/wdvxdr1123/ZeroBot"
-	"github.com/wdvxdr1123/ZeroBot/extension/rate"
+	"github.com/wdvxdr1123/ZeroBot/message"
 
 	"github.com/FloatTech/AnimeAPI/aireply"
 	"github.com/FloatTech/AnimeAPI/mockingbird"
 	control "github.com/FloatTech/zbputils/control"
+	"github.com/FloatTech/zbputils/ctxext"
 
 	"github.com/FloatTech/ZeroBot-Plugin/order"
 )
 
 func init() {
-	limit := rate.NewManager(time.Second*10, 1)
-
 	control.Register("mockingbird", order.PrioMockingBird, &control.Options{
 		DisableOnDefault: false,
 		Help:             "拟声鸟\n- @Bot 任意文本(任意一句话回复)",
-	}).OnMessage(zero.OnlyToMe, func(ctx *zero.Ctx) bool {
-		return limit.Load(ctx.Event.UserID).Acquire()
-	}).SetBlock(true).
+	}).OnMessage(zero.OnlyToMe).SetBlock(true).Limit(ctxext.LimitByUser).
 		Handle(func(ctx *zero.Ctx) {
 			msg := ctx.ExtractPlainText()
 			r := aireply.NewAIReply(getReplyMode(ctx))
-			ctx.SendChain(mockingbird.Speak(ctx.Event.UserID, func() string {
-				return r.TalkPlain(msg)
-			}))
+			ctx.SendChain(message.Record(mockingbird.Speak(ctx.Event.UserID, func() string {
+				return r.TalkPlain(msg, zero.BotConfig.NickName[0])
+			})))
 		})
 }

plugin_aiwife/non-existent.go

@@ -7,6 +7,7 @@ import (
 	"time"
 
 	control "github.com/FloatTech/zbputils/control"
+	"github.com/FloatTech/zbputils/ctxext"
 	zero "github.com/wdvxdr1123/ZeroBot"
 	"github.com/wdvxdr1123/ZeroBot/message"
 
@@ -18,14 +19,12 @@ const (
 )
 
 func init() { // 插件主体
-	// TODO: 1.17 特性暂不增加
-	// rand.Seed(time.Now().UnixMicro())
 	rand.Seed(time.Now().UnixNano())
 	control.Register("aiwife", order.PrioAIWife, &control.Options{
 		DisableOnDefault: false,
 		Help: "AIWife\n" +
 			"- waifu | 随机waifu",
-	}).OnFullMatchGroup([]string{"waifu", "随机waifu"}).SetBlock(true).
+	}).ApplySingle(ctxext.DefaultSingle).OnFullMatchGroup([]string{"waifu", "随机waifu"}).SetBlock(true).
 		Handle(func(ctx *zero.Ctx) {
 			miku := rand.Intn(100000) + 1
 			ctx.SendChain(message.At(ctx.Event.UserID), message.Image(fmt.Sprintf(bed, miku)))

plugin_b14/main.go

@@ -20,7 +20,7 @@ func init() {
 		Help: "base16384加解密\n" +
 			"- 加密xxx\n- 解密xxx\n- 用yyy加密xxx\n- 用yyy解密xxx",
 	})
-	en.OnRegex(`^加密(.*)`).SetBlock(true).
+	en.OnRegex(`^加密\s?(.*)`).SetBlock(true).
 		Handle(func(ctx *zero.Ctx) {
 			str := ctx.State["regex_matched"].([]string)[1]
 			es, err := base14.UTF16be2utf8(base14.EncodeString(str))
@@ -30,7 +30,7 @@ func init() {
 				ctx.SendChain(message.Text("加密失败!"))
 			}
 		})
-	en.OnRegex("^解密([\u4e00-\u8e00]*[\u3d01-\u3d06]?)$").SetBlock(true).
+	en.OnRegex(`^解密\s?([一-踀]*[㴁-㴆]?)$`).SetBlock(true).
 		Handle(func(ctx *zero.Ctx) {
 			str := ctx.State["regex_matched"].([]string)[1]
 			es, err := base14.UTF82utf16be(helper.StringToBytes(str))
@@ -40,7 +40,7 @@ func init() {
 				ctx.SendChain(message.Text("解密失败!"))
 			}
 		})
-	en.OnRegex(`^用(.*)加密(.*)`).SetBlock(true).
+	en.OnRegex(`^用(.*)加密\s?(.*)`).SetBlock(true).
 		Handle(func(ctx *zero.Ctx) {
 			key, str := ctx.State["regex_matched"].([]string)[1], ctx.State["regex_matched"].([]string)[2]
 			t := getea(key)
@@ -51,7 +51,7 @@ func init() {
 				ctx.SendChain(message.Text("加密失败!"))
 			}
 		})
-	en.OnRegex("^用(.*)解密([\u4e00-\u8e00]*[\u3d01-\u3d06]?)$").SetBlock(true).
+	en.OnRegex(`^用(.*)解密\s?([一-踀]*[㴁-㴆]?)$`).SetBlock(true).
 		Handle(func(ctx *zero.Ctx) {
 			key, str := ctx.State["regex_matched"].([]string)[1], ctx.State["regex_matched"].([]string)[2]
 			t := getea(key)

plugin_bilibili/info.go

@@ -22,7 +22,7 @@ var engine = control.Register("bilibili", order.PrioBilibili, &control.Options{
 
 // 查成分的
 func init() {
-	engine.OnRegex(`^>user info\s(.{1,25})$`).SetBlock(true).
+	engine.OnRegex(`^>(?:user|vup)\s?info\s?(.{1,25})$`).SetBlock(true).
 		Handle(func(ctx *zero.Ctx) {
 			keyword := ctx.State["regex_matched"].([]string)[1]
 			rest, err := uid(keyword)

plugin_bilibili_parse/bilibili_parse.go

@@ -0,0 +1,66 @@
+// Package bilibiliparse b站视频链接解析
+package bilibiliparse
+
+import (
+	"regexp"
+	"strings"
+
+	"github.com/FloatTech/zbputils/control"
+	"github.com/antchfx/htmlquery"
+	log "github.com/sirupsen/logrus"
+	zero "github.com/wdvxdr1123/ZeroBot"
+	"github.com/wdvxdr1123/ZeroBot/message"
+
+	"github.com/FloatTech/ZeroBot-Plugin/order"
+)
+
+var (
+	bilibiliRe = "https://www.bilibili.com/video/av[0-9]+|https://www.bilibili.com/video/BV[0-9a-zA-Z]+|https://b23.tv/[0-9a-zA-Z]+"
+	validRe    = "https://www.bilibili.com/video/(BV[0-9a-zA-Z]+)"
+)
+
+func init() {
+	engine := control.Register("bilibiliparse", order.PrioBiliBiliParse, &control.Options{
+		DisableOnDefault: false,
+		Help: "b站视频链接解析\n" +
+			"- https://www.bilibili.com/video/BV1xx411c7BF | https://www.bilibili.com/video/av1605 | https://b23.tv/I8uzWCA",
+	})
+
+	engine.OnRegex(bilibiliRe).SetBlock(true).Handle(func(ctx *zero.Ctx) {
+		bilibiliURL := ctx.State["regex_matched"].([]string)[0]
+		m := parseURL(bilibiliURL)
+		if len(m) != 0 {
+			ctx.Send(m)
+		}
+	})
+}
+
+func parseURL(bilibiliURL string) (m message.Message) {
+	doc, err := htmlquery.LoadURL(bilibiliURL)
+	if err != nil {
+		log.Errorln("[bilibiliparse]:访问的链接为", bilibiliURL, ",错误为", err)
+	}
+	videoURL := htmlquery.FindOne(doc, "/html/head/meta[@itemprop='url']").Attr[2].Val
+	re := regexp.MustCompile(validRe)
+	if !re.MatchString(videoURL) {
+		return
+	}
+	bv := re.FindStringSubmatch(videoURL)[1]
+	title := htmlquery.FindOne(doc, "//*[@id='viewbox_report']/h1/span/text()").Data
+	m = append(m, message.Text(title+"\n"))
+	view := htmlquery.FindOne(doc, "//*[@id='viewbox_report']/div/span[@class='view']/text()").Data
+	dm := htmlquery.FindOne(doc, "//*[@id='viewbox_report']/div/span[@class='dm']/text()").Data
+	m = append(m, message.Text(view+dm+"\n"))
+	t := htmlquery.FindOne(doc, "//*[@id='viewbox_report']/div/span[3]/text()").Data
+	m = append(m, message.Text(t))
+	image := htmlquery.FindOne(doc, "/html/head/meta[@itemprop='image']").Attr[2].Val
+	m = append(m, message.Image(image))
+	like := htmlquery.FindOne(doc, "//*[@id='arc_toolbar_report']/div[1]/span[@class='like']/text()").Data
+	coin := htmlquery.FindOne(doc, "//*[@id='arc_toolbar_report']/div[1]/span[@class='coin']/text()").Data
+	m = append(m, message.Text("\n点赞：", strings.TrimSpace(like)+"投币：", strings.TrimSpace(coin)+"\n"))
+	collect := htmlquery.FindOne(doc, "//*[@id='arc_toolbar_report']/div[1]/span[@class='collect']/text()").Data
+	share := htmlquery.FindOne(doc, "//*[@id='arc_toolbar_report']/div[1]/span[@class='share']/text()").Data
+	m = append(m, message.Text("收藏：", strings.TrimSpace(collect)+"分享：", strings.TrimSpace(share)+"\n"))
+	m = append(m, message.Text(bv))
+	return
+}

plugin_bilibili_push/bilibili_push.go

@@ -67,7 +67,7 @@ func init() {
 			"- 推送列表",
 	})
 
-	en.OnRegex(`^添加订阅(\d+)$`, ctxext.UserOrGrpAdmin).SetBlock(true).Handle(func(ctx *zero.Ctx) {
+	en.OnRegex(`^添加订阅\s?(\d+)$`, ctxext.UserOrGrpAdmin).SetBlock(true).Handle(func(ctx *zero.Ctx) {
 		buid, _ := strconv.ParseInt(ctx.State["regex_matched"].([]string)[1], 10, 64)
 		var name string
 		var ok bool
@@ -93,7 +93,7 @@ func init() {
 			ctx.SendChain(message.Text("已添加" + name + "的订阅"))
 		}
 	})
-	en.OnRegex(`^取消订阅(\d+)$`, ctxext.UserOrGrpAdmin).SetBlock(true).Handle(func(ctx *zero.Ctx) {
+	en.OnRegex(`^取消订阅\s?(\d+)$`, ctxext.UserOrGrpAdmin).SetBlock(true).Handle(func(ctx *zero.Ctx) {
 		buid, _ := strconv.ParseInt(ctx.State["regex_matched"].([]string)[1], 10, 64)
 		var name string
 		var ok bool
@@ -119,7 +119,7 @@ func init() {
 			ctx.SendChain(message.Text("已取消" + name + "的订阅"))
 		}
 	})
-	en.OnRegex(`^取消动态订阅(\d+)$`, ctxext.UserOrGrpAdmin).SetBlock(true).Handle(func(ctx *zero.Ctx) {
+	en.OnRegex(`^取消动态订阅\s?(\d+)$`, ctxext.UserOrGrpAdmin).SetBlock(true).Handle(func(ctx *zero.Ctx) {
 		buid, _ := strconv.ParseInt(ctx.State["regex_matched"].([]string)[1], 10, 64)
 		var name string
 		var ok bool
@@ -145,7 +145,7 @@ func init() {
 			ctx.SendChain(message.Text("已取消" + name + "的动态订阅"))
 		}
 	})
-	en.OnRegex(`^取消直播订阅(\d+)$`, ctxext.UserOrGrpAdmin).SetBlock(true).Handle(func(ctx *zero.Ctx) {
+	en.OnRegex(`^取消直播订阅\s?(\d+)$`, ctxext.UserOrGrpAdmin).SetBlock(true).Handle(func(ctx *zero.Ctx) {
 		buid, _ := strconv.ParseInt(ctx.State["regex_matched"].([]string)[1], 10, 64)
 		var name string
 		var ok bool

plugin_bilibili_push/data.go

@@ -5,6 +5,8 @@ import (
 
 	"github.com/FloatTech/zbputils/process"
 	log "github.com/sirupsen/logrus"
+
+	"github.com/FloatTech/ZeroBot-Plugin/order"
 )
 
 const (
@@ -19,6 +21,7 @@ var bdb *bilibilipushdb
 // 加载数据库
 func init() {
 	go func() {
+		defer order.DoneOnExit()()
 		process.SleepAbout1sTo2s()
 		_ = os.MkdirAll(dbpath, 0755)
 		os.RemoveAll(cachePath)

plugin_book_review/book_review.go

@@ -7,7 +7,7 @@ import (
 	"github.com/wdvxdr1123/ZeroBot/message"
 	"github.com/wdvxdr1123/ZeroBot/utils/helper"
 
-	control "github.com/FloatTech/zbputils/control"
+	"github.com/FloatTech/zbputils/control"
 	"github.com/FloatTech/zbputils/txt2img"
 
 	"github.com/FloatTech/ZeroBot-Plugin/order"

plugin_book_review/data.go

@@ -8,6 +8,8 @@ import (
 	"github.com/FloatTech/zbputils/file"
 	"github.com/FloatTech/zbputils/process"
 	"github.com/FloatTech/zbputils/sql"
+
+	"github.com/FloatTech/ZeroBot-Plugin/order"
 )
 
 const dbpath = "data/BookReview/"
@@ -18,6 +20,7 @@ var db = &sql.Sqlite{DBPath: dbfile}
 // 加载数据库
 func init() {
 	go func() {
+		defer order.DoneOnExit()()
 		process.SleepAbout1sTo2s()
 		// os.RemoveAll(dbpath)
 		_ = os.MkdirAll(dbpath, 0755)

plugin_cangtoushi/cangtoushi.go

@@ -37,7 +37,7 @@ func init() {
 		Help: "藏头诗\n" +
 			"- 藏头诗[xxx]\n- 藏尾诗[xxx]",
 	})
-	engine.OnRegex("藏头诗([\u4E00-\u9FA5]{3,10})").SetBlock(true).Handle(func(ctx *zero.Ctx) {
+	engine.OnRegex(`藏头诗\s?([一-龥]{3,10})$`).SetBlock(true).Handle(func(ctx *zero.Ctx) {
 		kw := ctx.State["regex_matched"].([]string)[1]
 		login()
 		data, err := search(kw, "7", "0")
@@ -48,7 +48,7 @@ func init() {
 		ctx.SendChain(message.Text(text))
 	})
 
-	engine.OnRegex("藏尾诗([\u4E00-\u9FA5]{3,10})").SetBlock(true).Handle(func(ctx *zero.Ctx) {
+	engine.OnRegex(`藏尾诗\s?([一-龥]{3,10})$`).SetBlock(true).Handle(func(ctx *zero.Ctx) {
 		kw := ctx.State["regex_matched"].([]string)[1]
 		login()
 		data, err := search(kw, "7", "2")

plugin_chat/data.go

@@ -8,12 +8,15 @@ import (
 
 	"github.com/FloatTech/zbputils/file"
 	"github.com/FloatTech/zbputils/process"
+
+	"github.com/FloatTech/ZeroBot-Plugin/order"
 )
 
 type kimo = map[string]*[]string
 
 func initChatList(postinit func()) {
 	go func() {
+		defer order.DoneOnExit()()
 		process.SleepAbout1sTo2s()
 		_ = os.MkdirAll(dbpath, 0755)
 		data, err := file.GetLazyData(dbfile, true, true)

plugin_chouxianghua/data.go

@@ -8,6 +8,8 @@ import (
 	"github.com/FloatTech/zbputils/file"
 	"github.com/FloatTech/zbputils/process"
 	"github.com/FloatTech/zbputils/sql"
+
+	"github.com/FloatTech/ZeroBot-Plugin/order"
 )
 
 const (
@@ -20,6 +22,7 @@ var db = &sql.Sqlite{DBPath: dbfile}
 // 加载数据库
 func init() {
 	go func() {
+		defer order.DoneOnExit()()
 		process.SleepAbout1sTo2s()
 		// os.RemoveAll(dbpath)
 		_ = os.MkdirAll(dbpath, 0755)

plugin_coser/coser.go

@@ -2,17 +2,15 @@
 package coser
 
 import (
-	"time"
-
 	"github.com/tidwall/gjson"
 
 	log "github.com/sirupsen/logrus"
 	zero "github.com/wdvxdr1123/ZeroBot"
-	"github.com/wdvxdr1123/ZeroBot/extension/rate"
 	"github.com/wdvxdr1123/ZeroBot/message"
 	"github.com/wdvxdr1123/ZeroBot/utils/helper"
 
 	control "github.com/FloatTech/zbputils/control"
+	"github.com/FloatTech/zbputils/ctxext"
 	"github.com/FloatTech/zbputils/web"
 
 	"github.com/FloatTech/ZeroBot-Plugin/order"
@@ -21,19 +19,14 @@ 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"
-	limit    = rate.NewManager(time.Minute, 5)
 )
 
 func init() {
 	control.Register("coser", order.PrioCoser, &control.Options{
 		DisableOnDefault: false,
 		Help:             "三次元小姐姐\n- coser",
-	}).OnFullMatch("coser", zero.OnlyGroup).SetBlock(true).
+	}).ApplySingle(ctxext.DefaultSingle).OnFullMatch("coser", zero.OnlyGroup).SetBlock(true).Limit(ctxext.LimitByGroup).
 		Handle(func(ctx *zero.Ctx) {
-			if !limit.Load(ctx.Event.GroupID).Acquire() {
-				ctx.SendChain(message.Text("请稍后重试0x0..."))
-				return
-			}
 			ctx.SendChain(message.Text("少女祈祷中......"))
 			data, err := web.ReqWith(coserURL, "GET", "", ua)
 			if err != nil {
@@ -48,12 +41,13 @@ func init() {
 					text,
 				))
 			gjson.Get(helper.BytesToString(data), "data.data").ForEach(func(_, value gjson.Result) bool {
-				imgcq := `[CQ:image,file=` + value.String() + `]`
 				m = append(m,
 					message.CustomNode(
 						ctx.Event.Sender.NickName,
 						ctx.Event.UserID,
-						imgcq),
+						[]message.MessageSegment{
+							message.Image(value.String()),
+						}),
 				)
 				return true
 			})

plugin_cpstory/cpstory.go

@@ -17,7 +17,7 @@ import (
 func init() {
 	engine := control.Register("cpstory", order.PrioCPStory, &control.Options{
 		DisableOnDefault: false,
-		Help:             "cp短打\n- 组cp[@xxx][@xxx]\n- 组cp大老师 雪乃",
+		Help:             "cp短打\n- 组cp[@xxx][@xxx]\n- 磕cp大老师 雪乃",
 	})
 	engine.OnRegex("^组cp.*?(\\d+).*?(\\d+)", zero.OnlyGroup).SetBlock(true).Handle(func(ctx *zero.Ctx) {
 		cs := getRandomCpStory()
@@ -29,7 +29,7 @@ func init() {
 		text = strings.ReplaceAll(text, cs.Shou, gong)
 		ctx.SendChain(message.Text(text))
 	})
-	engine.OnPrefix("组cp").SetBlock(true).Handle(func(ctx *zero.Ctx) {
+	engine.OnPrefix("磕cp").SetBlock(true).Handle(func(ctx *zero.Ctx) {
 		cs := getRandomCpStory()
 		params := strings.Split(ctx.State["args"].(string), " ")
 		if len(params) < 2 {

plugin_cpstory/data.go

@@ -8,6 +8,8 @@ import (
 	"github.com/FloatTech/zbputils/file"
 	"github.com/FloatTech/zbputils/process"
 	"github.com/FloatTech/zbputils/sql"
+
+	"github.com/FloatTech/ZeroBot-Plugin/order"
 )
 
 const (
@@ -20,6 +22,7 @@ var db = &sql.Sqlite{DBPath: dbfile}
 // 加载数据库
 func init() {
 	go func() {
+		defer order.DoneOnExit()()
 		process.SleepAbout1sTo2s()
 		// os.RemoveAll(dbpath)
 		_ = os.MkdirAll(dbpath, 0755)

plugin_curse/curse.go

@@ -2,13 +2,11 @@
 package curse
 
 import (
-	"time"
-
 	zero "github.com/wdvxdr1123/ZeroBot"
-	"github.com/wdvxdr1123/ZeroBot/extension/rate"
 	"github.com/wdvxdr1123/ZeroBot/message"
 
 	control "github.com/FloatTech/zbputils/control"
+	"github.com/FloatTech/zbputils/ctxext"
 	"github.com/FloatTech/zbputils/process"
 
 	"github.com/FloatTech/ZeroBot-Plugin/order"
@@ -20,25 +18,18 @@ const (
 )
 
 func init() {
-	limit := rate.NewManager(time.Minute, 30)
 	engine := control.Register("curse", order.PrioCurse, &control.Options{
 		DisableOnDefault: true,
 		Help:             "骂人(求骂,自卫)\n- 骂我\n- 大力骂我",
 	})
 
-	engine.OnFullMatch("骂我").SetBlock(true).Handle(func(ctx *zero.Ctx) {
-		if !limit.Load(ctx.Event.GroupID).Acquire() {
-			return
-		}
+	engine.OnFullMatch("骂我").SetBlock(true).Limit(ctxext.LimitByUser).Handle(func(ctx *zero.Ctx) {
 		process.SleepAbout1sTo2s()
 		text := getRandomCurseByLevel(minLevel).Text
 		ctx.SendChain(message.Reply(ctx.Event.MessageID), message.Text(text))
 	})
 
-	engine.OnFullMatch("大力骂我").SetBlock(true).Handle(func(ctx *zero.Ctx) {
-		if !limit.Load(ctx.Event.GroupID).Acquire() {
-			return
-		}
+	engine.OnFullMatch("大力骂我").SetBlock(true).Limit(ctxext.LimitByUser).Handle(func(ctx *zero.Ctx) {
 		process.SleepAbout1sTo2s()
 		text := getRandomCurseByLevel(maxLevel).Text
 		ctx.SendChain(message.Reply(ctx.Event.MessageID), message.Text(text))

plugin_curse/data.go

@@ -8,6 +8,8 @@ import (
 	"github.com/FloatTech/zbputils/file"
 	"github.com/FloatTech/zbputils/process"
 	"github.com/FloatTech/zbputils/sql"
+
+	"github.com/FloatTech/ZeroBot-Plugin/order"
 )
 
 const (
@@ -22,6 +24,7 @@ var (
 // 加载数据库
 func init() {
 	go func() {
+		defer order.DoneOnExit()()
 		process.SleepAbout1sTo2s()
 		_ = os.MkdirAll(dbpath, 0755)
 		_, err := file.GetLazyData(dbfile, false, true)

plugin_danbooru/main.go

@@ -32,7 +32,7 @@ func init() { // 插件主体
 			"- 鉴赏图片[图片]",
 	})
 	// 上传一张图进行评价
-	engine.OnKeywordGroup([]string{"鉴赏图片"}, zero.OnlyPublic, ctxext.CmdMatch, ctxext.MustGiven).SetBlock(true).
+	engine.OnKeywordGroup([]string{"鉴赏图片"}, zero.OnlyGroup, ctxext.CmdMatch, ctxext.MustGiven).SetBlock(true).
 		Handle(func(ctx *zero.Ctx) {
 			ctx.SendChain(message.Text("少女祈祷中..."))
 			for _, url := range ctx.State["image_url"].([]string) {
@@ -41,7 +41,7 @@ func init() { // 插件主体
 				if err != nil {
 					name = "未知图片"
 				} else {
-					name = r.Title
+					name = r[0].Title
 				}
 				t, err := danbooru.TagURL(name, url)
 				if err != nil {

plugin_diana/data/text.go

@@ -12,6 +12,8 @@ import (
 	"github.com/FloatTech/zbputils/file"
 	"github.com/FloatTech/zbputils/process"
 	"github.com/FloatTech/zbputils/sql"
+
+	"github.com/FloatTech/ZeroBot-Plugin/order"
 )
 
 const (
@@ -28,6 +30,7 @@ type text struct {
 
 func init() {
 	go func() {
+		defer order.DoneOnExit()()
 		process.SleepAbout1sTo2s()
 		err := os.MkdirAll(datapath, 0755)
 		if err != nil {

plugin_fortune/fortune.go

@@ -19,10 +19,10 @@ import (
 	"github.com/wdvxdr1123/ZeroBot/message"
 	"github.com/wdvxdr1123/ZeroBot/utils/helper"
 
-	"github.com/FloatTech/AnimeAPI/imgpool"
 	control "github.com/FloatTech/zbputils/control"
 	"github.com/FloatTech/zbputils/ctxext"
 	"github.com/FloatTech/zbputils/file"
+	"github.com/FloatTech/zbputils/imgpool"
 	"github.com/FloatTech/zbputils/math"
 	"github.com/FloatTech/zbputils/txt2img"
 
@@ -42,7 +42,7 @@ const (
 
 var (
 	// 底图类型列表：车万 DC4 爱因斯坦 星空列车 樱云之恋 富婆妹 李清歌
-	// 				公主连结 原神 明日方舟 碧蓝航线 碧蓝幻想 战双 阴阳师
+	// 				公主连结 原神 明日方舟 碧蓝航线 碧蓝幻想 战双 阴阳师 赛马娘
 	table = [...]string{"车万", "DC4", "爱因斯坦", "星空列车", "樱云之恋", "富婆妹", "李清歌", "公主连结", "原神", "明日方舟", "碧蓝航线", "碧蓝幻想", "战双", "阴阳师", "赛马娘"}
 	// 映射底图与 index
 	index = make(map[string]uint8)
@@ -82,7 +82,7 @@ func init() {
 			"- 运势 | 抽签\n" +
 			"- 设置底图[车万 | DC4 | 爱因斯坦 | 星空列车 | 樱云之恋 | 富婆妹 | 李清歌 | 公主连结 | 原神 | 明日方舟 | 碧蓝航线 | 碧蓝幻想 | 战双 | 阴阳师 | 赛马娘]",
 	})
-	en.OnRegex(`^设置底图(.*)`).SetBlock(true).
+	en.OnRegex(`^设置底图\s?(.*)`).SetBlock(true).
 		Handle(func(ctx *zero.Ctx) {
 			gid := ctx.Event.GroupID
 			if gid <= 0 {

plugin_funny/data.go

@@ -7,6 +7,8 @@ import (
 
 	"github.com/FloatTech/zbputils/file"
 	"github.com/FloatTech/zbputils/process"
+
+	"github.com/FloatTech/ZeroBot-Plugin/order"
 )
 
 type joke struct {
@@ -22,6 +24,7 @@ const (
 // 加载数据库
 func init() {
 	go func() {
+		defer order.DoneOnExit()()
 		process.SleepAbout1sTo2s()
 		_ = os.MkdirAll(dbpath, 0755)
 		_, err := file.GetLazyData(dbfile, false, true)

plugin_funny/laugh.go

@@ -3,10 +3,8 @@ package funny
 
 import (
 	"strings"
-	"time"
 
 	zero "github.com/wdvxdr1123/ZeroBot"
-	"github.com/wdvxdr1123/ZeroBot/extension/rate"
 	"github.com/wdvxdr1123/ZeroBot/message"
 
 	control "github.com/FloatTech/zbputils/control"
@@ -22,15 +20,11 @@ var (
 		Help: "讲个笑话\n" +
 			"- 讲个笑话[@xxx] | 讲个笑话[qq号]",
 	})
-	limit = rate.NewManager(time.Minute, 20)
-	db    = &sql.Sqlite{DBPath: dbfile}
+	db = &sql.Sqlite{DBPath: dbfile}
 )
 
 func init() {
-	engine.OnPrefix("讲个笑话").SetBlock(true).Handle(func(ctx *zero.Ctx) {
-		if !limit.Load(ctx.Event.GroupID).Acquire() {
-			return
-		}
+	engine.OnPrefix("讲个笑话").SetBlock(true).Limit(ctxext.LimitByUser).Handle(func(ctx *zero.Ctx) {
 		// 获取名字
 		name := ctxext.NickName(ctx)
 		var j joke

plugin_gif/run.go

@@ -9,6 +9,7 @@ import (
 	"time"
 
 	control "github.com/FloatTech/zbputils/control"
+	"github.com/FloatTech/zbputils/ctxext"
 	zero "github.com/wdvxdr1123/ZeroBot"
 	"github.com/wdvxdr1123/ZeroBot/message"
 
@@ -32,7 +33,7 @@ func init() { // 插件主体
 	control.Register("gif", order.PrioGIF, &control.Options{
 		DisableOnDefault: false,
 		Help:             "制图\n- " + strings.Join(cmds, "\n- "),
-	}).OnRegex(`^(` + strings.Join(cmds, "|") + `)\D*?(\[CQ:(image\,file=([0-9a-zA-Z]{32}).*|at.+?(\d{5,11}))\].*|(\d+))$`).
+	}).ApplySingle(ctxext.DefaultSingle).OnRegex(`^(` + strings.Join(cmds, "|") + `)\D*?(\[CQ:(image\,file=([0-9a-zA-Z]{32}).*|at.+?(\d{5,11}))\].*|(\d+))$`).
 		SetBlock(true).Handle(func(ctx *zero.Ctx) {
 		c := newContext(ctx.Event.UserID)
 		list := ctx.State["regex_matched"].([]string)

plugin_hs/run.go

@@ -13,6 +13,7 @@ import (
 	"github.com/wdvxdr1123/ZeroBot/utils/helper"
 
 	control "github.com/FloatTech/zbputils/control"
+	"github.com/FloatTech/zbputils/ctxext"
 	"github.com/FloatTech/zbputils/file"
 	"github.com/FloatTech/zbputils/web"
 
@@ -57,7 +58,7 @@ func init() {
 			"- 搜卡[xxxx]\n" +
 			"- [卡组代码xxx]\n" +
 			"- 更多搜卡指令参数：https://hs.fbigame.com/misc/searchhelp",
-	})
+	}).ApplySingle(ctxext.DefaultSingle)
 	engine.OnRegex(`^搜卡(.+)$`).
 		SetBlock(true).Handle(func(ctx *zero.Ctx) {
 		List := ctx.State["regex_matched"].([]string)[1]
@@ -71,7 +72,6 @@ func init() {
 		for i := 0; i < t && i < 5; i++ {
 			cid := gjson.Get(g, `list.`+strconv.Itoa(i)+`.CardID`).String()
 			cachefile := cachedir + cid
-			imgcq := `[CQ:image,file=` + "file:///" + cachefile + `]`
 			if file.IsNotExist(cachefile) {
 				data, err := web.ReqWith(
 					`https://res.fbigame.com/hs/v13/`+cid+`.png?auth_key=`+
@@ -81,7 +81,7 @@ func init() {
 					err = os.WriteFile(cachefile, data, 0644)
 				}
 				if err != nil {
-					imgcq = err.Error()
+					continue
 				}
 			}
 			sk = append(
@@ -89,7 +89,7 @@ func init() {
 				message.CustomNode(
 					zero.BotConfig.NickName[0],
 					ctx.Event.SelfID,
-					imgcq, // 图片
+					[]message.MessageSegment{message.Image("file:///" + cachefile)}, // 图片
 				),
 			)
 		}

plugin_image_finder/keyword.go

@@ -9,9 +9,9 @@ import (
 	"strings"
 	"time"
 
-	"github.com/FloatTech/AnimeAPI/imgpool"
 	control "github.com/FloatTech/zbputils/control"
 	"github.com/FloatTech/zbputils/ctxext"
+	"github.com/FloatTech/zbputils/imgpool"
 	zero "github.com/wdvxdr1123/ZeroBot"
 	"github.com/wdvxdr1123/ZeroBot/message"
 
@@ -69,7 +69,7 @@ func init() {
 		DisableOnDefault: false,
 		Help: "关键字搜图\n" +
 			"- 来张 [xxx]",
-	}).OnRegex(`^来张 (.*)$`, zero.AdminPermission).SetBlock(true).
+	}).OnRegex(`^来张\s?(.*)$`, zero.AdminPermission).SetBlock(true).
 		Handle(func(ctx *zero.Ctx) {
 			keyword := ctx.State["regex_matched"].([]string)[1]
 			soutujson := soutuapi(keyword)

plugin_jandan/data.go

@@ -0,0 +1,52 @@
+package jandan
+
+import (
+	"os"
+	"sync"
+
+	"github.com/FloatTech/zbputils/file"
+	"github.com/FloatTech/zbputils/process"
+	"github.com/FloatTech/zbputils/sql"
+	log "github.com/sirupsen/logrus"
+
+	"github.com/FloatTech/ZeroBot-Plugin/order"
+)
+
+const dbpath = "data/Jandan/"
+const dbfile = dbpath + "pics.db"
+
+var db = &sql.Sqlite{DBPath: dbfile}
+var mu sync.RWMutex
+
+type picture struct {
+	ID  uint64 `db:"id"`
+	URL string `db:"url"`
+}
+
+func getRandomPicture() (u string, err error) {
+	var p picture
+	mu.RLock()
+	err = db.Pick("picture", &p)
+	mu.RUnlock()
+	u = p.URL
+	return
+}
+
+// 加载数据库
+func init() {
+	go func() {
+		defer order.DoneOnExit()()
+		process.SleepAbout1sTo2s()
+		_ = os.MkdirAll(dbpath, 0755)
+		_, _ = file.GetLazyData(dbfile, false, false)
+		err := db.Create("picture", &picture{})
+		if err != nil {
+			panic(err)
+		}
+		n, err := db.Count("picture")
+		if err != nil {
+			panic(err)
+		}
+		log.Printf("[jandan]读取%d张图片", n)
+	}()
+}

plugin_jandan/jandan.go

@@ -0,0 +1,91 @@
+// Package jandan 煎蛋网无聊图
+package jandan
+
+import (
+	"fmt"
+	"hash/crc64"
+	"regexp"
+	"strconv"
+
+	"github.com/FloatTech/zbputils/binary"
+	"github.com/FloatTech/zbputils/control"
+	"github.com/antchfx/htmlquery"
+	"github.com/sirupsen/logrus"
+	zero "github.com/wdvxdr1123/ZeroBot"
+	"github.com/wdvxdr1123/ZeroBot/message"
+
+	"github.com/FloatTech/ZeroBot-Plugin/order"
+)
+
+const (
+	api = "http://jandan.net/pic"
+)
+
+func init() {
+	engine := control.Register("jandan", order.PrioJandan, &control.Options{
+		DisableOnDefault: false,
+		Help:             "煎蛋网无聊图\n- 来份屌图\n- 更新屌图\n",
+	})
+
+	engine.OnFullMatch("来份屌图").SetBlock(true).
+		Handle(func(ctx *zero.Ctx) {
+			u, err := getRandomPicture()
+			if err != nil {
+				ctx.SendChain(message.Text("ERROR:", err))
+				return
+			}
+			ctx.SendChain(message.Image(u))
+		})
+
+	engine.OnFullMatch("更新屌图", zero.SuperUserPermission).SetBlock(true).
+		Handle(func(ctx *zero.Ctx) {
+			ctx.Send("少女更新中...")
+			webpageURL := api
+			doc, err := htmlquery.LoadURL(webpageURL)
+			if err != nil {
+				ctx.SendChain(message.Text("ERROR:", err))
+				return
+			}
+			re := regexp.MustCompile(`\d+`)
+			pageTotal, err := strconv.Atoi(re.FindString(htmlquery.FindOne(doc, "//*[@id='comments']/div[2]/div/span[@class='current-comment-page']/text()").Data))
+			if err != nil {
+				ctx.SendChain(message.Text("ERROR:", err))
+				return
+			}
+		LOOP:
+			for i := 0; i < pageTotal; i++ {
+				logrus.Infoln("[jandan]", fmt.Sprintf("处理第%d/%d页...", i, pageTotal))
+				doc, err = htmlquery.LoadURL(webpageURL)
+				if err != nil {
+					ctx.SendChain(message.Text("ERROR:", err))
+					return
+				}
+				picList, err := htmlquery.QueryAll(doc, "//*[@class='view_img_link']")
+				if err != nil {
+					ctx.SendChain(message.Text("ERROR:", err))
+					return
+				}
+				if len(picList) != 0 {
+					for _, v := range picList {
+						u := "https:" + v.Attr[0].Val
+						i := crc64.Checksum(binary.StringToBytes(u), crc64.MakeTable(crc64.ISO))
+						mu.RLock()
+						ok := db.CanFind("picture", "where id="+strconv.FormatUint(i, 10))
+						mu.RUnlock()
+						if !ok {
+							mu.Lock()
+							db.Insert("picture", &picture{ID: i, URL: u})
+							mu.Unlock()
+						} else {
+							// 开始重复，说明之后都是重复
+							break LOOP
+						}
+					}
+				}
+				if i != pageTotal-1 {
+					webpageURL = "https:" + htmlquery.FindOne(doc, "//*[@id='comments']/div[@class='comments']/div[@class='cp-pagenavi']/a[@class='previous-comment-page']").Attr[1].Val
+				}
+			}
+			ctx.Send("更新完成!")
+		})
+}

plugin_juejuezi/juejuezi.go

@@ -6,13 +6,12 @@ import (
 	"io"
 	"net/http"
 	"strings"
-	"time"
 
 	control "github.com/FloatTech/zbputils/control"
+	"github.com/FloatTech/zbputils/ctxext"
 	log "github.com/sirupsen/logrus"
 	"github.com/tidwall/gjson"
 	zero "github.com/wdvxdr1123/ZeroBot"
-	"github.com/wdvxdr1123/ZeroBot/extension/rate"
 	"github.com/wdvxdr1123/ZeroBot/message"
 	"github.com/wdvxdr1123/ZeroBot/utils/helper"
 
@@ -25,19 +24,12 @@ const (
 	ua          = "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/96.0.4664.110 Safari/537.36"
 )
 
-var (
-	limit = rate.NewManager(time.Minute, 20)
-)
-
 func init() {
 	control.Register("juejuezi", order.PrioJueJueZi, &control.Options{
 		DisableOnDefault: false,
 		Help: "绝绝子生成器\n" +
 			"- 喝奶茶绝绝子 | 绝绝子吃饭",
-	}).OnRegex("[\u4E00-\u9FA5]{0,10}绝绝子[\u4E00-\u9FA5]{0,10}").SetBlock(true).Handle(func(ctx *zero.Ctx) {
-		if !limit.Load(ctx.Event.GroupID).Acquire() {
-			return
-		}
+	}).OnRegex("[\u4E00-\u9FA5]{0,10}绝绝子[\u4E00-\u9FA5]{0,10}").SetBlock(true).Limit(ctxext.LimitByUser).Handle(func(ctx *zero.Ctx) {
 		toDealStr := []rune(strings.ReplaceAll(ctx.ExtractPlainText(), "绝绝子", ""))
 		switch len(toDealStr) {
 		case 0, 1:

plugin_lolicon/lolicon.go

@@ -11,9 +11,9 @@ import (
 	zero "github.com/wdvxdr1123/ZeroBot"
 	"github.com/wdvxdr1123/ZeroBot/message"
 
-	"github.com/FloatTech/AnimeAPI/imgpool"
 	control "github.com/FloatTech/zbputils/control"
 	"github.com/FloatTech/zbputils/ctxext"
+	"github.com/FloatTech/zbputils/imgpool"
 	"github.com/FloatTech/zbputils/math"
 	"github.com/FloatTech/zbputils/process"
 
@@ -34,7 +34,7 @@ func init() {
 		DisableOnDefault: false,
 		Help: "lolicon\n" +
 			"- 来份萝莉",
-	}).OnFullMatch("来份萝莉").SetBlock(true).
+	}).ApplySingle(ctxext.DefaultSingle).OnFullMatch("来份萝莉").SetBlock(true).
 		Handle(func(ctx *zero.Ctx) {
 			go func() {
 				for i := 0; i < math.Min(cap(queue)-len(queue), 2); i++ {

plugin_manager/manager.go

@@ -12,7 +12,6 @@ import (
 
 	"github.com/sirupsen/logrus"
 	zero "github.com/wdvxdr1123/ZeroBot"
-	"github.com/wdvxdr1123/ZeroBot/extension/rate"
 	"github.com/wdvxdr1123/ZeroBot/message"
 
 	control "github.com/FloatTech/zbputils/control"
@@ -57,7 +56,6 @@ const (
 
 var (
 	db    = &sql.Sqlite{DBPath: confile}
-	limit = rate.NewManager(time.Minute*5, 2)
 	clock timer.Clock
 )
 
@@ -68,6 +66,7 @@ var engine = control.Register("manager", order.PrioManager, &control.Options{
 
 func init() { // 插件主体
 	go func() {
+		defer order.DoneOnExit()()
 		process.SleepAbout1sTo2s()
 		_ = os.MkdirAll(datapath, 0755)
 		clock = timer.NewClock(db)
@@ -332,12 +331,8 @@ func init() { // 插件主体
 			ctx.SendChain(message.Text(clock.ListTimers(ctx.Event.GroupID)))
 		})
 	// 随机点名
-	engine.OnFullMatchGroup([]string{"翻牌"}, zero.OnlyGroup).SetBlock(true).
+	engine.OnFullMatchGroup([]string{"翻牌"}, zero.OnlyGroup).SetBlock(true).Limit(ctxext.LimitByUser).
 		Handle(func(ctx *zero.Ctx) {
-			if !limit.Load(ctx.Event.UserID).Acquire() {
-				ctx.SendChain(message.Text("少女祈祷中......"))
-				return
-			}
 			// 无缓存获取群员列表
 			list := ctx.CallAction("get_group_member_list", zero.Params{
 				"group_id": ctx.Event.GroupID,

plugin_music/selecter.go

@@ -12,16 +12,14 @@ import (
 	"time"
 
 	control "github.com/FloatTech/zbputils/control"
+	"github.com/FloatTech/zbputils/ctxext"
 	"github.com/tidwall/gjson"
 	zero "github.com/wdvxdr1123/ZeroBot"
-	"github.com/wdvxdr1123/ZeroBot/extension/rate"
 	"github.com/wdvxdr1123/ZeroBot/message"
 
 	"github.com/FloatTech/ZeroBot-Plugin/order"
 )
 
-var limit = rate.NewManager(time.Minute*3, 5)
-
 func init() {
 	control.Register("music", order.PrioMusic, &control.Options{
 		DisableOnDefault: false,
@@ -30,12 +28,8 @@ func init() {
 			"- 网易点歌[xxx]\n" +
 			"- 酷我点歌[xxx]\n" +
 			"- 酷狗点歌[xxx]",
-	}).OnRegex("^(.{0,2})点歌(.{1,25})$").SetBlock(true).
+	}).OnRegex(`^(.{0,2})点歌\s?(.{1,25})$`).SetBlock(true).Limit(ctxext.LimitByUser).
 		Handle(func(ctx *zero.Ctx) {
-			if !limit.Load(ctx.Event.UserID).Acquire() {
-				ctx.SendChain(message.Text("请稍后重试0x0..."))
-				return
-			}
 			// switch 平台
 			switch ctx.State["regex_matched"].([]string)[1] {
 			case "酷我":

plugin_nativesetu/data.go

@@ -5,6 +5,7 @@ import (
 	"image"
 	"io/fs"
 	"os"
+	"strings"
 	"sync"
 
 	"github.com/corona10/goimagehash"
@@ -15,6 +16,8 @@ import (
 	"github.com/FloatTech/zbputils/file"
 	"github.com/FloatTech/zbputils/process"
 	"github.com/FloatTech/zbputils/sql"
+
+	"github.com/FloatTech/ZeroBot-Plugin/order"
 )
 
 // setuclass holds setus in a folder, which is the class name.
@@ -24,14 +27,11 @@ type setuclass struct {
 	Path  string `db:"path"`  // Path 图片路径
 }
 
-var (
-	setuclasses []string
-	db          = &sql.Sqlite{DBPath: dbfile}
-	mu          sync.RWMutex
-)
+var ns = &nsetu{db: &sql.Sqlite{DBPath: dbfile}}
 
 func init() {
 	go func() {
+		defer order.DoneOnExit()()
 		process.SleepAbout1sTo2s()
 		err := os.MkdirAll(datapath, 0755)
 		if err != nil {
@@ -44,24 +44,32 @@ func init() {
 				logrus.Println("[nsetu] set setu dir to", setupath)
 			}
 		}
-		if file.IsExist(dbfile) {
-			err := db.Open()
-			if err == nil {
-				setuclasses, err = db.ListTables()
-			}
-			if err != nil {
-				logrus.Errorln("[nsetu]", err)
-			}
-		}
 	}()
 }
 
-func scanall(path string) error {
-	setuclasses = nil
+type nsetu struct {
+	db *sql.Sqlite
+	mu sync.RWMutex
+}
+
+func (n *nsetu) List() (l []string) {
+	if file.IsExist(n.db.DBPath) {
+		err := n.db.Open()
+		if err == nil {
+			l, err = n.db.ListTables()
+		}
+		if err != nil {
+			logrus.Errorln("[nsetu]", err)
+		}
+	}
+	return
+}
+
+func (n *nsetu) scanall(path string) error {
 	model := &setuclass{}
 	root := os.DirFS(path)
-	_ = db.Close()
-	_ = os.Remove(dbfile)
+	_ = n.db.Close()
+	_ = os.Remove(n.db.DBPath)
 	return fs.WalkDir(root, ".", func(path string, d fs.DirEntry, err error) error {
 		if err != nil {
 			return err
@@ -69,12 +77,11 @@ func scanall(path string) error {
 		if d.IsDir() {
 			clsn := d.Name()
 			if clsn != "." {
-				mu.Lock()
-				err = db.Create(clsn, model)
-				setuclasses = append(setuclasses, clsn)
-				mu.Unlock()
+				n.mu.Lock()
+				err = n.db.Create(clsn, model)
+				n.mu.Unlock()
 				if err == nil {
-					err = scanclass(root, path, clsn)
+					err = n.scanclass(root, path, clsn)
 					if err != nil {
 						logrus.Errorln("[nsetu]", err)
 						return err
@@ -86,17 +93,21 @@ func scanall(path string) error {
 	})
 }
 
-func scanclass(root fs.FS, path, clsn string) error {
+func (n *nsetu) scanclass(root fs.FS, path, clsn string) error {
 	ds, err := fs.ReadDir(root, path)
 	if err != nil {
 		return err
 	}
-	mu.Lock()
-	_ = db.Truncate(clsn)
-	mu.Unlock()
+	n.mu.Lock()
+	_ = n.db.Truncate(clsn)
+	n.mu.Unlock()
 	for _, d := range ds {
-		if !d.IsDir() {
-			relpath := path + "/" + d.Name()
+		nm := d.Name()
+		ln := strings.ToLower(nm)
+		if !d.IsDir() &&
+			(strings.HasSuffix(ln, ".jpg") || strings.HasSuffix(ln, ".jpeg") ||
+				strings.HasSuffix(ln, ".png") || strings.HasSuffix(ln, ".gif") || strings.HasSuffix(ln, ".webp")) {
+			relpath := path + "/" + nm
 			logrus.Debugln("[nsetu] read", relpath)
 			f, e := fs.ReadFile(root, relpath)
 			if e != nil {
@@ -112,10 +123,10 @@ func scanclass(root fs.FS, path, clsn string) error {
 				return e
 			}
 			dhi := int64(dh.GetHash())
-			logrus.Debugln("[nsetu] insert", d.Name(), "with id", dhi, "into", clsn)
-			mu.Lock()
-			err = db.Insert(clsn, &setuclass{ImgID: dhi, Name: d.Name(), Path: relpath})
-			mu.Unlock()
+			logrus.Debugln("[nsetu] insert", nm, "with id", dhi, "into", clsn)
+			n.mu.Lock()
+			err = n.db.Insert(clsn, &setuclass{ImgID: dhi, Name: nm, Path: relpath})
+			n.mu.Unlock()
 			if err != nil {
 				return err
 			}

plugin_nativesetu/main.go

@@ -36,13 +36,13 @@ func init() {
 			"- 刷新所有本地setu\n" +
 			"- 所有本地setu分类",
 	})
-	engine.OnRegex(`^本地(.*)$`, func(ctx *zero.Ctx) bool { return rule.FirstValueInList(setuclasses)(ctx) }).SetBlock(true).
+	engine.OnRegex(`^本地(.*)$`, rule.FirstValueInList(ns)).SetBlock(true).
 		Handle(func(ctx *zero.Ctx) {
 			imgtype := ctx.State["regex_matched"].([]string)[1]
 			sc := new(setuclass)
-			mu.RLock()
-			err := db.Pick(imgtype, sc)
-			mu.RUnlock()
+			ns.mu.RLock()
+			err := ns.db.Pick(imgtype, sc)
+			ns.mu.RUnlock()
 			if err != nil {
 				ctx.SendChain(message.Text("ERROR: ", err))
 			} else {
@@ -50,10 +50,10 @@ func init() {
 				ctx.SendChain(message.Text(imgtype, ": ", sc.Name, "\n"), message.Image(p))
 			}
 		})
-	engine.OnRegex(`^刷新本地(.*)$`, func(ctx *zero.Ctx) bool { return rule.FirstValueInList(setuclasses)(ctx) }, zero.SuperUserPermission).SetBlock(true).
+	engine.OnRegex(`^刷新本地(.*)$`, rule.FirstValueInList(ns), zero.SuperUserPermission).SetBlock(true).
 		Handle(func(ctx *zero.Ctx) {
 			imgtype := ctx.State["regex_matched"].([]string)[1]
-			err := scanclass(os.DirFS(setupath), imgtype, imgtype)
+			err := ns.scanclass(os.DirFS(setupath), imgtype, imgtype)
 			if err == nil {
 				ctx.SendChain(message.Text("成功！"))
 			} else {
@@ -72,7 +72,7 @@ func init() {
 		})
 	engine.OnFullMatch("刷新所有本地setu", zero.SuperUserPermission).SetBlock(true).
 		Handle(func(ctx *zero.Ctx) {
-			err := scanall(setupath)
+			err := ns.scanall(setupath)
 			if err == nil {
 				ctx.SendChain(message.Text("成功！"))
 			} else {
@@ -82,9 +82,9 @@ func init() {
 	engine.OnFullMatch("所有本地setu分类").SetBlock(true).
 		Handle(func(ctx *zero.Ctx) {
 			msg := "所有本地setu分类"
-			mu.RLock()
-			for i, c := range setuclasses {
-				n, err := db.Count(c)
+			ns.mu.RLock()
+			for i, c := range ns.List() {
+				n, err := ns.db.Count(c)
 				if err == nil {
 					msg += fmt.Sprintf("\n%02d. %s(%d)", i, c, n)
 				} else {
@@ -92,7 +92,7 @@ func init() {
 					logrus.Errorln("[nsetu]", err)
 				}
 			}
-			mu.RUnlock()
+			ns.mu.RUnlock()
 			ctx.SendChain(message.Text(msg))
 		})
 }

plugin_novel/qianbi.go

@@ -9,17 +9,16 @@ import (
 	"net/url"
 	"regexp"
 	"strings"
-	"time"
 
 	"github.com/antchfx/htmlquery"
 	log "github.com/sirupsen/logrus"
 	zero "github.com/wdvxdr1123/ZeroBot"
-	"github.com/wdvxdr1123/ZeroBot/extension/rate"
 	"github.com/wdvxdr1123/ZeroBot/message"
 	"github.com/wdvxdr1123/ZeroBot/utils/helper"
 
 	ub "github.com/FloatTech/zbputils/binary"
 	control "github.com/FloatTech/zbputils/control"
+	"github.com/FloatTech/zbputils/ctxext"
 	"github.com/FloatTech/zbputils/txt2img"
 
 	"github.com/FloatTech/ZeroBot-Plugin/order"
@@ -44,16 +43,11 @@ var (
 		DisableOnDefault: false,
 		Help:             "铅笔小说网搜索\n- 小说[xxx]",
 	})
-	limit = rate.NewManager(time.Minute, 5)
 )
 
 func init() {
-	engine.OnRegex("^小说([\u4E00-\u9FA5A-Za-z0-9]{1,25})$").SetBlock(true).
+	engine.OnRegex("^小说([\u4E00-\u9FA5A-Za-z0-9]{1,25})$").SetBlock(true).Limit(ctxext.LimitByUser).
 		Handle(func(ctx *zero.Ctx) {
-			if !limit.Load(ctx.Event.GroupID).Acquire() {
-				ctx.SendChain(message.Text("请稍后重试0x0..."))
-				return
-			}
 			ctx.SendChain(message.Text("少女祈祷中......"))
 			login(username, password)
 			searchKey := ctx.State["regex_matched"].([]string)[1]

plugin_nsfw/main.go

@@ -0,0 +1,101 @@
+// Package nsfw 图片合规性审查
+package nsfw
+
+import (
+	"github.com/FloatTech/AnimeAPI/nsfw"
+	"github.com/FloatTech/zbputils/control"
+	"github.com/FloatTech/zbputils/ctxext"
+	"github.com/FloatTech/zbputils/process"
+	zero "github.com/wdvxdr1123/ZeroBot"
+	"github.com/wdvxdr1123/ZeroBot/message"
+
+	"github.com/FloatTech/ZeroBot-Plugin/order"
+)
+
+func init() {
+	engine := control.Register("nsfw", order.PrioNSFW, &control.Options{
+		DisableOnDefault: false,
+		Help:             "nsfw图片识别\n- nsfw打分[图片]",
+	}).ApplySingle(ctxext.DefaultSingle)
+	// 上传一张图进行评价
+	engine.OnKeywordGroup([]string{"nsfw打分"}, zero.OnlyGroup, ctxext.CmdMatch, ctxext.MustGiven).SetBlock(true).
+		Handle(func(ctx *zero.Ctx) {
+			url := ctx.State["image_url"].([]string)
+			if len(url) > 0 {
+				ctx.SendChain(message.Text("少女祈祷中..."))
+				p, err := nsfw.Classify(url...)
+				if err != nil {
+					ctx.SendChain(message.Text("ERROR:", err))
+					return
+				}
+				ctx.Send(message.ReplyWithMessage(ctx.Event.MessageID, message.Text(judge(p[0]))))
+			}
+		})
+	en := control.Register("nsfwauto", order.PrioNSFWAuto, &control.Options{
+		DisableOnDefault: true,
+		Help:             "nsfw图片自动识别\n- 当图片属于非 neutral 类别时自动发送评价",
+	})
+	en.OnMessage(ctxext.Exists).SetBlock(false).
+		Handle(func(ctx *zero.Ctx) {
+			url := ctx.State["image_url"].([]string)
+			if len(url) > 0 {
+				process.SleepAbout1sTo2s()
+				p, err := nsfw.Classify(url...)
+				if err != nil {
+					return
+				}
+				process.SleepAbout1sTo2s()
+				autojudge(ctx, p[0])
+			}
+		})
+}
+
+func judge(p nsfw.Picture) string {
+	if p.Neutral > 0.3 {
+		return "普通哦"
+	}
+	c := ""
+	if p.Drawings > 0.3 || p.Neutral < 0.3 {
+		c = "二次元"
+	} else {
+		c = "三次元"
+	}
+	if p.Hentai > 0.3 {
+		c += " hentai"
+	}
+	if p.Porn > 0.3 {
+		c += " porn"
+	}
+	if p.Sexy > 0.3 {
+		c += " hso"
+	}
+	return c
+}
+
+func autojudge(ctx *zero.Ctx, p nsfw.Picture) {
+	if p.Neutral > 0.3 {
+		return
+	}
+	c := ""
+	if p.Drawings > 0.3 {
+		c = "二次元"
+	} else {
+		c = "三次元"
+	}
+	i := 0
+	if p.Hentai > 0.3 {
+		c += " hentai"
+		i++
+	}
+	if p.Porn > 0.3 {
+		c += " porn"
+		i++
+	}
+	if p.Sexy > 0.3 {
+		c += " hso"
+		i++
+	}
+	if i > 0 {
+		ctx.Send(message.ReplyWithMessage(ctx.Event.MessageID, message.Text(c)))
+	}
+}

plugin_omikuji/data.go

@@ -8,6 +8,8 @@ import (
 	"github.com/FloatTech/zbputils/file"
 	"github.com/FloatTech/zbputils/process"
 	"github.com/FloatTech/zbputils/sql"
+
+	"github.com/FloatTech/ZeroBot-Plugin/order"
 )
 
 const (
@@ -19,11 +21,7 @@ var db = &sql.Sqlite{DBPath: dbfile}
 
 func init() {
 	go func() {
-		defer func() {
-			if err := recover(); err != nil {
-				log.Println(err)
-			}
-		}()
+		defer order.DoneOnExit()()
 		process.SleepAbout1sTo2s()
 		_ = os.MkdirAll(dbpath, 0755)
 		_, _ = file.GetLazyData(dbfile, false, true)

plugin_omikuji/sensou.go

@@ -13,6 +13,7 @@ import (
 	"github.com/wdvxdr1123/ZeroBot/utils/helper"
 
 	control "github.com/FloatTech/zbputils/control"
+	"github.com/FloatTech/zbputils/ctxext"
 	"github.com/FloatTech/zbputils/txt2img"
 
 	"github.com/FloatTech/ZeroBot-Plugin/order"
@@ -27,7 +28,7 @@ var (
 		DisableOnDefault: false,
 		Help: "浅草寺求签\n" +
 			"- 求签 | 占卜\n- 解签",
-	})
+	}).ApplySingle(ctxext.DefaultSingle)
 )
 
 func init() { // 插件主体

plugin_reborn/load.go

@@ -9,6 +9,8 @@ import (
 
 	"github.com/FloatTech/zbputils/file"
 	"github.com/FloatTech/zbputils/process"
+
+	"github.com/FloatTech/ZeroBot-Plugin/order"
 )
 
 const (
@@ -27,6 +29,7 @@ var (
 
 func init() {
 	go func() {
+		defer order.DoneOnExit()()
 		process.SleepAbout1sTo2s()
 		err := os.MkdirAll(datapath, 0755)
 		if err != nil {

plugin_runcode/code_runner.go

@@ -10,8 +10,8 @@ import (
 	"time"
 
 	control "github.com/FloatTech/zbputils/control"
+	"github.com/FloatTech/zbputils/ctxext"
 	zero "github.com/wdvxdr1123/ZeroBot"
-	"github.com/wdvxdr1123/ZeroBot/extension/rate"
 	"github.com/wdvxdr1123/ZeroBot/message"
 
 	"github.com/FloatTech/ZeroBot-Plugin/order"
@@ -20,7 +20,6 @@ import (
 )
 
 var (
-	limit     = rate.NewManager(time.Minute*3, 5)
 	templates = map[string]string{
 		"py2":        "print 'Hello World!'",
 		"ruby":       "puts \"Hello World!\";",
@@ -105,46 +104,42 @@ func init() {
 			"JavaScript || TypeScript || PHP || Shell \n" +
 			"Kotlin  || Rust || Erlang || Ruby || Swift \n" +
 			"R || VB || Py2 || Perl || Pascal || Scala",
-	}).OnRegex(`^>runcode\s(.+?)\s([\s\S]+)$`).SetBlock(true).
+	}).ApplySingle(ctxext.DefaultSingle).OnRegex(`^>runcode\s(.+?)\s([\s\S]+)$`).SetBlock(true).Limit(ctxext.LimitByUser).
 		Handle(func(ctx *zero.Ctx) {
-			if !limit.Load(ctx.Event.UserID).Acquire() {
-				ctx.SendChain(message.Text("请稍后重试0x0..."))
+			language := ctx.State["regex_matched"].([]string)[1]
+			language = strings.ToLower(language)
+			if runType, exist := table[language]; !exist {
+				// 不支持语言
+				ctx.SendChain(
+					message.Text("> ", ctx.Event.Sender.NickName, "\n"),
+					message.Text("语言不是受支持的编程语种呢~"),
+				)
 			} else {
-				language := ctx.State["regex_matched"].([]string)[1]
-				language = strings.ToLower(language)
-				if runType, exist := table[language]; !exist {
-					// 不支持语言
+				// 执行运行
+				block := ctx.State["regex_matched"].([]string)[2]
+				block = message.UnescapeCQCodeText(block)
+				if block == "help" {
+					// 输出模板
 					ctx.SendChain(
-						message.Text("> ", ctx.Event.Sender.NickName, "\n"),
-						message.Text("语言不是受支持的编程语种呢~"),
+						message.Text("> ", ctx.Event.Sender.NickName, "  ", language, "-template:\n"),
+						message.Text(
+							">runcode ", language, "\n",
+							templates[language],
+						),
 					)
 				} else {
-					// 执行运行
-					block := ctx.State["regex_matched"].([]string)[2]
-					block = message.UnescapeCQCodeText(block)
-					if block == "help" {
-						// 输出模板
+					if output, err := runCode(block, runType); err != nil {
+						// 运行失败
 						ctx.SendChain(
-							message.Text("> ", ctx.Event.Sender.NickName, "  ", language, "-template:\n"),
-							message.Text(
-								">runcode ", language, "\n",
-								templates[language],
-							),
+							message.Text("> ", ctx.Event.Sender.NickName, "\n"),
+							message.Text("ERROR: ", err),
 						)
 					} else {
-						if output, err := runCode(block, runType); err != nil {
-							// 运行失败
-							ctx.SendChain(
-								message.Text("> ", ctx.Event.Sender.NickName, "\n"),
-								message.Text("ERROR: ", err),
-							)
-						} else {
-							// 运行成功
-							ctx.SendChain(
-								message.Text("> ", ctx.Event.Sender.NickName, "\n"),
-								message.Text(output),
-							)
-						}
+						// 运行成功
+						ctx.SendChain(
+							message.Text("> ", ctx.Event.Sender.NickName, "\n"),
+							message.Text(output),
+						)
 					}
 				}
 			}

plugin_saucenao/searcher.go

@@ -6,12 +6,12 @@ import (
 	"strconv"
 
 	"github.com/FloatTech/AnimeAPI/ascii2d"
-	"github.com/FloatTech/AnimeAPI/imgpool"
 	"github.com/FloatTech/AnimeAPI/pixiv"
 	"github.com/FloatTech/AnimeAPI/saucenao"
 	control "github.com/FloatTech/zbputils/control"
 	"github.com/FloatTech/zbputils/ctxext"
 	"github.com/FloatTech/zbputils/file"
+	"github.com/FloatTech/zbputils/imgpool"
 	"github.com/FloatTech/zbputils/process"
 	"github.com/sirupsen/logrus"
 	zero "github.com/wdvxdr1123/ZeroBot"
@@ -61,7 +61,7 @@ func init() { // 插件主体
 						logrus.Debugln("[sausenao]开始下载", n)
 						filepath, err = illust.DownloadToCache(i, n)
 						if err == nil {
-							f = filepath
+							f = file.BOTPATH + "/" + filepath
 						}
 					}
 					if f != "" {
@@ -97,7 +97,7 @@ func init() { // 插件主体
 			}
 		})
 	// 以图搜图
-	engine.OnKeywordGroup([]string{"以图搜图", "搜索图片", "以图识图"}, ctxext.CmdMatch, ctxext.MustGiven).SetBlock(true).
+	engine.OnKeywordGroup([]string{"以图搜图", "搜索图片", "以图识图"}, zero.OnlyGroup, ctxext.CmdMatch, ctxext.MustGiven).SetBlock(true).
 		Handle(func(ctx *zero.Ctx) {
 			// 开始搜索图片
 			ctx.SendChain(message.Text("少女祈祷中......"))
@@ -109,34 +109,55 @@ func init() { // 插件主体
 					// 返回SauceNAO的结果
 					ctx.SendChain(
 						message.Text("我有把握是这个！"),
-						message.Image(result.Thumbnail),
+						message.Image(result[0].Thumbnail),
 						message.Text(
 							"\n",
-							"相似度：", result.Similarity, "\n",
-							"标题：", result.Title, "\n",
-							"插画ID：", result.PixivID, "\n",
-							"画师：", result.MemberName, "\n",
-							"画师ID：", result.MemberID, "\n",
-							"直链：", "https://pixivel.moe/detail?id=", result.PixivID,
+							"相似度：", result[0].Similarity, "\n",
+							"标题：", result[0].Title, "\n",
+							"插画ID：", result[0].PixivID, "\n",
+							"画师：", result[0].MemberName, "\n",
+							"画师ID：", result[0].MemberID, "\n",
+							"直链：", "https://pixivel.moe/detail?id=", result[0].PixivID,
 						),
 					)
 					continue
 				}
 				if result, err := ascii2d.Ascii2d(pic); err != nil {
 					ctx.SendChain(message.Text("ERROR: ", err))
-				} else {
-					// 返回Ascii2d的结果
-					ctx.SendChain(
-						message.Text(
-							"大概是这个？", "\n",
-							"标题：", result.Title, "\n",
-							"插画ID：", result.Pid, "\n",
-							"画师：", result.UserName, "\n",
-							"画师ID：", result.UserId, "\n",
-							"直链：", "https://pixivel.moe/detail?id=", result.Pid,
-						),
-					)
 					continue
+				} else {
+					var msg message.Message = []message.MessageSegment{
+						message.CustomNode(
+							ctx.Event.Sender.Name(),
+							ctx.Event.UserID,
+							"ascii2d搜图结果",
+						)}
+					for i := 0; i < len(result) && i < 5; i++ {
+						msg = append(
+							msg,
+							message.CustomNode(
+								ctx.Event.Sender.Name(),
+								ctx.Event.UserID,
+								[]message.MessageSegment{
+									message.Image(result[i].Thumb),
+									message.Text(fmt.Sprintf(
+										"标题：%s\n图源：%s\n画师：%s\n画师链接：%s\n图片链接：%s",
+										result[i].Name,
+										result[i].Type,
+										result[i].AuthNm,
+										result[i].Author,
+										result[i].Link,
+									)),
+								},
+							),
+						)
+					}
+					if id := ctx.SendGroupForwardMessage(
+						ctx.Event.GroupID,
+						msg,
+					).Get("message_id").Int(); id == 0 {
+						ctx.SendChain(message.Text("ERROR: 可能被风控了"))
+					}
 				}
 			}
 		})

plugin_scale/main.go

@@ -0,0 +1,104 @@
+// Package scale 叔叔的AI二次元图片放大
+package scale
+
+import (
+	"os"
+	"strconv"
+	"time"
+
+	"github.com/FloatTech/AnimeAPI/nsfw"
+	"github.com/FloatTech/AnimeAPI/scale"
+	"github.com/FloatTech/zbputils/control"
+	"github.com/FloatTech/zbputils/ctxext"
+	"github.com/FloatTech/zbputils/file"
+	zero "github.com/wdvxdr1123/ZeroBot"
+	"github.com/wdvxdr1123/ZeroBot/message"
+
+	"github.com/FloatTech/ZeroBot-Plugin/order"
+)
+
+const cachedir = "data/scale/"
+
+func init() {
+	_ = os.RemoveAll(cachedir)
+	err := os.MkdirAll(cachedir, 0755)
+	if err != nil {
+		panic(err)
+	}
+	engine := control.Register("scale", order.PrioScale, &control.Options{
+		DisableOnDefault: false,
+		Help:             "叔叔的AI二次元图片放大\n- 放大图片[图片]",
+	}).ApplySingle(ctxext.DefaultSingle)
+	// 上传一张图进行评价
+	engine.OnKeywordGroup([]string{"放大图片"}, zero.OnlyGroup, ctxext.CmdMatch, ctxext.MustGiven, getPara).SetBlock(true).
+		Handle(func(ctx *zero.Ctx) {
+			url := ctx.State["image_url"].([]string)
+			if len(url) > 0 {
+				ctx.SendChain(message.Text("少女祈祷中..."))
+				p, err := nsfw.Classify(url[0])
+				if err != nil {
+					ctx.SendChain(message.Text("ERROR:", err))
+					return
+				}
+				if p[0].Drawings < 0.1 || p[0].Neutral > 0.8 {
+					ctx.SendChain(message.Text("请发送二次元图片!"))
+					return
+				}
+				paras := ctx.State["scale_paras"].([2]int)
+				data, err := scale.Get(url[0], paras[0], paras[1], 2)
+				if err != nil {
+					ctx.SendChain(message.Text("ERROR:", err))
+					return
+				}
+				n := cachedir + strconv.Itoa(int(ctx.Event.UserID))
+				f, err := os.Create(n)
+				if err != nil {
+					ctx.SendChain(message.Text("ERROR:", err))
+					return
+				}
+				_, _ = f.Write(data)
+				_ = f.Close()
+				ctx.SendChain(message.Image("file:///" + file.BOTPATH + "/" + n))
+			}
+		})
+}
+
+func getPara(ctx *zero.Ctx) bool {
+	next := zero.NewFutureEvent("message", 999, false, zero.CheckUser(ctx.Event.UserID))
+	recv, cancel := next.Repeat()
+	i := 0
+	paras := [2]int{}
+	ctx.SendChain(message.Text("请输入模型序号\n0.", scale.Models[0], "\n1.", scale.Models[1], "\n2.", scale.Models[2], "\n3.", scale.Models[3], "\n4.", scale.Models[4]))
+	for {
+		select {
+		case <-time.After(time.Second * 120):
+			return false
+		case e := <-recv:
+			msg := e.Message.ExtractPlainText()
+			num, err := strconv.Atoi(msg)
+			if err != nil {
+				ctx.SendChain(message.Text("请输入数字!"))
+				continue
+			}
+			switch i {
+			case 0:
+				if num < 0 || num > 4 {
+					ctx.SendChain(message.Text("模型序号非法!"))
+					continue
+				}
+				paras[0] = num
+				ctx.SendChain(message.Text("请输入放大倍数(2-4)"))
+			case 1:
+				if num < 2 || num > 4 {
+					ctx.SendChain(message.Text("放大倍数非法!"))
+					continue
+				}
+				cancel()
+				paras[1] = num
+				ctx.State["scale_paras"] = paras
+				return true
+			}
+			i++
+		}
+	}
+}

plugin_score/data.go

@@ -8,6 +8,8 @@ import (
 	"github.com/FloatTech/zbputils/file"
 	"github.com/FloatTech/zbputils/process"
 	"github.com/FloatTech/zbputils/txt2img"
+
+	"github.com/FloatTech/ZeroBot-Plugin/order"
 )
 
 const (
@@ -22,6 +24,7 @@ var sdb *scoredb
 // 加载数据库
 func init() {
 	go func() {
+		defer order.DoneOnExit()()
 		process.SleepAbout1sTo2s()
 		_, err := file.GetLazyData(txt2img.BoldFontFile, false, true)
 		if err != nil {

plugin_setutime/setu_geter.go

@@ -2,23 +2,24 @@
 package setutime
 
 import (
+	"errors"
 	"fmt"
+	"os"
 	"strconv"
 	"strings"
 	"sync"
 	"time"
 
-	imagepool "github.com/FloatTech/AnimeAPI/imgpool"
 	"github.com/FloatTech/AnimeAPI/pixiv"
 	control "github.com/FloatTech/zbputils/control"
 	"github.com/FloatTech/zbputils/ctxext"
 	fileutil "github.com/FloatTech/zbputils/file"
+	imagepool "github.com/FloatTech/zbputils/imgpool"
 	"github.com/FloatTech/zbputils/math"
 	"github.com/FloatTech/zbputils/process"
 	"github.com/FloatTech/zbputils/rule"
 	"github.com/FloatTech/zbputils/sql"
 	zero "github.com/wdvxdr1123/ZeroBot"
-	"github.com/wdvxdr1123/ZeroBot/extension/rate"
 	"github.com/wdvxdr1123/ZeroBot/message"
 
 	"github.com/FloatTech/ZeroBot-Plugin/order"
@@ -26,43 +27,48 @@ import (
 
 // Pools 图片缓冲池
 type imgpool struct {
-	Lock  sync.Mutex
-	DB    *sql.Sqlite
-	Path  string
-	Group int64
-	List  []string
-	Max   int
-	Pool  map[string][]*pixiv.Illust
-	Form  int64
+	lock sync.Mutex
+	db   *sql.Sqlite
+	path string
+	max  int
+	pool map[string][]*pixiv.Illust
 }
 
-// NewPoolsCache 返回一个缓冲池对象
-func newPools() *imgpool {
-	cache := &imgpool{
-		DB:    &sql.Sqlite{DBPath: "data/SetuTime/SetuTime.db"},
-		Path:  pixiv.CacheDir,
-		Group: 0,
-		List:  []string{"涩图", "二次元", "风景", "车万"}, // 可以自己加类别，得自己加图片进数据库
-		Max:   10,
-		Pool:  map[string][]*pixiv.Illust{},
-		Form:  0,
+func (p *imgpool) List() (l []string) {
+	var err error
+	l, err = p.db.ListTables()
+	if err != nil {
+		l = []string{"涩图", "二次元", "风景", "车万"}
 	}
-	// 如果数据库不存在则下载
-	_, _ = fileutil.GetLazyData(cache.DB.DBPath, false, false)
-	for i := range cache.List {
-		if err := cache.DB.Create(cache.List[i], &pixiv.Illust{}); err != nil {
-			panic(err)
-		}
-	}
-	return cache
+	return l
 }
 
-var (
-	pool  *imgpool
-	limit = rate.NewManager(time.Minute*1, 5)
-)
+var pool = &imgpool{
+	db:   &sql.Sqlite{DBPath: "data/SetuTime/SetuTime.db"},
+	path: pixiv.CacheDir,
+	max:  10,
+	pool: map[string][]*pixiv.Illust{},
+}
 
 func init() { // 插件主体
+	_ = os.MkdirAll("data/SetuTime", 0755)
+
+	go func() {
+		defer order.DoneOnExit()()
+		process.SleepAbout1sTo2s()
+		// 如果数据库不存在则下载
+		_, _ = fileutil.GetLazyData(pool.db.DBPath, false, false)
+		err := pool.db.Open()
+		if err != nil {
+			panic(err)
+		}
+		for _, imgtype := range pool.List() {
+			if err := pool.db.Create(imgtype, &pixiv.Illust{}); err != nil {
+				panic(err)
+			}
+		}
+	}()
+
 	engine := control.Register("setutime", order.PrioSetuTime, &control.Options{
 		DisableOnDefault: false,
 		Help: "涩图\n" +
@@ -71,30 +77,11 @@ func init() { // 插件主体
 			"- 删除[涩图/二次元/风景/车万][P站图片ID]\n" +
 			"- >setu status",
 	})
-	process.SleepAbout1sTo2s()
-	pool = newPools()
-	engine.OnRegex(`^来份(.*)$`, rule.FirstValueInList(pool.List)).SetBlock(true).
+	engine.OnRegex(`^来份(.*)$`, rule.FirstValueInList(pool)).SetBlock(true).Limit(ctxext.LimitByUser).
 		Handle(func(ctx *zero.Ctx) {
-			if !limit.Load(ctx.Event.UserID).Acquire() {
-				ctx.SendChain(message.Text("请稍后重试0x0..."))
-				return
-			}
 			var imgtype = ctx.State["regex_matched"].([]string)[1]
 			// 补充池子
-			go func() {
-				times := math.Min(pool.Max-pool.size(imgtype), 2)
-				for i := 0; i < times; i++ {
-					illust := &pixiv.Illust{}
-					// 查询出一张图片
-					if err := pool.DB.Pick(imgtype, illust); err != nil {
-						ctx.SendChain(message.Text("ERROR: ", err))
-						continue
-					}
-					// 向缓冲池添加一张图片
-					pool.push(ctx, imgtype, illust)
-					process.SleepAbout1sTo2s()
-				}
-			}()
+			go pool.fill(ctx, imgtype)
 			// 如果没有缓存，阻塞10秒
 			if pool.size(imgtype) == 0 {
 				ctx.SendChain(message.Text("INFO: 正在填充弹药......"))
@@ -105,50 +92,33 @@ func init() { // 插件主体
 				}
 			}
 			// 从缓冲池里抽一张
-			if id := ctx.SendChain(message.Image(file(pool.pop(imgtype)))); id.ID() == 0 {
+			if id := ctx.SendChain(message.Image(pool.popfile(imgtype))); id.ID() == 0 {
 				ctx.SendChain(message.Text("ERROR: 可能被风控了"))
 			}
 		})
 
-	engine.OnRegex(`^添加(.*?)(\d+)$`, rule.FirstValueInList(pool.List), zero.SuperUserPermission).SetBlock(true).
+	engine.OnRegex(`^添加(.*?)(\d+)$`, zero.SuperUserPermission).SetBlock(true).
 		Handle(func(ctx *zero.Ctx) {
 			var (
 				imgtype = ctx.State["regex_matched"].([]string)[1]
 				id, _   = strconv.ParseInt(ctx.State["regex_matched"].([]string)[2], 10, 64)
 			)
-			ctx.SendChain(message.Text("少女祈祷中......"))
-			// 查询P站插图信息
-			illust, err := pixiv.Works(id)
+			err := pool.add(ctx, imgtype, id)
 			if err != nil {
-				ctx.SendChain(message.Text("ERROR: ", err))
+				ctx.SendChain(message.Text("ERROR:", err))
 				return
 			}
-			// 下载插画
-			if _, err := illust.DownloadToCache(0, strconv.FormatInt(id, 10)+"_p0"); err != nil {
-				ctx.SendChain(message.Text("ERROR: ", err))
-				return
-			}
-			// 发送到发送者
-			if id := ctx.SendChain(message.Image(file(illust))); id.ID() == 0 {
-				ctx.SendChain(message.Text("ERROR: 可能被风控，发送失败"))
-				return
-			}
-			// 添加插画到对应的数据库table
-			if err := pool.DB.Insert(imgtype, illust); err != nil {
-				ctx.SendChain(message.Text("ERROR: ", err))
-				return
-			}
-			ctx.SendChain(message.Text("添加成功"))
+			ctx.SendChain(message.Text("成功向分类", imgtype, "添加图片", id))
 		})
 
-	engine.OnRegex(`^删除(.*?)(\d+)$`, rule.FirstValueInList(pool.List), zero.SuperUserPermission).SetBlock(true).
+	engine.OnRegex(`^删除(.*?)(\d+)$`, rule.FirstValueInList(pool), zero.SuperUserPermission).SetBlock(true).
 		Handle(func(ctx *zero.Ctx) {
 			var (
 				imgtype = ctx.State["regex_matched"].([]string)[1]
 				id, _   = strconv.ParseInt(ctx.State["regex_matched"].([]string)[2], 10, 64)
 			)
 			// 查询数据库
-			if err := pool.DB.Del(imgtype, fmt.Sprintf("WHERE pid=%d", id)); err != nil {
+			if err := pool.remove(imgtype, id); err != nil {
 				ctx.SendChain(message.Text("ERROR: ", err))
 				return
 			}
@@ -159,13 +129,13 @@ func init() { // 插件主体
 	engine.OnFullMatchGroup([]string{">setu status"}).SetBlock(true).
 		Handle(func(ctx *zero.Ctx) {
 			state := []string{"[SetuTime]"}
-			for i := range pool.List {
-				num, err := pool.DB.Count(pool.List[i])
+			for _, imgtype := range pool.List() {
+				num, err := pool.db.Count(imgtype)
 				if err != nil {
 					num = 0
 				}
 				state = append(state, "\n")
-				state = append(state, pool.List[i])
+				state = append(state, imgtype)
 				state = append(state, ": ")
 				state = append(state, fmt.Sprintf("%d", num))
 			}
@@ -175,16 +145,9 @@ func init() { // 插件主体
 
 // size 返回缓冲池指定类型的现有大小
 func (p *imgpool) size(imgtype string) int {
-	return len(p.Pool[imgtype])
+	return len(p.pool[imgtype])
 }
 
-/*
-// isFull 返回缓冲池指定类型是否已满
-func (p *imgpool) isFull(imgtype string) bool {
-	return len(p.Pool[imgtype]) >= p.Max
-}*/
-
-// push 向缓冲池插入一张图片
 func (p *imgpool) push(ctx *zero.Ctx, imgtype string, illust *pixiv.Illust) {
 	u := illust.ImageUrls[0]
 	n := u[strings.LastIndex(u, "/")+1 : len(u)-4]
@@ -199,31 +162,30 @@ func (p *imgpool) push(ctx *zero.Ctx, imgtype string, illust *pixiv.Illust) {
 		m.SetFile(fileutil.BOTPATH + "/" + f)
 		_, _ = m.Push(ctxext.SendToSelf(ctx), ctxext.GetMessage(ctx))
 	}
-	p.Lock.Lock()
-	p.Pool[imgtype] = append(p.Pool[imgtype], illust)
-	p.Lock.Unlock()
+	p.lock.Lock()
+	p.pool[imgtype] = append(p.pool[imgtype], illust)
+	p.lock.Unlock()
 }
 
-// Push 在缓冲池拿出一张图片
 func (p *imgpool) pop(imgtype string) (illust *pixiv.Illust) {
-	p.Lock.Lock()
-	defer p.Lock.Unlock()
+	p.lock.Lock()
+	defer p.lock.Unlock()
 	if p.size(imgtype) == 0 {
 		return
 	}
-	illust = p.Pool[imgtype][0]
-	p.Pool[imgtype] = p.Pool[imgtype][1:]
+	illust = p.pool[imgtype][0]
+	p.pool[imgtype] = p.pool[imgtype][1:]
 	return
 }
 
-func file(i *pixiv.Illust) string {
+func (p *imgpool) file(i *pixiv.Illust) string {
 	u := i.ImageUrls[0]
 	m, err := imagepool.GetImage(u[strings.LastIndex(u, "/")+1 : len(u)-4])
 	if err == nil {
 		return m.String()
 	}
 	filename := fmt.Sprint(i.Pid) + "_p0"
-	filepath := fileutil.BOTPATH + `/` + pool.Path + filename
+	filepath := fileutil.BOTPATH + `/` + p.path + filename
 	if fileutil.IsExist(filepath + ".jpg") {
 		return `file:///` + filepath + ".jpg"
 	}
@@ -235,3 +197,52 @@ func file(i *pixiv.Illust) string {
 	}
 	return ""
 }
+
+func (p *imgpool) popfile(imgtype string) string {
+	return p.file(p.pop(imgtype))
+}
+
+// fill 补充池子
+func (p *imgpool) fill(ctx *zero.Ctx, imgtype string) {
+	times := math.Min(p.max-p.size(imgtype), 2)
+	for i := 0; i < times; i++ {
+		illust := &pixiv.Illust{}
+		// 查询出一张图片
+		if err := p.db.Pick(imgtype, illust); err != nil {
+			ctx.SendChain(message.Text("ERROR: ", err))
+			continue
+		}
+		// 向缓冲池添加一张图片
+		p.push(ctx, imgtype, illust)
+		process.SleepAbout1sTo2s()
+	}
+}
+
+func (p *imgpool) add(ctx *zero.Ctx, imgtype string, id int64) error {
+	if err := p.db.Create(imgtype, &pixiv.Illust{}); err != nil {
+		return err
+	}
+	ctx.SendChain(message.Text("少女祈祷中......"))
+	// 查询P站插图信息
+	illust, err := pixiv.Works(id)
+	if err != nil {
+		return err
+	}
+	// 下载插画
+	if _, err := illust.DownloadToCache(0, strconv.FormatInt(id, 10)+"_p0"); err != nil {
+		return err
+	}
+	// 发送到发送者
+	if id := ctx.SendChain(message.Image(p.file(illust))); id.ID() == 0 {
+		return errors.New("可能被风控，发送失败")
+	}
+	// 添加插画到对应的数据库table
+	if err := p.db.Insert(imgtype, illust); err != nil {
+		return err
+	}
+	return nil
+}
+
+func (p *imgpool) remove(imgtype string, id int64) error {
+	return p.db.Del(imgtype, fmt.Sprintf("WHERE pid=%d", id))
+}

plugin_shadiao/caihongpi.go

@@ -5,14 +5,12 @@ import (
 	"github.com/wdvxdr1123/ZeroBot/message"
 	"github.com/wdvxdr1123/ZeroBot/utils/helper"
 
+	"github.com/FloatTech/zbputils/ctxext"
 	"github.com/FloatTech/zbputils/web"
 )
 
 func init() {
-	engine.OnFullMatch("哄我").SetBlock(true).Handle(func(ctx *zero.Ctx) {
-		if !limit.Load(ctx.Event.GroupID).Acquire() {
-			return
-		}
+	engine.OnFullMatch("哄我").SetBlock(true).Limit(ctxext.LimitByUser).Handle(func(ctx *zero.Ctx) {
 		data, err := web.ReqWith(chpURL, "GET", chpReferer, ua)
 		if err != nil {
 			ctx.SendChain(message.Text("ERROR:", err))

plugin_shadiao/dujitang.go

@@ -5,14 +5,12 @@ import (
 	"github.com/wdvxdr1123/ZeroBot/message"
 	"github.com/wdvxdr1123/ZeroBot/utils/helper"
 
+	"github.com/FloatTech/zbputils/ctxext"
 	"github.com/FloatTech/zbputils/web"
 )
 
 func init() {
-	engine.OnFullMatch("来碗毒鸡汤").SetBlock(true).Handle(func(ctx *zero.Ctx) {
-		if !limit.Load(ctx.Event.GroupID).Acquire() {
-			return
-		}
+	engine.OnFullMatch("来碗毒鸡汤").SetBlock(true).Limit(ctxext.LimitByUser).Handle(func(ctx *zero.Ctx) {
 		data, err := web.ReqWith(duURL, "GET", duReferer, ua)
 		if err != nil {
 			ctx.SendChain(message.Text("ERROR:", err))

plugin_shadiao/pengyouquan.go

@@ -5,14 +5,12 @@ import (
 	"github.com/wdvxdr1123/ZeroBot/message"
 	"github.com/wdvxdr1123/ZeroBot/utils/helper"
 
+	"github.com/FloatTech/zbputils/ctxext"
 	"github.com/FloatTech/zbputils/web"
 )
 
 func init() {
-	engine.OnFullMatch("发个朋友圈").SetBlock(true).Handle(func(ctx *zero.Ctx) {
-		if !limit.Load(ctx.Event.GroupID).Acquire() {
-			return
-		}
+	engine.OnFullMatch("发个朋友圈").SetBlock(true).Limit(ctxext.LimitByUser).Handle(func(ctx *zero.Ctx) {
 		data, err := web.ReqWith(pyqURL, "GET", pyqReferer, ua)
 		if err != nil {
 			ctx.SendChain(message.Text("ERROR:", err))

plugin_shadiao/shadiao.go

@@ -2,10 +2,7 @@
 package shadiao
 
 import (
-	"time"
-
 	control "github.com/FloatTech/zbputils/control"
-	"github.com/wdvxdr1123/ZeroBot/extension/rate"
 
 	"github.com/FloatTech/ZeroBot-Plugin/order"
 )
@@ -31,5 +28,4 @@ var (
 		Help: "沙雕app\n" +
 			"- 哄我\n- 渣我\n- 来碗绿茶\n- 发个朋友圈\n- 来碗毒鸡汤\n- 讲个段子",
 	})
-	limit = rate.NewManager(time.Minute, 60)
 )

plugin_shadiao/sweetnothings.go

@@ -6,14 +6,12 @@ import (
 	"github.com/wdvxdr1123/ZeroBot/message"
 	"github.com/wdvxdr1123/ZeroBot/utils/helper"
 
+	"github.com/FloatTech/zbputils/ctxext"
 	"github.com/FloatTech/zbputils/web"
 )
 
 func init() {
-	engine.OnFullMatch("来碗绿茶").SetBlock(true).Handle(func(ctx *zero.Ctx) {
-		if !limit.Load(ctx.Event.GroupID).Acquire() {
-			return
-		}
+	engine.OnFullMatch("来碗绿茶").SetBlock(true).Limit(ctxext.LimitByUser).Handle(func(ctx *zero.Ctx) {
 		data, err := web.ReqWith(chayiURL, "GET", loveliveReferer, ua)
 		if err != nil {
 			ctx.SendChain(message.Text("ERROR:", err))
@@ -23,10 +21,7 @@ func init() {
 		ctx.SendChain(message.Reply(ctx.Event.MessageID), message.Text(text))
 	})
 
-	engine.OnFullMatch("渣我").SetBlock(true).Handle(func(ctx *zero.Ctx) {
-		if !limit.Load(ctx.Event.GroupID).Acquire() {
-			return
-		}
+	engine.OnFullMatch("渣我").SetBlock(true).Limit(ctxext.LimitByUser).Handle(func(ctx *zero.Ctx) {
 		data, err := web.ReqWith(ganhaiURL, "GET", loveliveReferer, ua)
 		if err != nil {
 			ctx.SendChain(message.Text("ERROR:", err))

plugin_shadiao/yduanzi.go

@@ -8,14 +8,12 @@ import (
 	"github.com/wdvxdr1123/ZeroBot/message"
 	"github.com/wdvxdr1123/ZeroBot/utils/helper"
 
+	"github.com/FloatTech/zbputils/ctxext"
 	"github.com/FloatTech/zbputils/web"
 )
 
 func init() {
-	engine.OnFullMatch("讲个段子").SetBlock(true).Handle(func(ctx *zero.Ctx) {
-		if !limit.Load(ctx.Event.GroupID).Acquire() {
-			return
-		}
+	engine.OnFullMatch("讲个段子").SetBlock(true).Limit(ctxext.LimitByUser).Handle(func(ctx *zero.Ctx) {
 		data, err := web.ReqWith(yduanziURL, "POST", yduanziReferer, ua)
 		if err != nil {
 			ctx.SendChain(message.Text("ERROR:", err))

plugin_shindan/shindan.go

@@ -2,12 +2,9 @@
 package shindan
 
 import (
-	"time"
-
 	"github.com/FloatTech/AnimeAPI/shindanmaker"
 	log "github.com/sirupsen/logrus"
 	zero "github.com/wdvxdr1123/ZeroBot"
-	"github.com/wdvxdr1123/ZeroBot/extension/rate"
 	"github.com/wdvxdr1123/ZeroBot/message"
 	"github.com/wdvxdr1123/ZeroBot/utils/helper"
 
@@ -18,11 +15,6 @@ import (
 	"github.com/FloatTech/zbputils/txt2img"
 )
 
-var (
-	// 限制调用频率
-	limit = rate.NewManager(time.Minute*5, 5)
-)
-
 func init() {
 	engine := control.Register("shindan", order.PrioShinDan, &control.Options{
 		DisableOnDefault: false,
@@ -32,18 +24,14 @@ func init() {
 			"- 卖萌[@xxx]\n" +
 			"- 抽老婆[@xxx]",
 	})
-	engine.OnPrefix("异世界转生", number(587874)).SetBlock(true).Handle(handle)
-	engine.OnPrefix("今天是什么少女", number(162207)).SetBlock(true).Handle(handle)
-	engine.OnPrefix("卖萌", number(360578)).SetBlock(true).Handle(handle)
-	engine.OnPrefix("抽老婆", number(1075116)).SetBlock(true).Handle(handle)
+	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)
 }
 
 // shindanmaker 处理函数
 func handle(ctx *zero.Ctx) {
-	if !limit.Load(ctx.Event.UserID).Acquire() {
-		ctx.SendChain(message.Text("请稍后重试0x0..."))
-		return
-	}
 	// 获取名字
 	name := ctxext.NickName(ctx)
 	// 调用接口

plugin_sleep_manage/data.go

@@ -3,20 +3,15 @@ package sleepmanage
 import (
 	"os"
 
-	log "github.com/sirupsen/logrus"
-
 	"github.com/FloatTech/zbputils/process"
 
+	"github.com/FloatTech/ZeroBot-Plugin/order"
 	"github.com/FloatTech/ZeroBot-Plugin/plugin_sleep_manage/model"
 )
 
 func init() {
 	go func() {
-		defer func() {
-			if err := recover(); err != nil {
-				log.Println(err)
-			}
-		}()
+		defer order.DoneOnExit()()
 		process.SleepAbout1sTo2s()
 		_ = os.MkdirAll(dbpath, 0755)
 		model.Initialize(dbfile)

plugin_translation/tl.go

@@ -6,23 +6,18 @@ import (
 	"fmt"
 	"io/ioutil"
 	"net/http"
-	"time"
 
 	"github.com/tidwall/gjson"
 	zero "github.com/wdvxdr1123/ZeroBot"
-	"github.com/wdvxdr1123/ZeroBot/extension/rate"
 	"github.com/wdvxdr1123/ZeroBot/message"
 
 	control "github.com/FloatTech/zbputils/control"
+	"github.com/FloatTech/zbputils/ctxext"
 	"github.com/FloatTech/zbputils/process"
 
 	"github.com/FloatTech/ZeroBot-Plugin/order"
 )
 
-var (
-	bucket = rate.NewManager(time.Minute, 20) // 接口回复
-)
-
 func tl(d string) ([]byte, error) {
 	url := "https://api.cloolc.club/fanyi?data=" + d
 	resp, err := http.Get(url)
@@ -47,12 +42,8 @@ func init() {
 		DisableOnDefault: false,
 		Help: "翻译\n" +
 			">TL 你好",
-	}).OnRegex(`^>TL\s(-.{1,10}? )?(.*)$`).SetBlock(true).
+	}).OnRegex(`^>TL\s(-.{1,10}? )?(.*)$`).SetBlock(true).Limit(ctxext.LimitByUser).
 		Handle(func(ctx *zero.Ctx) {
-			if !bucket.Load(ctx.Event.UserID).Acquire() {
-				// 频繁触发，不回复
-				return
-			}
 			msg := []string{ctx.State["regex_matched"].([]string)[2]}
 			rely, err := tl(msg[0])
 			if err != nil {

plugin_vtb_quotation/cron.go

@@ -6,11 +6,13 @@ import (
 
 	"github.com/FloatTech/zbputils/process"
 
+	"github.com/FloatTech/ZeroBot-Plugin/order"
 	"github.com/FloatTech/ZeroBot-Plugin/plugin_vtb_quotation/model"
 )
 
 func init() {
 	go func() {
+		defer order.DoneOnExit()()
 		process.SleepAbout1sTo2s()
 		log.Println("[vtb/cron] 开启vtb数据库日常更新")
 		vtbDaily()

plugin_vtb_quotation/data.go

@@ -5,11 +5,14 @@ import (
 
 	"github.com/FloatTech/zbputils/file"
 	"github.com/FloatTech/zbputils/process"
+
+	"github.com/FloatTech/ZeroBot-Plugin/order"
 )
 
 // 加载数据库
 func init() {
 	go func() {
+		defer order.DoneOnExit()()
 		process.SleepAbout1sTo2s()
 		_ = os.MkdirAll(dbpath, 0755)
 		_, _ = file.GetLazyData(dbfile, false, false)

plugin_vtb_quotation/vtb_quotation.go

@@ -29,7 +29,7 @@ const (
 
 var engine = control.Register("vtbquotation", order.PrioVtbQuotation, &control.Options{
 	DisableOnDefault: false,
-	Help:             "vtbkeyboard.moe\n- vtb语录\n- 随机vtb",
+	Help:             "vtbkeyboard.moe\n- vtb语录\n- 随机vtb\n- 更新vtb\n",
 })
 
 func init() {
@@ -195,4 +195,10 @@ func init() {
 			}
 			db.Close()
 		})
+	engine.OnFullMatch("更新vtb", zero.SuperUserPermission).SetBlock(true).
+		Handle(func(ctx *zero.Ctx) {
+			ctx.Send("少女祈祷中......")
+			vtbData()
+			ctx.Send("vtb数据库已更新")
+		})
 }

plugin_wangyiyun/main.go

@@ -2,12 +2,10 @@
 package wangyiyun
 
 import (
-	"time"
-
 	"github.com/FloatTech/zbputils/control"
+	"github.com/FloatTech/zbputils/ctxext"
 	"github.com/FloatTech/zbputils/web"
 	zero "github.com/wdvxdr1123/ZeroBot"
-	"github.com/wdvxdr1123/ZeroBot/extension/rate"
 	"github.com/wdvxdr1123/ZeroBot/message"
 	"github.com/wdvxdr1123/ZeroBot/utils/helper"
 
@@ -21,15 +19,11 @@ const (
 )
 
 func init() {
-	limit := rate.NewManager(time.Minute, 60)
 	control.Register("wangyiyun", order.PrioWangYiYun, &control.Options{
 		DisableOnDefault: false,
 		Help:             "wangyiyun \n- 来份网易云热评",
-	}).OnFullMatch("来份网易云热评").SetBlock(true).
+	}).OnFullMatch("来份网易云热评").SetBlock(true).Limit(ctxext.LimitByUser).
 		Handle(func(ctx *zero.Ctx) {
-			if !limit.Load(ctx.Event.GroupID).Acquire() {
-				return
-			}
 			data, err := web.ReqWith(wangyiyunURL, "GET", wangyiyunReferer, ua)
 			if err != nil {
 				ctx.SendChain(message.Text("ERROR:", err))

plugin_wtf/main.go

@@ -4,21 +4,15 @@ package wtf
 import (
 	"fmt"
 	"strconv"
-	"time"
 
 	control "github.com/FloatTech/zbputils/control"
+	"github.com/FloatTech/zbputils/ctxext"
 	zero "github.com/wdvxdr1123/ZeroBot"
-	"github.com/wdvxdr1123/ZeroBot/extension/rate"
 	"github.com/wdvxdr1123/ZeroBot/message"
 
 	"github.com/FloatTech/ZeroBot-Plugin/order"
 )
 
-var (
-	// 限制调用频率
-	limit = rate.NewManager(time.Minute*5, 5)
-)
-
 func init() {
 	en := control.Register("wtf", order.PrioWtf, &control.Options{
 		DisableOnDefault: false,
@@ -32,12 +26,8 @@ func init() {
 			}
 			ctx.SendChain(message.Text(s))
 		})
-	en.OnRegex(`^查询鬼东西(\d*)`, zero.OnlyGroup).SetBlock(true).
+	en.OnRegex(`^查询鬼东西(\d*)`, zero.OnlyGroup).SetBlock(true).Limit(ctxext.LimitByUser).
 		Handle(func(ctx *zero.Ctx) {
-			if !limit.Load(ctx.Event.UserID).Acquire() {
-				ctx.SendChain(message.Text("请稍后重试0x0..."))
-				return
-			}
 			// 调用接口
 			i, err := strconv.Atoi(ctx.State["regex_matched"].([]string)[1])
 			if err != nil {