修复pixiv下载

* ✏️ 修复抓不到日历的碧油鸡

* ✏️ 小修改

README.md

@@ -57,6 +57,7 @@ zerobot [-h] [-t token] [-u url] [-n nickname] [-p prefix] [-d|w] [-g 监听地
     - [x] /全局启用 xxx
     - [x] /全局禁用 xxx
     - [x] /还原 xxx (在发送的群/用户还原xxx的开启状态到初始状态)
+    - 注：当全局未配置或与默认相同时，状态取决于单独配置，后备为默认配置；当全局与默认不同时，状态取决于全局配置，单独配置失效。
     - [x] /禁止 service qq1 qq2... (禁止 qqs 使用服务 service)
     - [x] /允许 service qq1 qq2... (重新允许 qqs 使用服务 service)
     - [x] /封禁 qq1 qq2... (禁止 qqs 使用全部服务)
@@ -65,19 +66,19 @@ zerobot [-h] [-t token] [-u url] [-n nickname] [-p prefix] [-d|w] [-g 监听地
     - [x] /服务列表
     - [x] /服务详情
     - [x] @Bot 插件冲突检测 (会在本群发送一条消息并在约 1s 后撤回以检测其它同类 bot 中已启用的插件并禁用)
-- **聊天** `import _ "github.com/FloatTech/ZeroBot-Plugin/plugin_chat"`
+- **聊天** `import _ "github.com/FloatTech/ZeroBot-Plugin/plugin/chat"`
     - [x] [BOT名字]
     - [x] [戳一戳BOT]
     - [x] 空调开
     - [x] 空调关
     - [x] 群温度
     - [x] 设置温度[正整数]
-- **词典匹配回复** `import _ "github.com/FloatTech/ZeroBot-Plugin/plugin_thesaurus"`
+- **词典匹配回复** `import _ "github.com/FloatTech/ZeroBot-Plugin/plugin/thesaurus"`
     - [x] @Bot 关键词
-- **ATRI** `import _ "github.com/FloatTech/ZeroBot-Plugin/plugin_atri"`
+- **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"`
+- **群管** `import _ "github.com/FloatTech/ZeroBot-Plugin/plugin/manager"`
     - [x] 禁言[@xxx][分钟]
     - [x] 解除禁言[@xxx]
     - [x] 我要自闭 | 禅定 x [分钟 | 小时 | 天]
@@ -108,179 +109,182 @@ zerobot [-h] [-t token] [-u url] [-n nickname] [-p prefix] [-d|w] [-g 监听地
     - [ ] 警告[@xxx]
     - [x] run[xxx]
     - 注：使用gist加群自动审批，请在群介绍添加以下说明，同时开启`需要回答问题并由管理员审核`：加群请在github新建一个gist，其文件名为本群群号的字符串的md5(小写)，内容为一行，是当前unix时间戳(10分钟内有效)。然后请将您的用户名和gist哈希(小写)按照username/gisthash的格式填写到回答即可。
-- **GitHub仓库搜索** `import _ "github.com/FloatTech/ZeroBot-Plugin/plugin_github"`
+- **GitHub仓库搜索** `import _ "github.com/FloatTech/ZeroBot-Plugin/plugin/github"`
     - [x] >github [xxx]
     - [x] >github -p [xxx]
-- **在线代码运行** `import _ "github.com/FloatTech/ZeroBot-Plugin/plugin_runcode"`
+- **在线代码运行** `import _ "github.com/FloatTech/ZeroBot-Plugin/plugin/runcode"`
     - [x] > runcode [language] help
     - [x] > runcode [language] [code block]
-- **点歌** `import _ "github.com/FloatTech/ZeroBot-Plugin/plugin_music"`
+- **点歌** `import _ "github.com/FloatTech/ZeroBot-Plugin/plugin/music"`
     - [x] 点歌[xxx]
     - [x] 网易点歌[xxx]
     - [x] 酷我点歌[xxx]
     - [x] 酷狗点歌[xxx]
-- **shindan** `import _ "github.com/FloatTech/ZeroBot-Plugin/plugin_shindan"`
+- **shindan** `import _ "github.com/FloatTech/ZeroBot-Plugin/plugin/shindan"`
     - [x] 今天是什么少女[@xxx]
     - [x] 异世界转生[@xxx]
     - [x] 卖萌[@xxx]
     - [x] 抽老婆[@xxx]
-- **AIWife** `import _ "github.com/FloatTech/ZeroBot-Plugin/plugin_aiwife"`
+- **AIWife** `import _ "github.com/FloatTech/ZeroBot-Plugin/plugin/aiwife"`
     - [x] waifu | 随机waifu(从[100000个AI生成的waifu](https://www.thiswaifudoesnotexist.net/)中随机一位)
-- **gif** `import _ "github.com/FloatTech/ZeroBot-Plugin/plugin_gif"`
+- **gif** `import _ "github.com/FloatTech/ZeroBot-Plugin/plugin/gif"`
     - [x] 爬[@xxx]
     - [x] 摸[@xxx]
     - [x] 搓[@xxx]
     - 注：更多指令见项目 --> https://github.com/FloatTech/ZeroBot-Plugin-Gif
-- **base16384加解密** `import _ "github.com/FloatTech/ZeroBot-Plugin/plugin_b14"`
+- **base16384加解密** `import _ "github.com/FloatTech/ZeroBot-Plugin/plugin/b14"`
     - [x] 加密xxx
     - [x] 解密xxx
     - [x] 用yyy加密xxx
     - [x] 用yyy解密xxx
-- **摸鱼** `import _ "github.com/FloatTech/ZeroBot-Plugin/plugin_moyu"`
+- **摸鱼** `import _ "github.com/FloatTech/ZeroBot-Plugin/plugin/moyu"`
     - [x] /启用 moyu
     - [x] /禁用 moyu
-- **涩图** `import _ "github.com/FloatTech/ZeroBot-Plugin/plugin_setutime"`
+- **摸鱼人日历** `import _ "github.com/FloatTech/ZeroBot-Plugin/plugin/moyu_calendar"`
+    - [x] /启用 moyucalendar
+    - [x] /禁用 moyucalendar
+- **涩图** `import _ "github.com/FloatTech/ZeroBot-Plugin/plugin/setutime"`
     - [x] 来份[涩图/二次元/风景/车万]
     - [x] 添加[涩图/二次元/风景/车万][P站图片ID]
     - [x] 删除[涩图/二次元/风景/车万][P站图片ID]
     - [x] > setu status
-- **本地涩图** `import _ "github.com/FloatTech/ZeroBot-Plugin/plugin_nativesetu"`
+- **本地涩图** `import _ "github.com/FloatTech/ZeroBot-Plugin/plugin/nativesetu"`
     - [x] 本地[xxx]
     - [x] 刷新本地[xxx]
     - [x] 设置本地setu绝对路径[xxx]
     - [x] 刷新所有本地setu
     - [x] 所有本地setu分类
     - 注：刷新文件夹较慢，请耐心等待刷新完成，会提示“成功”。
-- **nsfw图片识别** `import _ "github.com/FloatTech/ZeroBot-Plugin/plugin_nsfw"`
+- **nsfw图片识别** `import _ "github.com/FloatTech/ZeroBot-Plugin/plugin/nsfw"`
     - [x] nsfw打分[图片]
     - [x] 当图片属于非 neutral 类别时自动发送评价(默认禁用，启用输入 /启用 nsfwauto)
-- **lolicon** `import _ "github.com/FloatTech/ZeroBot-Plugin/plugin_lolicon"`
+- **lolicon** `import _ "github.com/FloatTech/ZeroBot-Plugin/plugin/lolicon"`
     - [x] 来份萝莉
-- **搜图** `import _ "github.com/FloatTech/ZeroBot-Plugin/plugin_saucenao"`
+- **搜图** `import _ "github.com/FloatTech/ZeroBot-Plugin/plugin/saucenao"`
     - [x] 以图搜图 | 搜索图片 | 以图识图[图片]
     - [x] 搜图[P站图片ID]
-- **搜番** `import _ "github.com/FloatTech/ZeroBot-Plugin/plugin_tracemoe"`
+- **搜番** `import _ "github.com/FloatTech/ZeroBot-Plugin/plugin/tracemoe"`
     - [x] 搜番 | 搜索番剧[图片]
-- **随机图片与AI点评** `import _ github.com/FloatTech/ZeroBot-Plugin/plugin_acgimage`
+- **百度一下** `import _ "github.com/FloatTech/ZeroBot-Plugin/plugin/baidu"`
+    - [x] 百度下[xxx]
+- **随机图片与AI点评** `import _ github.com/FloatTech/ZeroBot-Plugin/plugin/acgimage`
     - [x] 随机图片(评级大于6的图将私发)
     - [x] 直接随机(无r18检测，务必小心，仅管理可用)
     - [x] 设置随机图片网址[url]
     - [x] 太涩了(撤回最近发的图)
     - [x] 评价图片(发送一张图片让bot评分)
-- **DeepDanbooru二次元图标签识别** `import _ github.com/FloatTech/ZeroBot-Plugin/plugin_danbooru`
+- **DeepDanbooru二次元图标签识别** `import _ github.com/FloatTech/ZeroBot-Plugin/plugin/danbooru`
     - [x] 鉴赏图片[图片]
-- **叔叔的AI二次元图片放大** `import _ "github.com/FloatTech/ZeroBot-Plugin/plugin_scale"`
+- **叔叔的AI二次元图片放大** `import _ "github.com/FloatTech/ZeroBot-Plugin/plugin/scale"`
     - [x] 放大图片[图片]
-- **每日运势** `import _ github.com/FloatTech/ZeroBot-Plugin/plugin_fortune`
+- **每日运势** `import _ github.com/FloatTech/ZeroBot-Plugin/plugin/fortune`
     - [x] 运势 | 抽签
     - [x] 设置底图[车万 DC4 爱因斯坦 星空列车 樱云之恋 富婆妹 李清歌 公主连结 原神 明日方舟 碧蓝航线 碧蓝幻想 战双 阴阳师 赛马娘]
-- **睡眠管理** `import _ github.com/FloatTech/ZeroBot-Plugin/plugin_sleep_manage`
+- **睡眠管理** `import _ github.com/FloatTech/ZeroBot-Plugin/plugin/sleep_manage`
     - [x] 早安 | 晚安
-- **浅草寺求签** `import _ github.com/FloatTech/ZeroBot-Plugin/plugin_omikuji`
+- **浅草寺求签** `import _ github.com/FloatTech/ZeroBot-Plugin/plugin/omikuji`
     - [x] 求签 | 占卜
     - [x] 解签
-- **漂流瓶** `import _ "github.com/FloatTech/ZeroBot-Plugin/plugin_drift_bottle"`
+- **漂流瓶** `import _ "github.com/FloatTech/ZeroBot-Plugin/plugin/drift_bottle"`
     - [x] (在群xxx)丢漂流瓶(到频道xxx) [消息]
     - [x] (从频道xxx)捡漂流瓶
     - [x] @BOT 创建频道 xxx
     - [x] 跳入(频道)海中
     - [x] 注：不显式限制时，私聊发送可在所有群抽到，群聊发送仅可在本群抽到，默认频道为 global
-- **bilibili** `import _ "github.com/FloatTech/ZeroBot-Plugin/plugin_bilibili"`
+- **猜单词** `import _ "github.com/FloatTech/ZeroBot-Plugin/plugin/wordle"`
+    - [x] 个人猜单词
+    - [x] 团队猜单词
+- **bilibili** `import _ "github.com/FloatTech/ZeroBot-Plugin/plugin/bilibili"`
     - [x] >vup info [名字 | uid]
     - [x] >user info [名字 | uid]
     - [x] /开启粉丝日报
-- **嘉然** `import _ "github.com/FloatTech/ZeroBot-Plugin/plugin_diana"`
+- **嘉然** `import _ "github.com/FloatTech/ZeroBot-Plugin/plugin/diana"`
     - [x] 小作文
     - [x] 发大病
     - [x] 教你一篇小作文[作文]
     - [x] [回复]查重
-- **鬼东西** `import _ "github.com/FloatTech/ZeroBot-Plugin/plugin_wtf"`
+- **鬼东西** `import _ "github.com/FloatTech/ZeroBot-Plugin/plugin/wtf"`
     - [x] 鬼东西列表
     - [x] 查询鬼东西[序号][@xxx]
     - 注：由于需要科学，默认注释。
-- **AIfalse** `import _ "github.com/FloatTech/ZeroBot-Plugin/plugin_ai_false"`
+- **AIfalse** `import _ "github.com/FloatTech/ZeroBot-Plugin/plugin/ai_false"`
     - [x] 查询计算机当前活跃度: [检查身体 | 自检 | 启动自检 | 系统状态]
     - [x] 清理缓存 (仅适用于 gocq 且需要 bot 的运行目录和 gocq 相同)
     - [ ] 简易语音
     - [ ] 爬图合成 [@xxx]
-- **抽wife** `import _ "github.com/FloatTech/ZeroBot-Plugin/plugin_nativewife"`
+- **抽wife** `import _ "github.com/FloatTech/ZeroBot-Plugin/plugin/nativewife"`
     - [x] 抽wife[@xxx]
     - [x] 添加wife[名字][图片]
     - [x] 删除wife[名字]
     - [x] [让 | 不让]所有人均可添加wife
     - 注：不同群添加后不会重叠
-- **minecraft** `import _ "github.com/FloatTech/ZeroBot-Plugin/plugin_minecraft"`
-    - [x] /mcstart xxx
-    - [x] /mcstop xxx
-    - [x] /mclist servername
-    - 注：此功能实现依赖[MCSManager](https://github.com/Suwings/MCSManager)项目对服务器的管理api，mc服务器如果没有在该管理平台部署此功能无效
-- **炉石** `import _ "github.com/FloatTech/ZeroBot-Plugin/plugin_hs"`
+- **炉石** `import _ "github.com/FloatTech/ZeroBot-Plugin/plugin/hs"`
     - [x] 搜卡[xxxx]
     - [x] [卡组代码xxx]
     - 注：更多搜卡指令参数：https://hs.fbigame.com/misc/searchhelp
-- **人工智能回复** `import _ "github.com/FloatTech/ZeroBot-Plugin/plugin_ai_reply"`
+- **人工智能回复** `import _ "github.com/FloatTech/ZeroBot-Plugin/plugin/ai_reply"`
     - [x] @Bot 任意文本(任意一句话回复)
     - [x] 设置回复模式[青云客 | 小爱]
-- **关键字搜图** `import _ "github.com/FloatTech/ZeroBot-Plugin/plugin_image_finder"`
+- **关键字搜图** `import _ "github.com/FloatTech/ZeroBot-Plugin/plugin/image_finder"`
     - [x] 来张 [xxx]
-- **拼音首字母释义工具** `import _ "github.com/FloatTech/ZeroBot-Plugin/plugin_nbnhhsh"`
+- **拼音首字母释义工具** `import _ "github.com/FloatTech/ZeroBot-Plugin/plugin/nbnhhsh"`
     - [x] ?? [缩写]
-- **选择困难症帮手** `import _ "github.com/FloatTech/ZeroBot-Plugin/plugin_choose"`
+- **选择困难症帮手** `import _ "github.com/FloatTech/ZeroBot-Plugin/plugin/choose"`
     - [x] 选择[选择项1]还是[选项2]还是[更多选项]
-- **投胎** `import _ "github.com/FloatTech/ZeroBot-Plugin/plugin_reborn"`
+- **投胎** `import _ "github.com/FloatTech/ZeroBot-Plugin/plugin/reborn"`
     - [x] reborn
     - 注：本插件来源于[tgbot](https://github.com/YukariChiba/tgbot/blob/main/modules/Reborn.py)
-- **翻译** `import _ "github.com/FloatTech/ZeroBot-Plugin/plugin_translation"`
+- **翻译** `import _ "github.com/FloatTech/ZeroBot-Plugin/plugin/translation"`
     - [x] >TL 你好
-- **vtb语录** `import _ "github.com/FloatTech/ZeroBot-Plugin/plugin_vtb_quotation"`
+- **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"`
+- **书评** `import _ "github.com/FloatTech/ZeroBot-Plugin/plugin/book_review"`
     - [x] 书评[xxx]
     - [x] 随机书评
-- **coser** `import _ "github.com/FloatTech/ZeroBot-Plugin/plugin_coser" `
+- **coser** `import _ "github.com/FloatTech/ZeroBot-Plugin/plugin/coser" `
     - [x] coser
-- **小说** `import _ "github.com/FloatTech/ZeroBot-Plugin/plugin_novel" `
+- **小说** `import _ "github.com/FloatTech/ZeroBot-Plugin/plugin/novel" `
     - [x] 小说[xxx]
-- **沙雕app插件** `import _ "github.com/FloatTech/ZeroBot-Plugin/plugin_shadiao"`
+- **沙雕app插件** `import _ "github.com/FloatTech/ZeroBot-Plugin/plugin/shadiao"`
     - [x] 哄我
     - [x] 渣我
     - [x] 来碗绿茶
     - [x] 发个朋友圈
     - [x] 来碗毒鸡汤
     - [x] 讲个段子
-- **笑话** `import _ "github.com/FloatTech/ZeroBot-Plugin/plugin_funny"`
+- **笑话** `import _ "github.com/FloatTech/ZeroBot-Plugin/plugin/funny"`
     - [x] 讲个笑话[@xxx] | 讲个笑话[qq号]
-- **抽象话** `import _ "github.com/FloatTech/ZeroBot-Plugin/plugin_chouxianghua"`
+- **抽象话** `import _ "github.com/FloatTech/ZeroBot-Plugin/plugin/chouxianghua"`
     - [x] 抽象翻译[xxx]
-- **合成emoji** `import _ "github.com/FloatTech/ZeroBot-Plugin/plugin_emojimix"`
+- **合成emoji** `import _ "github.com/FloatTech/ZeroBot-Plugin/plugin/emojimix"`
     - [x] [emoji][emoji]
-- **绝绝子** `import _ "github.com/FloatTech/ZeroBot-Plugin/plugin_juejuezi"`
+- **绝绝子** `import _ "github.com/FloatTech/ZeroBot-Plugin/plugin/juejuezi"`
     - [x] 喝奶茶绝绝子 | 绝绝子吃饭
-- **藏头诗** `import _ "github.com/FloatTech/ZeroBot-Plugin/plugin_cangtoushi"`
+- **藏头诗** `import _ "github.com/FloatTech/ZeroBot-Plugin/plugin/cangtoushi"`
     - [x] 藏头诗[xxx]
     - [x] 藏尾诗[xxx]
-- **cp短打** `import _ "github.com/FloatTech/ZeroBot-Plugin/plugin_cpstory"`
+- **cp短打** `import _ "github.com/FloatTech/ZeroBot-Plugin/plugin/cpstory"`
     - [x] 组cp[@xxx][@xxx]
     - [x] 磕cp大老师 雪乃
-- **签到得分** `import _ "github.com/FloatTech/ZeroBot-Plugin/plugin_score"`
+- **签到得分** `import _ "github.com/FloatTech/ZeroBot-Plugin/plugin/score"`
     - [x] 签到
     - [x] 获得签到背景[@xxx] | 获得签到背景
-- **骂人** `import _ "github.com/FloatTech/ZeroBot-Plugin/plugin_curse"`
+- **骂人** `import _ "github.com/FloatTech/ZeroBot-Plugin/plugin/curse"`
     - [x] 骂我
     - [x] 大力骂我
-- **b站推送** `import _ "github.com/FloatTech/ZeroBot-Plugin/plugin_bilibili_push"`
+- **b站推送** `import _ "github.com/FloatTech/ZeroBot-Plugin/plugin/bilibili_push"`
     - [x] 添加订阅[uid]
     - [x] 取消订阅[uid]
     - [x] 取消动态订阅[uid]
     - [x] 取消直播订阅[uid]
     - [x] 推送列表
-- **网易云音乐热评** `import _ "github.com/FloatTech/ZeroBot-Plugin/plugin_wangyiyun"`
+- **网易云音乐热评** `import _ "github.com/FloatTech/ZeroBot-Plugin/plugin/wangyiyun"`
     - [x] 来份网易云热评
-- **b站视频链接解析** `import _ "github.com/FloatTech/ZeroBot-Plugin/plugin_bilibili_parse"`
+- **b站视频链接解析** `import _ "github.com/FloatTech/ZeroBot-Plugin/plugin/bilibili_parse"`
     - [x] https://www.bilibili.com/video/BV1xx411c7BF | https://www.bilibili.com/video/av1605 | https://b23.tv/I8uzWCA | https://www.bilibili.com/video/bv1xx411c7BF
-- **煎蛋网无聊图** `import _ "github.com/FloatTech/ZeroBot-Plugin/plugin_jandan"`
+- **煎蛋网无聊图** `import _ "github.com/FloatTech/ZeroBot-Plugin/plugin/jandan"`
     - [x] 来份屌图
     - [x] 更新屌图
 - **TODO...**

go.mod

@@ -3,9 +3,9 @@ module github.com/FloatTech/ZeroBot-Plugin
 go 1.17
 
 require (
-	github.com/FloatTech/AnimeAPI v1.3.0-beta8.0.20220219143823-2a02ca18b80f
+	github.com/FloatTech/AnimeAPI v1.3.0-beta8.0.20220227060429-ae266747b1df
 	github.com/FloatTech/sqlite v0.2.0
-	github.com/FloatTech/zbputils v1.3.0-beta8.0.20220219143652-6a7c76858a09
+	github.com/FloatTech/zbputils v1.3.0-beta8.0.20220227042832-376a84a3ea87
 	github.com/antchfx/htmlquery v1.2.4
 	github.com/corona10/goimagehash v1.0.3
 	github.com/fogleman/gg v1.3.0
@@ -17,10 +17,11 @@ require (
 	github.com/fumiama/sqlite3 v1.14.6
 	github.com/jinzhu/gorm v1.9.16
 	github.com/mroth/weightedrand v0.4.1
+	github.com/pkumza/numcn v1.0.0
 	github.com/shirou/gopsutil/v3 v3.21.12
 	github.com/sirupsen/logrus v1.8.1
 	github.com/tidwall/gjson v1.13.0
-	github.com/wdvxdr1123/ZeroBot v1.4.2-0.20220216133336-08b3b9bc74b2
+	github.com/wdvxdr1123/ZeroBot v1.4.2-0.20220223090418-8c5d8eccaf3a
 	golang.org/x/image v0.0.0-20211028202545-6944b10bf410
 )
 

go.sum

@@ -1,10 +1,10 @@
-github.com/FloatTech/AnimeAPI v1.3.0-beta8.0.20220219143823-2a02ca18b80f h1:e2SSjsD06q1eT1l+b9gLi9A+9g5B23TT/XuZbJrckec=
-github.com/FloatTech/AnimeAPI v1.3.0-beta8.0.20220219143823-2a02ca18b80f/go.mod h1:o0XA9RdADgR84fL43pvnBb1uwnq/b5Tw49LEnZZXY2E=
+github.com/FloatTech/AnimeAPI v1.3.0-beta8.0.20220227060429-ae266747b1df h1:pz6mcz4pC8hEbyygM/QX/mX7pgvQOIpYF8H940/4Z8Q=
+github.com/FloatTech/AnimeAPI v1.3.0-beta8.0.20220227060429-ae266747b1df/go.mod h1:uMe7TzdyGnyRn6AzMmkvDXp+GfTTWV/vBlv6mhhP8kg=
 github.com/FloatTech/bot-manager v1.0.0/go.mod h1:8YYRJ16oroGHQGD2En0oVnmcKJkxR9O/jd5BPSfWfOQ=
 github.com/FloatTech/sqlite v0.2.0 h1:x3uls/hExXH1+bbaNLkvilce6ATtWlDx4IqoxBW/bv8=
 github.com/FloatTech/sqlite v0.2.0/go.mod h1:xIDWIvpOFl8AXmZm0FC8t3PZjiR6ZutytCpBv2EWCns=
-github.com/FloatTech/zbputils v1.3.0-beta8.0.20220219143652-6a7c76858a09 h1:kv2t4YsK+jLuCL9LIAvoVffbCUjpmiQwWf8fMbYF2YI=
-github.com/FloatTech/zbputils v1.3.0-beta8.0.20220219143652-6a7c76858a09/go.mod h1:lNDjXvvNHlo4LHiAMyP/FVWcvw6kWB5onuQ024QvHfw=
+github.com/FloatTech/zbputils v1.3.0-beta8.0.20220227042832-376a84a3ea87 h1:nyUTZLGUAJP/kLXx48j2qdxQBPVqaZgypjjIqpIRqwk=
+github.com/FloatTech/zbputils v1.3.0-beta8.0.20220227042832-376a84a3ea87/go.mod h1:Jn5LmnwqYivr64qQJBdhDwm2gRut8Hhq5gPBydV0Gvg=
 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=
@@ -117,6 +117,8 @@ github.com/onsi/ginkgo v1.6.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+W
 github.com/onsi/ginkgo v1.7.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE=
 github.com/onsi/gomega v1.4.3/go.mod h1:ex+gbHU/CVuBBDIJjb2X0qEXbFg53c61hWP/1CpauHY=
 github.com/pkg/diff v0.0.0-20210226163009-20ebb0f2a09e/go.mod h1:pJLUxLENpZxwdsKMEsNbx1VGcRFpLqf3715MtcvvzbA=
+github.com/pkumza/numcn v1.0.0 h1:ZT5cf9IJkUZgRgEtCiNNykk0RwsrKXSTsvDHOwUTzgE=
+github.com/pkumza/numcn v1.0.0/go.mod h1:QSeH+al9dWCd8di5HZM/ZqHqhZmUKfph572e9Ev/ETc=
 github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
 github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
 github.com/power-devops/perfstat v0.0.0-20210106213030-5aafc221ea8c h1:ncq/mPwQF4JjgDlrVEn3C11VoGHZN7m8qihwgMEtzYw=
@@ -154,8 +156,8 @@ github.com/ugorji/go v1.1.7/go.mod h1:kZn38zHttfInRq0xu/PH0az30d+z6vm202qpg1oXVM
 github.com/ugorji/go v1.2.6/go.mod h1:anCg0y61KIhDlPZmnH+so+RQbysYVyDko0IMgJv0Nn0=
 github.com/ugorji/go/codec v1.1.7/go.mod h1:Ax+UKWsSmolVDwsd+7N3ZtXu+yMGCf907BLYF3GoBXY=
 github.com/ugorji/go/codec v1.2.6/go.mod h1:V6TCNZ4PHqoHGFZuSG1W8nrCzzdgA2DozYxWFFpvxTw=
-github.com/wdvxdr1123/ZeroBot v1.4.2-0.20220216133336-08b3b9bc74b2 h1:nt1cAlrT0eFrnqzR1WsMx2VMrWZsAl2FrrHHwh4Z9QM=
-github.com/wdvxdr1123/ZeroBot v1.4.2-0.20220216133336-08b3b9bc74b2/go.mod h1:NwXIp7PgjV+kUALMXJ4v4/3QcsRSOodtjhLekuPXFog=
+github.com/wdvxdr1123/ZeroBot v1.4.2-0.20220223090418-8c5d8eccaf3a h1:Mw7850zyEgIr8VO9e8iofo78maed53FclPzRiMa7aeY=
+github.com/wdvxdr1123/ZeroBot v1.4.2-0.20220223090418-8c5d8eccaf3a/go.mod h1:NwXIp7PgjV+kUALMXJ4v4/3QcsRSOodtjhLekuPXFog=
 github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
 github.com/yusufpapurcu/wmi v1.2.2 h1:KBNDSne4vP5mbSWnJbO+51IMOXJB67QiYCSBrubbPRg=
 github.com/yusufpapurcu/wmi v1.2.2/go.mod h1:SBZ9tNy3G9/m5Oi98Zks0QjeHVDvuK0qfxQmPyzfmi0=

main.go

@@ -24,15 +24,15 @@ import (
 
 	// webctrl "github.com/FloatTech/zbputils/control/web"           // web 后端控制
 
-	_ "github.com/FloatTech/ZeroBot-Plugin/plugin_chat" // 基础词库
+	_ "github.com/FloatTech/ZeroBot-Plugin/plugin/chat" // 基础词库
 
-	_ "github.com/FloatTech/ZeroBot-Plugin/plugin_sleep_manage" // 统计睡眠时间
+	_ "github.com/FloatTech/ZeroBot-Plugin/plugin/sleep_manage" // 统计睡眠时间
 
-	_ "github.com/FloatTech/ZeroBot-Plugin/plugin_atri" // ATRI词库
+	_ "github.com/FloatTech/ZeroBot-Plugin/plugin/atri" // ATRI词库
 
-	_ "github.com/FloatTech/ZeroBot-Plugin/plugin_manager" // 群管
+	_ "github.com/FloatTech/ZeroBot-Plugin/plugin/manager" // 群管
 
-	_ "github.com/FloatTech/ZeroBot-Plugin/plugin_thesaurus" // 词典匹配回复
+	_ "github.com/FloatTech/ZeroBot-Plugin/plugin/thesaurus" // 词典匹配回复
 
 	//                               ^^^^                               //
 	//                          ^^^^^^^^^^^^^^                          //
@@ -52,55 +52,57 @@ import (
 	//                          vvvvvvvvvvvvvv                          //
 	//                               vvvv                               //
 
-	_ "github.com/FloatTech/ZeroBot-Plugin/plugin_acgimage"       // 随机图片与AI点评
-	_ "github.com/FloatTech/ZeroBot-Plugin/plugin_ai_false"       // 服务器监控
-	_ "github.com/FloatTech/ZeroBot-Plugin/plugin_aiwife"         // 随机老婆
-	_ "github.com/FloatTech/ZeroBot-Plugin/plugin_b14"            // base16384加解密
-	_ "github.com/FloatTech/ZeroBot-Plugin/plugin_bilibili"       // 查询b站用户信息
-	_ "github.com/FloatTech/ZeroBot-Plugin/plugin_bilibili_parse" // b站视频链接解析
-	_ "github.com/FloatTech/ZeroBot-Plugin/plugin_book_review"    // 哀伤雪刃吧推书记录
-	_ "github.com/FloatTech/ZeroBot-Plugin/plugin_cangtoushi"     // 藏头诗
-	_ "github.com/FloatTech/ZeroBot-Plugin/plugin_choose"         // 选择困难症帮手
-	_ "github.com/FloatTech/ZeroBot-Plugin/plugin_chouxianghua"   // 说抽象话
-	_ "github.com/FloatTech/ZeroBot-Plugin/plugin_coser"          // 三次元小姐姐
-	_ "github.com/FloatTech/ZeroBot-Plugin/plugin_cpstory"        // cp短打
-	_ "github.com/FloatTech/ZeroBot-Plugin/plugin_danbooru"       // DeepDanbooru二次元图标签识别
-	_ "github.com/FloatTech/ZeroBot-Plugin/plugin_diana"          // 嘉心糖发病
-	_ "github.com/FloatTech/ZeroBot-Plugin/plugin_drift_bottle"   // 漂流瓶
-	_ "github.com/FloatTech/ZeroBot-Plugin/plugin_emojimix"       // 合成emoji
-	_ "github.com/FloatTech/ZeroBot-Plugin/plugin_fortune"        // 运势
-	_ "github.com/FloatTech/ZeroBot-Plugin/plugin_funny"          // 笑话
-	_ "github.com/FloatTech/ZeroBot-Plugin/plugin_gif"            // 制图
-	_ "github.com/FloatTech/ZeroBot-Plugin/plugin_github"         // 搜索GitHub仓库
-	_ "github.com/FloatTech/ZeroBot-Plugin/plugin_hs"             // 炉石
-	_ "github.com/FloatTech/ZeroBot-Plugin/plugin_image_finder"   // 关键字搜图
-	_ "github.com/FloatTech/ZeroBot-Plugin/plugin_jandan"         // 煎蛋网无聊图
-	_ "github.com/FloatTech/ZeroBot-Plugin/plugin_juejuezi"       // 绝绝子生成器
-	_ "github.com/FloatTech/ZeroBot-Plugin/plugin_lolicon"        // lolicon 随机图片
-	_ "github.com/FloatTech/ZeroBot-Plugin/plugin_minecraft"      // MCSManager
-	_ "github.com/FloatTech/ZeroBot-Plugin/plugin_moyu"           // 摸鱼
-	_ "github.com/FloatTech/ZeroBot-Plugin/plugin_music"          // 点歌
-	_ "github.com/FloatTech/ZeroBot-Plugin/plugin_nativesetu"     // 本地涩图
-	_ "github.com/FloatTech/ZeroBot-Plugin/plugin_nativewife"     // 本地老婆
-	_ "github.com/FloatTech/ZeroBot-Plugin/plugin_nbnhhsh"        // 拼音首字母缩写释义工具
-	_ "github.com/FloatTech/ZeroBot-Plugin/plugin_novel"          // 铅笔小说网搜索
-	_ "github.com/FloatTech/ZeroBot-Plugin/plugin_nsfw"           // nsfw图片识别
-	_ "github.com/FloatTech/ZeroBot-Plugin/plugin_omikuji"        // 浅草寺求签
-	_ "github.com/FloatTech/ZeroBot-Plugin/plugin_reborn"         // 投胎
-	_ "github.com/FloatTech/ZeroBot-Plugin/plugin_runcode"        // 在线运行代码
-	_ "github.com/FloatTech/ZeroBot-Plugin/plugin_saucenao"       // 以图搜图
-	_ "github.com/FloatTech/ZeroBot-Plugin/plugin_scale"          // 叔叔的AI二次元图片放大
-	_ "github.com/FloatTech/ZeroBot-Plugin/plugin_score"          // 分数
-	_ "github.com/FloatTech/ZeroBot-Plugin/plugin_setutime"       // 来份涩图
-	_ "github.com/FloatTech/ZeroBot-Plugin/plugin_shadiao"        // 沙雕app
-	_ "github.com/FloatTech/ZeroBot-Plugin/plugin_shindan"        // 测定
-	_ "github.com/FloatTech/ZeroBot-Plugin/plugin_tracemoe"       // 搜番
-	_ "github.com/FloatTech/ZeroBot-Plugin/plugin_translation"    // 翻译
-	_ "github.com/FloatTech/ZeroBot-Plugin/plugin_vtb_quotation"  // vtb语录
-	_ "github.com/FloatTech/ZeroBot-Plugin/plugin_wangyiyun"      // 网易云音乐热评
+	_ "github.com/FloatTech/ZeroBot-Plugin/plugin/acgimage"       // 随机图片与AI点评
+	_ "github.com/FloatTech/ZeroBot-Plugin/plugin/ai_false"       // 服务器监控
+	_ "github.com/FloatTech/ZeroBot-Plugin/plugin/aiwife"         // 随机老婆
+	_ "github.com/FloatTech/ZeroBot-Plugin/plugin/b14"            // base16384加解密
+	_ "github.com/FloatTech/ZeroBot-Plugin/plugin/baidu"          // 百度一下
+	_ "github.com/FloatTech/ZeroBot-Plugin/plugin/bilibili"       // 查询b站用户信息
+	_ "github.com/FloatTech/ZeroBot-Plugin/plugin/bilibili_parse" // b站视频链接解析
+	_ "github.com/FloatTech/ZeroBot-Plugin/plugin/book_review"    // 哀伤雪刃吧推书记录
+	_ "github.com/FloatTech/ZeroBot-Plugin/plugin/cangtoushi"     // 藏头诗
+	_ "github.com/FloatTech/ZeroBot-Plugin/plugin/choose"         // 选择困难症帮手
+	_ "github.com/FloatTech/ZeroBot-Plugin/plugin/chouxianghua"   // 说抽象话
+	_ "github.com/FloatTech/ZeroBot-Plugin/plugin/coser"          // 三次元小姐姐
+	_ "github.com/FloatTech/ZeroBot-Plugin/plugin/cpstory"        // cp短打
+	_ "github.com/FloatTech/ZeroBot-Plugin/plugin/danbooru"       // DeepDanbooru二次元图标签识别
+	_ "github.com/FloatTech/ZeroBot-Plugin/plugin/diana"          // 嘉心糖发病
+	_ "github.com/FloatTech/ZeroBot-Plugin/plugin/drift_bottle"   // 漂流瓶
+	_ "github.com/FloatTech/ZeroBot-Plugin/plugin/emojimix"       // 合成emoji
+	_ "github.com/FloatTech/ZeroBot-Plugin/plugin/fortune"        // 运势
+	_ "github.com/FloatTech/ZeroBot-Plugin/plugin/funny"          // 笑话
+	_ "github.com/FloatTech/ZeroBot-Plugin/plugin/gif"            // 制图
+	_ "github.com/FloatTech/ZeroBot-Plugin/plugin/github"         // 搜索GitHub仓库
+	_ "github.com/FloatTech/ZeroBot-Plugin/plugin/hs"             // 炉石
+	_ "github.com/FloatTech/ZeroBot-Plugin/plugin/image_finder"   // 关键字搜图
+	_ "github.com/FloatTech/ZeroBot-Plugin/plugin/jandan"         // 煎蛋网无聊图
+	_ "github.com/FloatTech/ZeroBot-Plugin/plugin/juejuezi"       // 绝绝子生成器
+	_ "github.com/FloatTech/ZeroBot-Plugin/plugin/lolicon"        // lolicon 随机图片
+	_ "github.com/FloatTech/ZeroBot-Plugin/plugin/moyu"           // 摸鱼
+	_ "github.com/FloatTech/ZeroBot-Plugin/plugin/moyu_calendar"  // 摸鱼人日历
+	_ "github.com/FloatTech/ZeroBot-Plugin/plugin/music"          // 点歌
+	_ "github.com/FloatTech/ZeroBot-Plugin/plugin/nativesetu"     // 本地涩图
+	_ "github.com/FloatTech/ZeroBot-Plugin/plugin/nativewife"     // 本地老婆
+	_ "github.com/FloatTech/ZeroBot-Plugin/plugin/nbnhhsh"        // 拼音首字母缩写释义工具
+	_ "github.com/FloatTech/ZeroBot-Plugin/plugin/novel"          // 铅笔小说网搜索
+	_ "github.com/FloatTech/ZeroBot-Plugin/plugin/nsfw"           // nsfw图片识别
+	_ "github.com/FloatTech/ZeroBot-Plugin/plugin/omikuji"        // 浅草寺求签
+	_ "github.com/FloatTech/ZeroBot-Plugin/plugin/reborn"         // 投胎
+	_ "github.com/FloatTech/ZeroBot-Plugin/plugin/runcode"        // 在线运行代码
+	_ "github.com/FloatTech/ZeroBot-Plugin/plugin/saucenao"       // 以图搜图
+	_ "github.com/FloatTech/ZeroBot-Plugin/plugin/scale"          // 叔叔的AI二次元图片放大
+	_ "github.com/FloatTech/ZeroBot-Plugin/plugin/score"          // 分数
+	_ "github.com/FloatTech/ZeroBot-Plugin/plugin/setutime"       // 来份涩图
+	_ "github.com/FloatTech/ZeroBot-Plugin/plugin/shadiao"        // 沙雕app
+	_ "github.com/FloatTech/ZeroBot-Plugin/plugin/shindan"        // 测定
+	_ "github.com/FloatTech/ZeroBot-Plugin/plugin/tracemoe"       // 搜番
+	_ "github.com/FloatTech/ZeroBot-Plugin/plugin/translation"    // 翻译
+	_ "github.com/FloatTech/ZeroBot-Plugin/plugin/vtb_quotation"  // vtb语录
+	_ "github.com/FloatTech/ZeroBot-Plugin/plugin/wangyiyun"      // 网易云音乐热评
+	_ "github.com/FloatTech/ZeroBot-Plugin/plugin/wordle"         // 猜单词
 
-	// _ "github.com/FloatTech/ZeroBot-Plugin/plugin_wtf"            // 鬼东西
-	// _ "github.com/FloatTech/ZeroBot-Plugin/plugin_bilibili_push"  // b站推送
+	// _ "github.com/FloatTech/ZeroBot-Plugin/plugin/wtf"            // 鬼东西
+	// _ "github.com/FloatTech/ZeroBot-Plugin/plugin/bilibili_push"  // b站推送
 
 	//                               ^^^^                               //
 	//                          ^^^^^^^^^^^^^^                          //
@@ -120,9 +122,9 @@ import (
 	//                          vvvvvvvvvvvvvv                          //
 	//                               vvvv                               //
 
-	_ "github.com/FloatTech/ZeroBot-Plugin/plugin_curse" // 骂人
+	_ "github.com/FloatTech/ZeroBot-Plugin/plugin/curse" // 骂人
 
-	_ "github.com/FloatTech/ZeroBot-Plugin/plugin_ai_reply" // 人工智能回复
+	_ "github.com/FloatTech/ZeroBot-Plugin/plugin/ai_reply" // 人工智能回复
 
 	//                               ^^^^                               //
 	//                          ^^^^^^^^^^^^^^                          //

plugin/acgimage/classify.go

@@ -113,16 +113,10 @@ func init() { // 插件主体
 					u = apihead + dhash
 				}
 
-				m, hassent, err := pool.NewImage(ctxext.Send(ctx), ctxext.GetMessage(ctx), dhash, u)
-				if err == nil && !hassent {
-					// 发送图片
-					id := ctx.SendChain(message.Image(m.String()))
-					if id.ID() == 0 {
-						id = ctx.SendChain(message.Image(m.String()).Add("cache", "0"))
-						if id.ID() == 0 {
-							ctx.SendChain(message.Text("图片发送失败，可能被风控了~"))
-						}
-					}
+				err := pool.SendRemoteImageFromPool(dhash, u, ctxext.Send(ctx), ctxext.GetMessage(ctx))
+				if err != nil {
+					ctx.SendChain(message.Text("ERROR:", err))
+					return
 				}
 			}
 		})
@@ -159,11 +153,5 @@ func reply(ctx *zero.Ctx, class int, dhash string, comment string) error {
 		}
 	}
 
-	m, hassent, err := pool.NewImage(send, ctxext.GetMessage(ctx), b14, u)
-	if err == nil && !hassent {
-		if send(message.Message{message.Image(m.String())}) == 0 {
-			send(message.Message{message.Image(m.String()).Add("cache", "0")})
-		}
-	}
-	return err
+	return pool.SendRemoteImageFromPool(b14, u, send, ctxext.GetMessage(ctx))
 }

plugin/ai_reply/main.go

@@ -15,13 +15,13 @@ import (
 )
 
 const (
-	serviceName = "aireply"
+	replyServiceName = "aireply"
 )
 
-var modes = [...]string{"青云客", "小爱"}
+var replyModes = [...]string{"青云客", "小爱"}
 
 func init() { // 插件主体
-	engine := control.Register(serviceName, order.AcquirePrio(), &control.Options{
+	engine := control.Register(replyServiceName, order.AcquirePrio(), &control.Options{
 		DisableOnDefault: false,
 		Help: "人工智能回复\n" +
 			"- @Bot 任意文本(任意一句话回复)\n- 设置回复模式[青云客  |  小爱]\n- ",
@@ -59,7 +59,7 @@ func setReplyMode(ctx *zero.Ctx, name string) error {
 	}
 	var ok bool
 	var index int64
-	for i, s := range modes {
+	for i, s := range replyModes {
 		if s == name {
 			ok = true
 			index = int64(i)
@@ -69,7 +69,7 @@ func setReplyMode(ctx *zero.Ctx, name string) error {
 	if !ok {
 		return errors.New("no such mode")
 	}
-	m, ok := control.Lookup(serviceName)
+	m, ok := control.Lookup(replyServiceName)
 	if !ok {
 		return errors.New("no such plugin")
 	}
@@ -81,11 +81,11 @@ func getReplyMode(ctx *zero.Ctx) (name string) {
 	if gid == 0 {
 		gid = -ctx.Event.UserID
 	}
-	m, ok := control.Lookup(serviceName)
+	m, ok := control.Lookup(replyServiceName)
 	if ok {
 		index := m.GetData(gid)
-		if int(index) < len(modes) {
-			return modes[index]
+		if int(index) < len(replyModes) {
+			return replyModes[index]
 		}
 	}
 	return "青云客"

plugin/ai_reply/tts.go

@@ -0,0 +1,122 @@
+package aireply
+
+import (
+	"errors"
+	"regexp"
+	"strconv"
+
+	"github.com/pkumza/numcn"
+	log "github.com/sirupsen/logrus"
+	zero "github.com/wdvxdr1123/ZeroBot"
+	"github.com/wdvxdr1123/ZeroBot/message"
+
+	"github.com/FloatTech/AnimeAPI/aireply"
+	"github.com/FloatTech/AnimeAPI/tts"
+	"github.com/FloatTech/AnimeAPI/tts/baidutts"
+	"github.com/FloatTech/AnimeAPI/tts/mockingbird"
+	"github.com/FloatTech/zbputils/control"
+	"github.com/FloatTech/zbputils/ctxext"
+
+	"github.com/FloatTech/zbputils/control/order"
+)
+
+const ttsServiceName = "tts"
+
+var (
+	t = &ttsInstances{
+		m: map[string]tts.TTS{
+			"百度女声":   baidutts.NewBaiduTTS(0),
+			"百度男声":   baidutts.NewBaiduTTS(1),
+			"百度度逍遥":  baidutts.NewBaiduTTS(3),
+			"百度度丫丫":  baidutts.NewBaiduTTS(4),
+			"拟声鸟阿梓":  mockingbird.NewMockingBirdTTS(0),
+			"拟声鸟药水哥": mockingbird.NewMockingBirdTTS(1),
+		},
+		l: []string{"拟声鸟阿梓", "拟声鸟药水哥", "百度女声", "百度男声", "百度度逍遥", "百度度丫丫"},
+	}
+	re = regexp.MustCompile(`(\-|\+)?\d+(\.\d+)?`)
+)
+
+type ttsInstances struct {
+	m map[string]tts.TTS
+	l []string
+}
+
+func (t *ttsInstances) List() []string {
+	return t.l
+}
+
+func init() {
+	engine := control.Register(ttsServiceName, order.AcquirePrio(), &control.Options{
+		DisableOnDefault: false,
+		Help:             "语音回复(包括拟声鸟和百度)\n- @Bot 任意文本(任意一句话回复)\n- 设置语音模式拟声鸟阿梓 | 设置语音模式拟声鸟药水哥 | 设置语音模式百度女声 | 设置语音模式百度男声| 设置语音模式百度度逍遥 | 设置语音模式百度度丫丫",
+	})
+	engine.OnMessage(zero.OnlyToMe).SetBlock(true).Limit(ctxext.LimitByUser).
+		Handle(func(ctx *zero.Ctx) {
+			msg := ctx.ExtractPlainText()
+			r := aireply.NewAIReply(getReplyMode(ctx))
+			tts := t.new(t.getSoundMode(ctx))
+			ctx.SendChain(message.Record(tts.Speak(ctx.Event.UserID, func() string {
+				reply := r.TalkPlain(msg, zero.BotConfig.NickName[0])
+				reply = re.ReplaceAllStringFunc(reply, func(s string) string {
+					f, err := strconv.ParseFloat(s, 64)
+					if err != nil {
+						log.Errorln("[tts]:", err)
+						return s
+					}
+					return numcn.EncodeFromFloat64(f)
+				})
+				log.Println("[tts]:", reply)
+				return reply
+			})))
+		})
+	engine.OnRegex(`^设置语音模式(.*)$`, ctxext.FirstValueInList(t)).SetBlock(true).
+		Handle(func(ctx *zero.Ctx) {
+			param := ctx.State["regex_matched"].([]string)[1]
+			err := t.setSoundMode(ctx, param)
+			if err != nil {
+				ctx.SendChain(message.Reply(ctx.Event.MessageID), message.Text(err))
+				return
+			}
+			ctx.SendChain(message.Reply(ctx.Event.MessageID), message.Text("成功"))
+		})
+}
+
+// new 语音简单工厂
+func (t *ttsInstances) new(name string) tts.TTS {
+	return t.m[name]
+}
+
+func (t *ttsInstances) setSoundMode(ctx *zero.Ctx, name string) error {
+	gid := ctx.Event.GroupID
+	if gid == 0 {
+		gid = -ctx.Event.UserID
+	}
+	var index int64
+	for i, s := range t.l {
+		if s == name {
+			index = int64(i)
+			break
+		}
+	}
+	m, ok := control.Lookup(ttsServiceName)
+	if !ok {
+		return errors.New("no such plugin")
+	}
+	return m.SetData(gid, index)
+}
+
+func (t *ttsInstances) getSoundMode(ctx *zero.Ctx) (name string) {
+	gid := ctx.Event.GroupID
+	if gid == 0 {
+		gid = -ctx.Event.UserID
+	}
+	m, ok := control.Lookup(ttsServiceName)
+	if ok {
+		index := m.GetData(gid)
+		if int(index) < len(t.l) {
+			return t.l[index]
+		}
+	}
+	return "拟声鸟阿梓"
+}

plugin/baidu/search.go

@@ -0,0 +1,27 @@
+// Package baidu 百度一下
+package baidu
+
+import (
+	"net/url"
+
+	zero "github.com/wdvxdr1123/ZeroBot"
+	"github.com/wdvxdr1123/ZeroBot/message"
+
+	"github.com/FloatTech/zbputils/control"
+	"github.com/FloatTech/zbputils/control/order"
+	"github.com/FloatTech/zbputils/ctxext"
+)
+
+func init() {
+	control.Register("baidu", order.AcquirePrio(), &control.Options{
+		DisableOnDefault: false,
+		Help: "baidu\n" +
+			"- 百度下[xxx]",
+	}).OnPrefix("百度下").SetBlock(true).Limit(ctxext.LimitByGroup).
+		Handle(func(ctx *zero.Ctx) {
+			txt := ctx.State["args"].(string)
+			if txt != "" {
+				ctx.SendChain(message.Text("https://buhuibaidu.me/?s=" + url.QueryEscape(txt)))
+			}
+		})
+}

plugin/bilibili/fansDaily.go

@@ -6,7 +6,7 @@ import (
 	"time"
 
 	control "github.com/FloatTech/zbputils/control"
-	"github.com/fumiama/cron"
+	"github.com/FloatTech/zbputils/process"
 	zero "github.com/wdvxdr1123/ZeroBot"
 	"github.com/wdvxdr1123/ZeroBot/message"
 
@@ -63,10 +63,9 @@ func init() {
 
 // 定时任务每天晚上最后2分钟执行一次
 func fansDaily() {
-	c := cron.New()
-	_, err := c.AddFunc("58 23 * * *", func() { sendNotice() })
-	if err == nil {
-		c.Start()
+	_, err := process.CronTab.AddFunc("58 23 * * *", func() { sendNotice() })
+	if err != nil {
+		panic(err)
 	}
 }
 

plugin/diana/bing.go

@@ -9,7 +9,7 @@ import (
 
 	"github.com/FloatTech/zbputils/control/order"
 
-	"github.com/FloatTech/ZeroBot-Plugin/plugin_diana/data"
+	"github.com/FloatTech/ZeroBot-Plugin/plugin/diana/data"
 )
 
 var engine = control.Register("diana", order.AcquirePrio(), &control.Options{

plugin/fortune/fortune.go

@@ -146,39 +146,18 @@ func init() {
 			digest := md5.Sum(helper.StringToBytes(zipfile + strconv.Itoa(index) + title + text))
 			cachefile := cache + hex.EncodeToString(digest[:])
 
-			m, err := pool.GetImage(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
-					}
-				}
-				m.SetFile(file.BOTPATH + "/" + cachefile)
-				hassent, err := m.Push(ctxext.Send(ctx), ctxext.GetMessage(ctx))
-				if hassent {
-					return
-				}
+			err = pool.SendImageFromPool(cachefile, cachefile, func() error {
+				f, err := os.Create(cachefile)
 				if err != nil {
-					ctx.SendChain(message.Text("ERROR: ", err))
-					return
-				}
-			}
-			// 发送图片
-			id := ctx.SendChain(message.Image(m.String()))
-			if id.ID() == 0 {
-				id = ctx.SendChain(message.Image(m.String()).Add("cache", "0"))
-				if id.ID() == 0 {
-					ctx.SendChain(message.Text("图片发送失败，可能被风控了~"))
+					return err
 				}
+				_, err = draw(background, title, text, f)
+				_ = f.Close()
+				return err
+			}, ctxext.Send(ctx), ctxext.GetMessage(ctx))
+			if err != nil {
+				ctx.SendChain(message.Text("ERROR: ", err))
+				return
 			}
 		})
 }

plugin/gif/png.go

@@ -4,8 +4,10 @@ import (
 	"errors"
 	"image"
 	"math/rand"
+	"os"
 	"strconv"
 
+	"github.com/FloatTech/zbputils/file"
 	"github.com/FloatTech/zbputils/img"
 	"github.com/FloatTech/zbputils/img/writer"
 )
@@ -19,6 +21,12 @@ func (cc *context) A爬() (string, error) {
 	}
 	// 随机爬图序号
 	rand := rand.Intn(60) + 1
+	if file.IsNotExist(datapath + "materials/pa") {
+		err = os.MkdirAll(datapath+"materials/pa", 0755)
+		if err != nil {
+			return "", err
+		}
+	}
 	f, err := dlblock(`pa/` + strconv.Itoa(rand) + `.png`)
 	if err != nil {
 		return "", err
@@ -39,6 +47,12 @@ func (cc *context) A撕() (string, error) {
 	}
 	im1 := img.Rotate(tou, 20, 380, 380)
 	im2 := img.Rotate(tou, -12, 380, 380)
+	if file.IsNotExist(datapath + "materials/si") {
+		err = os.MkdirAll(datapath+"materials/si", 0755)
+		if err != nil {
+			return "", err
+		}
+	}
 	f, err := dlblock(`si/0.png`)
 	if err != nil {
 		return "", err

plugin/image_finder/keyword.go

@@ -15,7 +15,6 @@ import (
 	"github.com/FloatTech/zbputils/control"
 	"github.com/FloatTech/zbputils/control/order"
 	"github.com/FloatTech/zbputils/ctxext"
-	"github.com/FloatTech/zbputils/file"
 	"github.com/FloatTech/zbputils/img/pool"
 	"github.com/FloatTech/zbputils/web"
 )
@@ -55,31 +54,15 @@ func init() {
 			}
 			u := illust.ImageUrls[0]
 			n := u[strings.LastIndex(u, "/")+1 : len(u)-4]
-			m, err := pool.GetImage(n)
-			if err != nil {
+			f := illust.Path(0)
+
+			err = pool.SendImageFromPool(n, f, func() error {
 				// 下载图片
-				f := ""
-				if f, err = illust.DownloadToCache(0, n); err != nil {
-					ctx.SendChain(message.Text("ERROR: ", err))
-					return
-				}
-				m.SetFile(file.BOTPATH + "/" + f)
-				hassent, err := m.Push(ctxext.Send(ctx), ctxext.GetMessage(ctx))
-				if hassent {
-					return
-				}
-				if err != nil {
-					ctx.SendChain(message.Text("ERROR: ", err))
-					return
-				}
-			}
-			// 发送图片
-			id := ctx.SendChain(message.Image(m.String()))
-			if id.ID() == 0 {
-				id = ctx.SendChain(message.Image(m.String()).Add("cache", "0"))
-				if id.ID() == 0 {
-					ctx.SendChain(message.Text("图片发送失败，可能被风控了~"))
-				}
+				return illust.DownloadToCache(0)
+			}, ctxext.Send(ctx), ctxext.GetMessage(ctx))
+			if err != nil {
+				ctx.SendChain(message.Text("ERROR: ", err))
+				return
 			}
 		})
 }

plugin/lolicon/lolicon.go

@@ -58,7 +58,7 @@ func init() {
 					url = strings.ReplaceAll(url, "i.pixiv.cat", "i.pixiv.re")
 					name := url[strings.LastIndex(url, "/")+1 : len(url)-4]
 					m, err := pool.GetImage(name)
-					if err != nil {
+					if err != nil && err != pool.ErrImgFileAsync {
 						m.SetFile(url)
 						_, err = m.Push(ctxext.SendToSelf(ctx), ctxext.GetMessage(ctx))
 						process.SleepAbout1sTo2s()
@@ -73,13 +73,12 @@ func init() {
 			select {
 			case <-time.After(time.Minute):
 				ctx.SendChain(message.Text("ERROR: 等待填充，请稍后再试......"))
-			case url := <-queue:
-				// 发送图片
-				id := ctx.SendChain(message.Image(url))
+			case img := <-queue:
+				id := ctx.SendChain(message.Image(img))
 				if id.ID() == 0 {
-					id = ctx.SendChain(message.Image(url).Add("cache", "0"))
+					id = ctx.SendChain(message.Image(img).Add("cache", "0"))
 					if id.ID() == 0 {
-						ctx.SendChain(message.Text("图片发送失败，可能被风控了~"))
+						ctx.SendChain(message.Text("ERROR:图片发送失败，可能被风控了~"))
 					}
 				}
 			}

plugin/manager/manager.go

@@ -21,7 +21,7 @@ import (
 
 	"github.com/FloatTech/zbputils/control/order"
 
-	"github.com/FloatTech/ZeroBot-Plugin/plugin_manager/timer"
+	"github.com/FloatTech/ZeroBot-Plugin/plugin/manager/timer"
 )
 
 const (
@@ -48,7 +48,8 @@ const (
 		"- 取消在\"cron\"的提醒\n" +
 		"- 列出所有提醒\n" +
 		"- 翻牌\n" +
-		"- 设置欢迎语XXX\n" +
+		"- 设置欢迎语XXX（可加{at}在欢迎时@对方）\n" +
+		"- 测试欢迎语\n" +
 		"- [开启 | 关闭]入群验证"
 )
 
@@ -210,6 +211,10 @@ func init() { // 插件主体
 	// 修改名片
 	engine.OnRegex(`^修改名片.*?(\d+).*?\s(.*)`, zero.OnlyGroup, zero.AdminPermission).SetBlock(true).
 		Handle(func(ctx *zero.Ctx) {
+			if len(ctx.State["regex_matched"].([]string)[2]) > 60 {
+				ctx.SendChain(message.Text("名字太长啦！"))
+				return
+			}
 			ctx.SetGroupCard(
 				ctx.Event.GroupID,
 				math.Str2Int64(ctx.State["regex_matched"].([]string)[1]), // 被修改群名片的人
@@ -220,6 +225,10 @@ func init() { // 插件主体
 	// 修改头衔
 	engine.OnRegex(`^修改头衔.*?(\d+).*?\s(.*)`, zero.OnlyGroup, zero.AdminPermission).SetBlock(true).
 		Handle(func(ctx *zero.Ctx) {
+			if len(ctx.State["regex_matched"].([]string)[1]) > 18 {
+				ctx.SendChain(message.Text("头衔太长啦！"))
+				return
+			}
 			ctx.SetGroupSpecialTitle(
 				ctx.Event.GroupID,
 				math.Str2Int64(ctx.State["regex_matched"].([]string)[1]), // 被修改群头衔的人
@@ -230,6 +239,10 @@ func init() { // 插件主体
 	// 申请头衔
 	engine.OnRegex(`^申请头衔(.*)`, zero.OnlyGroup).SetBlock(true).
 		Handle(func(ctx *zero.Ctx) {
+			if len(ctx.State["regex_matched"].([]string)[1]) > 18 {
+				ctx.SendChain(message.Text("头衔太长啦！"))
+				return
+			}
 			ctx.SetGroupSpecialTitle(
 				ctx.Event.GroupID,
 				ctx.Event.UserID,                         // 被修改群头衔的人
@@ -369,7 +382,7 @@ func init() { // 插件主体
 				var w welcome
 				err := db.Find("welcome", &w, "where gid = "+strconv.FormatInt(ctx.Event.GroupID, 10))
 				if err == nil {
-					ctx.SendChain(message.Text(w.Msg))
+					ctx.SendGroupMessage(ctx.Event.GroupID, message.ParseMessageFromString(strings.ReplaceAll(w.Msg, "{at}", "[CQ:at,qq="+strconv.FormatInt(ctx.Event.UserID, 10)+"]")))
 				} else {
 					ctx.SendChain(message.Text("欢迎~"))
 				}
@@ -436,6 +449,17 @@ func init() { // 插件主体
 				ctx.SendChain(message.Text("出错啦: ", err))
 			}
 		})
+	// 测试欢迎语
+	engine.OnFullMatch("测试欢迎语", zero.OnlyGroup, zero.AdminPermission).SetBlock(true).
+		Handle(func(ctx *zero.Ctx) {
+			var w welcome
+			err := db.Find("welcome", &w, "where gid = "+strconv.FormatInt(ctx.Event.GroupID, 10))
+			if err == nil {
+				ctx.SendGroupMessage(ctx.Event.GroupID, message.ParseMessageFromString(strings.ReplaceAll(w.Msg, "{at}", "[CQ:at,qq="+strconv.FormatInt(ctx.Event.UserID, 10)+"]")))
+			} else {
+				ctx.SendChain(message.Text("欢迎~"))
+			}
+		})
 	// 入群后验证开关
 	engine.OnRegex(`^(.*)入群验证$`, zero.OnlyGroup, zero.AdminPermission).SetBlock(true).
 		Handle(func(ctx *zero.Ctx) {

plugin/moyu/holiday_test.go

@@ -12,7 +12,6 @@ var sr = reg.NewRegedit("reilia.fumiama.top:32664", "fumiama", "--")
 
 func TestGetHoliday(t *testing.T) {
 	registry.Connect()
-	holidaymap = make(map[string]*Holiday)
 	h := GetHoliday("元旦")
 	registry.Close()
 	t.Fatal(h)

plugin/moyu/nowork.go

@@ -21,29 +21,20 @@ func NewHoliday(name string, dur, year int, month time.Month, day int) *Holiday
 	return &Holiday{name: name, date: time.Date(year, month, day, 0, 0, 0, 0, time.Local), dur: time.Duration(dur) * time.Hour * 24}
 }
 
-var (
-	registry   = reg.NewRegReader("reilia.fumiama.top:32664", "fumiama")
-	holidaymap map[string]*Holiday
-)
+var registry = reg.NewRegReader("reilia.fumiama.top:32664", "fumiama")
 
 // GetHoliday 从 reg 服务器获取节日
 func GetHoliday(name string) *Holiday {
 	var dur, year int
 	var month time.Month
 	var day int
-	h, ok := holidaymap[name]
-	if ok {
-		return h
-	}
 	ret, err := registry.Get("holiday/" + name)
 	if err != nil {
 		return NewHoliday(name+err.Error(), 0, 0, 0, 0)
 	}
 	fmt.Sscanf(ret, "%d_%d_%d_%d", &dur, &year, &month, &day)
 	logrus.Debugln("[moyu]获取节日:", name, dur, year, month, day)
-	h = NewHoliday(name, dur, year, month, day)
-	holidaymap[name] = h
-	return h
+	return NewHoliday(name, dur, year, month, day)
 }
 
 // String 获取两个时间相差

plugin/moyu/run.go

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

plugin/moyu_calendar/calendar.go

@@ -0,0 +1,226 @@
+// Package moyucalendar 摸鱼人日历
+package moyucalendar
+
+import (
+	"bufio"
+	"errors"
+	"fmt"
+	"io"
+	"net/http"
+	"net/url"
+	"regexp"
+	"strings"
+	"time"
+
+	control "github.com/FloatTech/zbputils/control"
+	"github.com/FloatTech/zbputils/control/order"
+	"github.com/FloatTech/zbputils/process"
+	zero "github.com/wdvxdr1123/ZeroBot"
+	"github.com/wdvxdr1123/ZeroBot/message"
+
+	xpath "github.com/antchfx/htmlquery"
+)
+
+var ua = "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/88.0.4324.182 Safari/537.36"
+var weixin = regexp.MustCompile(`url \+= '(.+)';`)
+
+var client = &http.Client{}
+
+func init() {
+	control.Register("moyucalendar", order.AcquirePrio(), &control.Options{
+		DisableOnDefault: true,
+		Help: "摸鱼人日历\n" +
+			"- /启用 moyucalendar\n" +
+			"- /禁用 moyucalendar",
+	}).OnFullMatch("摸鱼人日历").SetBlock(true).
+		Handle(func(ctx *zero.Ctx) {
+			title := fmt.Sprintf("摸鱼人日历 %d月%d日", time.Now().Month(), time.Now().Day())
+			sg, cookies, err := sougou(title, "摸鱼人日历", ua)
+			if err != nil {
+				ctx.SendChain(message.Text("ERROR: ", err))
+				return
+			}
+			wx, err := redirect(sg, cookies, ua)
+			if err != nil {
+				ctx.SendChain(message.Text("ERROR: ", err))
+				return
+			}
+			image, err := calendar(wx, ua)
+			if err != nil {
+				ctx.SendChain(message.Text("ERROR: ", err))
+				return
+			}
+			ctx.SendChain(message.Image(image))
+		})
+
+	// 定时任务每天8点30分执行一次
+	_, err := process.CronTab.AddFunc("30 8 * * *", func() {
+		m, ok := control.Lookup("moyucalendar")
+		if !ok {
+			return
+		}
+		title := fmt.Sprintf("摸鱼人日历 %d月%d日", time.Now().Month(), time.Now().Day())
+		sg, cookies, err := sougou(title, "摸鱼人日历", ua)
+		if err != nil {
+			return
+		}
+		wx, err := redirect(sg, cookies, ua)
+		if err != nil {
+			return
+		}
+		image, err := calendar(wx, ua)
+		if err != nil {
+			return
+		}
+		zero.RangeBot(func(id int64, ctx *zero.Ctx) bool {
+			for _, g := range ctx.GetGroupList().Array() {
+				grp := g.Get("group_id").Int()
+				if m.IsEnabledIn(grp) {
+					ctx.SendGroupMessage(grp, message.Message{message.Image(image)})
+					process.SleepAbout1sTo2s()
+				}
+			}
+			return true
+		})
+	})
+	if err != nil {
+		panic(err)
+	}
+}
+
+func sougou(title, publisher, ua string) (string, []*http.Cookie, error) {
+	u, _ := url.Parse("https://weixin.sogou.com/weixin")
+	u.RawQuery = url.Values{
+		"type":   []string{"2"},
+		"s_from": []string{"input"},
+		"query":  []string{title},
+	}.Encode()
+	req, err := http.NewRequest("GET", u.String(), nil)
+	if err != nil {
+		return "", nil, err
+	}
+	req.Header.Set("User-Agent", ua)
+	resp, err := client.Do(req)
+	if err != nil {
+		return "", nil, err
+	}
+	defer resp.Body.Close()
+	if resp.StatusCode != http.StatusOK {
+		return "", nil, errors.New("status not ok")
+	}
+	// 解析XPATH
+	doc, err := xpath.Parse(resp.Body)
+	if err != nil {
+		return "", nil, err
+	}
+	// 取出每个返回的结果
+	list := xpath.Find(doc, `//*[@class="news-list"]/li/div[@class="txt-box"]`)
+	if len(list) == 0 {
+		return "", nil, errors.New("sougou result not found")
+	}
+	var match string
+	for i := range list {
+		account := xpath.FindOne(list[i], `//div[@class="s-p"]/a[@class="account"]`)
+		if account == nil {
+			continue
+		}
+		if xpath.InnerText(account) != publisher {
+			continue
+		}
+		target := xpath.FindOne(list[i], `//h3/a[@target="_blank"]`)
+		if target == nil {
+			continue
+		}
+		match = xpath.SelectAttr(target, "href")
+		break
+	}
+	if match == "" {
+		return "", nil, errors.New("sougou result not found")
+	}
+	return "https://weixin.sogou.com" + match, resp.Cookies(), nil
+}
+
+func redirect(link string, cookies []*http.Cookie, ua string) (string, error) {
+	req, err := http.NewRequest("GET", link, nil)
+	if err != nil {
+		return "", err
+	}
+	req.Header.Set("User-Agent", ua)
+	var c = make([]string, 0, 4)
+	for _, cookie := range cookies {
+		if cookie.Name != "ABTEST" && cookie.Name != "SNUID" &&
+			cookie.Name != "IPLOC" && cookie.Name != "SUID" {
+			continue
+		}
+		c = append(c, cookie.Name+"="+cookie.Value)
+	}
+	req.Header.Set("Cookie", strings.Join(c, "; "))
+	resp, err := client.Do(req)
+	if err != nil {
+		return "", err
+	}
+	defer resp.Body.Close()
+	if resp.StatusCode != http.StatusOK {
+		return "", errors.New("status not ok")
+	}
+	br := bufio.NewReader(resp.Body)
+	var u = make([]string, 0)
+	for {
+		b, _, err := br.ReadLine()
+		if err == io.EOF {
+			break
+		}
+		if err != nil {
+			return "", err
+		}
+		matcha := weixin.FindStringSubmatch(string(b))
+		if len(matcha) < 2 {
+			continue
+		}
+		u = append(u, strings.ReplaceAll(matcha[1], "@", ""))
+	}
+	if len(u) == 0 {
+		return "", errors.New("weixin url not found")
+	}
+	return strings.Join(u, ""), nil
+}
+
+func calendar(link, ua string) (string, error) {
+	req, err := http.NewRequest("GET", link, nil)
+	req.Header.Set("User-Agent", ua)
+	if err != nil {
+		return "", err
+	}
+	resp, err := client.Do(req)
+	if err != nil {
+		return "", err
+	}
+	defer resp.Body.Close()
+	if resp.StatusCode != http.StatusOK {
+		return "", errors.New("status not ok")
+	}
+	doc, err := xpath.Parse(resp.Body)
+	if err != nil {
+		return "", err
+	}
+	html := xpath.OutputHTML(doc, false)
+	if !strings.Contains(html, time.Now().Format("2006-01-02")) {
+		return "", errors.New("calendar not today")
+	}
+	images := xpath.Find(doc, `//*[@id="js_content"]/p/img`)
+	if images == nil {
+		return "", errors.New("calendar not found")
+	}
+	var image string
+	for i := range images {
+		if xpath.SelectAttr(images[i], "data-w") != "540" {
+			continue
+		}
+		image = xpath.SelectAttr(images[i], "data-src")
+		break
+	}
+	if image == "" {
+		return "", errors.New("image not found")
+	}
+	return image, nil
+}

plugin/saucenao/searcher.go

@@ -43,34 +43,26 @@ func init() { // 插件主体
 				name := strconv.FormatInt(illust.Pid, 10)
 				var imgs message.Message
 				for i := range illust.ImageUrls {
+					f := file.BOTPATH + "/" + illust.Path(i)
 					n := name + "_p" + strconv.Itoa(i)
-					filepath := file.BOTPATH + "/" + pixiv.CacheDir + n
-					f := ""
 					var m *pool.Image
-					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:
+					if file.IsNotExist(f) {
 						m, err = pool.GetImage(n)
 						if err == nil {
-							imgs = append(imgs, message.Image(m.String()).Add("cache", "0"))
+							imgs = append(imgs, message.Image(m.String()))
 							continue
 						}
 						logrus.Debugln("[sausenao]开始下载", n)
-						filepath, err = illust.DownloadToCache(i, n)
-						if err == nil {
-							f = file.BOTPATH + "/" + filepath
+						err1 := illust.DownloadToCache(i)
+						if err != pool.ErrImgFileAsync && err1 == nil {
 							m.SetFile(f)
 							_, _ = m.Push(ctxext.SendToSelf(ctx), ctxext.GetMessage(ctx))
 						}
+						if err1 != nil {
+							logrus.Debugln("[sausenao]下载err:", err1)
+						}
 					}
-					if f != "" {
-						imgs = append(imgs, message.Image("file:///"+f))
-					}
+					imgs = append(imgs, message.Image("file:///"+f))
 				}
 				txt := message.Text(
 					"标题：", illust.Title, "\n",

plugin/scale/main.go

@@ -4,20 +4,31 @@ package scale
 import (
 	"bytes"
 	"image"
+	"math"
 	"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"
-	"github.com/FloatTech/zbputils/web"
+	_ "image/gif"  // import gif decoding
+	_ "image/jpeg" // import jpg decoding
+	_ "image/png"  // import png decoding
+
+	_ "golang.org/x/image/webp" // import webp decoding
+
 	zero "github.com/wdvxdr1123/ZeroBot"
 	"github.com/wdvxdr1123/ZeroBot/message"
 
+	"github.com/FloatTech/AnimeAPI/nsfw"
+	"github.com/FloatTech/AnimeAPI/scale"
+
+	"github.com/FloatTech/zbputils/binary"
+	"github.com/FloatTech/zbputils/control"
 	"github.com/FloatTech/zbputils/control/order"
+	"github.com/FloatTech/zbputils/ctxext"
+	"github.com/FloatTech/zbputils/file"
+	"github.com/FloatTech/zbputils/img"
+	"github.com/FloatTech/zbputils/img/writer"
+	"github.com/FloatTech/zbputils/web"
 )
 
 func init() {
@@ -40,6 +51,7 @@ func init() {
 					datachan <- d
 				}()
 				ctx.SendChain(message.Text("少女祈祷中..."))
+
 				p, err := nsfw.Classify(url[0])
 				if err != nil {
 					ctx.SendChain(message.Text("ERROR:", err))
@@ -49,6 +61,7 @@ func init() {
 					ctx.SendChain(message.Text("请发送二次元图片!"))
 					return
 				}
+
 				data := <-datachan
 				if errsub != nil {
 					ctx.SendChain(message.Text("ERROR:", errsub))
@@ -59,16 +72,31 @@ func init() {
 					ctx.SendChain(message.Text("ERROR:", err))
 					return
 				}
-				if im.Bounds().Size().X > 1080 || im.Bounds().Size().Y > 1080 {
-					ctx.SendChain(message.Text("图片过大!"))
-					return
-				}
+				px := im.Bounds().Size().X * im.Bounds().Size().Y
 				paras := ctx.State["scale_paras"].([2]int)
-				data, err = scale.Get(url[0], paras[0], paras[1], 2)
+
+				if px > 512*512 {
+					px = int(math.Pow(float64(px), 0.5) + 0.5)
+					x := im.Bounds().Size().X * 512 / px
+					y := im.Bounds().Size().Y * 512 / px
+					ctx.SendChain(message.Text("图片", im.Bounds().Size().X, "x", im.Bounds().Size().Y, "过大，调整图片至", x, "x", y))
+					im = img.Size(im, x, y).Im
+					w := binary.SelectWriter()
+					defer binary.PutWriter(w)
+					_, err = writer.WriteTo(im, w)
+					if err != nil {
+						ctx.SendChain(message.Text("ERROR:", err))
+						return
+					}
+					data, err = scale.Post(bytes.NewReader(w.Bytes()), paras[0], paras[1], 2)
+				} else {
+					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 {

plugin/score/sign_in.go

@@ -12,7 +12,6 @@ import (
 	"github.com/tidwall/gjson"
 	zero "github.com/wdvxdr1123/ZeroBot"
 	"github.com/wdvxdr1123/ZeroBot/message"
-	"github.com/wdvxdr1123/ZeroBot/utils/helper"
 
 	control "github.com/FloatTech/zbputils/control"
 	"github.com/FloatTech/zbputils/ctxext"
@@ -144,12 +143,9 @@ func init() {
 			f, err := os.Create(drawedFile)
 			if err != nil {
 				log.Errorln("[score]", err)
-				canvasBase64, err := writer.ToBase64(canvas.Image())
-				if err != nil {
-					ctx.SendChain(message.Text("ERROR:", err))
-					return
-				}
-				ctx.SendChain(message.Image("base64://" + helper.BytesToString(canvasBase64)))
+				data, cl := writer.ToBytes(canvas.Image())
+				ctx.SendChain(message.ImageBytes(data))
+				cl()
 				return
 			}
 			_, err = writer.WriteTo(canvas.Image(), f)

plugin/setutime/setu_geter.go

@@ -2,7 +2,6 @@
 package setutime
 
 import (
-	"errors"
 	"fmt"
 	"strconv"
 	"strings"
@@ -156,16 +155,19 @@ func (p *imgpool) push(ctx *zero.Ctx, imgtype string, illust *pixiv.Illust) {
 	n := u[strings.LastIndex(u, "/")+1 : len(u)-4]
 	m, err := imagepool.GetImage(n)
 	var msg message.MessageSegment
+	f := fileutil.BOTPATH + "/" + illust.Path(0)
 	if err != nil {
-		// 下载图片
-		f := ""
-		if f, err = illust.DownloadToCache(0, n); err != nil {
-			ctx.SendChain(message.Text("ERROR: ", err))
-			return
+		if fileutil.IsNotExist(f) {
+			// 下载图片
+			if err := illust.DownloadToCache(0); err != nil {
+				ctx.SendChain(message.Text("ERROR: ", err))
+				return
+			}
+		}
+		if err != imagepool.ErrImgFileAsync {
+			m.SetFile(f)
+			_, _ = m.Push(ctxext.SendToSelf(ctx), ctxext.GetMessage(ctx))
 		}
-		f = fileutil.BOTPATH + "/" + f
-		m.SetFile(f)
-		_, _ = m.Push(ctxext.SendToSelf(ctx), ctxext.GetMessage(ctx))
 		msg = message.Image("file:///" + f)
 	} else {
 		msg = message.Image(m.String())
@@ -189,21 +191,6 @@ func (p *imgpool) pop(imgtype string) (msg *message.MessageSegment) {
 	return
 }
 
-func (p *imgpool) cachefile(i *pixiv.Illust) string {
-	filename := fmt.Sprint(i.Pid) + "_p0"
-	filepath := fileutil.BOTPATH + `/` + p.path + filename
-	if fileutil.IsExist(filepath + ".jpg") {
-		return `file:///` + filepath + ".jpg"
-	}
-	if fileutil.IsExist(filepath + ".png") {
-		return `file:///` + filepath + ".png"
-	}
-	if fileutil.IsExist(filepath + ".gif") {
-		return `file:///` + filepath + ".gif"
-	}
-	return ""
-}
-
 // fill 补充池子
 func (p *imgpool) fill(ctx *zero.Ctx, imgtype string) {
 	times := math.Min(p.max-p.size(imgtype), 2)
@@ -234,14 +221,12 @@ func (p *imgpool) add(ctx *zero.Ctx, imgtype string, id int64) error {
 	if err != nil {
 		return err
 	}
-	// 下载插画
-	if _, err := illust.DownloadToCache(0, strconv.FormatInt(id, 10)+"_p0"); err != nil {
+	err = imagepool.SendImageFromPool(strconv.FormatInt(illust.Pid, 10)+"_p0", illust.Path(0), func() error {
+		return illust.DownloadToCache(0)
+	}, ctxext.Send(ctx), ctxext.GetMessage(ctx))
+	if err != nil {
 		return err
 	}
-	// 发送到发送者
-	if id := ctx.SendChain(message.Image(p.cachefile(illust))); id.ID() == 0 {
-		return errors.New("可能被风控，发送失败")
-	}
 	// 添加插画到对应的数据库table
 	if err := p.db.Insert(imgtype, illust); err != nil {
 		return err

plugin/sleep_manage/sleep_manage.go

@@ -13,7 +13,7 @@ import (
 
 	"github.com/FloatTech/zbputils/control/order"
 
-	"github.com/FloatTech/ZeroBot-Plugin/plugin_sleep_manage/model"
+	"github.com/FloatTech/ZeroBot-Plugin/plugin/sleep_manage/model"
 )
 
 func init() {

plugin/vtb_quotation/vtb_quotation.go

@@ -25,7 +25,7 @@ import (
 
 	"github.com/FloatTech/zbputils/control/order"
 
-	"github.com/FloatTech/ZeroBot-Plugin/plugin_vtb_quotation/model"
+	"github.com/FloatTech/ZeroBot-Plugin/plugin/vtb_quotation/model"
 )
 
 const regStr = ".*/(.*)"