🐛 防止风控

* fix:新动态处理

* fix:使用正确的变量cOrigType

* fix:单小说的时候不用渲染图片

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

.golangci.yml

@@ -64,6 +64,8 @@ run:
   deadline: 5m
   issues-exit-code: 1
   tests: false
+  skip-dirs:
+    - order
 
 # output configuration options
 output:

README.md

@@ -69,14 +69,14 @@ zerobot [-h] [-t token] [-u url] [-n nickname] [-p prefix] [-d|w] [-g 监听地
     - [x] 空调关
     - [x] 群温度
     - [x] 设置温度[正整数]
-    - [x] @Bot mua|啾咪|摸|上你|傻|裸|贴|老婆|抱|亲|一下|咬|操|123|进去|调教|搓|让|捏|挤|略|呐|原味|胖次|内裤|内衣|衣服|ghs|批|憨批|kkp|咕|骚|喜欢|suki|好き|看|不能|砸了|透|口我|草我|自慰|onani|オナニー|炸了|色图|涩图|告白|对不起|回来|吻|软|壁咚|掰开|女友|是|喵|嗷呜|叫|拜|佬|awsl|臭|香|腿|张开|脚|脸|头发|手|pr|舔|小穴|腰|诶嘿嘿|可爱|扭蛋|鼻|眼|色气|推|床|举|手冲|饿|变|敲|爬|怕|冲|射|不穿|迫害|猫粮|揪尾巴|薄荷|早|晚安|揉|榨|掐|胸|奶子|欧派|嫩|蹭|牵手|握手|拍照|w|睡不着|欧尼酱|哥|爱你|过来|自闭|打不过|么么哒|很懂|膝枕|累了|安慰|洗澡|一起睡觉|一起|多大|姐姐|糖|嗦|牛子|🐂子|🐮子|嫌弃|紧|baka|笨蛋|插|插进来|屁股|翘|翘起来|抬|抬起|爸|傲娇|rua|咕噜咕噜|咕噜|上床|做爱|吃掉|吃|揪|种草莓|种草|掀|妹|病娇|嘻
+    - [x] @Bot mua | 啾咪 | 摸 | 上你 | 傻 | 裸 | 贴 | 老婆 | 抱 | 亲 | 一下 | 咬 | 操 | 123 | 进去 | 调教 | 搓 | 让 | 捏 | 挤 | 略 | 呐 | 原味 | 胖次 | 内裤 | 内衣 | 衣服 | ghs | 批 | 憨批 | kkp | 咕 | 骚 | 喜欢 | suki | 好き | 看 | 不能 | 砸了 | 透 | 口我 | 草我 | 自慰 | onani | オナニー | 炸了 | 色图 | 涩图 | 告白 | 对不起 | 回来 | 吻 | 软 | 壁咚 | 掰开 | 女友 | 是 | 喵 | 嗷呜 | 叫 | 拜 | 佬 | awsl | 臭 | 香 | 腿 | 张开 | 脚 | 脸 | 头发 | 手 | pr | 舔 | 小穴 | 腰 | 诶嘿嘿 | 可爱 | 扭蛋 | 鼻 | 眼 | 色气 | 推 | 床 | 举 | 手冲 | 饿 | 变 | 敲 | 爬 | 怕 | 冲 | 射 | 不穿 | 迫害 | 猫粮 | 揪尾巴 | 薄荷 | 早 | 晚安 | 揉 | 榨 | 掐 | 胸 | 奶子 | 欧派 | 嫩 | 蹭 | 牵手 | 握手 | 拍照 | w | 睡不着 | 欧尼酱 | 哥 | 爱你 | 过来 | 自闭 | 打不过 | 么么哒 | 很懂 | 膝枕 | 累了 | 安慰 | 洗澡 | 一起睡觉 | 一起 | 多大 | 姐姐 | 糖 | 嗦 | 牛子 | 🐂子 | 🐮子 | 嫌弃 | 紧 | baka | 笨蛋 | 插 | 插进来 | 屁股 | 翘 | 翘起来 | 抬 | 抬起 | 爸 | 傲娇 | rua | 咕噜咕噜 | 咕噜 | 上床 | 做爱 | 吃掉 | 吃 | 揪 | 种草莓 | 种草 | 掀 | 妹 | 病娇 | 嘻
 - **ATRI** `import _ "github.com/FloatTech/ZeroBot-Plugin/plugin_atri"`
     - [x] 具体指令看 /用法 atri
     - 注：本插件基于 [ATRI](https://github.com/Kyomotoi/ATRI) ，为 Golang 移植版
 - **群管** `import _ "github.com/FloatTech/ZeroBot-Plugin/plugin_manager"`
     - [x] 禁言[@xxx][分钟]
     - [x] 解除禁言[@xxx]
-    - [x] 我要自闭|禅定 x [分钟|小时|天]
+    - [x] 我要自闭 | 禅定 x [分钟 | 小时 | 天]
     - [x] 开启全员禁言
     - [x] 解除全员禁言
     - [x] 升为管理[@xxx]
@@ -90,15 +90,15 @@ zerobot [-h] [-t token] [-u url] [-n nickname] [-p prefix] [-d|w] [-g 监听地
     - [x] *退群通知
     - [x] 设置欢迎语[欢迎~]
     - [x] 在[MM]月[dd]日的[hh]点[mm]分时(用[url])提醒大家[xxx]
-    - [x] 在[MM]月[每周|周几]的[hh]点[mm]分时(用[url])提醒大家[xxx]
+    - [x] 在[MM]月[每周 | 周几]的[hh]点[mm]分时(用[url])提醒大家[xxx]
     - [x] 取消在[MM]月[dd]日的[hh]点[mm]分的提醒
-    - [x] 取消在[MM]月[每周|周几]的[hh]点[mm]分的提醒
+    - [x] 取消在[MM]月[每周 | 周几]的[hh]点[mm]分的提醒
     - [x] 在"cron"时(用[url])提醒大家[xxx]
     - [x] 取消在"cron"的提醒
     - [x] 列出所有提醒
     - [x] 翻牌
-    - [x] [开启|关闭]入群验证
-    - [x] [开启|关闭]gist加群自动审批
+    - [x] [开启 | 关闭]入群验证
+    - [x] [开启 | 关闭]gist加群自动审批
     - [ ] 同意好友请求
     - [ ] 撤回[@xxx] [xxx]
     - [ ] 警告[@xxx]
@@ -121,7 +121,7 @@ zerobot [-h] [-t token] [-u url] [-n nickname] [-p prefix] [-d|w] [-g 监听地
     - [x] 卖萌[@xxx]
     - [x] 抽老婆[@xxx]
 - **AIWife** `import _ "github.com/FloatTech/ZeroBot-Plugin/plugin_aiwife"`
-    - [x] waifu|随机waifu(从[100000个AI生成的waifu](https://www.thiswaifudoesnotexist.net/)中随机一位)
+    - [x] waifu | 随机waifu(从[100000个AI生成的waifu](https://www.thiswaifudoesnotexist.net/)中随机一位)
 - **gif** `import _ "github.com/FloatTech/ZeroBot-Plugin/plugin_gif"`
     - [x] 爬[@xxx]
     - [x] 摸[@xxx]
@@ -150,10 +150,10 @@ zerobot [-h] [-t token] [-u url] [-n nickname] [-p prefix] [-d|w] [-g 监听地
 - **lolicon** `import _ "github.com/FloatTech/ZeroBot-Plugin/plugin_lolicon"`
     - [x] 来份萝莉
 - **搜图** `import _ "github.com/FloatTech/ZeroBot-Plugin/plugin_saucenao"`
-    - [x] 以图搜图|搜索图片|以图识图[图片]
+    - [x] 以图搜图 | 搜索图片 | 以图识图[图片]
     - [x] 搜图[P站图片ID]
 - **搜番** `import _ "github.com/FloatTech/ZeroBot-Plugin/plugin_tracemoe"`
-    - [x] 搜番|搜索番剧[图片]
+    - [x] 搜番 | 搜索番剧[图片]
 - **随机图片与AI点评** `import _ github.com/FloatTech/ZeroBot-Plugin/plugin_acgimage`
     - [x] 随机图片(评级大于6的图将私发)
     - [x] 直接随机(无r18检测，务必小心，仅管理可用)
@@ -163,16 +163,16 @@ zerobot [-h] [-t token] [-u url] [-n nickname] [-p prefix] [-d|w] [-g 监听地
 - **DeepDanbooru二次元图标签识别** `import _ github.com/FloatTech/ZeroBot-Plugin/plugin_danbooru`
     - [x] 鉴赏图片[图片]
 - **每日运势** `import _ github.com/FloatTech/ZeroBot-Plugin/plugin_fortune`
-    - [x] 运势|抽签
-    - [x] 设置底图[车万 DC4 爱因斯坦 星空列车 樱云之恋 富婆妹 李清歌 公主连结 原神 明日方舟 碧蓝航线 碧蓝幻想 战双 阴阳师]
+    - [x] 运势 | 抽签
+    - [x] 设置底图[车万 DC4 爱因斯坦 星空列车 樱云之恋 富婆妹 李清歌 公主连结 原神 明日方舟 碧蓝航线 碧蓝幻想 战双 阴阳师 赛马娘]
 - **睡眠管理** `import _ github.com/FloatTech/ZeroBot-Plugin/plugin_sleep_manage`
-    - [x] 早安|晚安
+    - [x] 早安 | 晚安
 - **浅草寺求签** `import _ github.com/FloatTech/ZeroBot-Plugin/plugin_omikuji`
-    - [x] 求签|占卜
+    - [x] 求签 | 占卜
     - [x] 解签
 - **bilibili** `import _ "github.com/FloatTech/ZeroBot-Plugin/plugin_bilibili"`
-    - [x] >vup info [名字|uid]
-    - [x] >user info [名字|uid]
+    - [x] >vup info [名字 | uid]
+    - [x] >user info [名字 | uid]
     - [x] /开启粉丝日报
 - **嘉然** `import _ "github.com/FloatTech/ZeroBot-Plugin/plugin_diana"`
     - [x] 小作文
@@ -184,7 +184,7 @@ zerobot [-h] [-t token] [-u url] [-n nickname] [-p prefix] [-d|w] [-g 监听地
     - [x] 查询鬼东西[序号][@xxx]
     - 注：由于需要科学，默认注释。
 - **AIfalse** `import _ "github.com/FloatTech/ZeroBot-Plugin/plugin_ai_false"`
-    - [x] 查询计算机当前活跃度: [检查身体|自检|启动自检|系统状态]
+    - [x] 查询计算机当前活跃度: [检查身体 | 自检 | 启动自检 | 系统状态]
     - [x] 清理缓存 (仅适用于 gocq 且需要 bot 的运行目录和 gocq 相同)
     - [ ] 简易语音
     - [ ] 爬图合成 [@xxx]
@@ -192,7 +192,7 @@ zerobot [-h] [-t token] [-u url] [-n nickname] [-p prefix] [-d|w] [-g 监听地
     - [x] 抽wife[@xxx]
     - [x] 添加wife[名字][图片]
     - [x] 删除wife[名字]
-    - [x] [让|不让]所有人均可添加wife
+    - [x] [让 | 不让]所有人均可添加wife
     - 注：不同群添加后不会重叠
 - **minecraft** `import _ "github.com/FloatTech/ZeroBot-Plugin/plugin_minecraft"`
     - [x] /mcstart xxx
@@ -205,7 +205,7 @@ zerobot [-h] [-t token] [-u url] [-n nickname] [-p prefix] [-d|w] [-g 监听地
     - 注：更多搜卡指令参数：https://hs.fbigame.com/misc/searchhelp
 - **人工智能回复** `import _ "github.com/FloatTech/ZeroBot-Plugin/plugin_ai_reply"`
     - [x] @Bot 任意文本(任意一句话回复)
-    - [x] 设置回复模式[青云客|小爱]
+    - [x] 设置回复模式[青云客 | 小爱]
 - **关键字搜图** `import _ "github.com/FloatTech/ZeroBot-Plugin/plugin_image_finder"`
     - [x] 来张 [xxx]
 - **拼音首字母释义工具** `import _ "github.com/FloatTech/ZeroBot-Plugin/plugin_nbnhhsh"`
@@ -235,11 +235,11 @@ zerobot [-h] [-t token] [-u url] [-n nickname] [-p prefix] [-d|w] [-g 监听地
     - [x] 来碗毒鸡汤
     - [x] 讲个段子
 - **笑话** `import _ "github.com/FloatTech/ZeroBot-Plugin/plugin_funny"`
-    - [x] 讲个笑话[@xxx]|讲个笑话[qq号]
+    - [x] 讲个笑话[@xxx] | 讲个笑话[qq号]
 - **抽象话** `import _ "github.com/FloatTech/ZeroBot-Plugin/plugin_chouxianghua"`
     - [x] 抽象翻译[xxx]
 - **绝绝子** `import _ "github.com/FloatTech/ZeroBot-Plugin/plugin_juejuezi"`
-    - [x] 喝奶茶绝绝子|绝绝子吃饭
+    - [x] 喝奶茶绝绝子 | 绝绝子吃饭
 - **藏头诗** `import _ "github.com/FloatTech/ZeroBot-Plugin/plugin_cangtoushi"`
     - [x] 藏头诗[xxx]
     - [x] 藏尾诗[xxx]
@@ -248,7 +248,7 @@ zerobot [-h] [-t token] [-u url] [-n nickname] [-p prefix] [-d|w] [-g 监听地
     - [x] 组cp大老师 雪乃
 - **签到得分** `import _ "github.com/FloatTech/ZeroBot-Plugin/plugin_score"`
     - [x] 签到
-    - [x] 获得签到背景[@xxx]|获得签到背景
+    - [x] 获得签到背景[@xxx] | 获得签到背景
 - **骂人** `import _ "github.com/FloatTech/ZeroBot-Plugin/plugin_curse"`
     - [x] 骂我
     - [x] 大力骂我
@@ -258,7 +258,6 @@ zerobot [-h] [-t token] [-u url] [-n nickname] [-p prefix] [-d|w] [-g 监听地
     - [x] 取消动态订阅[uid]
     - [x] 取消直播订阅[uid]
     - [x] 推送列表
-    - 注: linux下要想动态图片显示正常，需要下载chrome浏览器，并安装字体，具体看https://www.yuque.com/xiangrikuidezhongzi/zerobot/qrwxth
 - **TODO...**
 
 ## 使用方法

go.mod

@@ -3,10 +3,9 @@ module github.com/FloatTech/ZeroBot-Plugin
 go 1.17
 
 require (
-	github.com/FloatTech/AnimeAPI v1.2.4-beta2
-	github.com/FloatTech/zbputils v1.2.4-beta2
+	github.com/FloatTech/AnimeAPI v1.2.4-beta22
+	github.com/FloatTech/zbputils v1.2.4-beta7
 	github.com/antchfx/htmlquery v1.2.4
-	github.com/chromedp/chromedp v0.7.6
 	github.com/corona10/goimagehash v1.0.3
 	github.com/fogleman/gg v1.3.0
 	github.com/fumiama/cron v1.3.0
@@ -20,29 +19,22 @@ require (
 	github.com/shirou/gopsutil/v3 v3.21.12
 	github.com/sirupsen/logrus v1.8.1
 	github.com/tidwall/gjson v1.12.1
-	github.com/wdvxdr1123/ZeroBot v1.4.1
+	github.com/wdvxdr1123/ZeroBot v1.4.2-0.20220122162257-bc71c479f3d1
 	golang.org/x/image v0.0.0-20211028202545-6944b10bf410
 )
 
 require (
 	github.com/antchfx/xpath v1.2.0 // indirect
-	github.com/chromedp/cdproto v0.0.0-20211126220118-81fa0469ad77 // indirect
-	github.com/chromedp/sysutil v1.0.0 // indirect
 	github.com/disintegration/imaging v1.6.2 // indirect
 	github.com/ericpauley/go-quantize v0.0.0-20200331213906-ae555eb2afa4 // indirect
 	github.com/go-ole/go-ole v1.2.6 // indirect
-	github.com/gobwas/httphead v0.1.0 // indirect
-	github.com/gobwas/pool v0.2.1 // indirect
-	github.com/gobwas/ws v1.1.0 // indirect
 	github.com/golang/freetype v0.0.0-20170609003504-e2365dfdc4a0 // indirect
 	github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
 	github.com/google/uuid v1.3.0 // indirect
 	github.com/gorilla/websocket v1.4.2 // indirect
 	github.com/jinzhu/inflection v1.0.0 // indirect
-	github.com/josharian/intern 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
-	github.com/mailru/easyjson v0.7.7 // indirect
 	github.com/mattn/go-isatty v0.0.14 // indirect
 	github.com/nfnt/resize v0.0.0-20180221191011-83c6a9932646 // indirect
 	github.com/power-devops/perfstat v0.0.0-20210106213030-5aafc221ea8c // indirect

go.sum

@@ -1,8 +1,8 @@
-github.com/FloatTech/AnimeAPI v1.2.4-beta2 h1:bpWv2QwIgommXblBTro+OtxfUWfSv86dSLMA2M1jjog=
-github.com/FloatTech/AnimeAPI v1.2.4-beta2/go.mod h1:q2WwEhalrhjGdI/woUwWMryUXwIWKgJybQA2t2B+hB4=
+github.com/FloatTech/AnimeAPI v1.2.4-beta22 h1:v1Zyfzrkss0bnpH7iMN0ajpMM4JUT5bNerQ4ntN3dI0=
+github.com/FloatTech/AnimeAPI v1.2.4-beta22/go.mod h1:rhYvzqLH2YTKBOk7DfJsXsdZlnxhpBP3HvctwqlLykM=
 github.com/FloatTech/bot-manager v1.0.0/go.mod h1:8YYRJ16oroGHQGD2En0oVnmcKJkxR9O/jd5BPSfWfOQ=
-github.com/FloatTech/zbputils v1.2.4-beta2 h1:9y8BZR5Rr4NgDz/818r8sCBjitIPrHY+Hd6tl3lINn4=
-github.com/FloatTech/zbputils v1.2.4-beta2/go.mod h1:ZIuQP4tuhn7jiowEy+PALiHmr4zzPQBj4VdjEyd5/Es=
+github.com/FloatTech/zbputils v1.2.4-beta7 h1:DofQTSVEBU1BQnLb4GahNZqsqVqoj4Lu5GDJa2rJW9o=
+github.com/FloatTech/zbputils v1.2.4-beta7/go.mod h1:mPVpKu2scTyBiitNmzCrxGc9aIKs9rwfb6iqz/+heck=
 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=
@@ -13,12 +13,6 @@ github.com/antchfx/htmlquery v1.2.4/go.mod h1:2xO6iu3EVWs7R2JYqBbp8YzG50gj/ofqs5
 github.com/antchfx/xpath v1.1.6/go.mod h1:Yee4kTMuNiPYJ7nSNorELQMr1J33uOpXDMByNYhvtNk=
 github.com/antchfx/xpath v1.2.0 h1:mbwv7co+x0RwgeGAOHdrKy89GvHaGvxxBtPK0uF9Zr8=
 github.com/antchfx/xpath v1.2.0/go.mod h1:i54GszH55fYfBmoZXapTHN8T8tkcHfRgLyVwwqzXNcs=
-github.com/chromedp/cdproto v0.0.0-20211126220118-81fa0469ad77 h1:Et/9YcQRCsaZVT74sy6AHwWy/FcbYqm39jNprlfXF7c=
-github.com/chromedp/cdproto v0.0.0-20211126220118-81fa0469ad77/go.mod h1:At5TxYYdxkbQL0TSefRjhLE3Q0lgvqKKMSFUglJ7i1U=
-github.com/chromedp/chromedp v0.7.6 h1:2juGaktzjwULlsn+DnvIZXFUckEp5xs+GOBroaea+jA=
-github.com/chromedp/chromedp v0.7.6/go.mod h1:ayT4YU/MGAALNfOg9gNrpGSAdnU51PMx+FCeuT1iXzo=
-github.com/chromedp/sysutil v1.0.0 h1:+ZxhTpfpZlmchB58ih/LBHX52ky7w2VhQVKQMucy3Ic=
-github.com/chromedp/sysutil v1.0.0/go.mod h1:kgWmDdq8fTzXYcKIBqIYvRRTnYb9aNS9moAV0xufSww=
 github.com/corona10/goimagehash v1.0.3 h1:NZM518aKLmoNluluhfHGxT3LGOnrojrxhGn63DR/CZA=
 github.com/corona10/goimagehash v1.0.3/go.mod h1:VkvE0mLn84L4aF8vCb6mafVajEb6QYMHl2ZJLn0mOGI=
 github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
@@ -57,12 +51,6 @@ github.com/go-playground/universal-translator v0.17.0/go.mod h1:UkSxE5sNxxRwHyU+
 github.com/go-playground/validator/v10 v10.4.1/go.mod h1:nlOn6nFhuKACm19sB/8EGNn9GlaMV7XkbRSipzJ0Ii4=
 github.com/go-sql-driver/mysql v1.5.0 h1:ozyZYNQW3x3HtqT1jira07DN2PArx2v7/mN66gGcHOs=
 github.com/go-sql-driver/mysql v1.5.0/go.mod h1:DCzpHaOWr8IXmIStZouvnhqoel9Qv2LBy8hT2VhHyBg=
-github.com/gobwas/httphead v0.1.0 h1:exrUm0f4YX0L7EBwZHuCF4GDp8aJfVeBrlLQrs6NqWU=
-github.com/gobwas/httphead v0.1.0/go.mod h1:O/RXo79gxV8G+RqlR/otEwx4Q36zl9rqC5u12GKvMCM=
-github.com/gobwas/pool v0.2.1 h1:xfeeEhW7pwmX8nuLVlqbzVc7udMDrwetjEv+TZIz1og=
-github.com/gobwas/pool v0.2.1/go.mod h1:q8bcK0KcYlCgd9e7WYLm9LpyS+YeLd8JVDW6WezmKEw=
-github.com/gobwas/ws v1.1.0 h1:7RFti/xnNkMJnrK7D1yQ/iCIB5OrrY/54/H930kIbHA=
-github.com/gobwas/ws v1.1.0/go.mod h1:nzvNcVha5eUziGrbxFCo6qFIojQHjJV5cLYIbezhfL0=
 github.com/golang-sql/civil v0.0.0-20190719163853-cb61b32ac6fe h1:lXe2qZdvpiX5WZkZR4hgp4KJVfY3nMkvmwbVkpv1rVY=
 github.com/golang-sql/civil v0.0.0-20190719163853-cb61b32ac6fe/go.mod h1:8vg3r2VgvsThLBIFL93Qb5yWzgyZWhEmBwUJWevAkK0=
 github.com/golang/freetype v0.0.0-20170609003504-e2365dfdc4a0 h1:DACJavvAHhabrF08vX0COfcOBJRhZ8lUbR+ZWIs0Y5g=
@@ -90,8 +78,6 @@ github.com/jinzhu/inflection v1.0.0 h1:K317FqzuhWc8YvSVlFMCCUb36O/S9MCKRDI7QkRKD
 github.com/jinzhu/inflection v1.0.0/go.mod h1:h+uFLlag+Qp1Va5pdKtLDYj+kHp5pxUVkryuEj+Srlc=
 github.com/jinzhu/now v1.0.1 h1:HjfetcXq097iXP0uoPCdnM4Efp5/9MsM0/M+XOTeR3M=
 github.com/jinzhu/now v1.0.1/go.mod h1:d3SSVoowX0Lcu0IBviAWJpolVfI5UJVZZ7cO71lE/z8=
-github.com/josharian/intern v1.0.0 h1:vlS4z54oSdjm0bgjRigI+G1HpF+tI+9rE5LLzOg8HmY=
-github.com/josharian/intern v1.0.0/go.mod h1:5DoeVV0s6jJacbCEi61lwdGj/aVlrQvzHFFd8Hwg//Y=
 github.com/json-iterator/go v1.1.9/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4=
 github.com/kballard/go-shellquote v0.0.0-20180428030007-95032a82bc51 h1:Z9n2FFNUXsshfwJMBgNA0RU6/i7WVaAegv3PtuIHPMs=
 github.com/kballard/go-shellquote v0.0.0-20180428030007-95032a82bc51/go.mod h1:CzGEWj7cYgsdH8dAjBGEr58BoE7ScuLd+fwFZ44+/x8=
@@ -104,12 +90,9 @@ github.com/logoove/sqlite v1.13.0 h1:XM7QKK9R3tm8o7bI75R3zmwYBFQ5S3Jqg+XCaqsAMQQ
 github.com/logoove/sqlite v1.13.0/go.mod h1:MRpE/o3qQhT7AgfIdnBue5c63+//xT+KXV0gHeVAUAg=
 github.com/lufia/plan9stats v0.0.0-20211012122336-39d0f177ccd0 h1:6E+4a0GO5zZEnZ81pIr0yLvtUWk2if982qA3F3QD6H4=
 github.com/lufia/plan9stats v0.0.0-20211012122336-39d0f177ccd0/go.mod h1:zJYVVT2jmtg6P3p1VtQj7WsuWi/y4VnjVBn7F8KPB3I=
-github.com/mailru/easyjson v0.7.7 h1:UGYAvKxe3sBsEDzO8ZeWOSlIQfWFlxbzLZe7hwFURr0=
-github.com/mailru/easyjson v0.7.7/go.mod h1:xzfreul335JAWq5oZzymOObrkdz5UnU4kGfJJLY9Nlc=
 github.com/mattn/go-isatty v0.0.12/go.mod h1:cbi8OIDigv2wuxKPP5vlRcQ1OAZbq2CE4Kysco4FUpU=
 github.com/mattn/go-isatty v0.0.14 h1:yVuAays6BHfxijgZPzw+3Zlu5yQgKGP2/hcQbHb7S9Y=
 github.com/mattn/go-isatty v0.0.14/go.mod h1:7GGIvUiUoEMVVmxf/4nioHXj79iQHKdU27kJ6hsGG94=
-github.com/mattn/go-runewidth v0.0.13/go.mod h1:Jdepj2loyihRzMpdS35Xk/zdY8IAYHsh153qUoGf23w=
 github.com/mattn/go-sqlite3 v1.14.0/go.mod h1:JIl7NbARA7phWnGvh0LKTyg7S9BA+6gx71ShQilpsus=
 github.com/mattn/go-sqlite3 v1.14.10 h1:MLn+5bFRlWMGoSRmJour3CL1w/qL96mvipqpwQW/Sfk=
 github.com/mattn/go-sqlite3 v1.14.10/go.mod h1:NyWgC/yNuGj7Q9rpYnZvas74GogHl5/Z4A/KQRfk6bU=
@@ -122,8 +105,6 @@ github.com/nfnt/resize v0.0.0-20180221191011-83c6a9932646/go.mod h1:jpp1/29i3P1S
 github.com/onsi/ginkgo v1.6.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE=
 github.com/onsi/ginkgo v1.7.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE=
 github.com/onsi/gomega v1.4.3/go.mod h1:ex+gbHU/CVuBBDIJjb2X0qEXbFg53c61hWP/1CpauHY=
-github.com/orisano/pixelmatch v0.0.0-20210112091706-4fa4c7ba91d5 h1:1SoBaSPudixRecmlHXb/GxmaD3fLMtHIDN13QujwQuc=
-github.com/orisano/pixelmatch v0.0.0-20210112091706-4fa4c7ba91d5/go.mod h1:nZgzbfBr3hhjoZnS66nKrHmduYNpc34ny7RK4z5/HM0=
 github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4=
 github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
 github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
@@ -132,7 +113,6 @@ github.com/power-devops/perfstat v0.0.0-20210106213030-5aafc221ea8c h1:ncq/mPwQF
 github.com/power-devops/perfstat v0.0.0-20210106213030-5aafc221ea8c/go.mod h1:OmDBASR4679mdNQnz2pUhc2G8CO2JrUAVFDRBDP/hJE=
 github.com/remyoudompheng/bigfft v0.0.0-20200410134404-eec4a21b6bb0 h1:OdAsTTz6OkFY5QxjkYwrChwuRruF69c169dPK26NUlk=
 github.com/remyoudompheng/bigfft v0.0.0-20200410134404-eec4a21b6bb0/go.mod h1:qqbHyh8v60DhA7CoWK5oRCqLrMHRGoxYCSS9EjAz6Eo=
-github.com/rivo/uniseg v0.2.0/go.mod h1:J6wj4VEh+S6ZtnVlnTBMWIodfgj8LQOQFoIToxlJtxc=
 github.com/shirou/gopsutil/v3 v3.21.12 h1:VoGxEW2hpmz0Vt3wUvHIl9fquzYLNpVpgNNB7pGJimA=
 github.com/shirou/gopsutil/v3 v3.21.12/go.mod h1:BToYZVTlSVlfazpDDYFnsVZLaoRG+g8ufT6fPQLdJzA=
 github.com/sirupsen/logrus v1.4.2/go.mod h1:tLMulIdttU9McNUspp0xgXVQah82FyeX6MwdIuYE2rE=
@@ -164,8 +144,9 @@ github.com/tklauser/numcpus v0.3.0/go.mod h1:yFGUr7TUHQRAhyqBcEg0Ge34zDBAsIvJJcy
 github.com/ugorji/go v1.1.7/go.mod h1:kZn38zHttfInRq0xu/PH0az30d+z6vm202qpg1oXVMw=
 github.com/ugorji/go/codec v1.1.7/go.mod h1:Ax+UKWsSmolVDwsd+7N3ZtXu+yMGCf907BLYF3GoBXY=
 github.com/wdvxdr1123/ZeroBot v1.3.2/go.mod h1:i2DIqQjtjE+3gvVi9r9sc+QpNaUuyTXx/HNXXayIpwI=
-github.com/wdvxdr1123/ZeroBot v1.4.1 h1:fk/8RH2D1gB3YeC1eI/SZi/kG31Rh7Z8lAiDc60VZFM=
 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/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=
@@ -211,7 +192,6 @@ golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7w
 golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20201126233918-771906719818/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20201204225414-ed752295db88/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20201207223542-d4d67f95c62d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20210423082822-04245dca01da/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20210630005230-0f9fa26af87c/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
@@ -220,7 +200,6 @@ 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-20211124211545-fe61309f8881/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20220111092808-5a964db01320 h1:0jf+tOCoZ3LyutmCOWpVni1chK4VfFLhRsDK7MhqGRY=
 golang.org/x/sys v0.0.0-20220111092808-5a964db01320/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=

main.go

@@ -13,6 +13,9 @@ import (
 	// webctrl "github.com/FloatTech/zbputils/control/web" // web 后端控制
 
 	// 词库类
+	"github.com/FloatTech/AnimeAPI/imgpool"
+	"github.com/FloatTech/zbputils/control"
+
 	_ "github.com/FloatTech/ZeroBot-Plugin/plugin_ai_reply" // 人工智能回复
 	_ "github.com/FloatTech/ZeroBot-Plugin/plugin_atri"     // ATRI词库
 	_ "github.com/FloatTech/ZeroBot-Plugin/plugin_chat"     // 基础词库
@@ -52,7 +55,7 @@ import (
 
 	// b站相关
 	_ "github.com/FloatTech/ZeroBot-Plugin/plugin_bilibili" // 查询b站用户信息
-	// _ "github.com/FloatTech/ZeroBot-Plugin/plugin_bilibili_push" // b站推送（需要安装chrome浏览器）
+	// _ "github.com/FloatTech/ZeroBot-Plugin/plugin_bilibili_push" // b站推送
 	_ "github.com/FloatTech/ZeroBot-Plugin/plugin_diana" // 嘉心糖发病
 
 	// 二次元图片
@@ -84,13 +87,14 @@ var (
 		"* Copyright © 2020 - 2021 FloatTech. All Rights Reserved.",
 		"* Project: https://github.com/FloatTech/ZeroBot-Plugin",
 	}
-	nicks  = []string{"ATRI", "atri", "亚托莉", "アトリ"}
-	banner = strings.Join(contents, "\n")
-	token  *string
-	url    *string
-	adana  *string
-	prefix *string
-	reg    = registry.NewRegReader("reilia.fumiama.top:32664", "fumiama")
+	nicks   = []string{"ATRI", "atri", "亚托莉", "アトリ"}
+	banner  = strings.Join(contents, "\n")
+	token   *string
+	url     *string
+	adana   *string
+	prefix  *string
+	poolkey *string
+	reg     = registry.NewRegReader("reilia.fumiama.top:32664", "fumiama")
 )
 
 func init() {
@@ -108,6 +112,7 @@ func init() {
 	// 默认昵称
 	adana = flag.String("n", "椛椛", "Set default nickname.")
 	prefix = flag.String("p", "/", "Set command prefix.")
+	poolkey = flag.String("pk", "", "Set imgpool key and enable listening.")
 
 	flag.Parse()
 	if *h {
@@ -123,6 +128,11 @@ func init() {
 			logrus.SetLevel(logrus.WarnLevel)
 		}
 	}
+
+	if *poolkey != "" {
+		imgpool.RegisterListener(*poolkey, control.Register("imgpool", 1, &control.Options{}))
+	}
+
 	// 启用 gui
 	// webctrl.InitGui(*g)
 }

order/prio.go

@@ -2,104 +2,55 @@
 package order
 
 const (
-	//nolint: revive
 	PrioChat = iota * 10
-	//nolint: revive
 	PrioSleepManage
-	//nolint: revive
 	PrioAtri
-	//nolint: revive
 	PrioManager
 
-	//nolint: revive
 	PrioACGImage
-	//nolint: revive
 	PrioAIFalse
-	//nolint: revive
 	PrioAIWife
-	//nolint: revive
 	PrioBase14
-	//nolint: revive
 	PrioBilibili
-	//nolint: revive
 	PrioBilibiliPush
-	//nolint: revive
 	PrioBookReview
-	//nolint: revive
 	PrioCangTouShi
-	//nolint: revive
 	PrioChoose
-	//nolint: revive
 	PrioChouXiangHua
-	//nolint: revive
 	PrioCoser
-	//nolint: revive
 	PrioCPStory
-	//nolint: revive
 	PrioDanbooru
-	//nolint: revive
 	PrioDiana
-	//nolint: revive
 	PrioFansDaily
-	//nolint: revive
 	PrioFortune
-	//nolint: revive
 	PrioFunny
-	//nolint: revive
 	PrioGIF
-	//nolint: revive
 	PrioGithub
-	//nolint: revive
 	PrioHS
-	//nolint: revive
 	PrioImageFinder
-	//nolint: revive
 	PrioJueJueZi
-	//nolint: revive
 	PrioLolicon
-	//nolint: revive
 	PrioMinecraft
-	//nolint: revive
 	PrioMoyu
-	//nolint: revive
 	PrioMusic
-	//nolint: revive
 	PrioNativeSetu
-	//nolint: revive
 	PrioNativeWife
-	//nolint: revive
 	PrioNBNHHSH
-	//nolint: revive
 	PrioNovel
-	//nolint: revive
 	PrioOmikuji
-	//nolint: revive
 	PrioReborn
-	//nolint: revive
 	PrioRuncode
-	//nolint: revive
 	PrioSauceNao
-	//nolint: revive
 	PrioScore
-	//nolint: revive
 	PrioSetuTime
-	//nolint: revive
 	PrioShaDiao
-	//nolint: revive
 	PrioShinDan
-	//nolint: revive
 	PrioTraceMoe
-	//nolint: revive
 	PrioTranslation
-	//nolint: revive
 	PrioVtbQuotation
-	//nolint: revive
 	PrioWtf
 
-	//nolint: revive
 	PrioCurse
-	//nolint: revive
 	PrioMockingBird
-	//nolint: revive
 	PrioAIReply
 )

plugin_acgimage/classify.go

@@ -7,7 +7,7 @@ import (
 	"time"
 
 	"github.com/FloatTech/AnimeAPI/classify"
-	"github.com/FloatTech/AnimeAPI/picture"
+	"github.com/FloatTech/AnimeAPI/imgpool"
 	zero "github.com/wdvxdr1123/ZeroBot"
 	"github.com/wdvxdr1123/ZeroBot/extension/rate"
 	"github.com/wdvxdr1123/ZeroBot/message"
@@ -15,6 +15,7 @@ import (
 	"github.com/FloatTech/ZeroBot-Plugin/order"
 
 	control "github.com/FloatTech/zbputils/control"
+	"github.com/FloatTech/zbputils/ctxext"
 	"github.com/FloatTech/zbputils/web"
 )
 
@@ -27,7 +28,7 @@ const (
 var (
 	// r18有一定保护，一般不会发出图片
 	randapi = "&loli=true&r18=true"
-	msgof   = make(map[int64]int64)
+	msgof   = make(map[int64]message.MessageID)
 	block   = false
 	limit   = rate.NewManager(time.Minute, 5)
 )
@@ -53,7 +54,7 @@ func init() { // 插件主体
 			}
 		})
 	// 有保护的随机图片
-	engine.OnFullMatch("随机图片", zero.OnlyGroup).SetBlock(true).
+	engine.OnFullMatch("随机图片", zero.OnlyPublic).SetBlock(true).
 		Handle(func(ctx *zero.Ctx) {
 			if limit.Load(ctx.Event.UserID).Acquire() {
 				class, dhash, comment, _ := classify.Classify(randapi, true)
@@ -63,7 +64,7 @@ func init() { // 插件主体
 			ctx.SendChain(message.Text("你太快啦!"))
 		})
 	// 直接随机图片，无r18保护，后果自负。如果出r18图可尽快通过发送"太涩了"撤回
-	engine.OnFullMatch("直接随机", zero.OnlyGroup, zero.AdminPermission).SetBlock(true).
+	engine.OnFullMatch("直接随机", ctxext.UserOrGrpAdmin).SetBlock(true).
 		Handle(func(ctx *zero.Ctx) {
 			if block {
 				ctx.SendChain(message.Text("请稍后再试哦"))
@@ -80,7 +81,7 @@ func init() { // 插件主体
 			}
 		})
 	// 撤回最后的直接随机图片
-	engine.OnFullMatch("太涩了").SetBlock(true).
+	engine.OnFullMatch("太涩了", zero.OnlyGroup).SetBlock(true).
 		Handle(func(ctx *zero.Ctx) {
 			msg, ok := msgof[ctx.Event.GroupID]
 			if ok {
@@ -89,7 +90,7 @@ func init() { // 插件主体
 			}
 		})
 	// 上传一张图进行评价
-	engine.OnKeywordGroup([]string{"评价图片"}, zero.OnlyGroup, picture.CmdMatch, picture.MustGiven).SetBlock(true).
+	engine.OnKeywordGroup([]string{"评价图片"}, zero.OnlyPublic, ctxext.CmdMatch, ctxext.MustGiven).SetBlock(true).
 		Handle(func(ctx *zero.Ctx) {
 			ctx.SendChain(message.Text("少女祈祷中..."))
 			for _, url := range ctx.State["image_url"].([]string) {
@@ -102,16 +103,27 @@ func init() { // 插件主体
 		Handle(func(ctx *zero.Ctx) {
 			dhash := ctx.State["regex_matched"].([]string)[1]
 			if len(dhash) == 5*3 {
+				var u string
 				if web.IsSupportIPv6 {
-					ctx.SendChain(message.Image(apiheadv6 + dhash + ".webp"))
+					u = apiheadv6 + dhash + ".webp"
 				} else {
-					ctx.SendChain(message.Image(apihead + dhash))
+					u = apihead + dhash
 				}
+
+				m, err := imgpool.NewImage(ctx, dhash, u)
+				var img message.MessageSegment
+				if err != nil {
+					img = message.Image(u)
+				} else {
+					img = message.Image(m.String())
+				}
+
+				ctx.SendChain(img)
 			}
 		})
 }
 
-func setLastMsg(id int64, msg int64) {
+func setLastMsg(id int64, msg message.MessageID) {
 	msgof[id] = msg
 }
 
@@ -121,17 +133,26 @@ func replyClass(ctx *zero.Ctx, class int, dhash string, comment string, isupload
 		return
 	}
 
-	var img message.MessageSegment
+	var u string
 	if web.IsSupportIPv6 {
-		img = message.Image(apiheadv6 + dhash + ".webp")
+		u = apiheadv6 + dhash + ".webp"
 	} else {
-		img = message.Image(apihead + dhash)
+		u = apihead + dhash
+	}
+
+	m, err := imgpool.NewImage(ctx, b14, u)
+	var img message.MessageSegment
+	if err != nil {
+		img = message.Image(u)
+	} else {
+		img = message.Image(m.String())
 	}
 
 	if class > 5 {
 		if dhash != "" && !isupload {
 			ctx.SendChain(message.Text(comment + "\n给你点提示哦：" + b14))
 			ctx.Event.GroupID = 0
+			ctx.Event.DetailType = "private"
 			ctx.SendChain(img)
 			return
 		}

plugin_ai_false/ai_false.go

@@ -22,7 +22,7 @@ func init() { // 插件主体
 	engine := control.Register("aifalse", order.PrioAIFalse, &control.Options{
 		DisableOnDefault: false,
 		Help: "AIfalse\n" +
-			"- 查询计算机当前活跃度: [检查身体|自检|启动自检|系统状态]",
+			"- 查询计算机当前活跃度: [检查身体 | 自检 | 启动自检 | 系统状态]",
 	})
 	engine.OnFullMatchGroup([]string{"检查身体", "自检", "启动自检", "系统状态"}, zero.AdminPermission).SetBlock(true).
 		Handle(func(ctx *zero.Ctx) {

plugin_ai_reply/main.go

@@ -25,7 +25,7 @@ func init() { // 插件主体
 	engine := control.Register(serviceName, order.PrioAIReply, &control.Options{
 		DisableOnDefault: false,
 		Help: "人工智能回复\n" +
-			"- @Bot 任意文本(任意一句话回复)\n- 设置回复模式[青云客|小爱]\n- ",
+			"- @Bot 任意文本(任意一句话回复)\n- 设置回复模式[青云客  |  小爱]\n- ",
 	})
 	// 回复 @和包括名字
 	engine.OnMessage(zero.OnlyToMe).SetBlock(true).
@@ -38,7 +38,7 @@ func init() { // 插件主体
 			reply := aireply.Talk(ctx.ExtractPlainText())
 			// 回复
 			time.Sleep(time.Second * 1)
-			if ctx.Event.MessageType == "group" {
+			if zero.OnlyPublic(ctx) {
 				reply = append(reply, message.Reply(ctx.Event.MessageID))
 				ctx.Send(reply)
 				return

plugin_aiwife/non-existent.go

@@ -24,7 +24,7 @@ func init() { // 插件主体
 	control.Register("aiwife", order.PrioAIWife, &control.Options{
 		DisableOnDefault: false,
 		Help: "AIWife\n" +
-			"- waifu|随机waifu",
+			"- waifu | 随机waifu",
 	}).OnFullMatchGroup([]string{"waifu", "随机waifu"}).SetBlock(true).
 		Handle(func(ctx *zero.Ctx) {
 			miku := rand.Intn(100000) + 1

plugin_atri/atri.go

@@ -29,10 +29,10 @@ func init() { // 插件主体
 	engine := control.Register(servicename, order.PrioAtri, &control.Options{
 		DisableOnDefault: false,
 		Help: "本插件基于 ATRI ，为 Golang 移植版\n" +
-			"- ATRI醒醒\n- ATRI睡吧\n- 萝卜子\n- 喜欢|爱你|爱|suki|daisuki|すき|好き|贴贴|老婆|亲一个|mua\n" +
-			"- 草你妈|操你妈|脑瘫|废柴|fw|废物|战斗|爬|爪巴|sb|SB|傻B\n- 早安|早哇|早上好|ohayo|哦哈哟|お早う|早好|早|早早早\n" +
-			"- 中午好|午安|午好\n- 晚安|oyasuminasai|おやすみなさい|晚好|晚上好\n- 高性能|太棒了|すごい|sugoi|斯国一|よかった\n" +
-			"- 没事|没关系|大丈夫|还好|不要紧|没出大问题|没伤到哪\n- 好吗|是吗|行不行|能不能|可不可以\n- 啊这\n- 我好了\n- ？|?|¿\n" +
+			"- ATRI醒醒\n- ATRI睡吧\n- 萝卜子\n- 喜欢 | 爱你 | 爱 | suki | daisuki | すき | 好き | 贴贴 | 老婆 | 亲一个 | mua\n" +
+			"- 草你妈 | 操你妈 | 脑瘫 | 废柴 | fw | 废物 | 战斗 | 爬 | 爪巴 | sb | SB | 傻B\n- 早安 | 早哇 | 早上好 | ohayo | 哦哈哟 | お早う | 早好 | 早 | 早早早\n" +
+			"- 中午好 | 午安 | 午好\n- 晚安 | oyasuminasai | おやすみなさい | 晚好 | 晚上好\n- 高性能 | 太棒了 | すごい | sugoi | 斯国一 | よかった\n" +
+			"- 没事 | 没关系 | 大丈夫 | 还好 | 不要紧 | 没出大问题 | 没伤到哪\n- 好吗 | 是吗 | 行不行 | 能不能 | 可不可以\n- 啊这\n- 我好了\n- ？ | ? | ¿\n" +
 			"- 离谱\n- 答应我",
 	})
 	zero.OnFullMatch("ATRI醒醒", zero.AdminPermission).SetBlock(true).

plugin_bilibili/info.go

@@ -16,8 +16,8 @@ import (
 var engine = control.Register("bilibili", order.PrioBilibili, &control.Options{
 	DisableOnDefault: false,
 	Help: "bilibili\n" +
-		"- >vup info [名字|uid]\n" +
-		"- >user info [名字|uid]",
+		"- >vup info [名字 | uid]\n" +
+		"- >user info [名字 | uid]",
 })
 
 // 查成分的

plugin_bilibili_push/bilibili_push.go

@@ -3,21 +3,17 @@ package bilibilipush
 
 import (
 	"bytes"
-	"context"
 	"encoding/json"
 	"fmt"
 	"io"
-	"io/ioutil"
 	"net/http"
 	"strconv"
 	"time"
 
 	"github.com/FloatTech/zbputils/control"
 	"github.com/FloatTech/zbputils/ctxext"
-	"github.com/FloatTech/zbputils/file"
 	"github.com/FloatTech/zbputils/txt2img"
 	"github.com/FloatTech/zbputils/web"
-	"github.com/chromedp/chromedp"
 	log "github.com/sirupsen/logrus"
 	"github.com/tidwall/gjson"
 	zero "github.com/wdvxdr1123/ZeroBot"
@@ -41,10 +37,9 @@ const (
 var (
 	lastTime = map[int64]int64{}
 	typeMsg  = map[int64]string{
-		0:   "发布了新动态",
 		1:   "转发了一条动态",
-		2:   "发布了新动态",
-		4:   "发布了新动态",
+		2:   "有图营业",
+		4:   "无图营业",
 		8:   "发布了新投稿",
 		16:  "发布了短视频",
 		64:  "发布了新专栏",
@@ -207,7 +202,7 @@ func init() {
 		if err != nil {
 			log.Errorln("[bilibilipush]:", err)
 		}
-		if id := ctx.SendChain(message.Image("base64://" + helper.BytesToString(data))); id == 0 {
+		if id := ctx.SendChain(message.Image("base64://" + helper.BytesToString(data))); id.ID() == 0 {
 			ctx.SendChain(message.Text("ERROR: 可能被风控了"))
 		}
 	})
@@ -333,15 +328,150 @@ func sendDynamic() {
 				m, ok := control.Lookup(serviceName)
 				if ok {
 					groupList := bdb.getAllGroupByBuidAndDynamic(buid)
-					cID := cardList[i].Get("desc.dynamic_id").String()
-					cType := cardList[i].Get("desc.type").Int()
-					cName := cardList[i].Get("desc.user_profile.info.uname").String()
-					screenshotFile := cachePath + cID + ".png"
-					initDynamicScreenshot(cID)
 					var msg []message.MessageSegment
-					msg = append(msg, message.Text(cName+typeMsg[cType]))
-					msg = append(msg, message.Image("file:///"+file.BOTPATH+"/"+screenshotFile))
-					msg = append(msg, message.Text(tURL+cID))
+					cType := cardList[i].Get("desc.type").Int()
+					cardStr := cardList[i].Get("card").String()
+					switch cType {
+					case 0:
+						cName := cardList[i].Get("desc.user_profile.info.uname").String()
+						cTime := time.Unix(cardList[i].Get("desc.timestamp").Int(), 0).Format("2006-01-02 15:04:05")
+						msg = append(msg, message.Text(cName+"在"+cTime+typeMsg[cType]+"\n"))
+					case 1:
+						cName := gjson.Get(cardStr, "user.uname").String()
+						msg = append(msg, message.Text(cName+typeMsg[cType]+"\n"))
+						cContent := gjson.Get(cardStr, "item.content").String()
+						msg = append(msg, message.Text(cContent+"\n"))
+						msg = append(msg, message.Text("转发的内容：\n"))
+						cOrigType := gjson.Get(cardStr, "item.orig_type").Int()
+						cOrigin := gjson.Get(cardStr, "origin").String()
+						switch cOrigType {
+						case 1:
+							cName := gjson.Get(cOrigin, "user.uname").String()
+							msg = append(msg, message.Text(cName+typeMsg[cOrigType]+"\n"))
+						case 2:
+							cName := gjson.Get(cOrigin, "user.name").String()
+							cUploadTime := time.Unix(gjson.Get(cOrigin, "item.upload_time").Int(), 0).Format("2006-01-02 15:04:05")
+							msg = append(msg, message.Text(cName+"在"+cUploadTime+typeMsg[cOrigType]+"\n"))
+							cDescription := gjson.Get(cOrigin, "item.description")
+							msg = append(msg, message.Text(cDescription))
+							if gjson.Get(cOrigin, "item.pictures.#").Int() != 0 {
+								gjson.Get(cOrigin, "item.pictures").ForEach(func(_, v gjson.Result) bool {
+									msg = append(msg, message.Image(v.Get("img_src").String()))
+									return true
+								})
+							}
+						case 4:
+							cName := gjson.Get(cOrigin, "user.uname").String()
+							cTimestamp := time.Unix(gjson.Get(cOrigin, "item.timestamp").Int(), 0).Format("2006-01-02 15:04:05")
+							msg = append(msg, message.Text(cName+"在"+cTimestamp+typeMsg[cOrigType]+"\n"))
+							cContent := gjson.Get(cOrigin, "item.content").String()
+							msg = append(msg, message.Text(cContent+"\n"))
+						case 8:
+							cName := gjson.Get(cOrigin, "owner.name").String()
+							cTime := time.Unix(gjson.Get(cOrigin, "ctime").Int(), 0).Format("2006-01-02 15:04:05")
+							msg = append(msg, message.Text(cName+"在"+cTime+typeMsg[cOrigType]+"\n"))
+							cTitle := gjson.Get(cOrigin, "title").String()
+							msg = append(msg, message.Text(cTitle))
+							cPic := gjson.Get(cOrigin, "pic").String()
+							msg = append(msg, message.Image(cPic))
+							cDesc := gjson.Get(cOrigin, "desc").String()
+							msg = append(msg, message.Text(cDesc+"\n"))
+							cShareSubtitle := gjson.Get(cOrigin, "share_subtitle").String()
+							msg = append(msg, message.Text(cShareSubtitle+"\n"))
+							cShortLink := gjson.Get(cOrigin, "short_link").String()
+							msg = append(msg, message.Text("视频链接："+cShortLink+"\n"))
+						case 16:
+							cName := gjson.Get(cOrigin, "user.name").String()
+							cUploadTime := gjson.Get(cOrigin, "item.upload_time").String()
+							msg = append(msg, message.Text(cName+"在"+cUploadTime+typeMsg[cOrigType]+"\n"))
+							cDescription := gjson.Get(cOrigin, "item.description")
+							msg = append(msg, message.Text(cDescription))
+							cCover := gjson.Get(cOrigin, "item.cover.default").String()
+							msg = append(msg, message.Image(cCover))
+						case 64:
+							cName := gjson.Get(cOrigin, "author.name").String()
+							cPublishTime := time.Unix(gjson.Get(cOrigin, "publish_time").Int(), 0).Format("2006-01-02 15:04:05")
+							msg = append(msg, message.Text(cName+"在"+cPublishTime+typeMsg[cOrigType]+"\n"))
+							cTitle := gjson.Get(cOrigin, "title").String()
+							msg = append(msg, message.Text(cTitle+"\n"))
+							cSummary := gjson.Get(cOrigin, "summary").String()
+							msg = append(msg, message.Text(cSummary))
+							cBannerURL := gjson.Get(cOrigin, "banner_url").String()
+							msg = append(msg, message.Image(cBannerURL))
+						case 256:
+							cUpper := gjson.Get(cOrigin, "upper").String()
+							cTime := time.UnixMilli(gjson.Get(cOrigin, "ctime").Int()).Format("2006-01-02 15:04:05")
+							msg = append(msg, message.Text(cUpper+"在"+cTime+typeMsg[cOrigType]+"\n"))
+							cTitle := gjson.Get(cOrigin, "title").String()
+							msg = append(msg, message.Text(cTitle))
+							cCover := gjson.Get(cOrigin, "cover").String()
+							msg = append(msg, message.Image(cCover))
+						default:
+							msg = append(msg, message.Text("未知动态类型"+strconv.FormatInt(cOrigType, 10)+"\n"))
+						}
+					case 2:
+						cName := gjson.Get(cardStr, "user.name").String()
+						cUploadTime := time.Unix(gjson.Get(cardStr, "item.upload_time").Int(), 0).Format("2006-01-02 15:04:05")
+						msg = append(msg, message.Text(cName+"在"+cUploadTime+typeMsg[cType]+"\n"))
+						cDescription := gjson.Get(cardStr, "item.description")
+						msg = append(msg, message.Text(cDescription))
+						if gjson.Get(cardStr, "item.pictures.#").Int() != 0 {
+							gjson.Get(cardStr, "item.pictures").ForEach(func(_, v gjson.Result) bool {
+								msg = append(msg, message.Image(v.Get("img_src").String()))
+								return true
+							})
+						}
+					case 4:
+						cName := gjson.Get(cardStr, "user.uname").String()
+						cTimestamp := time.Unix(gjson.Get(cardStr, "item.timestamp").Int(), 0).Format("2006-01-02 15:04:05")
+						msg = append(msg, message.Text(cName+"在"+cTimestamp+typeMsg[cType]+"\n"))
+						cContent := gjson.Get(cardStr, "item.content").String()
+						msg = append(msg, message.Text(cContent+"\n"))
+					case 8:
+						cName := gjson.Get(cardStr, "owner.name").String()
+						cTime := time.Unix(gjson.Get(cardStr, "ctime").Int(), 0).Format("2006-01-02 15:04:05")
+						msg = append(msg, message.Text(cName+"在"+cTime+typeMsg[cType]+"\n"))
+						cTitle := gjson.Get(cardStr, "title").String()
+						msg = append(msg, message.Text(cTitle))
+						cPic := gjson.Get(cardStr, "pic").String()
+						msg = append(msg, message.Image(cPic))
+						cDesc := gjson.Get(cardStr, "desc").String()
+						msg = append(msg, message.Text(cDesc+"\n"))
+						cShareSubtitle := gjson.Get(cardStr, "share_subtitle").String()
+						msg = append(msg, message.Text(cShareSubtitle+"\n"))
+						cShortLink := gjson.Get(cardStr, "short_link").String()
+						msg = append(msg, message.Text("视频链接："+cShortLink+"\n"))
+					case 16:
+						cName := gjson.Get(cardStr, "user.name").String()
+						cUploadTime := gjson.Get(cardStr, "item.upload_time").String()
+						msg = append(msg, message.Text(cName+"在"+cUploadTime+typeMsg[cType]+"\n"))
+						cDescription := gjson.Get(cardStr, "item.description")
+						msg = append(msg, message.Text(cDescription))
+						cCover := gjson.Get(cardStr, "item.cover.default").String()
+						msg = append(msg, message.Image(cCover))
+					case 64:
+						cName := gjson.Get(cardStr, "author.name").String()
+						cPublishTime := time.Unix(gjson.Get(cardStr, "publish_time").Int(), 0).Format("2006-01-02 15:04:05")
+						msg = append(msg, message.Text(cName+"在"+cPublishTime+typeMsg[cType]+"\n"))
+						cTitle := gjson.Get(cardStr, "title").String()
+						msg = append(msg, message.Text(cTitle+"\n"))
+						cSummary := gjson.Get(cardStr, "summary").String()
+						msg = append(msg, message.Text(cSummary))
+						cBannerURL := gjson.Get(cardStr, "banner_url").String()
+						msg = append(msg, message.Image(cBannerURL))
+					case 256:
+						cUpper := gjson.Get(cardStr, "upper").String()
+						cTime := time.UnixMilli(gjson.Get(cardStr, "ctime").Int()).Format("2006-01-02 15:04:05")
+						msg = append(msg, message.Text(cUpper+"在"+cTime+typeMsg[cType]+"\n"))
+						cTitle := gjson.Get(cardStr, "title").String()
+						msg = append(msg, message.Text(cTitle))
+						cCover := gjson.Get(cardStr, "cover").String()
+						msg = append(msg, message.Image(cCover))
+					default:
+						msg = append(msg, message.Text("未知动态类型"+strconv.FormatInt(cType, 10)+"\n"))
+					}
+					cID := cardList[i].Get("desc.dynamic_id").String()
+					msg = append(msg, message.Text("动态链接：", tURL+cID))
 
 					zero.RangeBot(func(id int64, ctx *zero.Ctx) bool {
 						for _, gid := range groupList {
@@ -393,10 +523,10 @@ func sendLive() {
 					lCover = value.Get("keyframe").String()
 				}
 				var msg []message.MessageSegment
-				msg = append(msg, message.Text(lName+" 正在直播:\n"))
+				msg = append(msg, message.Text(lName+" 正在直播：\n"))
 				msg = append(msg, message.Text(lTitle))
 				msg = append(msg, message.Image(lCover))
-				msg = append(msg, message.Text(lURL))
+				msg = append(msg, message.Text("直播链接：", lURL))
 				zero.RangeBot(func(id int64, ctx *zero.Ctx) bool {
 					for _, gid := range groupList {
 						if m.IsEnabledIn(gid) {
@@ -419,26 +549,3 @@ func sendLive() {
 		return true
 	})
 }
-
-func initDynamicScreenshot(dynamicID string) {
-	screenshotFile := cachePath + dynamicID + ".png"
-	if file.IsNotExist(screenshotFile) {
-		var imageBuf []byte
-		dynamicURL := tURL + dynamicID
-		ctx, cancel := chromedp.NewContext(context.Background(), chromedp.WithDebugf(log.Printf))
-		defer cancel()
-
-		if err := chromedp.Run(ctx, chromedp.Tasks{
-			chromedp.Navigate(dynamicURL),
-			chromedp.SetAttributeValue(`div.unlogin-popover-avatar`, "style", "display:none;", chromedp.ByQuery),
-			chromedp.SetAttributeValue(`div.bb-comment`, "style", "display:none;", chromedp.ByQuery),
-			chromedp.Screenshot(`.card`, &imageBuf, chromedp.NodeVisible, chromedp.ByQuery),
-		}); err != nil {
-			log.Errorln("[bilibilipush]:", err)
-		}
-
-		if err := ioutil.WriteFile(screenshotFile, imageBuf, 0644); err != nil {
-			log.Errorln("[bilibilipush]:", err)
-		}
-	}
-}

plugin_book_review/book_review.go

@@ -27,7 +27,7 @@ func init() {
 			if err != nil {
 				log.Println("err:", err)
 			}
-			if id := ctx.SendChain(message.Image("base64://" + helper.BytesToString(data))); id == 0 {
+			if id := ctx.SendChain(message.Image("base64://" + helper.BytesToString(data))); id.ID() == 0 {
 				ctx.SendChain(message.Text("ERROR: 可能被风控了"))
 			}
 		})
@@ -39,7 +39,7 @@ func init() {
 			if err != nil {
 				log.Println("err:", err)
 			}
-			if id := ctx.SendChain(message.Image("base64://" + helper.BytesToString(data))); id == 0 {
+			if id := ctx.SendChain(message.Image("base64://" + helper.BytesToString(data))); id.ID() == 0 {
 				ctx.SendChain(message.Text("ERROR: 可能被风控了"))
 			}
 		})

plugin_chat/chat.go

@@ -23,7 +23,7 @@ var (
 	poke   = rate.NewManager(time.Minute*5, 8) // 戳一戳
 	engine = control.Register("chat", order.PrioChat, &control.Options{
 		DisableOnDefault: false,
-		Help:             "chat\n- [BOT名字]\n- [戳一戳BOT]\n- 空调开\n- 空调关\n- 群温度\n- 设置温度[正整数]\n- mua|啾咪|摸|上你|傻|裸|贴|老婆|抱|亲|一下|咬|操|123|进去|调教|搓|让|捏|挤|略|呐|原味|胖次|内裤|内衣|衣服|ghs|批|憨批|kkp|咕|骚|喜欢|suki|好き|看|不能|砸了|透|口我|草我|自慰|onani|オナニー|炸了|色图|涩图|告白|对不起|回来|吻|软|壁咚|掰开|女友|是|喵|嗷呜|叫|拜|佬|awsl|臭|香|腿|张开|脚|脸|头发|手|pr|舔|小穴|腰|诶嘿嘿|可爱|扭蛋|鼻|眼|色气|推|床|举|手冲|饿|变|敲|爬|怕|冲|射|不穿|迫害|猫粮|揪尾巴|薄荷|早|晚安|揉|榨|掐|胸|奶子|欧派|嫩|蹭|牵手|握手|拍照|w|睡不着|欧尼酱|哥|爱你|过来|自闭|打不过|么么哒|很懂|膝枕|累了|安慰|洗澡|一起睡觉|一起|多大|姐姐|糖|嗦|牛子|🐂子|🐮子|嫌弃|紧|baka|笨蛋|插|插进来|屁股|翘|翘起来|抬|抬起|爸|傲娇|rua|咕噜咕噜|咕噜|上床|做爱|吃掉|吃|揪|种草莓|种草|掀|妹|病娇|嘻",
+		Help:             "chat\n- [BOT名字]\n- [戳一戳BOT]\n- 空调开\n- 空调关\n- 群温度\n- 设置温度[正整数]\n- mua | 啾咪 | 摸 | 上你 | 傻 | 裸 | 贴 | 老婆 | 抱 | 亲 | 一下 | 咬 | 操 | 123 | 进去 | 调教 | 搓 | 让 | 捏 | 挤 | 略 | 呐 | 原味 | 胖次 | 内裤 | 内衣 | 衣服 | ghs | 批 | 憨批 | kkp | 咕 | 骚 | 喜欢 | suki | 好き | 看 | 不能 | 砸了 | 透 | 口我 | 草我 | 自慰 | onani | オナニー | 炸了 | 色图 | 涩图 | 告白 | 对不起 | 回来 | 吻 | 软 | 壁咚 | 掰开 | 女友 | 是 | 喵 | 嗷呜 | 叫 | 拜 | 佬 | awsl | 臭 | 香 | 腿 | 张开 | 脚 | 脸 | 头发 | 手 | pr | 舔 | 小穴 | 腰 | 诶嘿嘿 | 可爱 | 扭蛋 | 鼻 | 眼 | 色气 | 推 | 床 | 举 | 手冲 | 饿 | 变 | 敲 | 爬 | 怕 | 冲 | 射 | 不穿 | 迫害 | 猫粮 | 揪尾巴 | 薄荷 | 早 | 晚安 | 揉 | 榨 | 掐 | 胸 | 奶子 | 欧派 | 嫩 | 蹭 | 牵手 | 握手 | 拍照 | w | 睡不着 | 欧尼酱 | 哥 | 爱你 | 过来 | 自闭 | 打不过 | 么么哒 | 很懂 | 膝枕 | 累了 | 安慰 | 洗澡 | 一起睡觉 | 一起 | 多大 | 姐姐 | 糖 | 嗦 | 牛子 | 🐂子 | 🐮子 | 嫌弃 | 紧 | baka | 笨蛋 | 插 | 插进来 | 屁股 | 翘 | 翘起来 | 抬 | 抬起 | 爸 | 傲娇 | rua | 咕噜咕噜 | 咕噜 | 上床 | 做爱 | 吃掉 | 吃 | 揪 | 种草莓 | 种草 | 掀 | 妹 | 病娇 | 嘻",
 	})
 	kimomap  = make(kimo, 256)
 	chatList = make([]string, 0, 256)

plugin_curse/curse.go

@@ -15,7 +15,6 @@ import (
 )
 
 const (
-	prio     = 250
 	minLevel = "min"
 	maxLevel = "max"
 )

plugin_danbooru/main.go

@@ -7,9 +7,9 @@ import (
 	"os"
 
 	"github.com/FloatTech/AnimeAPI/danbooru"
-	"github.com/FloatTech/AnimeAPI/picture"
 	"github.com/FloatTech/AnimeAPI/saucenao"
 	"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"
@@ -32,7 +32,7 @@ func init() { // 插件主体
 			"- 鉴赏图片[图片]",
 	})
 	// 上传一张图进行评价
-	engine.OnKeywordGroup([]string{"鉴赏图片"}, zero.OnlyGroup, picture.CmdMatch, picture.MustGiven).SetBlock(true).
+	engine.OnKeywordGroup([]string{"鉴赏图片"}, zero.OnlyPublic, ctxext.CmdMatch, ctxext.MustGiven).SetBlock(true).
 		Handle(func(ctx *zero.Ctx) {
 			ctx.SendChain(message.Text("少女祈祷中..."))
 			for _, url := range ctx.State["image_url"].([]string) {

plugin_diana/zhiwang.go

@@ -5,7 +5,6 @@ import (
 	"bytes"
 	"encoding/json"
 	"math"
-	"strconv"
 	"time"
 
 	"github.com/wdvxdr1123/ZeroBot/message"
@@ -33,8 +32,7 @@ func init() {
 		Handle(func(ctx *zero.Ctx) {
 			msg := ctx.Event.Message
 			if msg[0].Type == "reply" {
-				id, _ := strconv.Atoi(msg[0].Data["id"])
-				msg := ctx.GetMessage(int64(id)).Elements[0].Data["text"]
+				msg := ctx.GetMessage(message.NewMessageID(msg[0].Data["id"])).Elements[0].Data["text"]
 				zhiwangjson := zhiwangapi(msg)
 
 				if zhiwangjson == nil || zhiwangjson.Code != 0 {

plugin_fortune/fortune.go

@@ -7,6 +7,7 @@ import (
 	"encoding/hex"
 	"encoding/json"
 	"image"
+	"io"
 	"math/rand"
 	"os"
 	"strconv"
@@ -18,16 +19,16 @@ 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/file"
 	"github.com/FloatTech/zbputils/math"
-	"github.com/FloatTech/zbputils/process"
 	"github.com/FloatTech/zbputils/txt2img"
 
 	"github.com/FloatTech/ZeroBot-Plugin/order"
 )
 
-var (
+const (
 	// 底图缓存位置
 	images = "data/Fortune/"
 	// 基础文件位置
@@ -36,9 +37,12 @@ var (
 	font = "data/Font/sakura.ttf"
 	// 生成图缓存位置
 	cache = images + "cache/"
+)
+
+var (
 	// 底图类型列表：车万 DC4 爱因斯坦 星空列车 樱云之恋 富婆妹 李清歌
 	// 				公主连结 原神 明日方舟 碧蓝航线 碧蓝幻想 战双 阴阳师
-	table = [...]string{"车万", "DC4", "爱因斯坦", "星空列车", "樱云之恋", "富婆妹", "李清歌", "公主连结", "原神", "明日方舟", "碧蓝航线", "碧蓝幻想", "战双", "阴阳师"}
+	table = [...]string{"车万", "DC4", "爱因斯坦", "星空列车", "樱云之恋", "富婆妹", "李清歌", "公主连结", "原神", "明日方舟", "碧蓝航线", "碧蓝幻想", "战双", "阴阳师", "赛马娘"}
 	// 映射底图与 index
 	index = make(map[string]uint8)
 	// 签文
@@ -53,11 +57,11 @@ func init() {
 	if err != nil {
 		panic(err)
 	}
+	_ = os.RemoveAll(cache)
 	err = os.MkdirAll(cache, 0755)
 	if err != nil {
 		panic(err)
 	}
-	process.SleepAbout1sTo2s()
 	data, err := file.GetLazyData(omikujson, true, false)
 	if err != nil {
 		panic(err)
@@ -74,8 +78,8 @@ func init() {
 	en := control.Register("fortune", order.PrioFortune, &control.Options{
 		DisableOnDefault: false,
 		Help: "每日运势: \n" +
-			"- 运势|抽签\n" +
-			"- 设置底图[车万 DC4 爱因斯坦 星空列车 樱云之恋 富婆妹 李清歌 公主连结 原神 明日方舟 碧蓝航线 碧蓝幻想 战双 阴阳师]",
+			"- 运势 | 抽签\n" +
+			"- 设置底图[车万 | DC4 | 爱因斯坦 | 星空列车 | 樱云之恋 | 富婆妹 | 李清歌 | 公主连结 | 原神 | 明日方舟 | 碧蓝航线 | 碧蓝幻想 | 战双 | 阴阳师 | 赛马娘]",
 	})
 	en.OnRegex(`^设置底图(.*)`).SetBlock(true).
 		Handle(func(ctx *zero.Ctx) {
@@ -142,27 +146,32 @@ func init() {
 			digest := md5.Sum(helper.StringToBytes(zipfile + strconv.Itoa(index) + title + text))
 			cachefile := cache + hex.EncodeToString(digest[:])
 
-			var data []byte
-			switch file.IsExist(cachefile) {
-			case true:
-				data, err = os.ReadFile(cachefile)
-				if err == nil {
-					break
+			m, err := imgpool.NewImage(ctx, cachefile, file.BOTPATH+"/"+cachefile)
+			if err != nil {
+				logrus.Debugln("[fortune]", err)
+				if file.IsNotExist(cachefile) {
+					f, err := os.Create(cachefile)
+					if err != nil {
+						ctx.SendChain(message.Text("ERROR: ", err))
+						return
+					}
+					_, err = draw(background, title, text, f)
+					_ = f.Close()
+					if err != nil {
+						ctx.SendChain(message.Text("ERROR: ", err))
+						return
+					}
 				}
-				_ = os.Remove(cachefile)
-				fallthrough
-			case false:
-				// 绘制背景
-				data, err = draw(background, title, text)
+				m, err = imgpool.NewImage(ctx, cachefile, file.BOTPATH+"/"+cachefile)
 			}
 
 			if err != nil {
 				ctx.SendChain(message.Text("ERROR: ", err))
 				return
 			}
-			_ = os.WriteFile(cachefile, data, 0644)
+
 			// 发送图片
-			ctx.SendChain(message.Image("base64://" + helper.BytesToString(data)))
+			ctx.SendChain(message.Image(m.String()))
 		})
 }
 
@@ -206,20 +215,20 @@ func randtext(seed int64) (string, string) {
 // @param title 签名
 // @param text 签文
 // @return 错误信息
-func draw(back image.Image, title, text string) ([]byte, error) {
+func draw(back image.Image, title, text string, f io.Writer) (int64, error) {
 	canvas := gg.NewContext(back.Bounds().Size().Y, back.Bounds().Size().X)
 	canvas.DrawImage(back, 0, 0)
 	// 写标题
 	canvas.SetRGB(1, 1, 1)
 	if err := canvas.LoadFontFace(font, 45); err != nil {
-		return nil, err
+		return -1, err
 	}
 	sw, _ := canvas.MeasureString(title)
 	canvas.DrawString(title, 140-sw/2, 112)
 	// 写正文
 	canvas.SetRGB(0, 0, 0)
 	if err := canvas.LoadFontFace(font, 23); err != nil {
-		return nil, err
+		return -1, err
 	}
 	tw, th := canvas.MeasureString("测")
 	tw, th = tw+10, th+10
@@ -247,7 +256,7 @@ func draw(back image.Image, title, text string) ([]byte, error) {
 			}
 		}
 	}
-	return txt2img.TxtCanvas{Canvas: canvas}.ToBase64()
+	return txt2img.TxtCanvas{Canvas: canvas}.WriteTo(f)
 }
 
 func offest(total, now int, distance float64) float64 {

plugin_funny/laugh.go

@@ -20,7 +20,7 @@ var (
 	engine = control.Register("funny", order.PrioFunny, &control.Options{
 		DisableOnDefault: false,
 		Help: "讲个笑话\n" +
-			"- 讲个笑话[@xxx]|讲个笑话[qq号]",
+			"- 讲个笑话[@xxx] | 讲个笑话[qq号]",
 	})
 	limit = rate.NewManager(time.Minute, 20)
 	db    = &sql.Sqlite{DBPath: dbfile}

plugin_image_finder/keyword.go

@@ -6,8 +6,10 @@ import (
 	"fmt"
 	"math/rand"
 	"net/http"
+	"strconv"
 	"time"
 
+	"github.com/FloatTech/AnimeAPI/imgpool"
 	control "github.com/FloatTech/zbputils/control"
 	zero "github.com/wdvxdr1123/ZeroBot"
 	"github.com/wdvxdr1123/ZeroBot/message"
@@ -73,7 +75,13 @@ func init() {
 			pom1 := "https://i.pixiv.re"
 			rannum := randintn(len(soutujson.Illusts))
 			pom2 := soutujson.Illusts[rannum].ImageUrls.Medium[19:]
-			ctx.SendChain(message.Image(pom1 + pom2))
+			u := pom1 + pom2
+			m, err := imgpool.NewImage(ctx, strconv.Itoa(soutujson.Illusts[rannum].ID), u)
+			if err != nil {
+				ctx.SendChain(message.Image(u))
+				return
+			}
+			ctx.SendChain(message.Image(m.String()))
 		})
 }
 

plugin_juejuezi/juejuezi.go

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

plugin_lolicon/lolicon.go

@@ -11,6 +11,7 @@ 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/math"
 
@@ -52,8 +53,13 @@ func init() {
 						continue
 					}
 					url := json.Get("data.0.urls.original").Str
-					ctx.SendGroupMessage(0, message.Image(strings.ReplaceAll(url, "i.pixiv.cat", "i.pixiv.re")))
-					queue <- url
+					url = strings.ReplaceAll(url, "i.pixiv.cat", "i.pixiv.re")
+					m, err := imgpool.NewImage(ctx, url[:strings.LastIndex(url, "/")+1], url)
+					if err == nil {
+						queue <- m.String()
+					} else {
+						queue <- url
+					}
 				}
 			}()
 			select {

plugin_manager/manager.go

@@ -44,15 +44,15 @@ const (
 		"- 群聊转发 1234 XXX\n" +
 		"- 私聊转发 0000 XXX\n" +
 		"- 在MM月dd日的hh点mm分时(用http://url)提醒大家XXX\n" +
-		"- 在MM月[每周|周几]的hh点mm分时(用http://url)提醒大家XXX\n" +
+		"- 在MM月[每周 | 周几]的hh点mm分时(用http://url)提醒大家XXX\n" +
 		"- 取消在MM月dd日的hh点mm分的提醒\n" +
-		"- 取消在MM月[每周|周几]的hh点mm分的提醒\n" +
+		"- 取消在MM月[每周 | 周几]的hh点mm分的提醒\n" +
 		"- 在\"cron\"时(用[url])提醒大家[xxx]\n" +
 		"- 取消在\"cron\"的提醒\n" +
 		"- 列出所有提醒\n" +
 		"- 翻牌\n" +
 		"- 设置欢迎语XXX\n" +
-		"- [开启|关闭]入群验证"
+		"- [开启 | 关闭]入群验证"
 )
 
 var (

plugin_nativewife/main.go

@@ -12,7 +12,6 @@ import (
 	"strings"
 	"time"
 
-	"github.com/FloatTech/AnimeAPI/picture"
 	zero "github.com/wdvxdr1123/ZeroBot"
 	"github.com/wdvxdr1123/ZeroBot/message"
 	"github.com/wdvxdr1123/ZeroBot/utils/helper"
@@ -35,7 +34,7 @@ func init() {
 	}
 	engine := control.Register("nwife", order.PrioNativeWife, &control.Options{
 		DisableOnDefault: false,
-		Help:             "nativewife\n- 抽wife[@xxx]\n- 添加wife[名字][图片]\n- 删除wife[名字]\n- [让|不让]所有人均可添加wife",
+		Help:             "nativewife\n- 抽wife[@xxx]\n- 添加wife[名字][图片]\n- 删除wife[名字]\n- [让 | 不让]所有人均可添加wife",
 	})
 	engine.OnPrefix("抽wife", zero.OnlyGroup).SetBlock(true).
 		Handle(func(ctx *zero.Ctx) {
@@ -63,7 +62,7 @@ func init() {
 			}
 		})
 	// 上传一张图
-	engine.OnPrefix("添加wife", zero.OnlyGroup, chkAddWifePermission, picture.MustGiven).SetBlock(true).
+	engine.OnPrefix("添加wife", zero.OnlyGroup, chkAddWifePermission, ctxext.MustGiven).SetBlock(true).
 		Handle(func(ctx *zero.Ctx) {
 			name := ""
 			for _, elem := range ctx.Event.Message {

plugin_novel/qianbi.go

@@ -92,7 +92,7 @@ func init() {
 					if err != nil {
 						log.Println("err:", err)
 					}
-					if id := ctx.SendChain(message.Image("base64://" + helper.BytesToString(data))); id == 0 {
+					if id := ctx.SendChain(message.Image("base64://" + helper.BytesToString(data))); id.ID() == 0 {
 						ctx.SendChain(message.Text("ERROR: 可能被风控了"))
 					}
 				} else {
@@ -120,13 +120,7 @@ func init() {
 				webpageURL := websiteURL + "/book/" + id + "/"
 				downloadURL := websiteURL + "/modules/article/txtarticle.php?id=" + id
 				text := fmt.Sprintf("书名:%s\n类型:%s\n作者:%s\n状态:%s\n简介:%s\n更新时间:%s\n最新章节:%s\n网页链接:%s\n下载地址:%s\n", bookName, category, author, status, description, updateTime, latestChapter, webpageURL, downloadURL)
-				data, err := txt2img.RenderToBase64(text, txt2img.FontFile, 400, 20)
-				if err != nil {
-					log.Println("err:", err)
-				}
-				if id := ctx.SendChain(message.Image("base64://" + helper.BytesToString(data))); id == 0 {
-					ctx.SendChain(message.Text("ERROR: 可能被风控了"))
-				}
+				ctx.SendChain(message.Text(text))
 			}
 		})
 }

plugin_omikuji/sensou.go

@@ -26,7 +26,7 @@ var (
 	engine = control.Register("omikuji", order.PrioOmikuji, &control.Options{
 		DisableOnDefault: false,
 		Help: "浅草寺求签\n" +
-			"- 求签|占卜\n- 解签",
+			"- 求签 | 占卜\n- 解签",
 	})
 )
 
@@ -46,7 +46,7 @@ func init() { // 插件主体
 			if err != nil {
 				log.Errorln("[omikuji]:", err)
 			}
-			if id := ctx.SendChain(message.At(ctx.Event.UserID), message.Image("base64://"+helper.BytesToString(kujiBytes))); id == 0 {
+			if id := ctx.SendChain(message.At(ctx.Event.UserID), message.Image("base64://"+helper.BytesToString(kujiBytes))); id.ID() == 0 {
 				ctx.SendChain(message.Text("ERROR: 可能被风控了"))
 			}
 		})

plugin_saucenao/searcher.go

@@ -7,7 +7,7 @@ import (
 	"strconv"
 
 	"github.com/FloatTech/AnimeAPI/ascii2d"
-	"github.com/FloatTech/AnimeAPI/picture"
+	"github.com/FloatTech/AnimeAPI/imgpool"
 	"github.com/FloatTech/AnimeAPI/pixiv"
 	"github.com/FloatTech/AnimeAPI/saucenao"
 	"github.com/sirupsen/logrus"
@@ -17,6 +17,7 @@ import (
 	"github.com/FloatTech/ZeroBot-Plugin/order"
 
 	control "github.com/FloatTech/zbputils/control"
+	"github.com/FloatTech/zbputils/ctxext"
 	"github.com/FloatTech/zbputils/file"
 )
 
@@ -33,7 +34,7 @@ func init() { // 插件主体
 	engine := control.Register("saucenao", order.PrioSauceNao, &control.Options{
 		DisableOnDefault: false,
 		Help: "搜图\n" +
-			"- 以图搜图|搜索图片|以图识图[图片]\n" +
+			"- 以图搜图 | 搜索图片 | 以图识图[图片]\n" +
 			"- 搜图[P站图片ID]",
 	})
 	// 根据 PID 搜图
@@ -49,22 +50,32 @@ func init() { // 插件主体
 			}
 			if illust.Pid > 0 {
 				name := strconv.FormatInt(illust.Pid, 10)
-				filepath := datapath + name
-				switch {
-				case file.IsExist(filepath + ".jpg"):
-					filepath = "file:///" + filepath + ".jpg"
-				case file.IsExist(filepath + ".png"):
-					filepath = "file:///" + filepath + ".png"
-				case file.IsExist(filepath + ".gif"):
-					filepath = "file:///" + filepath + ".gif"
-				default:
-					filepath = ""
-				}
-				if filepath == "" {
-					logrus.Debug("[sausenao]开始下载", name)
-					filepath, err = pixiv.Download(illust.ImageUrls, datapath, name)
-					if err == nil {
-						filepath = "file:///" + filepath
+				var imgs message.Message
+				for i, u := range illust.ImageUrls {
+					n := name + "_p" + strconv.Itoa(i)
+					filepath := datapath + n
+					f := ""
+					switch {
+					case file.IsExist(filepath + ".jpg"):
+						f = filepath + ".jpg"
+					case file.IsExist(filepath + ".png"):
+						f = filepath + ".png"
+					case file.IsExist(filepath + ".gif"):
+						f = filepath + ".gif"
+					default:
+						logrus.Debugln("[sausenao]开始下载", n)
+						filepath, err = pixiv.Download(u, datapath, n)
+						if err == nil {
+							f = filepath
+						}
+					}
+					if f != "" {
+						m, err := imgpool.NewImage(ctx, n, f)
+						if err == nil {
+							imgs = append(imgs, message.Image(m.String()))
+						} else {
+							imgs = append(imgs, message.Image("file:///"+f))
+						}
 					}
 				}
 				txt := message.Text(
@@ -74,9 +85,9 @@ func init() { // 插件主体
 					"画师ID：", illust.UserId, "\n",
 					"直链：", "https://pixivel.moe/detail?id=", illust.Pid,
 				)
-				if filepath != "" {
+				if imgs != nil {
 					// 发送搜索结果
-					ctx.SendChain(message.Image(filepath), message.Text("\n"), txt)
+					ctx.Send(append(imgs, message.Text("\n"), txt))
 				} else {
 					// 图片下载失败，仅发送文字结果
 					ctx.SendChain(txt)
@@ -86,7 +97,7 @@ func init() { // 插件主体
 			}
 		})
 	// 以图搜图
-	engine.OnKeywordGroup([]string{"以图搜图", "搜索图片", "以图识图"}, picture.CmdMatch, picture.MustGiven).SetBlock(true).
+	engine.OnKeywordGroup([]string{"以图搜图", "搜索图片", "以图识图"}, ctxext.CmdMatch, ctxext.MustGiven).SetBlock(true).
 		Handle(func(ctx *zero.Ctx) {
 			// 开始搜索图片
 			ctx.SendChain(message.Text("少女祈祷中......"))

plugin_score/sign_in.go

@@ -35,13 +35,13 @@ const (
 var (
 	engine = control.Register("score", order.PrioScore, &control.Options{
 		DisableOnDefault: false,
-		Help:             "签到得分\n- 签到\n- 获得签到背景[@xxx]|获得签到背景",
+		Help:             "签到得分\n- 签到\n- 获得签到背景[@xxx] | 获得签到背景",
 	})
 	levelArray = [...]int{0, 1, 2, 5, 10, 20, 35, 55, 75, 100, 120}
 )
 
 func init() {
-	engine.OnFullMatch("签到").SetBlock(true).
+	engine.OnFullMatch("签到", zero.OnlyGroup).SetBlock(true).
 		Handle(func(ctx *zero.Ctx) {
 			uid := ctx.Event.UserID
 			now := time.Now()

plugin_setutime/setu_geter.go

@@ -118,7 +118,7 @@ func init() { // 插件主体
 					}
 				}
 				// 从缓冲池里抽一张
-				if id := ctx.SendChain(message.Image(file(pool.pop(imgtype)))); id == 0 {
+				if id := ctx.SendChain(message.Image(file(pool.pop(imgtype)))); id.ID() == 0 {
 					ctx.SendChain(message.Text("ERROR: 可能被风控了"))
 				}
 			})
@@ -142,7 +142,7 @@ func init() { // 插件主体
 					return
 				}
 				// 发送到发送者
-				if id := ctx.SendChain(message.Image(file(illust))); id == 0 {
+				if id := ctx.SendChain(message.Image(file(illust))); id.ID() == 0 {
 					ctx.SendChain(message.Text("ERROR: 可能被风控，发送失败"))
 					return
 				}
@@ -245,7 +245,7 @@ func download(i *pixiv.Illust, filedir string) /*(string, */ error /*)*/ {
 		return /*filepath + ".gif",*/ nil
 	}
 	// 下载最大分辨率为 1200 的图片
-	link := i.ImageUrls
+	link := i.ImageUrls[0]
 	link = strings.ReplaceAll(link, "img-original", "img-master")
 	link = strings.ReplaceAll(link, "_p0", "_p0_master1200")
 	link = strings.ReplaceAll(link, ".png", ".jpg")

plugin_shindan/shindan.go

@@ -58,7 +58,7 @@ func handle(ctx *zero.Ctx) {
 		if err != nil {
 			log.Errorln("[shindan]:", err)
 		}
-		if id := ctx.SendChain(message.Image("base64://" + helper.BytesToString(data))); id == 0 {
+		if id := ctx.SendChain(message.Image("base64://" + helper.BytesToString(data))); id.ID() == 0 {
 			ctx.SendChain(message.Text("ERROR: 可能被风控了"))
 		}
 	default:

plugin_tracemoe/moe.go

@@ -4,8 +4,8 @@ package tracemoe
 import (
 	"fmt"
 
-	"github.com/FloatTech/AnimeAPI/picture"
 	control "github.com/FloatTech/zbputils/control"
+	"github.com/FloatTech/zbputils/ctxext"
 	trmoe "github.com/fumiama/gotracemoe"
 	zero "github.com/wdvxdr1123/ZeroBot"
 	"github.com/wdvxdr1123/ZeroBot/message"
@@ -20,10 +20,10 @@ var (
 func init() { // 插件主体
 	engine := control.Register("tracemoe", order.PrioTraceMoe, &control.Options{
 		DisableOnDefault: false,
-		Help:             "tracemoe\n- 搜番|搜索番剧[图片]",
+		Help:             "tracemoe\n- 搜番 | 搜索番剧[图片]",
 	})
 	// 以图搜图
-	engine.OnKeywordGroup([]string{"搜番", "搜索番剧"}, picture.CmdMatch, picture.MustGiven).SetBlock(true).
+	engine.OnKeywordGroup([]string{"搜番", "搜索番剧"}, ctxext.CmdMatch, ctxext.MustGiven).SetBlock(true).
 		Handle(func(ctx *zero.Ctx) {
 			// 开始搜索图片
 			ctx.SendChain(message.Text("少女祈祷中......"))

plugin_vtb_quotation/vtb_quotation.go

@@ -52,7 +52,7 @@ func init() {
 			if err != nil {
 				log.Errorln("[vtb]:", err)
 			}
-			if id := ctx.SendChain(message.Reply(ctx.Event.MessageID), message.Image("base64://"+helper.BytesToString(firstStepImageBytes))); id == 0 {
+			if id := ctx.SendChain(message.Reply(ctx.Event.MessageID), message.Image("base64://"+helper.BytesToString(firstStepImageBytes))); id.ID() == 0 {
 				ctx.SendChain(message.Text("ERROR: 可能被风控了"))
 			}
 			// 步骤0，1，2，依次选择3个类别
@@ -84,7 +84,7 @@ func init() {
 								if err != nil {
 									log.Errorln("[vtb]:", err)
 								}
-								if id := ctx.SendChain(message.Reply(ctx.Event.MessageID), message.Image("base64://"+helper.BytesToString(firstStepImageBytes))); id == 0 {
+								if id := ctx.SendChain(message.Reply(ctx.Event.MessageID), message.Image("base64://"+helper.BytesToString(firstStepImageBytes))); id.ID() == 0 {
 									ctx.SendChain(message.Text("ERROR: 可能被风控了"))
 								}
 								errorCount++
@@ -93,7 +93,7 @@ func init() {
 								if err != nil {
 									log.Errorln("[vtb]:", err)
 								}
-								if id := ctx.SendChain(message.Reply(ctx.Event.MessageID), message.Image("base64://"+helper.BytesToString(secondStepMessageBytes))); id == 0 {
+								if id := ctx.SendChain(message.Reply(ctx.Event.MessageID), message.Image("base64://"+helper.BytesToString(secondStepMessageBytes))); id.ID() == 0 {
 									ctx.SendChain(message.Text("ERROR: 可能被风控了"))
 								}
 								step++
@@ -115,7 +115,7 @@ func init() {
 								if err != nil {
 									log.Errorln("[vtb]:", err)
 								}
-								if id := ctx.SendChain(message.Reply(ctx.Event.MessageID), message.Image("base64://"+helper.BytesToString(secondStepMessageBytes))); id == 0 {
+								if id := ctx.SendChain(message.Reply(ctx.Event.MessageID), message.Image("base64://"+helper.BytesToString(secondStepMessageBytes))); id.ID() == 0 {
 									ctx.SendChain(message.Text("ERROR: 可能被风控了"))
 								}
 								errorCount++
@@ -124,7 +124,7 @@ func init() {
 								if err != nil {
 									log.Errorln("[vtb]:", err)
 								}
-								if id := ctx.SendChain(message.Reply(ctx.Event.MessageID), message.Image("base64://"+helper.BytesToString(thirdStepMessageBytes))); id == 0 {
+								if id := ctx.SendChain(message.Reply(ctx.Event.MessageID), message.Image("base64://"+helper.BytesToString(thirdStepMessageBytes))); id.ID() == 0 {
 									ctx.SendChain(message.Text("ERROR: 可能被风控了"))
 								}
 								step++
@@ -147,7 +147,7 @@ func init() {
 								if err != nil {
 									log.Errorln("[vtb]:", err)
 								}
-								if id := ctx.SendChain(message.Reply(ctx.Event.MessageID), message.Image("base64://"+helper.BytesToString(firstStepImageBytes))); id == 0 {
+								if id := ctx.SendChain(message.Reply(ctx.Event.MessageID), message.Image("base64://"+helper.BytesToString(firstStepImageBytes))); id.ID() == 0 {
 									ctx.SendChain(message.Text("ERROR: 可能被风控了"))
 								}
 								errorCount++