✨ add plugin 渲染任意文字到图片

* 优化在两个命令中使用空格分隔的体验
- fortune的设置底图功能
- b14的加密功能

* 优化四个插件中使用空格分隔的体验
- 加密
- 哔哩哔哩推送
- 藏头诗
- 运势

* 优化并修正了上一个commit
- 加上了因为复制粘贴疏忽又没有注意测试遗漏的`?`
- 调整藏头诗和加密的正则触发，使其不必多此一举
- 删去了未被发现的测试代码

* - 删去了遗漏的Trim

* 优化了更多插件中使用空格的体验
- 优化了music bilibili image_finder 中使用空格的体验
- 补上了plugin_bilibili中未实现的vup开头触发
- 为plugin_bilibili_parse输出的消息加上一个换行符，优化排版

* 小调整

- 考虑到屌字既难打又有碍观瞻,改为正则匹配`[屌|弔|吊]图`
- 增加了退群提醒的定制

* - 修复退群提醒本身忘记修改了的问题

.github/workflows/nightly.yml

@@ -28,7 +28,7 @@ jobs:
       - name: Setup Go environment
         uses: actions/setup-go@v2.1.3
         with:
-          go-version: 1.17
+          go-version: 1.18
       - name: Cache downloaded module
         uses: actions/cache@v2
         with:

.github/workflows/pull.yml

@@ -8,7 +8,7 @@ jobs:
       - name: Set up Go
         uses: actions/setup-go@v2
         with:
-          go-version: 1.17
+          go-version: 1.18
 
       - name: Check out code into the Go module directory
         uses: actions/checkout@v2
@@ -28,9 +28,6 @@ jobs:
           # Optional: show only new issues if it's a pull request. The default value is `false`.
           # only-new-issues: true
 
-          # Optional: if set to true then the action will use pre-installed Go.
-          skip-go-installation: true
-
           # Optional: if set to true then the action don't cache or restore ~/go/pkg.
           # skip-pkg-cache: true
 

.github/workflows/push.yml

@@ -8,7 +8,7 @@ jobs:
       - name: Set up Go
         uses: actions/setup-go@v2
         with:
-          go-version: 1.17
+          go-version: 1.18
 
       - name: Check out code into the Go module directory
         uses: actions/checkout@v2
@@ -18,7 +18,6 @@ jobs:
         with:
           version: latest
           args: --issues-exit-code=0
-          skip-go-installation: true
       - name: Commit back
         continue-on-error: true
         run: |

.github/workflows/release.yml

@@ -16,7 +16,7 @@ jobs:
       - name: Set up Go
         uses: actions/setup-go@v2
         with:
-          go-version: '1.17'
+          go-version: '1.18'
 
       - name: Run GoReleaser
         uses: goreleaser/goreleaser-action@v2

.golangci.yml

@@ -1,15 +1,11 @@
 linters-settings:
   errcheck:
-    ignore: fmt:.*,io/ioutil:^Read.*
+    ignore: fmt:.*
     ignoretests: true
 
   goimports:
     local-prefixes: github.com/FloatTech/ZeroBot-Plugin
 
-  gocritic:
-    disabled-checks:
-      - exitAfterDefer
-
   forbidigo:
     # Forbid the following identifiers
     forbid:
@@ -66,6 +62,7 @@ run:
   tests: false
   skip-dirs:
     - order
+  go: '1.18'
 
 # output configuration options
 output:

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,18 +66,74 @@ 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/zbputils/job"`
+    - 注意：触发器具有限速，每 2s 仅允许最多一次触发
+    - [x] 记录以"完全匹配关键词"触发的(代表我执行的)指令
+    - [x] 取消以"完全匹配关键词"触发的(代表我执行的)指令
+    - [x] 记录在"cron"触发的指令
+    - [x] 取消在"cron"触发的指令
+    - [x] 查看所有触发指令
+    - [x] 查看在"cron"触发的指令
+    - [x] 查看以"完全匹配关键词"触发的(代表我执行的)指令
+    - [x] 注入指令结果：任意指令
+    - [x] 执行指令：任意指令
+    - 注：任意指令可以使用形如`?::参数1提示语::1!`,`?::参数2提示语::2!`,`?::?可选参数3提示语，不回答将填入空值::3!`,`!::从url获取的参数::4!`,`!::?可选的从url获取的参数，出错将填入空值::5!`的未定参数，在注入时一一匹配
+    - 一些示例
+> 每日9:30推送摸鱼人日历
+```
+记录在"30 9 * * *"触发的指令
+run[CQ:image,file=https://api.vvhan.com/api/moyu]
+```
+> 每日12:00以1/2概率执行coser指令
+```python
+记录在"0 12 * * *"触发的指令
+注入指令结果：>runcoderaw py
+from random import random
+if random() > 0.5: print('coser')
+else: print('今天没有coser哦~')
+```
+> 每日15:00询问设置定时者否想看coser
+```python
+记录在"0 15 * * *"触发的指令
+注入指令结果：>runcoderaw py
+if '?::想看coser吗？::1!' == '想': print('coser')
+else: print('好吧')
+```
+> 自行编写简易的选择困难症助手小插件
+```python
+记录以"简易的选择困难症助手"触发的指令
+执行指令：>runcoderaw py
+from random import random
+if random() > 0.5: print('您最终会选?::请输入您的选择1::1!')
+else: print('您最终会选?::请输入您的选择2::2!')
+简易的选择困难症助手
+```
+> 自行编写随机b站404页趣图插件
+```python
+记录以"随机b站404页趣图"触发的代表我执行的指令
+注入指令结果：>runcoderaw py
+import json
+j = json.loads(r'''!::https://api.iyk0.com/bili_chart::1!''')
+print("run[CQ:image,file="+j["img"]+"]")
+随机b站404页趣图
+```
+![随机b站404页趣图](https://user-images.githubusercontent.com/41315874/157371451-c09ad3bb-c61a-4a42-9c47-fab3305bc0f8.png)
+
+- **渲染任意文字到图片** `import _ "github.com/FloatTech/ZeroBot-Plugin/plugin/font"`
+    - [x] (用[终末体|终末变体|紫罗兰体|樱酥体|Consolas体|苹方体])渲染文字xxx
+- **聊天** `import _ "github.com/FloatTech/ZeroBot-Plugin/plugin/chat"`
     - [x] [BOT名字]
     - [x] [戳一戳BOT]
     - [x] 空调开
     - [x] 空调关
     - [x] 群温度
     - [x] 设置温度[正整数]
-    - [x] @Bot mua | 啾咪 | 摸 | 上你 | 傻 | 裸 | 贴 | 老婆 | 抱 | 亲 | 一下 | 咬 | 操 | 123 | 进去 | 调教 | 搓 | 让 | 捏 | 挤 | 略 | 呐 | 原味 | 胖次 | 内裤 | 内衣 | 衣服 | ghs | 批 | 憨批 | kkp | 咕 | 骚 | 喜欢 | suki | 好き | 看 | 不能 | 砸了 | 透 | 口我 | 草我 | 自慰 | onani | オナニー | 炸了 | 色图 | 涩图 | 告白 | 对不起 | 回来 | 吻 | 软 | 壁咚 | 掰开 | 女友 | 是 | 喵 | 嗷呜 | 叫 | 拜 | 佬 | awsl | 臭 | 香 | 腿 | 张开 | 脚 | 脸 | 头发 | 手 | pr | 舔 | 小穴 | 腰 | 诶嘿嘿 | 可爱 | 扭蛋 | 鼻 | 眼 | 色气 | 推 | 床 | 举 | 手冲 | 饿 | 变 | 敲 | 爬 | 怕 | 冲 | 射 | 不穿 | 迫害 | 猫粮 | 揪尾巴 | 薄荷 | 早 | 晚安 | 揉 | 榨 | 掐 | 胸 | 奶子 | 欧派 | 嫩 | 蹭 | 牵手 | 握手 | 拍照 | w | 睡不着 | 欧尼酱 | 哥 | 爱你 | 过来 | 自闭 | 打不过 | 么么哒 | 很懂 | 膝枕 | 累了 | 安慰 | 洗澡 | 一起睡觉 | 一起 | 多大 | 姐姐 | 糖 | 嗦 | 牛子 | 🐂子 | 🐮子 | 嫌弃 | 紧 | baka | 笨蛋 | 插 | 插进来 | 屁股 | 翘 | 翘起来 | 抬 | 抬起 | 爸 | 傲娇 | rua | 咕噜咕噜 | 咕噜 | 上床 | 做爱 | 吃掉 | 吃 | 揪 | 种草莓 | 种草 | 掀 | 妹 | 病娇 | 嘻
-- **ATRI** `import _ "github.com/FloatTech/ZeroBot-Plugin/plugin_atri"`
+- **词典匹配回复** `import _ "github.com/FloatTech/ZeroBot-Plugin/plugin/thesaurus"`
+    - [x] @Bot 关键词
+- **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 [分钟 | 小时 | 天]
@@ -91,7 +148,7 @@ zerobot [-h] [-t token] [-u url] [-n nickname] [-p prefix] [-d|w] [-g 监听地
     - [x] 退出群聊[群号]@Bot
     - [x] *入群欢迎
     - [x] *退群通知
-    - [x] 设置欢迎语[欢迎~]
+    - [x] 设置欢迎语[欢迎~]  可选添加 [{at}] [{nickname}] [{avatar}]
     - [x] 在[MM]月[dd]日的[hh]点[mm]分时(用[url])提醒大家[xxx]
     - [x] 在[MM]月[每周 | 周几]的[hh]点[mm]分时(用[url])提醒大家[xxx]
     - [x] 取消在[MM]月[dd]日的[hh]点[mm]分的提醒
@@ -105,175 +162,218 @@ zerobot [-h] [-t token] [-u url] [-n nickname] [-p prefix] [-d|w] [-g 监听地
     - [ ] 同意好友请求
     - [ ] 撤回[@xxx] [xxx]
     - [ ] 警告[@xxx]
-    - [x] run[xxx]
     - 注：使用gist加群自动审批，请在群介绍添加以下说明，同时开启`需要回答问题并由管理员审核`：加群请在github新建一个gist，其文件名为本群群号的字符串的md5(小写)，内容为一行，是当前unix时间戳(10分钟内有效)。然后请将您的用户名和gist哈希(小写)按照username/gisthash的格式填写到回答即可。
-- **GitHub仓库搜索** `import _ "github.com/FloatTech/ZeroBot-Plugin/plugin_github"`
+    - 设置欢迎语可选添加参数说明：{at}可在发送时艾特被欢迎者 {nickname}是被欢迎者名字 {avatar}是被欢迎者头像
+- **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/inject"`
+    - [x] run[CQ码]
+- **在线代码运行** `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"`
+    - [x] > runcoderaw [language] [code block]
+- **点歌** `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"`
+    - [x] 黄油角色[@xxx]
+- **AIWife** `import _ "github.com/FloatTech/ZeroBot-Plugin/plugin/aiwife"`
     - [x] waifu | 随机waifu(从[100000个AI生成的waifu](https://www.thiswaifudoesnotexist.net/)中随机一位)
-- **gif** `import _ "github.com/FloatTech/ZeroBot-Plugin/plugin_gif"`
+- **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"`
+```
+记录在"0 10 * * *"触发的指令
+摸鱼提醒
+```
+- **摸鱼人日历** `import _ "github.com/FloatTech/ZeroBot-Plugin/plugin/moyu_calendar"`
+    - [x] /启用 moyucalendar
+    - [x] /禁用 moyucalendar
+```
+记录在"30 8 * * *"触发的指令
+摸鱼人日历
+```
+- **涩图** `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`
+    - [x] 设置底图[车万 DC4 爱因斯坦 星空列车 樱云之恋 富婆妹 李清歌 公主连结 原神 明日方舟 碧蓝航线 碧蓝幻想 战双 阴阳师 赛马娘 东方归言录]
+- **原神抽卡** `import _ github.com/FloatTech/ZeroBot-Plugin/plugin/genshin`
+    - [x] 切换原神卡池
+    - [x] 原神十连
+- **睡眠管理** `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] 解签
-- **bilibili** `import _ "github.com/FloatTech/ZeroBot-Plugin/plugin_bilibili"`
+- **漂流瓶** `import _ "github.com/FloatTech/ZeroBot-Plugin/plugin/drift_bottle"`
+    - [x] (在群xxx)丢漂流瓶(到频道xxx) [消息]
+    - [x] (从频道xxx)捡漂流瓶
+    - [x] @BOT 创建频道 xxx
+    - [x] 跳入(频道)海中
+    - [x] 注：不显式限制时，私聊发送可在所有群抽到，群聊发送仅可在本群抽到，默认频道为 global
+- **猜单词** `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]
-- **绝绝子** `import _ "github.com/FloatTech/ZeroBot-Plugin/plugin_juejuezi"`
+- **合成emoji** `import _ "github.com/FloatTech/ZeroBot-Plugin/plugin/emojimix"`
+    - [x] [emoji][emoji]
+- **绝绝子** `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"`
-    - [x] https://www.bilibili.com/video/BV1xx411c7BF | https://www.bilibili.com/video/av1605 | https://b23.tv/I8uzWCA
-- **煎蛋网无聊图** `import _ "github.com/FloatTech/ZeroBot-Plugin/plugin_jandan"`
-    - [x] 来份屌图
-    - [x] 更新屌图
+- **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"`
+    - [x] 来份[屌|弔|吊]图
+    - [x] 更新[屌|弔|吊]图
+- **月幕galgame图** `import _ "github.com/FloatTech/ZeroBot-Plugin/plugin/ymgal"`
+    - [x] 随机galCG
+    - [x] 随机gal表情包
+    - [x] galCG[xxx]
+    - [x] gal表情包[xxx]
+    - [x] 更新gal
+- **城市疫情查询** `import _ "github.com/FloatTech/ZeroBot-Plugin/plugin/epidemic"`
+    - [x] xxx疫情
+- **早报** `import _ "github.com/FloatTech/ZeroBot-Plugin/plugin/zaobao"`
+    - api早上8点更新，推荐定时在8点30后。配合插件`job`中的记录在"cron"触发的指令使用
+    - [x] /启用 zaobao
+    - [x] /禁用 zaobao
+- **舔狗日记** `import _ "github.com/FloatTech/ZeroBot-Plugin/plugin/tiangou"`
+    - [x] 舔狗日记
+```
+记录在"00 9 * * *"触发的指令
+今日早报
+```
 - **TODO...**
 
 ## 使用方法
@@ -328,7 +428,7 @@ GOOS=linux GOARCH=amd64 go build -ldflags "-s -w" -o zerobot -trimpath
 GOOS=windows GOARCH=amd64 go build -ldflags "-s -w" -o zerobot.exe -trimpath
 # armv6 Linux 平台 如树莓派 zero W
 GOOS=linux GOARCH=arm GOARM=6 CGO_ENABLED=0 go build -ldflags "-s -w" -o zerobot -trimpath
-# （由于引入了github.com/logoove/sqlite，本项不再可用）mips Linux 平台 如 路由器 wndr4300
+# （由于引入了github.com/fumiama/sqlite3，本项不再可用）mips Linux 平台 如 路由器 wndr4300
 GOOS=linux GOARCH=mips GOMIPS=softfloat CGO_ENABLED=0 go build -ldflags "-s -w" -o zerobot -trimpath
 ```
 

go.mod

@@ -1,27 +1,29 @@
 module github.com/FloatTech/ZeroBot-Plugin
 
-go 1.17
+go 1.18
 
 require (
-	github.com/FloatTech/AnimeAPI v1.3.0-beta3
-	github.com/FloatTech/sqlite v0.1.0
-	github.com/FloatTech/zbputils v1.3.0-beta3
+	github.com/FloatTech/AnimeAPI v1.3.2-0.20220326161751-d0d2797b91da
+	github.com/FloatTech/sqlite v0.2.1
+	github.com/FloatTech/zbputils v1.3.2-0.20220327052638-95033087f201
 	github.com/antchfx/htmlquery v1.2.4
 	github.com/corona10/goimagehash v1.0.3
 	github.com/fogleman/gg v1.3.0
 	github.com/fumiama/cron v1.3.0
-	github.com/fumiama/go-base16384 v1.3.0
-	github.com/fumiama/go-registry v0.0.3
-	github.com/fumiama/gofastTEA v0.0.7
+	github.com/fumiama/go-base16384 v1.4.0
+	github.com/fumiama/go-registry v0.1.1
+	github.com/fumiama/gofastTEA v0.0.10
 	github.com/fumiama/gotracemoe v0.0.3
+	github.com/fumiama/sqlite3 v1.14.6
+	github.com/golang/freetype v0.0.0-20170609003504-e2365dfdc4a0
 	github.com/jinzhu/gorm v1.9.16
-	github.com/logoove/sqlite v1.13.0
 	github.com/mroth/weightedrand v0.4.1
-	github.com/shirou/gopsutil/v3 v3.21.12
+	github.com/pkumza/numcn v1.0.0
+	github.com/shirou/gopsutil/v3 v3.22.2
 	github.com/sirupsen/logrus v1.8.1
-	github.com/tidwall/gjson v1.13.0
-	github.com/wdvxdr1123/ZeroBot v1.4.2-0.20220208041536-d463c1c92bb4
-	golang.org/x/image v0.0.0-20211028202545-6944b10bf410
+	github.com/tidwall/gjson v1.14.0
+	github.com/wdvxdr1123/ZeroBot v1.4.2-0.20220326160643-893d4e910785
+	golang.org/x/image v0.0.0-20220321031419-a8550c1d254a
 )
 
 require (
@@ -30,35 +32,24 @@ require (
 	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/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/jinzhu/inflection v1.0.0 // indirect
-	github.com/kballard/go-shellquote v0.0.0-20180428030007-95032a82bc51 // indirect
 	github.com/lufia/plan9stats v0.0.0-20211012122336-39d0f177ccd0 // indirect
 	github.com/mattn/go-isatty v0.0.14 // indirect
+	github.com/mattn/go-sqlite3 v1.14.12 // indirect
 	github.com/nfnt/resize v0.0.0-20180221191011-83c6a9932646 // indirect
-	github.com/power-devops/perfstat v0.0.0-20210106213030-5aafc221ea8c // indirect
+	github.com/power-devops/perfstat v0.0.0-20220216144756-c35f1ee13d7c // indirect
 	github.com/remyoudompheng/bigfft v0.0.0-20200410134404-eec4a21b6bb0 // indirect
 	github.com/tidwall/match v1.1.1 // indirect
 	github.com/tidwall/pretty v1.2.0 // indirect
-	github.com/tklauser/go-sysconf v0.3.9 // indirect
-	github.com/tklauser/numcpus v0.3.0 // indirect
+	github.com/tklauser/go-sysconf v0.3.10 // indirect
+	github.com/tklauser/numcpus v0.4.0 // indirect
 	github.com/yusufpapurcu/wmi v1.2.2 // indirect
-	golang.org/x/mod v0.5.1 // indirect
-	golang.org/x/net v0.0.0-20220111093109-d55c255bac03 // indirect
-	golang.org/x/sys v0.0.0-20220207234003-57398862261d // indirect
+	golang.org/x/net v0.0.0-20220225172249-27dd8689420f // indirect
+	golang.org/x/sys v0.0.0-20220325203850-36772127a21f // indirect
 	golang.org/x/text v0.3.7 // indirect
-	golang.org/x/tools v0.1.9 // indirect
-	golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1 // indirect
-	lukechampine.com/uint128 v1.2.0 // indirect
-	modernc.org/cc/v3 v3.35.22 // indirect
-	modernc.org/ccgo/v3 v3.15.13 // indirect
-	modernc.org/libc v1.14.5 // indirect
+	modernc.org/libc v1.14.12 // indirect
 	modernc.org/mathutil v1.4.1 // indirect
-	modernc.org/memory v1.0.5 // indirect
-	modernc.org/opt v0.1.1 // indirect
-	modernc.org/sqlite v1.14.6 // indirect
-	modernc.org/strutil v1.1.1 // indirect
-	modernc.org/token v1.0.0 // indirect
+	modernc.org/memory v1.0.7 // indirect
 )

go.sum

@@ -1,10 +1,9 @@
-github.com/FloatTech/AnimeAPI v1.3.0-beta3 h1:QBvpSUDCNI73MULuCYlFcEYVAzCcS4Ttu4XQW61AlIs=
-github.com/FloatTech/AnimeAPI v1.3.0-beta3/go.mod h1:QMHkpimgjHIooLI/NU/t9xC6XOhlHRPgHe8oU/3d85w=
-github.com/FloatTech/bot-manager v1.0.0/go.mod h1:8YYRJ16oroGHQGD2En0oVnmcKJkxR9O/jd5BPSfWfOQ=
-github.com/FloatTech/sqlite v0.1.0 h1:Geh6Z+DWZXmyXVOhM0U2oXT7b1Ob6sQtuyjInk+MCUk=
-github.com/FloatTech/sqlite v0.1.0/go.mod h1:XS0oeSqtH6lFzpPRiDE9fV6+zMcuUF5/6o+tQVO1QZE=
-github.com/FloatTech/zbputils v1.3.0-beta3 h1:MSaKUo43JqtVKlNIUfkgw1aT0thepmT83kcExVqDDis=
-github.com/FloatTech/zbputils v1.3.0-beta3/go.mod h1:wCHxRavRKTWABr7Qvfitqubfq9M96lUJApXrPSplCIo=
+github.com/FloatTech/AnimeAPI v1.3.2-0.20220326161751-d0d2797b91da h1:KbJujP8k2/3BYRb+F292zLmDOV79uTOu/24n3fhIwRU=
+github.com/FloatTech/AnimeAPI v1.3.2-0.20220326161751-d0d2797b91da/go.mod h1:aC3EOKpb0R0VOdW9QIQCfqN6ZFymOfvCgzVY1/Fz3Og=
+github.com/FloatTech/sqlite v0.2.1 h1:9t6Me48XJJCIoPy4nLRvcdhcVKfT0c2lilp7SEKROG8=
+github.com/FloatTech/sqlite v0.2.1/go.mod h1:6NfHRzqOo9RWeMJEoAQVuo51Omd5LFNxCNQhMF02/9U=
+github.com/FloatTech/zbputils v1.3.2-0.20220327052638-95033087f201 h1:7x73xvsTmz7HWL4CjmX0jmfp2XAr2Hvpt2ay+DPOo6c=
+github.com/FloatTech/zbputils v1.3.2-0.20220327052638-95033087f201/go.mod h1:qZlHzG1s1giQrXaosjOAA2utGNaPZjwJsVZfBog2bhg=
 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=
@@ -15,7 +14,6 @@ github.com/antchfx/xpath v1.2.0 h1:mbwv7co+x0RwgeGAOHdrKy89GvHaGvxxBtPK0uF9Zr8=
 github.com/antchfx/xpath v1.2.0/go.mod h1:i54GszH55fYfBmoZXapTHN8T8tkcHfRgLyVwwqzXNcs=
 github.com/corona10/goimagehash v1.0.3 h1:NZM518aKLmoNluluhfHGxT3LGOnrojrxhGn63DR/CZA=
 github.com/corona10/goimagehash v1.0.3/go.mod h1:VkvE0mLn84L4aF8vCb6mafVajEb6QYMHl2ZJLn0mOGI=
-github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E=
 github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
 github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
@@ -23,7 +21,6 @@ github.com/denisenkom/go-mssqldb v0.0.0-20191124224453-732737034ffd h1:83Wprp6RO
 github.com/denisenkom/go-mssqldb v0.0.0-20191124224453-732737034ffd/go.mod h1:xbL0rPBG9cCiLr28tMa8zpbdarY27NDyej4t/EjAShU=
 github.com/disintegration/imaging v1.6.2 h1:w1LecBlG2Lnp8B3jk5zSuNqd7b4DXhcjwek1ei82L+c=
 github.com/disintegration/imaging v1.6.2/go.mod h1:44/5580QXChDfwIclfc/PCwrr44amcmDAg8hxG0Ewe4=
-github.com/dustin/go-humanize v1.0.0 h1:VSnTsYCnlFHaM2/igO1h6X3HA71jcobQuxemgkq4zYo=
 github.com/dustin/go-humanize v1.0.0/go.mod h1:HtrtbFcZ19U5GC7JDqmcUSB87Iq5E25KnS6fMYU6eOk=
 github.com/ericpauley/go-quantize v0.0.0-20200331213906-ae555eb2afa4 h1:BBade+JlV/f7JstZ4pitd4tHhpN+w+6I+LyOS7B4fyU=
 github.com/ericpauley/go-quantize v0.0.0-20200331213906-ae555eb2afa4/go.mod h1:H7chHJglrhPPzetLdzBleF8d22WYOv7UM/lEKYiwlKM=
@@ -34,25 +31,19 @@ github.com/fogleman/gg v1.3.0/go.mod h1:R/bRT+9gY/C5z7JzPU0zXsXHKM4/ayA+zqcVNZzP
 github.com/fsnotify/fsnotify v1.4.7/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMoQvtojpjFo=
 github.com/fumiama/cron v1.3.0 h1:ZWlwuexF+HQHl3cYytEE5HNwD99q+3vNZF1GrEiXCFo=
 github.com/fumiama/cron v1.3.0/go.mod h1:bz5Izvgi/xEUI8tlBN8BI2jr9Moo8N4or0KV8xXuPDY=
-github.com/fumiama/go-base16384 v1.3.0 h1:J5Xtwh/3alGJt/z/0IFralo5UQA89iFWQqbxj5ZQZi8=
-github.com/fumiama/go-base16384 v1.3.0/go.mod h1:RGA715p34BiLoZvPRtaxuo2q25Kq9jFsgUsJb8dwy14=
-github.com/fumiama/go-registry v0.0.3 h1:zdfRR3lrgrKobw/T2oh1+HbSbKyUZ6sBvgdh+teQNtk=
-github.com/fumiama/go-registry v0.0.3/go.mod h1:tomy1EvenUPgxCPf/mFx0QZxp13ZO4hsSIslbkyeNQA=
-github.com/fumiama/gofastTEA v0.0.7 h1:Dbce+22jNm+7jpmAeju0C+esIAAnIrq75f5TsCYprS8=
-github.com/fumiama/gofastTEA v0.0.7/go.mod h1:RIdbYZyB4MbH6ZBlPymRaXn3cD6SedlCu5W/HHfMPBk=
+github.com/fumiama/go-base16384 v1.4.0 h1:4KrtewnmAChrZjPA7/QYc72t+vvsKF+DYB0q1iRPdpo=
+github.com/fumiama/go-base16384 v1.4.0/go.mod h1:OEn+947GV5gsbTAnyuUW/SrfxJYUdYupSIQXOuGOcXM=
+github.com/fumiama/go-registry v0.1.1 h1:cmCRizjXHFW2ApwUHCXi8wKLJ6Gtt4GrShJlamGPbVI=
+github.com/fumiama/go-registry v0.1.1/go.mod h1:iJT3DVgH7KXpJZs6waXEjnWtJPUBBGhF+ByJIMRfngk=
+github.com/fumiama/gofastTEA v0.0.10 h1:JJJ+brWD4kie+mmK2TkspDXKzqq0IjXm89aGYfoGhhQ=
+github.com/fumiama/gofastTEA v0.0.10/go.mod h1:RIdbYZyB4MbH6ZBlPymRaXn3cD6SedlCu5W/HHfMPBk=
 github.com/fumiama/gotracemoe v0.0.3 h1:iI5EbE9A3UUbfukG6+/soYPjp1S31eCNYf4tw7s6/Jc=
 github.com/fumiama/gotracemoe v0.0.3/go.mod h1:tyqahdUzHf0bQIAVY/GYmDWvYYe5ik1ZbhnGYh+zl40=
-github.com/gin-contrib/sse v0.1.0/go.mod h1:RHrZQHXnP2xjPF+u1gW/2HnVO7nvIa9PG3Gm+fLHvGI=
-github.com/gin-gonic/gin v1.7.7/go.mod h1:axIBovoeJpVj8S3BwE0uPMTeReE4+AfFtqpqaZ1qq1U=
+github.com/fumiama/sqlite3 v1.14.6 h1:+e+iygyiDXQJVi7xeXIviBvR7hAc5y20WA9hRwfKn10=
+github.com/fumiama/sqlite3 v1.14.6/go.mod h1:Xx9a2/OtHuy9pBjow0N+bE/RhNeZ7zZz5xh25vqbA5A=
 github.com/go-ole/go-ole v1.2.6 h1:/Fpf6oFPoeFik9ty7siob0G6Ke8QvQEuVcuChpwXzpY=
 github.com/go-ole/go-ole v1.2.6/go.mod h1:pprOEPIfldk/42T2oK7lQ4v4JSDwmV0As9GaiUsvbm0=
-github.com/go-playground/assert/v2 v2.0.1/go.mod h1:VDjEfimB/XKnb+ZQfWdccd7VUvScMdVu0Titje2rxJ4=
-github.com/go-playground/locales v0.13.0/go.mod h1:taPMhCMXrRLJO55olJkUXHZBHCxTMfnGwq/HNwmWNS8=
-github.com/go-playground/locales v0.14.0/go.mod h1:sawfccIbzZTqEDETgFXqTho0QybSa7l++s0DH+LDiLs=
-github.com/go-playground/universal-translator v0.17.0/go.mod h1:UkSxE5sNxxRwHyU+Scu5vgOQjsIJAF8j9muTVoKLVtA=
-github.com/go-playground/universal-translator v0.18.0/go.mod h1:UvRDBj+xPUEGrFYl+lu/H90nyDXpg0fqeB/AQUGNTVA=
-github.com/go-playground/validator/v10 v10.4.1/go.mod h1:nlOn6nFhuKACm19sB/8EGNn9GlaMV7XkbRSipzJ0Ii4=
-github.com/go-playground/validator/v10 v10.10.0/go.mod h1:74x4gJWsvQexRdW8Pn3dXSGrTK4nAUsbPlLADvpJkos=
+github.com/go-playground/assert/v2 v2.0.1 h1:MsBgLAaY856+nPRTKrp3/OZK38U/wa0CcBYNjji3q3A=
 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/golang-sql/civil v0.0.0-20190719163853-cb61b32ac6fe h1:lXe2qZdvpiX5WZkZR4hgp4KJVfY3nMkvmwbVkpv1rVY=
@@ -63,16 +54,11 @@ github.com/golang/groupcache v0.0.0-20200121045136-8c9f03a8e57e/go.mod h1:cIg4er
 github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da h1:oI5xCqsCo564l8iNU+DwB5epxmsaqB+rhGL0m5jtYqE=
 github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc=
 github.com/golang/protobuf v1.2.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
-github.com/golang/protobuf v1.3.3/go.mod h1:vzj43D7+SQXF/4pzW/hwtAqwc6iTitCiVSaWz5lYuqw=
-github.com/golang/protobuf v1.5.0/go.mod h1:FsONVRAS9T7sI+LIUmWTfcYkHO4aIWwzhcaSAoJOfIk=
-github.com/golang/protobuf v1.5.2/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiuN0vRsmY=
 github.com/golang/snappy v0.0.0-20180518054509-2e65f85255db/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q=
 github.com/google/go-cmp v0.5.3/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
-github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
 github.com/google/go-cmp v0.5.6/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
 github.com/google/go-cmp v0.5.7 h1:81/ik6ipDQS2aGcBfIN5dHDB36BwrStyeAQquSYCV4o=
 github.com/google/go-cmp v0.5.7/go.mod h1:n+brtR0CgQNWTVd5ZUFpTBC8YFBDLK/h/bpaJ8/DtOE=
-github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg=
 github.com/google/uuid v1.3.0 h1:t6JiXgmwXMjEs8VusXIJk2BXHsn+wx8BZdTaoZ5fu7I=
 github.com/google/uuid v1.3.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
 github.com/hpcloud/tail v1.0.0/go.mod h1:ab1qPbhIpdTxEkNHXyeSf5vhxWSCs/tWer42PpOxQnU=
@@ -82,35 +68,18 @@ 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/json-iterator/go v1.1.9/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4=
-github.com/json-iterator/go v1.1.12/go.mod h1:e30LSqwooZae/UwlEbR2852Gd8hjQvJoHmT4TnhNGBo=
-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=
 github.com/konsorten/go-windows-terminal-sequences v1.0.1/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ=
-github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo=
-github.com/kr/pretty v0.2.1/go.mod h1:ipq/a2n7PKx3OHsz4KJII5eveXtPO4qwEXGdVfWzfnI=
-github.com/kr/pretty v0.3.0/go.mod h1:640gp4NfQd8pI5XOwp5fnNeVWj67G7CFk/SaSQn7NBk=
-github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ=
-github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI=
-github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE=
-github.com/leodido/go-urn v1.2.0/go.mod h1:+8+nEpDfqqsY+g338gtMEUOtuK+4dEMhiQEgxpxOKII=
-github.com/leodido/go-urn v1.2.1/go.mod h1:zt4jvISO2HfUBqxjfIshjdMTYS56ZS/qv49ictyFfxY=
 github.com/lib/pq v1.1.1 h1:sJZmqHoEaY7f+NPP8pgLB/WxulyR3fewgCM2qaSlBb4=
 github.com/lib/pq v1.1.1/go.mod h1:5WUZQaWbwv1U+lTReE5YruASi9Al49XbQIvNi/34Woo=
-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/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-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=
-github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q=
-github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q=
-github.com/modern-go/reflect2 v0.0.0-20180701023420-4b7aa43c6742/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3RllmbCylyMrvgv0=
-github.com/modern-go/reflect2 v1.0.2/go.mod h1:yWuevngMOJpCy52FWWMvUC8ws7m/LJsjYzDa0/r8luk=
+github.com/mattn/go-sqlite3 v1.14.12 h1:TJ1bhYJPV44phC+IMu1u2K/i5RriLTPe+yc68XDJ1Z0=
+github.com/mattn/go-sqlite3 v1.14.12/go.mod h1:NyWgC/yNuGj7Q9rpYnZvas74GogHl5/Z4A/KQRfk6bU=
 github.com/mroth/weightedrand v0.4.1 h1:rHcbUBopmi/3x4nnrvwGJBhX9d0vk+KgoLUZeDP6YyI=
 github.com/mroth/weightedrand v0.4.1/go.mod h1:3p2SIcC8al1YMzGhAIoXD+r9olo/g/cdJgAD905gyNE=
 github.com/nfnt/resize v0.0.0-20180221191011-83c6a9932646 h1:zYyBkD/k9seD2A7fsi6Oo2LfFZAehjjQMERAvZLEDnQ=
@@ -118,48 +87,44 @@ 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/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=
 github.com/power-devops/perfstat v0.0.0-20210106213030-5aafc221ea8c/go.mod h1:OmDBASR4679mdNQnz2pUhc2G8CO2JrUAVFDRBDP/hJE=
+github.com/power-devops/perfstat v0.0.0-20220216144756-c35f1ee13d7c h1:NRoLoZvkBTKvR5gQLgA3e0hqjkY9u1wm+iOL45VN/qI=
+github.com/power-devops/perfstat v0.0.0-20220216144756-c35f1ee13d7c/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/rogpeppe/go-internal v1.6.1/go.mod h1:xXDCJY+GAPziupqXw64V24skbSoqbTEfhy4qGm1nDQc=
-github.com/rogpeppe/go-internal v1.8.0/go.mod h1:WmiCO8CzOY8rg0OYDC4/i/2WRWAB6poM+XZ2dLUbcbE=
-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/shirou/gopsutil/v3 v3.22.2 h1:wCrArWFkHYIdDxx/FSfF5RB4dpJYW6t7rcp3+zL8uks=
+github.com/shirou/gopsutil/v3 v3.22.2/go.mod h1:WapW1AOOPlHyXr+yOyw3uYx36enocrtSoSBy0L5vUHY=
 github.com/sirupsen/logrus v1.4.2/go.mod h1:tLMulIdttU9McNUspp0xgXVQah82FyeX6MwdIuYE2rE=
 github.com/sirupsen/logrus v1.8.1 h1:dJKuHgqk1NNQlqoA6BTlM1Wf9DOH3NBjQyu0h9+AZZE=
 github.com/sirupsen/logrus v1.8.1/go.mod h1:yWOB1SBYBC5VeMP7gHvWumXLIWorT60ONWic61uBYv0=
 github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
 github.com/stretchr/objx v0.1.1/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
 github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs=
-github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI=
-github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4=
-github.com/stretchr/testify v1.6.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
-github.com/stretchr/testify v1.7.0 h1:nwc3DEeHmmLAfoZucVR881uASk0Mfjw8xYJ99tb5CcY=
 github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
+github.com/stretchr/testify v1.7.1 h1:5TQK59W5E3v0r2duFAb7P95B6hEeOyEnHRa8MjYSMTY=
+github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
 github.com/syndtr/goleveldb v1.0.0/go.mod h1:ZVVdQEZoIme9iO1Ch2Jdy24qqXrMMOU6lpPAyBWyWuQ=
 github.com/t-tomalak/logrus-easy-formatter v0.0.0-20190827215021-c074f06c5816/go.mod h1:tzym/CEb5jnFI+Q0k4Qq3+LvRF4gO3E2pxS8fHP8jcA=
-github.com/tidwall/gjson v1.13.0 h1:3TFY9yxOQShrvmjdM76K+jc66zJeT6D3/VFFYCGQf7M=
 github.com/tidwall/gjson v1.13.0/go.mod h1:/wbyibRr2FHMks5tjHJ5F8dMZh3AcwJEMf5vlfC0lxk=
+github.com/tidwall/gjson v1.14.0 h1:6aeJ0bzojgWLa82gDQHcx3S0Lr/O51I9bJ5nv6JFx5w=
+github.com/tidwall/gjson v1.14.0/go.mod h1:/wbyibRr2FHMks5tjHJ5F8dMZh3AcwJEMf5vlfC0lxk=
 github.com/tidwall/match v1.1.1 h1:+Ho715JplO36QYgwN9PGYNhgZvoUSc9X2c80KVTi+GA=
 github.com/tidwall/match v1.1.1/go.mod h1:eRSPERbgtNPcGhD8UCthc6PmLEQXEWd3PRB5JTxsfmM=
 github.com/tidwall/pretty v1.2.0 h1:RWIZEg2iJ8/g6fDDYzMpobmaoGh5OLl4AXtGUGPcqCs=
 github.com/tidwall/pretty v1.2.0/go.mod h1:ITEVvHYasfjBbM0u2Pg8T2nJnzm8xPwvNhhsoaGGjNU=
-github.com/tklauser/go-sysconf v0.3.9 h1:JeUVdAOWhhxVcU6Eqr/ATFHgXk/mmiItdKeJPev3vTo=
 github.com/tklauser/go-sysconf v0.3.9/go.mod h1:11DU/5sG7UexIrp/O6g35hrWzu0JxlwQ3LSFUzyeuhs=
-github.com/tklauser/numcpus v0.3.0 h1:ILuRUQBtssgnxw0XXIjKUC56fgnOrFoQQ/4+DeU2biQ=
+github.com/tklauser/go-sysconf v0.3.10 h1:IJ1AZGZRWbY8T5Vfk04D9WOA5WSejdflXxP03OUqALw=
+github.com/tklauser/go-sysconf v0.3.10/go.mod h1:C8XykCvCb+Gn0oNCWPIlcb0RuglQTYaQ2hGm7jmxEFk=
 github.com/tklauser/numcpus v0.3.0/go.mod h1:yFGUr7TUHQRAhyqBcEg0Ge34zDBAsIvJJcyE6boqnA8=
-github.com/ugorji/go v1.1.7/go.mod h1:kZn38zHttfInRq0xu/PH0az30d+z6vm202qpg1oXVMw=
-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.20220208041536-d463c1c92bb4 h1:T/m7vDUFKdLd0xfSZHVPQGaRZ73nwPzidLW7hTn25mg=
-github.com/wdvxdr1123/ZeroBot v1.4.2-0.20220208041536-d463c1c92bb4/go.mod h1:NwXIp7PgjV+kUALMXJ4v4/3QcsRSOodtjhLekuPXFog=
+github.com/tklauser/numcpus v0.4.0 h1:E53Dm1HjH1/R2/aoCtXtPgzmElmn51aOkhCFSuZq//o=
+github.com/tklauser/numcpus v0.4.0/go.mod h1:1+UI3pD8NW14VMwdgJNJ1ESk2UnwhAnz5hMwiKKqXCQ=
+github.com/wdvxdr1123/ZeroBot v1.4.2-0.20220326160643-893d4e910785 h1:alVsiLOu9H0GCriAkTMqn310izMNEzg9y1Z9FqAV1DY=
+github.com/wdvxdr1123/ZeroBot v1.4.2-0.20220326160643-893d4e910785/go.mod h1:NwXIp7PgjV+kUALMXJ4v4/3QcsRSOodtjhLekuPXFog=
 github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
-github.com/yuin/goldmark v1.4.1/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k=
 github.com/yusufpapurcu/wmi v1.2.2 h1:KBNDSne4vP5mbSWnJbO+51IMOXJB67QiYCSBrubbPRg=
 github.com/yusufpapurcu/wmi v1.2.2/go.mod h1:SBZ9tNy3G9/m5Oi98Zks0QjeHVDvuK0qfxQmPyzfmi0=
 golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
@@ -167,15 +132,11 @@ golang.org/x/crypto v0.0.0-20190325154230-a5d413f7728c/go.mod h1:djNgcEr1/C05ACk
 golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
 golang.org/x/crypto v0.0.0-20191205180655-e7c4368fe9dd/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
 golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
-golang.org/x/crypto v0.0.0-20210711020723-a769d52b0f97/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc=
-golang.org/x/crypto v0.0.0-20220126234351-aa10faf2a1f8 h1:kACShD3qhmr/3rLmg1yXyt+N4HcwutKyPRB93s54TIU=
-golang.org/x/crypto v0.0.0-20220126234351-aa10faf2a1f8/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4=
+golang.org/x/crypto v0.0.0-20220321153916-2c7772ba3064 h1:S25/rfnfsMVgORT4/J61MJ7rdyseOZOyvLIrZEZ7s6s=
 golang.org/x/image v0.0.0-20191009234506-e7c1f5e7dbb8/go.mod h1:FeLwcggjj3mMvU+oOTbSwawSJRM1uh48EjtB4UJZlP0=
-golang.org/x/image v0.0.0-20211028202545-6944b10bf410 h1:hTftEOvwiOq2+O8k2D5/Q7COC7k5Qcrgc2TFURJYnvQ=
-golang.org/x/image v0.0.0-20211028202545-6944b10bf410/go.mod h1:023OzeP/+EPmXeapQh35lcL3II3LrY8Ic+EFFKVhULM=
+golang.org/x/image v0.0.0-20220321031419-a8550c1d254a h1:LnH9RNcpPv5Kzi15lXg42lYMPUf0x8CuPv1YnvBWZAg=
+golang.org/x/image v0.0.0-20220321031419-a8550c1d254a/go.mod h1:023OzeP/+EPmXeapQh35lcL3II3LrY8Ic+EFFKVhULM=
 golang.org/x/mod v0.3.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
-golang.org/x/mod v0.5.1 h1:OJxoQ/rynoF0dcCdI7cLPktw/hR2cueqYfjm43oqK38=
-golang.org/x/mod v0.5.1/go.mod h1:5OXOZSfqPIIbmVBIIKWRFfZjPR0E5r58TLhUjH0a2Ro=
 golang.org/x/net v0.0.0-20180218175443-cbe0f9307d01/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
 golang.org/x/net v0.0.0-20180906233101-161cd47e91fd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
 golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
@@ -184,15 +145,11 @@ golang.org/x/net v0.0.0-20200202094626-16171245cfb2/go.mod h1:z5CRVTTTmAJ677TzLL
 golang.org/x/net v0.0.0-20200324143707-d3edc9973b7e/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A=
 golang.org/x/net v0.0.0-20200421231249-e086a090c8fd/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A=
 golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU=
-golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg=
-golang.org/x/net v0.0.0-20211015210444-4f30a5c0130f/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
-golang.org/x/net v0.0.0-20211112202133-69e39bad7dc2/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
-golang.org/x/net v0.0.0-20220111093109-d55c255bac03 h1:0FB83qp0AzVJm+0wcIlauAjJ+tNdh7jLuacRYCIVv7s=
-golang.org/x/net v0.0.0-20220111093109-d55c255bac03/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
+golang.org/x/net v0.0.0-20220225172249-27dd8689420f h1:oA4XRj0qtSt8Yo1Zms0CUlsT3KG69V2UGQWPBxujDmc=
+golang.org/x/net v0.0.0-20220225172249-27dd8689420f/go.mod h1:CfG3xpIq0wQ8r1q4Su4UZFWDARRcnwPjda9FqA0JpMk=
 golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
-golang.org/x/sync v0.0.0-20210220032951-036812b2e83c/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sys v0.0.0-20180909124046-d0be0721c37e/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
@@ -202,24 +159,18 @@ golang.org/x/sys v0.0.0-20191026070338-33540a1f6037/go.mod h1:h1NjWce9XRLGQEsW7w
 golang.org/x/sys v0.0.0-20200116001909-b77594299b42/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20200323222414-85ca7c5b95cd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-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-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=
-golang.org/x/sys v0.0.0-20210806184541-e5e7981a1069/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20210816074244-15123e1e1f71/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20210902050250-f475640dd07b/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20211007075335-d3039528d8ac/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.0.0-20211013075003-97ac67df715c/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.0.0-20211019181941-9d821ace8654/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20220111092808-5a964db01320/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.0.0-20220207234003-57398862261d h1:Bm7BNOQt2Qv7ZqysjeLjgCBanX+88Z/OtdvsrEv1Djc=
-golang.org/x/sys v0.0.0-20220207234003-57398862261d/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
+golang.org/x/sys v0.0.0-20220128215802-99c3d69c2c27/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.0.0-20220209214540-3681064d5158/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.0.0-20220325203850-36772127a21f h1:TrmogKRsSOxRMJbLYGrB4SBbW+LJcEllYBLME5Zk5pU=
+golang.org/x/sys v0.0.0-20220325203850-36772127a21f/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
-golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk=
 golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
 golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
 golang.org/x/text v0.3.7 h1:olpwvP2KacW1ZWvsR7uQhoyTYvKAupfQrRGBFM352Gk=
@@ -227,32 +178,18 @@ golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ=
 golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
 golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
 golang.org/x/tools v0.0.0-20201124115921-2c860bdd6e78/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA=
-golang.org/x/tools v0.1.9 h1:j9KsMiaP1c3B0OTQGth0/k+miLGTgLsAFUCrF2vLcF8=
-golang.org/x/tools v0.1.9/go.mod h1:nABZi5QlRsZVlzPpHl034qft6wpY4eDcsTt5AaioBiU=
 golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1 h1:go1bK/D/BFZV2I8cIQd1NKEZ+0owSTG1fDTci4IqFcE=
 golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
-google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp09yW+WbY/TyQbw=
-google.golang.org/protobuf v1.26.0/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc=
-google.golang.org/protobuf v1.27.1/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
-gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
-gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c/go.mod h1:JHkPIbrfpd72SG/EVd6muEfDQjcINNoR0C8j2r3qZ4Q=
-gopkg.in/errgo.v2 v2.1.0/go.mod h1:hNsd1EY+bozCKY1Ytp96fpM3vjJbqLJn88ws8XvfDNI=
 gopkg.in/fsnotify.v1 v1.4.7/go.mod h1:Tz8NjZHkW78fSQdbUxIjBTcgA1z1m8ZHf0WmKUhAMys=
 gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7/go.mod h1:dt/ZhP58zS4L8KSrWDmTeBkI65Dw0HsyUHuEVlX15mw=
 gopkg.in/yaml.v2 v2.2.1/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
-gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
-gopkg.in/yaml.v2 v2.2.8/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
-gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ=
+gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c h1:dUUwHk2QECo/6vqA44rthZ8ie2QXMNeKRTHCNY2nXvo=
 gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
-gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b h1:h8qDotaEPuJATrMmW04NCwg7v22aHH28wwpauUhK9Oo=
-gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
 lukechampine.com/uint128 v1.1.1/go.mod h1:c4eWIwlEGaxC/+H1VguhU4PHXNWDCDMUlWdIWl2j1gk=
-lukechampine.com/uint128 v1.2.0 h1:mBi/5l91vocEN8otkC5bDLhi2KdCticRiwbdB0O+rjI=
-lukechampine.com/uint128 v1.2.0/go.mod h1:c4eWIwlEGaxC/+H1VguhU4PHXNWDCDMUlWdIWl2j1gk=
 modernc.org/cc/v3 v3.33.6/go.mod h1:iPJg1pkwXqAV16SNgFBVYmggfMg6xhs+2oiO0vclK3g=
 modernc.org/cc/v3 v3.33.9/go.mod h1:iPJg1pkwXqAV16SNgFBVYmggfMg6xhs+2oiO0vclK3g=
 modernc.org/cc/v3 v3.33.11/go.mod h1:iPJg1pkwXqAV16SNgFBVYmggfMg6xhs+2oiO0vclK3g=
@@ -268,8 +205,8 @@ modernc.org/cc/v3 v3.35.16/go.mod h1:iPJg1pkwXqAV16SNgFBVYmggfMg6xhs+2oiO0vclK3g
 modernc.org/cc/v3 v3.35.17/go.mod h1:iPJg1pkwXqAV16SNgFBVYmggfMg6xhs+2oiO0vclK3g=
 modernc.org/cc/v3 v3.35.18/go.mod h1:iPJg1pkwXqAV16SNgFBVYmggfMg6xhs+2oiO0vclK3g=
 modernc.org/cc/v3 v3.35.20/go.mod h1:iPJg1pkwXqAV16SNgFBVYmggfMg6xhs+2oiO0vclK3g=
-modernc.org/cc/v3 v3.35.22 h1:BzShpwCAP7TWzFppM4k2t03RhXhgYqaibROWkrWq7lE=
 modernc.org/cc/v3 v3.35.22/go.mod h1:iPJg1pkwXqAV16SNgFBVYmggfMg6xhs+2oiO0vclK3g=
+modernc.org/cc/v3 v3.35.24/go.mod h1:NFUHyPn4ekoC/JHeZFfZurN6ixxawE1BnVonP/oahEI=
 modernc.org/ccgo/v3 v3.9.5/go.mod h1:umuo2EP2oDSBnD3ckjaVUXMrmeAw8C8OSICVa0iFf60=
 modernc.org/ccgo/v3 v3.10.0/go.mod h1:c0yBmkRFi7uW4J7fwx/JiijwOjeAeR2NoSaRVFPmjMw=
 modernc.org/ccgo/v3 v3.11.0/go.mod h1:dGNposbDp9TOZ/1KBxghxtUp/bzErD0/0QW4hhSaBMI=
@@ -308,16 +245,15 @@ modernc.org/ccgo/v3 v3.12.86/go.mod h1:dN7S26DLTgVSni1PVA3KxxHTcykyDurf3OgUzNqTS
 modernc.org/ccgo/v3 v3.12.90/go.mod h1:obhSc3CdivCRpYZmrvO88TXlW0NvoSVvdh/ccRjJYko=
 modernc.org/ccgo/v3 v3.12.92/go.mod h1:5yDdN7ti9KWPi5bRVWPl8UNhpEAtCjuEE7ayQnzzqHA=
 modernc.org/ccgo/v3 v3.13.1/go.mod h1:aBYVOUfIlcSnrsRVU8VRS35y2DIfpgkmVkYZ0tpIXi4=
-modernc.org/ccgo/v3 v3.15.1/go.mod h1:md59wBwDT2LznX/OTCPoVS6KIsdRgY8xqQwBV+hkTH0=
 modernc.org/ccgo/v3 v3.15.9/go.mod h1:md59wBwDT2LznX/OTCPoVS6KIsdRgY8xqQwBV+hkTH0=
 modernc.org/ccgo/v3 v3.15.10/go.mod h1:wQKxoFn0ynxMuCLfFD09c8XPUCc8obfchoVR9Cn0fI8=
 modernc.org/ccgo/v3 v3.15.12/go.mod h1:VFePOWoCd8uDGRJpq/zfJ29D0EVzMSyID8LCMWYbX6I=
-modernc.org/ccgo/v3 v3.15.13 h1:hqlCzNJTXLrhS70y1PqWckrF9x1btSQRC7JFuQcBg5c=
-modernc.org/ccgo/v3 v3.15.13/go.mod h1:QHtvdpeODlXjdK3tsbpyK+7U9JV4PQsrPGIbtmc0KfY=
+modernc.org/ccgo/v3 v3.15.14/go.mod h1:144Sz2iBCKogb9OKwsu7hQEub3EVgOlyI8wMUPGKUXQ=
+modernc.org/ccgo/v3 v3.15.15/go.mod h1:z5qltXjU4PJl0pE5nhYQCvA9DhPHiWsl5GWl89+NSYE=
+modernc.org/ccgo/v3 v3.15.16/go.mod h1:XbKRMeMWMdq712Tr5ECgATYMrzJ+g9zAZEj2ktzBe24=
+modernc.org/ccgo/v3 v3.15.17/go.mod h1:bofnFkpRFf5gLY+mBZIyTW6FEcp26xi2lgOFk2Rlvs0=
 modernc.org/ccorpus v1.11.1/go.mod h1:2gEUTrWqdpH2pXsmTM1ZkjeSrUWDpjMu2T6m29L/ErQ=
-modernc.org/ccorpus v1.11.4 h1:YOmQBBzE8GC/puUx76D5j/gJYIZQsydrh6VMJVfXF0M=
-modernc.org/ccorpus v1.11.4/go.mod h1:2gEUTrWqdpH2pXsmTM1ZkjeSrUWDpjMu2T6m29L/ErQ=
-modernc.org/httpfs v1.0.6 h1:AAgIpFZRXuYnkjftxTAZwMIiwEqAfk8aVB2/oA6nAeM=
+modernc.org/ccorpus v1.11.6/go.mod h1:2gEUTrWqdpH2pXsmTM1ZkjeSrUWDpjMu2T6m29L/ErQ=
 modernc.org/httpfs v1.0.6/go.mod h1:7dosgurJGp0sPaRanU53W4xZYKh14wfzX420oZADeHM=
 modernc.org/libc v1.9.8/go.mod h1:U1eq8YWr/Kc1RWCMFUWEdkTg8OTcfLw2kY8EDwl039w=
 modernc.org/libc v1.9.11/go.mod h1:NyF3tsA5ArIjJ83XB0JlqhjTabTCHm9aX4XMPHyQn0Q=
@@ -360,23 +296,23 @@ modernc.org/libc v1.12.0/go.mod h1:2MH3DaF/gCU8i/UBiVE1VFRos4o523M7zipmwH8SIgQ=
 modernc.org/libc v1.14.1/go.mod h1:npFeGWjmZTjFeWALQLrvklVmAxv4m80jnG3+xI8FdJk=
 modernc.org/libc v1.14.2/go.mod h1:MX1GBLnRLNdvmK9azU9LCxZ5lMyhrbEMK8rG3X/Fe34=
 modernc.org/libc v1.14.3/go.mod h1:GPIvQVOVPizzlqyRX3l756/3ppsAgg1QgPxjr5Q4agQ=
-modernc.org/libc v1.14.5 h1:DAHvwGoVRDZs5iJXnX9RJrgXSsorupCWmJ2ac964Owk=
 modernc.org/libc v1.14.5/go.mod h1:2PJHINagVxO4QW/5OQdRrvMYo+bm5ClpUFfyXCYl9ak=
+modernc.org/libc v1.14.6/go.mod h1:2PJHINagVxO4QW/5OQdRrvMYo+bm5ClpUFfyXCYl9ak=
+modernc.org/libc v1.14.7/go.mod h1:f8xfWXW8LW41qb4X5+huVQo5dcfPlq7Cbny2TDheMv0=
+modernc.org/libc v1.14.8/go.mod h1:9+JCLb1MWSY23smyOpIPbd5ED+rSS/ieiDWUpdyO3mo=
+modernc.org/libc v1.14.10/go.mod h1:y1MtIWhwpJFpLYm6grAThtuXJKEsY6xkdZmXbRngIdo=
+modernc.org/libc v1.14.12 h1:pUBZTYoISfbb4pCf4PECENpbvwDBxeKc+/dS9LyOWFM=
+modernc.org/libc v1.14.12/go.mod h1:fJdoe23MHu2ruPQkFPPqCpToDi5cckzsbmkI6Ez0LqQ=
 modernc.org/mathutil v1.1.1/go.mod h1:mZW8CKdRPY1v87qxC/wUdX5O1qDzXMP5TH3wjfpga6E=
 modernc.org/mathutil v1.2.2/go.mod h1:mZW8CKdRPY1v87qxC/wUdX5O1qDzXMP5TH3wjfpga6E=
 modernc.org/mathutil v1.4.0/go.mod h1:mZW8CKdRPY1v87qxC/wUdX5O1qDzXMP5TH3wjfpga6E=
 modernc.org/mathutil v1.4.1 h1:ij3fYGe8zBF4Vu+g0oT7mB06r8sqGWKuJu1yXeR4by8=
 modernc.org/mathutil v1.4.1/go.mod h1:mZW8CKdRPY1v87qxC/wUdX5O1qDzXMP5TH3wjfpga6E=
 modernc.org/memory v1.0.4/go.mod h1:nV2OApxradM3/OVbs2/0OsP6nPfakXpi50C7dcoHXlc=
-modernc.org/memory v1.0.5 h1:XRch8trV7GgvTec2i7jc33YlUI0RKVDBvZ5eZ5m8y14=
 modernc.org/memory v1.0.5/go.mod h1:B7OYswTRnfGg+4tDH1t1OeUNnsy2viGTdME4tzd+IjM=
-modernc.org/opt v0.1.1 h1:/0RX92k9vwVeDXj+Xn23DKp2VJubL7k8qNffND6qn3A=
+modernc.org/memory v1.0.6/go.mod h1:/0wo5ibyrQiaoUoH7f9D8dnglAmILJ5/cxZlRECf+Nw=
+modernc.org/memory v1.0.7 h1:UE3cxTRFa5tfUibAV7Jqq8P7zRY0OlJg+yWVIIaluEE=
+modernc.org/memory v1.0.7/go.mod h1:/0wo5ibyrQiaoUoH7f9D8dnglAmILJ5/cxZlRECf+Nw=
 modernc.org/opt v0.1.1/go.mod h1:WdSiB5evDcignE70guQKxYUl14mgWtbClRi5wmkkTX0=
-modernc.org/sqlite v1.14.6 h1:Jt5P3k80EtDBWaq1beAxnWW+5MdHXbZITujnRS7+zWg=
-modernc.org/sqlite v1.14.6/go.mod h1:yiCvMv3HblGmzENNIaNtFhfaNIwcla4u2JQEwJPzfEc=
-modernc.org/strutil v1.1.1 h1:xv+J1BXY3Opl2ALrBwyfEikFAj8pmqcpnfmuwUwcozs=
 modernc.org/strutil v1.1.1/go.mod h1:DE+MQQ/hjKBZS2zNInV5hhcipt5rLPWkmpbGeW5mmdw=
-modernc.org/tcl v1.11.0/go.mod h1:zsTUpbQ+NxQEjOjCUlImDLPv1sG8Ww0qp66ZvyOxCgw=
-modernc.org/token v1.0.0 h1:a0jaWiNMDhDUtqOj09wvjWWAqd3q7WpBulmL9H2egsk=
 modernc.org/token v1.0.0/go.mod h1:UGzOrNV1mAFSEB63lOFHIpNRUVMvYTc6yu1SMY/XTDM=
-modernc.org/z v1.3.0/go.mod h1:+mvgLH814oDjtATDdT3rs84JnUIpkvAF5B8AVkNlE2g=

kanban/banner.go

@@ -0,0 +1,45 @@
+package kanban
+
+import (
+	"fmt"
+	"strings"
+
+	"github.com/fumiama/go-registry"
+)
+
+var (
+	info = [...]string{
+		"* OneBot + ZeroBot + Golang",
+		"* Version 1.3.2 - 2022-03-13 13:21:15 +0800 CST",
+		"* Copyright © 2020 - 2022 FloatTech. All Rights Reserved.",
+		"* Project: https://github.com/FloatTech/ZeroBot-Plugin",
+	}
+	// Banner ...
+	Banner = strings.Join(info[:], "\n")
+	reg    = registry.NewRegReader("reilia.westeurope.cloudapp.azure.com:32664", "fumiama")
+)
+
+// PrintBanner ...
+func PrintBanner() {
+	fmt.Print(
+		"\n======================[ZeroBot-Plugin]======================",
+		"\n", Banner, "\n",
+		"----------------------[ZeroBot-公告栏]----------------------",
+		"\n", Kanban(), "\n",
+		"============================================================\n\n",
+	)
+}
+
+// Kanban ...
+func Kanban() string {
+	err := reg.Connect()
+	if err != nil {
+		return err.Error()
+	}
+	defer reg.Close()
+	text, err := reg.Get("ZeroBot-Plugin/kanban")
+	if err != nil {
+		return err.Error()
+	}
+	return text
+}

kanban/init.go

@@ -0,0 +1,6 @@
+// Package kanban 打印版本信息
+package kanban
+
+func init() {
+	PrintBanner()
+}

main.go

@@ -3,8 +3,11 @@ package main
 import (
 	"flag"
 	"fmt"
+	"math/rand"
 	"os"
-	"strings"
+	"time"
+
+	"github.com/FloatTech/ZeroBot-Plugin/kanban" // 在最前打印 banner
 
 	// ---------以下插件均可通过前面加 // 注释，注释后停用并不加载插件--------- //
 	// ----------------------插件优先级按顺序从高到低---------------------- //
@@ -22,13 +25,17 @@ 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/zbputils/job" // 定时指令触发器
 
 	//                               ^^^^                               //
 	//                          ^^^^^^^^^^^^^^                          //
@@ -48,53 +55,64 @@ 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_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/epidemic"       // 城市疫情查询
+	_ "github.com/FloatTech/ZeroBot-Plugin/plugin/font"           // 渲染任意文字到图片
+	_ "github.com/FloatTech/ZeroBot-Plugin/plugin/fortune"        // 运势
+	_ "github.com/FloatTech/ZeroBot-Plugin/plugin/funny"          // 笑话
+	_ "github.com/FloatTech/ZeroBot-Plugin/plugin/genshin"        // 原神抽卡
+	_ "github.com/FloatTech/ZeroBot-Plugin/plugin/gif"            // 制图
+	_ "github.com/FloatTech/ZeroBot-Plugin/plugin/github"         // 搜索GitHub仓库
+	_ "github.com/FloatTech/ZeroBot-Plugin/plugin/hs"             // 炉石
+	_ "github.com/FloatTech/ZeroBot-Plugin/plugin/image_finder"   // 关键字搜图
+	_ "github.com/FloatTech/ZeroBot-Plugin/plugin/inject"         // 注入指令
+	_ "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/tiangou"        // 舔狗日记
+	_ "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/ymgal"          // 月幕galgame
+	_ "github.com/FloatTech/ZeroBot-Plugin/plugin/zaobao"         // 早报
 
-	// _ "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站推送
 
 	//                               ^^^^                               //
 	//                          ^^^^^^^^^^^^^^                          //
@@ -114,9 +132,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" // 人工智能回复
 
 	//                               ^^^^                               //
 	//                          ^^^^^^^^^^^^^^                          //
@@ -130,8 +148,7 @@ import (
 	//                                                                  //
 	//                                                                  //
 	// -----------------------以下为内置依赖，勿动------------------------ //
-	"github.com/FloatTech/zbputils/control/order"
-	"github.com/fumiama/go-registry"
+	"github.com/FloatTech/zbputils/process"
 	"github.com/sirupsen/logrus"
 	zero "github.com/wdvxdr1123/ZeroBot"
 	"github.com/wdvxdr1123/ZeroBot/driver"
@@ -140,19 +157,11 @@ import (
 )
 
 var (
-	contents = []string{
-		"* OneBot + ZeroBot + Golang",
-		"* Version 1.3.0 - 2022-02-09 14:31:34 +0800 CST",
-		"* 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")
 )
 
 func init() {
@@ -173,7 +182,7 @@ func init() {
 
 	flag.Parse()
 	if *h {
-		printBanner()
+		kanban.PrintBanner()
 		fmt.Println("Usage:")
 		flag.PrintDefaults()
 		os.Exit(0)
@@ -190,40 +199,16 @@ func init() {
 	// webctrl.InitGui(*g)
 }
 
-func printBanner() {
-	fmt.Print(
-		"\n======================[ZeroBot-Plugin]======================",
-		"\n", banner, "\n",
-		"----------------------[ZeroBot-公告栏]----------------------",
-		"\n", getKanban(), "\n",
-		"============================================================\n",
-	)
-}
-
-func getKanban() string {
-	err := reg.Connect()
-	if err != nil {
-		return err.Error()
-	}
-	defer reg.Close()
-	text, err := reg.Get("ZeroBot-Plugin/kanban")
-	if err != nil {
-		return err.Error()
-	}
-	return text
-}
-
 func main() {
-	order.Wait()
-	printBanner()
+	rand.Seed(time.Now().UnixNano()) // 全局 seed，其他插件无需再 seed
 	// 帮助
 	zero.OnFullMatchGroup([]string{"/help", ".help", "菜单"}, zero.OnlyToMe).SetBlock(true).
 		Handle(func(ctx *zero.Ctx) {
-			ctx.SendChain(message.Text(banner, "\n可发送\"/服务列表\"查看 bot 功能"))
+			ctx.SendChain(message.Text(kanban.Banner, "\n可发送\"/服务列表\"查看 bot 功能"))
 		})
 	zero.OnFullMatch("查看zbp公告", zero.OnlyToMe, zero.AdminPermission).SetBlock(true).
 		Handle(func(ctx *zero.Ctx) {
-			ctx.SendChain(message.Text(getKanban()))
+			ctx.SendChain(message.Text(kanban.Kanban()))
 		})
 	zero.RunAndBlock(
 		zero.Config{
@@ -234,5 +219,6 @@ func main() {
 			SuperUsers: flag.Args(), // 通过命令行参数的方式添加主人账号
 			Driver:     []zero.Driver{driver.NewWebSocketClient(*url, *token)},
 		},
+		process.GlobalInitMutex.Unlock,
 	)
 }

plugin/acgimage/classify.go

@@ -5,15 +5,16 @@ import (
 	"net/url"
 	"strings"
 
-	"github.com/FloatTech/AnimeAPI/classify"
-	control "github.com/FloatTech/zbputils/control"
-	"github.com/FloatTech/zbputils/ctxext"
-	"github.com/FloatTech/zbputils/img/pool"
-	"github.com/FloatTech/zbputils/web"
 	zero "github.com/wdvxdr1123/ZeroBot"
 	"github.com/wdvxdr1123/ZeroBot/message"
 
+	"github.com/FloatTech/AnimeAPI/classify"
+
+	"github.com/FloatTech/zbputils/control"
 	"github.com/FloatTech/zbputils/control/order"
+	"github.com/FloatTech/zbputils/ctxext"
+	"github.com/FloatTech/zbputils/img/pool"
+	"github.com/FloatTech/zbputils/web"
 )
 
 const (
@@ -52,11 +53,19 @@ func init() { // 插件主体
 	// 有保护的随机图片
 	engine.OnFullMatch("随机图片", zero.OnlyGroup).Limit(ctxext.LimitByUser).SetBlock(true).
 		Handle(func(ctx *zero.Ctx) {
-			class, dhash, comment, _ := classify.Classify(randapi, true)
-			replyClass(ctx, class, dhash, comment, false)
+			class, dhash, _, err := classify.Classify(randapi, true)
+			if err != nil {
+				ctx.SendChain(message.Text("ERROR:", err))
+				return
+			}
+			err = reply(ctx, class, dhash, classify.Comments[class])
+			if err != nil {
+				ctx.SendChain(message.Text("ERROR:", err))
+				return
+			}
 		})
 	// 直接随机图片，无r18保护，后果自负。如果出r18图可尽快通过发送"太涩了"撤回
-	engine.OnFullMatch("直接随机", ctxext.UserOrGrpAdmin).SetBlock(true).
+	engine.OnFullMatch("直接随机", zero.UserOrGrpAdmin).SetBlock(true).
 		Handle(func(ctx *zero.Ctx) {
 			if block {
 				ctx.SendChain(message.Text("请稍后再试哦"))
@@ -68,7 +77,13 @@ func init() { // 插件主体
 				} else {
 					url = randapi
 				}
-				setLastMsg(ctx.Event.GroupID, ctx.SendChain(message.Image(url).Add("cache", "0")))
+				setLastMsg(ctx.Event.GroupID, message.NewMessageID(
+					ctx.SendGroupForwardMessage(ctx.Event.GroupID,
+						message.Message{
+							ctxext.FakeSenderForwardNode(ctx,
+								message.Image(url).Add("cache", "0"),
+							),
+						}).Get("message_id").String()))
 				block = false
 			}
 		})
@@ -82,14 +97,16 @@ func init() { // 插件主体
 			}
 		})
 	// 上传一张图进行评价
-	engine.OnKeywordGroup([]string{"评价图片"}, zero.OnlyGroup, ctxext.MustProvidePicture).SetBlock(true).
+	engine.OnKeywordGroup([]string{"评价图片"}, zero.OnlyGroup, zero.MustProvidePicture).SetBlock(true).
 		Handle(func(ctx *zero.Ctx) {
 			ctx.SendChain(message.Text("少女祈祷中..."))
-			for _, url := range ctx.State["image_url"].([]string) {
-				class, dhash, comment, _ := classify.Classify(url, true)
-				replyClass(ctx, class, dhash, comment, true)
-				break
+			url := ctx.State["image_url"].([]string)[0]
+			class, _, _, err := classify.Classify(url, true)
+			if err != nil {
+				ctx.SendChain(message.Text("ERROR:", err))
+				return
 			}
+			ctx.SendChain(message.Reply(ctx.Event.MessageID), message.Text(classify.Comments[class]))
 		})
 	engine.OnRegex(`^给你点提示哦：(.*)$`, zero.OnlyPrivate).SetBlock(true).
 		Handle(func(ctx *zero.Ctx) {
@@ -102,9 +119,10 @@ func init() { // 插件主体
 					u = apihead + dhash
 				}
 
-				m, hassent, err := pool.NewImage(ctxext.Send(ctx), ctxext.GetMessage(ctx), dhash, u)
-				if err == nil && !hassent {
-					ctx.SendChain(message.Image(m.String()))
+				err := pool.SendRemoteImageFromPool(dhash, u, ctxext.Send(ctx), ctxext.GetMessage(ctx))
+				if err != nil {
+					ctx.SendChain(message.Text("ERROR:", err))
+					return
 				}
 			}
 		})
@@ -114,15 +132,10 @@ func setLastMsg(id int64, msg message.MessageID) {
 	msgof[id] = msg
 }
 
-func replyClass(ctx *zero.Ctx, class int, dhash string, comment string, isupload bool) {
-	if isupload {
-		ctx.SendChain(message.Reply(ctx.Event.MessageID), message.Text(comment))
-		return
-	}
-
+func reply(ctx *zero.Ctx, class int, dhash string, comment string) error {
 	b14, err := url.QueryUnescape(dhash)
 	if err != nil {
-		return
+		return err
 	}
 
 	var u string
@@ -142,12 +155,19 @@ func replyClass(ctx *zero.Ctx, class int, dhash string, comment string, isupload
 		}
 	} else {
 		send = func(msg interface{}) int64 {
-			return ctx.Send(append(msg.(message.Message), message.Text(comment))).ID()
+			return ctx.SendGroupForwardMessage(ctx.Event.GroupID, message.Message{
+				ctxext.FakeSenderForwardNode(ctx, append(
+					msg.(message.Message),
+					message.Text(comment))...,
+				),
+			}).Get("message_id").Int()
 		}
 	}
 
-	m, hassent, err := pool.NewImage(send, ctxext.GetMessage(ctx), b14, u)
-	if err == nil && !hassent {
-		send(message.Message{message.Image(m.String())})
-	}
+	return pool.SendRemoteImageFromPool(b14, u, send, func(i int64) zero.Message {
+		if class > 5 {
+			return ctxext.GetMessage(ctx)(i)
+		}
+		return ctxext.GetFirstMessageInForward(ctx)(i)
+	})
 }

plugin/ai_reply/ai_tts.go

@@ -0,0 +1,156 @@
+package aireply
+
+import (
+	"errors"
+	"regexp"
+	"strconv"
+	"sync"
+
+	"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 {
+	sync.RWMutex
+	m map[string]tts.TTS
+	l []string
+}
+
+func (t *ttsInstances) List() []string {
+	t.RLock()
+	cl := make([]string, len(t.l))
+	_ = copy(cl, t.l)
+	t.RUnlock()
+	return cl
+}
+
+func init() {
+	engine := control.Register(ttsServiceName, order.AcquirePrio(), &control.Options{
+		DisableOnDefault: true,
+		Help: "语音回复(包括拟声鸟和百度)\n" +
+			"- @Bot 任意文本(任意一句话回复)\n" +
+			"- 设置语音模式[拟声鸟阿梓 | 拟声鸟药水哥 | 百度女声 | 百度男声| 百度度逍遥 | 百度度丫丫]\n" +
+			"- 设置默认语音模式[拟声鸟阿梓 | 拟声鸟药水哥 | 百度女声 | 百度男声| 百度度逍遥 | 百度度丫丫]\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("设置成功，当前模式为", param))
+		})
+	engine.OnRegex(`^设置默认语音模式(.*)$`, ctxext.FirstValueInList(t)).SetBlock(true).
+		Handle(func(ctx *zero.Ctx) {
+			param := ctx.State["regex_matched"].([]string)[1]
+			t.setDefaultSoundMode(param)
+			ctx.SendChain(message.Reply(ctx.Event.MessageID), message.Text("设置成功，默认模式为", param))
+		})
+}
+
+// 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
+	t.RLock()
+	for i, s := range t.l {
+		if s == name {
+			index = int64(i)
+			break
+		}
+	}
+	t.RUnlock()
+	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 {
+		t.RLock()
+		defer t.RUnlock()
+		index := m.GetData(gid)
+		if int(index) < len(t.l) {
+			return t.l[index]
+		}
+	}
+	return "拟声鸟阿梓"
+}
+
+func (t *ttsInstances) setDefaultSoundMode(name string) {
+	var index int
+	t.RLock()
+	for _, s := range t.l {
+		if s == name {
+			break
+		}
+		index++
+	}
+	t.RUnlock()
+	t.Lock()
+	t.l[0], t.l[index] = t.l[index], t.l[0]
+	t.Unlock()
+}

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/aiwife/non-existent.go

@@ -4,7 +4,6 @@ package aiwife
 import (
 	"fmt"
 	"math/rand"
-	"time"
 
 	control "github.com/FloatTech/zbputils/control"
 	"github.com/FloatTech/zbputils/ctxext"
@@ -19,7 +18,6 @@ const (
 )
 
 func init() { // 插件主体
-	rand.Seed(time.Now().UnixNano())
 	control.Register("aiwife", order.AcquirePrio(), &control.Options{
 		DisableOnDefault: false,
 		Help: "AIWife\n" +

plugin/b14/main.go

@@ -23,9 +23,9 @@ func init() {
 	en.OnRegex(`^加密\s?(.*)`).SetBlock(true).
 		Handle(func(ctx *zero.Ctx) {
 			str := ctx.State["regex_matched"].([]string)[1]
-			es, err := base14.UTF16be2utf8(base14.EncodeString(str))
-			if err == nil {
-				ctx.SendChain(message.Text(helper.BytesToString(es)))
+			es := base14.EncodeString(str)
+			if es != "" {
+				ctx.SendChain(message.Text(es))
 			} else {
 				ctx.SendChain(message.Text("加密失败!"))
 			}
@@ -33,9 +33,9 @@ func init() {
 	en.OnRegex(`^解密\s?([一-踀]*[㴁-㴆]?)$`).SetBlock(true).
 		Handle(func(ctx *zero.Ctx) {
 			str := ctx.State["regex_matched"].([]string)[1]
-			es, err := base14.UTF82utf16be(helper.StringToBytes(str))
-			if err == nil {
-				ctx.SendChain(message.Text(base14.DecodeString(es)))
+			es := base14.DecodeString(str)
+			if es != "" {
+				ctx.SendChain(message.Text(es))
 			} else {
 				ctx.SendChain(message.Text("解密失败!"))
 			}
@@ -44,7 +44,7 @@ func init() {
 		Handle(func(ctx *zero.Ctx) {
 			key, str := ctx.State["regex_matched"].([]string)[1], ctx.State["regex_matched"].([]string)[2]
 			t := getea(key)
-			es, err := base14.UTF16be2utf8(base14.Encode(t.Encrypt(helper.StringToBytes(str))))
+			es, err := base14.UTF16BE2UTF8(base14.Encode(t.Encrypt(helper.StringToBytes(str))))
 			if err == nil {
 				ctx.SendChain(message.Text(helper.BytesToString(es)))
 			} else {
@@ -55,7 +55,7 @@ func init() {
 		Handle(func(ctx *zero.Ctx) {
 			key, str := ctx.State["regex_matched"].([]string)[1], ctx.State["regex_matched"].([]string)[2]
 			t := getea(key)
-			es, err := base14.UTF82utf16be(helper.StringToBytes(str))
+			es, err := base14.UTF82UTF16BE(helper.StringToBytes(str))
 			if err == nil {
 				ctx.SendChain(message.Text(helper.BytesToString(t.Decrypt(base14.Decode(es)))))
 			} else {

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/info.go

@@ -2,7 +2,7 @@
 package bilibili
 
 import (
-	"io/ioutil"
+	"io"
 	"net/http"
 
 	control "github.com/FloatTech/zbputils/control"
@@ -27,7 +27,7 @@ func init() {
 			keyword := ctx.State["regex_matched"].([]string)[1]
 			rest, err := uid(keyword)
 			if err != nil {
-				ctx.SendChain(message.Text("ERROR: ", err))
+				ctx.SendChain(message.Text("ERROR:", err))
 				return
 			}
 			id := rest.Get("data.result.0.mid").String()
@@ -36,20 +36,20 @@ func init() {
 			client := &http.Client{}
 			req, err := http.NewRequest(method, url, nil)
 			if err != nil {
-				ctx.SendChain(message.Text("ERROR: ", err))
+				ctx.SendChain(message.Text("ERROR:", err))
 				return
 			}
 			req.Header.Add("cookie", "CURRENT_FNVAL=80; _uuid=772B88E8-3ED1-D589-29BB-F6CB5214239A06137infoc; blackside_state=1; bfe_id=6f285c892d9d3c1f8f020adad8bed553; rpdid=|(umY~Jkl|kJ0J'uYkR|)lu|); fingerprint=0ec2b1140fb30b56d7b5e415bc3b5fb1; buvid_fp=C91F5265-3DF4-4D5A-9FF3-C546370B14C0143096infoc; buvid_fp_plain=C91F5265-3DF4-4D5A-9FF3-C546370B14C0143096infoc; SESSDATA=9e0266f6%2C1639637127%2Cb0172%2A61; bili_jct=96ddbd7e22d527abdc0501339a12d4d3; DedeUserID=695737880; DedeUserID__ckMd5=0117660e75db7b01; sid=5labuhaf; PVID=1; bfe_id=1e33d9ad1cb29251013800c68af42315")
 			res, err := client.Do(req)
 			if err != nil {
-				ctx.SendChain(message.Text("ERROR: ", err))
+				ctx.SendChain(message.Text("ERROR:", err))
 				return
 			}
 			defer res.Body.Close()
 
-			body, err := ioutil.ReadAll(res.Body)
+			body, err := io.ReadAll(res.Body)
 			if err != nil {
-				ctx.SendChain(message.Text("ERROR: ", err))
+				ctx.SendChain(message.Text("ERROR:", err))
 				return
 			}
 			data := string(body)

plugin/bilibili/live_info.go

@@ -0,0 +1,85 @@
+package bilibili
+
+import (
+	"encoding/json"
+	"errors"
+	"net/http"
+	"time"
+
+	"github.com/FloatTech/zbputils/web"
+	"github.com/tidwall/gjson"
+	zero "github.com/wdvxdr1123/ZeroBot"
+	"github.com/wdvxdr1123/ZeroBot/message"
+)
+
+// 查vup粉丝数据
+func init() {
+	engine.OnRegex(`^>vup info\s?(.{1,25})$`).SetBlock(true).
+		Handle(func(ctx *zero.Ctx) {
+			keyword := ctx.State["regex_matched"].([]string)[1]
+			res, err := uid(keyword)
+			if err != nil {
+				ctx.SendChain(message.Text("ERROR:", err))
+				return
+			}
+			id := res.Get("data.result.0.mid").String()
+			// 获取详情
+			fo, err := fansapi(id)
+			if err != nil {
+				ctx.SendChain(message.Text("ERROR:", err))
+				return
+			}
+			ctx.SendChain(message.Text(
+				"uid: ", fo.Mid, "\n",
+				"名字: ", fo.Uname, "\n",
+				"当前粉丝数: ", fo.Follower, "\n",
+				"24h涨粉数: ", fo.Rise, "\n",
+				"视频投稿数: ", fo.Video, "\n",
+				"直播间id: ", fo.Roomid, "\n",
+				"舰队: ", fo.GuardNum, "\n",
+				"直播总排名: ", fo.AreaRank, "\n",
+				"数据来源: ", "https://vtbs.moe/detail/", fo.Mid, "\n",
+				"数据获取时间: ", time.Now().Format("2006-01-02 15:04:05"),
+			))
+		})
+}
+
+// 搜索api：通过把触发指令传入的昵称找出uid返回
+func uid(keyword string) (*gjson.Result, error) {
+	api := "http://api.bilibili.com/x/web-interface/search/type?search_type=bili_user&&user_type=1&keyword=" + keyword
+	data, err := web.GetData(api)
+	if err != nil {
+		return nil, err
+	}
+	json := gjson.ParseBytes(data)
+	if json.Get("data.numResults").Int() == 0 {
+		return nil, errors.New("查无此人")
+	}
+	return &json, nil
+}
+
+type follower struct {
+	Mid      int    `json:"mid"`
+	Uname    string `json:"uname"`
+	Video    int    `json:"video"`
+	Roomid   int    `json:"roomid"`
+	Rise     int    `json:"rise"`
+	Follower int    `json:"follower"`
+	GuardNum int    `json:"guardNum"`
+	AreaRank int    `json:"areaRank"`
+}
+
+// 请求api
+func fansapi(uid string) (*follower, error) {
+	url := "https://api.vtbs.moe/v1/detail/" + uid
+	resp, err := http.Get(url)
+	if err != nil {
+		return nil, err
+	}
+	defer resp.Body.Close()
+	result := &follower{}
+	if err := json.NewDecoder(resp.Body).Decode(result); err != nil {
+		return nil, err
+	}
+	return result, nil
+}

plugin/bilibili_parse/bilibili_parse.go

@@ -2,6 +2,7 @@
 package bilibiliparse
 
 import (
+	"fmt"
 	"regexp"
 	"strings"
 
@@ -14,8 +15,8 @@ import (
 	"github.com/FloatTech/zbputils/control/order"
 )
 
-var (
-	bilibiliRe = "https://www.bilibili.com/video/av[0-9]+|https://www.bilibili.com/video/BV[0-9a-zA-Z]+|https://b23.tv/[0-9a-zA-Z]+"
+const (
+	bilibiliRe = "https://www.bilibili.com/video/av[0-9]+|https://www.bilibili.com/video/BV[0-9a-zA-Z]+|https://b23.tv/[0-9a-zA-Z]+|https://www.bilibili.com/video/bv[0-9a-zA-Z]+"
 	validRe    = "https://www.bilibili.com/video/(BV[0-9a-zA-Z]+)"
 )
 
@@ -23,7 +24,7 @@ func init() {
 	engine := control.Register("bilibiliparse", order.AcquirePrio(), &control.Options{
 		DisableOnDefault: false,
 		Help: "b站视频链接解析\n" +
-			"- https://www.bilibili.com/video/BV1xx411c7BF | https://www.bilibili.com/video/av1605 | https://b23.tv/I8uzWCA",
+			"- https://www.bilibili.com/video/BV1xx411c7BF | https://www.bilibili.com/video/av1605 | https://b23.tv/I8uzWCA | https://www.bilibili.com/video/bv1xx411c7BF",
 	})
 
 	engine.OnRegex(bilibiliRe).SetBlock(true).Handle(func(ctx *zero.Ctx) {
@@ -48,6 +49,11 @@ func parseURL(bilibiliURL string) (m message.Message) {
 	bv := re.FindStringSubmatch(videoURL)[1]
 	title := htmlquery.FindOne(doc, "//*[@id='viewbox_report']/h1/span/text()").Data
 	m = append(m, message.Text(title+"\n"))
+	upName := strings.TrimSpace(htmlquery.FindOne(doc, "//*[@id='v_upinfo']/div[2]/div[1]/a[1]/text()").Data)
+	fmt.Println(upName)
+	fanNumber := htmlquery.InnerText(htmlquery.FindOne(doc, "//i[@class='van-icon-general_addto_s']").NextSibling.NextSibling)
+	fmt.Println(fanNumber)
+	m = append(m, message.Text("up："+upName+"，粉丝："+fanNumber+"\n"))
 	view := htmlquery.FindOne(doc, "//*[@id='viewbox_report']/div/span[@class='view']/text()").Data
 	dm := htmlquery.FindOne(doc, "//*[@id='viewbox_report']/div/span[@class='dm']/text()").Data
 	m = append(m, message.Text(view+dm+"\n"))
@@ -57,10 +63,10 @@ func parseURL(bilibiliURL string) (m message.Message) {
 	m = append(m, message.Image(image))
 	like := htmlquery.FindOne(doc, "//*[@id='arc_toolbar_report']/div[1]/span[@class='like']/text()").Data
 	coin := htmlquery.FindOne(doc, "//*[@id='arc_toolbar_report']/div[1]/span[@class='coin']/text()").Data
-	m = append(m, message.Text("\n点赞：", strings.TrimSpace(like)+"投币：", strings.TrimSpace(coin)+"\n"))
+	m = append(m, message.Text("\n点赞：", strings.TrimSpace(like)+"，投币：", strings.TrimSpace(coin)+"\n"))
 	collect := htmlquery.FindOne(doc, "//*[@id='arc_toolbar_report']/div[1]/span[@class='collect']/text()").Data
 	share := htmlquery.FindOne(doc, "//*[@id='arc_toolbar_report']/div[1]/span[@class='share']/text()").Data
-	m = append(m, message.Text("收藏：", strings.TrimSpace(collect)+"分享：", strings.TrimSpace(share)+"\n"))
+	m = append(m, message.Text("收藏：", strings.TrimSpace(collect)+"，分享：", strings.TrimSpace(share)+"\n"))
 	m = append(m, message.Text(bv))
 	return
 }

plugin/bilibili_push/bilibili_push.go

@@ -10,17 +10,16 @@ import (
 	"strconv"
 	"time"
 
-	"github.com/FloatTech/zbputils/control"
-	"github.com/FloatTech/zbputils/ctxext"
-	"github.com/FloatTech/zbputils/img/text"
-	"github.com/FloatTech/zbputils/web"
 	log "github.com/sirupsen/logrus"
 	"github.com/tidwall/gjson"
 	zero "github.com/wdvxdr1123/ZeroBot"
 	"github.com/wdvxdr1123/ZeroBot/message"
-	"github.com/wdvxdr1123/ZeroBot/utils/helper"
 
+	"github.com/FloatTech/zbputils/binary"
+	"github.com/FloatTech/zbputils/control"
 	"github.com/FloatTech/zbputils/control/order"
+	"github.com/FloatTech/zbputils/img/text"
+	"github.com/FloatTech/zbputils/web"
 )
 
 const (
@@ -34,6 +33,9 @@ const (
 	serviceName    = "bilibilipush"
 )
 
+// bdb bilibili推送数据库
+var bdb *bilibilipushdb
+
 var (
 	lastTime = map[int64]int64{}
 	typeMsg  = map[int64]string{
@@ -65,9 +67,18 @@ func init() {
 			"- 取消动态订阅[uid]\n" +
 			"- 取消直播订阅[uid]\n" +
 			"- 推送列表",
+		PrivateDataFolder: serviceName,
 	})
 
-	en.OnRegex(`^添加订阅\s?(\d+)$`, ctxext.UserOrGrpAdmin).SetBlock(true).Handle(func(ctx *zero.Ctx) {
+	// 加载数据库
+	go func() {
+		dbpath := en.DataFolder()
+		dbfile := dbpath + "push.db"
+		bdb = initialize(dbfile)
+		log.Println("[bilibilipush]加载bilibilipush数据库")
+	}()
+
+	en.OnRegex(`^添加订阅\s?(\d+)$`, zero.UserOrGrpAdmin).SetBlock(true).Handle(func(ctx *zero.Ctx) {
 		buid, _ := strconv.ParseInt(ctx.State["regex_matched"].([]string)[1], 10, 64)
 		var name string
 		var ok bool
@@ -93,7 +104,7 @@ func init() {
 			ctx.SendChain(message.Text("已添加" + name + "的订阅"))
 		}
 	})
-	en.OnRegex(`^取消订阅\s?(\d+)$`, ctxext.UserOrGrpAdmin).SetBlock(true).Handle(func(ctx *zero.Ctx) {
+	en.OnRegex(`^取消订阅\s?(\d+)$`, zero.UserOrGrpAdmin).SetBlock(true).Handle(func(ctx *zero.Ctx) {
 		buid, _ := strconv.ParseInt(ctx.State["regex_matched"].([]string)[1], 10, 64)
 		var name string
 		var ok bool
@@ -119,7 +130,7 @@ func init() {
 			ctx.SendChain(message.Text("已取消" + name + "的订阅"))
 		}
 	})
-	en.OnRegex(`^取消动态订阅\s?(\d+)$`, ctxext.UserOrGrpAdmin).SetBlock(true).Handle(func(ctx *zero.Ctx) {
+	en.OnRegex(`^取消动态订阅\s?(\d+)$`, zero.UserOrGrpAdmin).SetBlock(true).Handle(func(ctx *zero.Ctx) {
 		buid, _ := strconv.ParseInt(ctx.State["regex_matched"].([]string)[1], 10, 64)
 		var name string
 		var ok bool
@@ -145,7 +156,7 @@ func init() {
 			ctx.SendChain(message.Text("已取消" + name + "的动态订阅"))
 		}
 	})
-	en.OnRegex(`^取消直播订阅\s?(\d+)$`, ctxext.UserOrGrpAdmin).SetBlock(true).Handle(func(ctx *zero.Ctx) {
+	en.OnRegex(`^取消直播订阅\s?(\d+)$`, zero.UserOrGrpAdmin).SetBlock(true).Handle(func(ctx *zero.Ctx) {
 		buid, _ := strconv.ParseInt(ctx.State["regex_matched"].([]string)[1], 10, 64)
 		var name string
 		var ok bool
@@ -171,7 +182,7 @@ func init() {
 			ctx.SendChain(message.Text("已取消" + name + "的直播订阅"))
 		}
 	})
-	en.OnFullMatch("推送列表", ctxext.UserOrGrpAdmin).SetBlock(true).Handle(func(ctx *zero.Ctx) {
+	en.OnFullMatch("推送列表", zero.UserOrGrpAdmin).SetBlock(true).Handle(func(ctx *zero.Ctx) {
 		gid := ctx.Event.GroupID
 		if gid == 0 {
 			gid = -ctx.Event.UserID
@@ -202,8 +213,8 @@ func init() {
 		if err != nil {
 			log.Errorln("[bilibilipush]:", err)
 		}
-		if id := ctx.SendChain(message.Image("base64://" + helper.BytesToString(data))); id.ID() == 0 {
-			ctx.SendChain(message.Text("ERROR: 可能被风控了"))
+		if id := ctx.SendChain(message.Image("base64://" + binary.BytesToString(data))); id.ID() == 0 {
+			ctx.SendChain(message.Text("ERROR:可能被风控了"))
 		}
 	})
 }
@@ -219,12 +230,12 @@ func bilibiliPushDaily() {
 }
 
 func checkBuid(buid int64) (status int, name string) {
-	data, err := web.ReqWith(fmt.Sprintf(infoURL, buid), "GET", referer, ua)
+	data, err := web.RequestDataWith(web.NewDefaultClient(), fmt.Sprintf(infoURL, buid), "GET", referer, ua)
 	if err != nil {
 		log.Errorln("[bilibilipush]:", err)
 	}
-	status = int(gjson.Get(helper.BytesToString(data), "code").Int())
-	name = gjson.Get(helper.BytesToString(data), "data.name").String()
+	status = int(gjson.Get(binary.BytesToString(data), "code").Int())
+	name = gjson.Get(binary.BytesToString(data), "data.name").String()
 	if status == 0 {
 		bdb.insertBilibiliUp(buid, name)
 		upMap[buid] = name
@@ -277,11 +288,11 @@ func unsubscribeLive(buid, groupid int64) (err error) {
 }
 
 func getUserDynamicCard(buid int64) (cardList []gjson.Result) {
-	data, err := web.ReqWith(fmt.Sprintf(userDynamicURL, buid), "GET", referer, ua)
+	data, err := web.RequestDataWith(web.NewDefaultClient(), fmt.Sprintf(userDynamicURL, buid), "GET", referer, ua)
 	if err != nil {
 		log.Errorln("[bilibilipush]:", err)
 	}
-	cardList = gjson.Get(helper.BytesToString(data), "data.cards").Array()
+	cardList = gjson.Get(binary.BytesToString(data), "data.cards").Array()
 	return
 }
 
@@ -306,7 +317,7 @@ func getLiveList(uids ...int64) string {
 	if err != nil {
 		log.Errorln("[bilibilipush]:", err)
 	}
-	return helper.BytesToString(data)
+	return binary.BytesToString(data)
 }
 
 func sendDynamic() {
@@ -368,7 +379,7 @@ func sendDynamic() {
 							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")
+							cTime := time.Unix(gjson.Get(cOrigin, "pubdate").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))

plugin/bilibili_push/model.go

@@ -4,8 +4,8 @@ import (
 	"encoding/json"
 	"os"
 
+	_ "github.com/fumiama/sqlite3" // import sql
 	"github.com/jinzhu/gorm"
-	_ "github.com/logoove/sqlite" // import sql
 )
 
 // bilibilipushdb bili推送数据库

plugin/book_review/book_review.go

@@ -5,20 +5,37 @@ import (
 	log "github.com/sirupsen/logrus"
 	zero "github.com/wdvxdr1123/ZeroBot"
 	"github.com/wdvxdr1123/ZeroBot/message"
-	"github.com/wdvxdr1123/ZeroBot/utils/helper"
 
+	"github.com/FloatTech/zbputils/binary"
 	"github.com/FloatTech/zbputils/control"
-	"github.com/FloatTech/zbputils/img/text"
-
 	"github.com/FloatTech/zbputils/control/order"
+	"github.com/FloatTech/zbputils/file"
+	"github.com/FloatTech/zbputils/img/text"
 )
 
 func init() {
 	engine := control.Register("bookreview", order.AcquirePrio(), &control.Options{
 		DisableOnDefault: false,
 		Help:             "哀伤雪刃推书记录\n- 书评[xxx]\n- 随机书评",
+		PublicDataFolder: "BookReview",
 	})
 
+	go func() {
+		dbpath := engine.DataFolder()
+		db.DBPath = dbpath + "bookreview.db"
+		// os.RemoveAll(dbpath)
+		_, _ = file.GetLazyData(db.DBPath, false, true)
+		err := db.Create("bookreview", &book{})
+		if err != nil {
+			panic(err)
+		}
+		n, err := db.Count("bookreview")
+		if err != nil {
+			panic(err)
+		}
+		log.Printf("[bookreview]读取%d条书评", n)
+	}()
+
 	// 中文、英文、数字但不包括下划线等符号
 	engine.OnRegex("^书评([\u4E00-\u9FA5A-Za-z0-9]{1,25})$").SetBlock(true).
 		Handle(func(ctx *zero.Ctx) {
@@ -27,8 +44,8 @@ func init() {
 			if err != nil {
 				log.Println("err:", err)
 			}
-			if id := ctx.SendChain(message.Image("base64://" + helper.BytesToString(data))); id.ID() == 0 {
-				ctx.SendChain(message.Text("ERROR: 可能被风控了"))
+			if id := ctx.SendChain(message.Image("base64://" + binary.BytesToString(data))); id.ID() == 0 {
+				ctx.SendChain(message.Text("ERROR:可能被风控了"))
 			}
 		})
 
@@ -39,8 +56,8 @@ func init() {
 			if err != nil {
 				log.Println("err:", err)
 			}
-			if id := ctx.SendChain(message.Image("base64://" + helper.BytesToString(data))); id.ID() == 0 {
-				ctx.SendChain(message.Text("ERROR: 可能被风控了"))
+			if id := ctx.SendChain(message.Image("base64://" + binary.BytesToString(data))); id.ID() == 0 {
+				ctx.SendChain(message.Text("ERROR:可能被风控了"))
 			}
 		})
 }

plugin/book_review/model.go

@@ -1,10 +1,14 @@
 package bookreview
 
+import sql "github.com/FloatTech/sqlite"
+
 type book struct {
 	ID         uint64 `db:"id"`
 	BookReview string `db:"bookreview"`
 }
 
+var db = &sql.Sqlite{}
+
 // 暂时随机选择一个书评
 func getBookReviewByKeyword(keyword string) (b book) {
 	_ = db.Find("bookreview", &b, "where bookreview LIKE '%"+keyword+"%'")

plugin/chat/chat.go

@@ -14,19 +14,12 @@ import (
 	"github.com/FloatTech/zbputils/control/order"
 )
 
-const (
-	dbpath = "data/Chat/"
-	dbfile = dbpath + "kimoi.json"
-)
-
 var (
 	poke   = rate.NewManager(time.Minute*5, 8) // 戳一戳
 	engine = control.Register("chat", order.AcquirePrio(), &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- 设置温度[正整数]",
 	})
-	kimomap  = make(kimo, 256)
-	chatList = make([]string, 0, 256)
 )
 
 func init() { // 插件主体
@@ -111,13 +104,4 @@ func init() { // 插件主体
 				))
 			}
 		})
-	initChatList(func() {
-		engine.OnFullMatchGroup(chatList, zero.OnlyToMe).SetBlock(true).Handle(
-			func(ctx *zero.Ctx) {
-				key := ctx.MessageString()
-				val := *kimomap[key]
-				text := val[rand.Intn(len(val))]
-				ctx.SendChain(message.Reply(ctx.Event.MessageID), message.Text(text))
-			})
-	})
 }

plugin/chouxianghua/chouxianghua.go

@@ -2,18 +2,39 @@
 package chouxianghua
 
 import (
-	control "github.com/FloatTech/zbputils/control"
+	"github.com/sirupsen/logrus"
 	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/file"
 )
 
 func init() {
-	control.Register("chouxianghua", order.AcquirePrio(), &control.Options{
+	en := control.Register("chouxianghua", order.AcquirePrio(), &control.Options{
 		DisableOnDefault: false,
 		Help:             "抽象话\n- 抽象翻译xxx",
-	}).OnRegex("^抽象翻译((\\s|[\\r\\n]|[\\p{Han}\\p{P}A-Za-z0-9])+)$").SetBlock(true).
+		PublicDataFolder: "ChouXiangHua",
+	})
+
+	go func() {
+		dbpath := en.DataFolder()
+		db.DBPath = dbpath + "cxh.db"
+		// os.RemoveAll(dbpath)
+		_, _ = file.GetLazyData(db.DBPath, false, true)
+		err := db.Create("pinyin", &pinyin{})
+		if err != nil {
+			panic(err)
+		}
+		n, err := db.Count("pinyin")
+		if err != nil {
+			panic(err)
+		}
+		logrus.Printf("[chouxianghua]读取%d条拼音", n)
+	}()
+
+	en.OnRegex("^抽象翻译((\\s|[\\r\\n]|[\\p{Han}\\p{P}A-Za-z0-9])+)$").SetBlock(true).
 		Handle(func(ctx *zero.Ctx) {
 			r := cx(ctx.State["regex_matched"].([]string)[1])
 			ctx.SendChain(message.Text(r))

plugin/chouxianghua/model.go

@@ -1,5 +1,7 @@
 package chouxianghua
 
+import sql "github.com/FloatTech/sqlite"
+
 type pinyin struct {
 	Word   string `db:"word"`
 	Pronun string `db:"pronunciation"`
@@ -9,6 +11,8 @@ type emoji struct {
 	Emoji  string `db:"emoji"`
 }
 
+var db = &sql.Sqlite{}
+
 func getPinyinByWord(word string) string {
 	var p pinyin
 	_ = db.Find("pinyin", &p, "where word = '"+word+"'")

plugin/coser/coser.go

@@ -28,34 +28,22 @@ func init() {
 	}).ApplySingle(ctxext.DefaultSingle).OnFullMatch("coser", zero.OnlyGroup).SetBlock(true).Limit(ctxext.LimitByGroup).
 		Handle(func(ctx *zero.Ctx) {
 			ctx.SendChain(message.Text("少女祈祷中......"))
-			data, err := web.ReqWith(coserURL, "GET", "", ua)
+			data, err := web.RequestDataWith(web.NewDefaultClient(), coserURL, "GET", "", ua)
 			if err != nil {
 				log.Println("err为:", err)
 			}
-			var m message.Message
+
 			text := gjson.Get(helper.BytesToString(data), "data.Title").String()
-			m = append(m,
-				message.CustomNode(
-					ctx.Event.Sender.NickName,
-					ctx.Event.UserID,
-					text,
-				))
+			m := message.Message{ctxext.FakeSenderForwardNode(ctx, message.Text(text))}
 			gjson.Get(helper.BytesToString(data), "data.data").ForEach(func(_, value gjson.Result) bool {
-				m = append(m,
-					message.CustomNode(
-						ctx.Event.Sender.NickName,
-						ctx.Event.UserID,
-						[]message.MessageSegment{
-							message.Image(value.String()),
-						}),
-				)
+				m = append(m, ctxext.FakeSenderForwardNode(ctx, message.Image(value.String())))
 				return true
 			})
 
 			if id := ctx.SendGroupForwardMessage(
 				ctx.Event.GroupID,
 				m).Get("message_id").Int(); id == 0 {
-				ctx.SendChain(message.Text("ERROR: 可能被风控了"))
+				ctx.SendChain(message.Text("ERROR:可能被风控了"))
 			}
 		})
 }

plugin/cpstory/cpstory.go

@@ -4,11 +4,12 @@ package cpstory
 import (
 	"strings"
 
+	"github.com/sirupsen/logrus"
 	zero "github.com/wdvxdr1123/ZeroBot"
 	"github.com/wdvxdr1123/ZeroBot/message"
 
 	control "github.com/FloatTech/zbputils/control"
-	"github.com/FloatTech/zbputils/ctxext"
+	"github.com/FloatTech/zbputils/file"
 	"github.com/FloatTech/zbputils/math"
 
 	"github.com/FloatTech/zbputils/control/order"
@@ -18,11 +19,29 @@ func init() {
 	engine := control.Register("cpstory", order.AcquirePrio(), &control.Options{
 		DisableOnDefault: false,
 		Help:             "cp短打\n- 组cp[@xxx][@xxx]\n- 磕cp大老师 雪乃",
+		PublicDataFolder: "CpStory",
 	})
+
+	go func() {
+		dbpath := engine.DataFolder()
+		db.DBPath = dbpath + "cp.db"
+		// os.RemoveAll(dbpath)
+		_, _ = file.GetLazyData(db.DBPath, false, true)
+		err := db.Create("cp_story", &cpstory{})
+		if err != nil {
+			panic(err)
+		}
+		n, err := db.Count("cp_story")
+		if err != nil {
+			panic(err)
+		}
+		logrus.Printf("[cpstory]读取%d条故事", n)
+	}()
+
 	engine.OnRegex("^组cp.*?(\\d+).*?(\\d+)", zero.OnlyGroup).SetBlock(true).Handle(func(ctx *zero.Ctx) {
 		cs := getRandomCpStory()
-		gong := ctxext.CardOrNickName(ctx, math.Str2Int64(ctx.State["regex_matched"].([]string)[1]))
-		shou := ctxext.CardOrNickName(ctx, math.Str2Int64(ctx.State["regex_matched"].([]string)[2]))
+		gong := ctx.CardOrNickName(math.Str2Int64(ctx.State["regex_matched"].([]string)[1]))
+		shou := ctx.CardOrNickName(math.Str2Int64(ctx.State["regex_matched"].([]string)[2]))
 		text := strings.ReplaceAll(cs.Story, "<攻>", gong)
 		text = strings.ReplaceAll(text, "<受>", shou)
 		text = strings.ReplaceAll(text, cs.Gong, gong)

plugin/cpstory/model.go

@@ -1,5 +1,7 @@
 package cpstory
 
+import sql "github.com/FloatTech/sqlite"
+
 type cpstory struct {
 	ID    int64  `db:"id"`
 	Gong  string `db:"gong"`
@@ -7,6 +9,8 @@ type cpstory struct {
 	Story string `db:"story"`
 }
 
+var db = &sql.Sqlite{}
+
 func getRandomCpStory() (cs cpstory) {
 	_ = db.Pick("cp_story", &cs)
 	return

plugin/curse/curse.go

@@ -2,11 +2,13 @@
 package curse
 
 import (
+	"github.com/sirupsen/logrus"
 	zero "github.com/wdvxdr1123/ZeroBot"
 	"github.com/wdvxdr1123/ZeroBot/message"
 
 	control "github.com/FloatTech/zbputils/control"
 	"github.com/FloatTech/zbputils/ctxext"
+	"github.com/FloatTech/zbputils/file"
 	"github.com/FloatTech/zbputils/process"
 
 	"github.com/FloatTech/zbputils/control/order"
@@ -21,8 +23,24 @@ func init() {
 	engine := control.Register("curse", order.AcquirePrio(), &control.Options{
 		DisableOnDefault: true,
 		Help:             "骂人(求骂,自卫)\n- 骂我\n- 大力骂我",
+		PublicDataFolder: "Curse",
 	})
 
+	go func() {
+		dbpath := engine.DataFolder()
+		db.DBPath = dbpath + "curse.db"
+		_, err := file.GetLazyData(db.DBPath, false, true)
+		if err != nil {
+			panic(err)
+		}
+		err = db.Create("curse", &curse{})
+		if err != nil {
+			panic(err)
+		}
+		c, _ := db.Count("curse")
+		logrus.Infoln("[curse]加载", c, "条骂人语录")
+	}()
+
 	engine.OnFullMatch("骂我").SetBlock(true).Limit(ctxext.LimitByUser).Handle(func(ctx *zero.Ctx) {
 		process.SleepAbout1sTo2s()
 		text := getRandomCurseByLevel(minLevel).Text

plugin/curse/model.go

@@ -1,11 +1,15 @@
 package curse
 
+import sql "github.com/FloatTech/sqlite"
+
 type curse struct {
 	ID    uint32 `db:"id"`
 	Text  string `db:"text"`
 	Level string `db:"level"`
 }
 
+var db = &sql.Sqlite{}
+
 func getRandomCurseByLevel(level string) (c curse) {
 	_ = db.Find("curse", &c, "where level = '"+level+"' ORDER BY RANDOM() limit 1")
 	return

plugin/danbooru/main.go

@@ -4,12 +4,10 @@ package deepdanbooru
 import (
 	"crypto/md5"
 	"encoding/hex"
-	"os"
 
 	"github.com/FloatTech/AnimeAPI/danbooru"
 	"github.com/FloatTech/AnimeAPI/saucenao"
 	"github.com/FloatTech/zbputils/control"
-	"github.com/FloatTech/zbputils/ctxext"
 	"github.com/FloatTech/zbputils/file"
 	"github.com/FloatTech/zbputils/img/writer"
 	zero "github.com/wdvxdr1123/ZeroBot"
@@ -19,21 +17,18 @@ import (
 	"github.com/FloatTech/zbputils/control/order"
 )
 
-const cachefile = "data/danbooru/"
-
 func init() { // 插件主体
-	_ = os.RemoveAll(cachefile)
-	err := os.MkdirAll(cachefile, 0755)
-	if err != nil {
-		panic(err)
-	}
 	engine := control.Register("danbooru", order.AcquirePrio(), &control.Options{
 		DisableOnDefault: false,
 		Help: "二次元图片标签识别\n" +
 			"- 鉴赏图片[图片]",
+		PrivateDataFolder: "danbooru",
 	})
+
+	cachefolder := engine.DataFolder()
+
 	// 上传一张图进行评价
-	engine.OnKeywordGroup([]string{"鉴赏图片"}, zero.OnlyGroup, ctxext.MustProvidePicture).SetBlock(true).
+	engine.OnKeywordGroup([]string{"鉴赏图片"}, zero.OnlyGroup, zero.MustProvidePicture).SetBlock(true).
 		Handle(func(ctx *zero.Ctx) {
 			ctx.SendChain(message.Text("少女祈祷中..."))
 			for _, url := range ctx.State["image_url"].([]string) {
@@ -50,7 +45,7 @@ func init() { // 插件主体
 					return
 				}
 				digest := md5.Sum(helper.StringToBytes(url))
-				f := cachefile + hex.EncodeToString(digest[:])
+				f := cachefolder + hex.EncodeToString(digest[:])
 				if file.IsNotExist(f) {
 					_ = writer.SavePNG2Path(f, t)
 				}

plugin/diana/bing.go

@@ -2,9 +2,6 @@
 package diana
 
 import (
-	"math/rand"
-	"time"
-
 	zero "github.com/wdvxdr1123/ZeroBot"
 	"github.com/wdvxdr1123/ZeroBot/message"
 
@@ -12,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{
@@ -22,13 +19,19 @@ var engine = control.Register("diana", order.AcquirePrio(), &control.Options{
 		"- 发大病\n" +
 		"- 教你一篇小作文[作文]\n" +
 		"- [回复]查重",
+	PublicDataFolder: "Diana",
 })
 
 func init() {
+	go func() {
+		datapath := engine.DataFolder()
+		dbfile := datapath + "text.db"
+		data.LoadText(dbfile)
+	}()
+
 	// 随机发送一篇上面的小作文
 	engine.OnFullMatch("小作文").SetBlock(true).
 		Handle(func(ctx *zero.Ctx) {
-			rand.Seed(time.Now().UnixNano())
 			// 绕过第一行发病
 			ctx.SendChain(message.Text(data.RandText()))
 		})
@@ -43,7 +46,7 @@ func init() {
 		Handle(func(ctx *zero.Ctx) {
 			err := data.AddText(ctx.State["regex_matched"].([]string)[1])
 			if err != nil {
-				ctx.SendChain(message.Text("ERROR: ", err))
+				ctx.SendChain(message.Text("ERROR:", err))
 			} else {
 				ctx.SendChain(message.Text("记住啦!"))
 			}

plugin/diana/data/text.go

@@ -4,61 +4,38 @@ package data
 import (
 	"crypto/md5"
 	"encoding/binary"
-	"os"
-
-	log "github.com/sirupsen/logrus"
-	"github.com/wdvxdr1123/ZeroBot/utils/helper"
 
 	sql "github.com/FloatTech/sqlite"
+	binutils "github.com/FloatTech/zbputils/binary"
 	"github.com/FloatTech/zbputils/file"
-	"github.com/FloatTech/zbputils/process"
-
-	"github.com/FloatTech/zbputils/control/order"
+	"github.com/sirupsen/logrus"
 )
 
-const (
-	datapath = "data/Diana"
-	dbfile   = datapath + "/text.db"
-)
-
-var db = sql.Sqlite{DBPath: dbfile}
+var db = sql.Sqlite{}
 
 type text struct {
 	ID   int64  `db:"id"`
 	Data string `db:"data"`
 }
 
-func init() {
-	go func() {
-		defer order.DoneOnExit()()
-		process.SleepAbout1sTo2s()
-		err := os.MkdirAll(datapath, 0755)
-		if err != nil {
-			panic(err)
-		}
-		err = LoadText()
-		if err == nil {
-			err = db.Create("text", &text{})
-			if err != nil {
-				panic(err)
-			}
-			c, _ := db.Count("text")
-			log.Printf("[Diana]读取%d条小作文", c)
-		} else {
-			log.Printf("[Diana]读取小作文错误：%v", err)
-		}
-	}()
-}
-
 // LoadText 加载小作文
-func LoadText() error {
+func LoadText(dbfile string) {
 	_, err := file.GetLazyData(dbfile, false, false)
-	return err
+	db.DBPath = dbfile
+	if err != nil {
+		panic(err)
+	}
+	err = db.Create("text", &text{})
+	if err != nil {
+		panic(err)
+	}
+	c, _ := db.Count("text")
+	logrus.Printf("[Diana]读取%d条小作文", c)
 }
 
 // AddText 添加小作文
 func AddText(txt string) error {
-	s := md5.Sum(helper.StringToBytes(txt))
+	s := md5.Sum(binutils.StringToBytes(txt))
 	i := binary.LittleEndian.Uint64(s[:8])
 	return db.Insert("text", &text{ID: int64(i), Data: txt})
 }

plugin/drift_bottle/data.go

@@ -0,0 +1,53 @@
+package driftbottle
+
+import (
+	"fmt"
+	"hash/crc64"
+	"strconv"
+	"sync"
+
+	sql "github.com/FloatTech/sqlite"
+	"github.com/FloatTech/zbputils/binary"
+)
+
+type bottle struct {
+	ID   int64  `db:"id"`   // ID qq_grp_name_msg 的 crc64
+	QQ   int64  `db:"qq"`   // QQ 发送者 qq
+	Grp  int64  `db:"grp"`  // Grp 限制抽出的群 / 人（负数）
+	Name string `db:"name"` // Name 发送者 昵称
+	Msg  string `db:"msg"`  // Msg 消息，纯文本
+}
+
+var sea = &sql.Sqlite{}
+var seamu sync.RWMutex
+
+func newBottle(qq, grp int64, name, msg string) *bottle {
+	id := int64(crc64.Checksum(binary.StringToBytes(fmt.Sprintf("%d_%d_%s_%s", qq, grp, name, msg)), crc64.MakeTable(crc64.ISO)))
+	return &bottle{ID: id, QQ: qq, Grp: grp, Name: name, Msg: msg}
+}
+
+func (b *bottle) throw(db *sql.Sqlite, channel string) error {
+	seamu.Lock()
+	defer seamu.Unlock()
+	return db.Insert(channel, b)
+}
+
+func (b *bottle) destroy(db *sql.Sqlite, channel string) error {
+	seamu.Lock()
+	defer seamu.Unlock()
+	return db.Del(channel, "WHERE id="+strconv.FormatInt(b.ID, 10))
+}
+
+// fetchBottle grp != 0
+func fetchBottle(db *sql.Sqlite, channel string, grp int64) (*bottle, error) {
+	seamu.RLock()
+	defer seamu.RUnlock()
+	b := new(bottle)
+	return b, db.Find(channel, b, "WHERE grp=0 or grp="+strconv.FormatInt(grp, 10)+" ORDER BY RANDOM() limit 1")
+}
+
+func createChannel(db *sql.Sqlite, channel string) error {
+	seamu.Lock()
+	defer seamu.Unlock()
+	return db.Create(channel, &bottle{})
+}

plugin/drift_bottle/main.go

@@ -0,0 +1,132 @@
+// Package driftbottle 漂流瓶
+package driftbottle
+
+import (
+	"strconv"
+	"strings"
+	"sync"
+
+	"github.com/FloatTech/zbputils/control"
+	"github.com/FloatTech/zbputils/control/order"
+	"github.com/sirupsen/logrus"
+	zero "github.com/wdvxdr1123/ZeroBot"
+	"github.com/wdvxdr1123/ZeroBot/message"
+)
+
+func init() {
+	en := control.Register("driftbottle", order.AcquirePrio(), &control.Options{
+		DisableOnDefault:  false,
+		Help:              "漂流瓶\n- (在群xxx)丢漂流瓶(到频道xxx) [消息]\n- (从频道xxx)捡漂流瓶\n- @BOT 创建频道 xxx\n- 跳入(频道)海中\n- 注：不显式限制时，私聊发送可在所有群抽到，群聊发送仅可在本群抽到，默认频道为 global",
+		PrivateDataFolder: "driftbottle",
+	})
+	sea.DBPath = en.DataFolder() + "sea.db"
+	err := sea.Open()
+	if err != nil {
+		panic(err)
+	}
+	_ = createChannel(sea, "global")
+	en.OnRegex(`^(在群\d+)?丢漂流瓶(到频道\w+)?\s+(.*)$`).SetBlock(true).
+		Handle(func(ctx *zero.Ctx) {
+			msgs := ctx.State["regex_matched"].([]string)
+			grp := ctx.Event.GroupID
+			channel := "global"
+			msg := msgs[3]
+			var err error
+			if msgs[1] != "" {
+				grp, err = strconv.ParseInt(msgs[1][6:], 10, 64)
+				if err != nil {
+					ctx.SendChain(message.Text("群号非法!"))
+					return
+				}
+			}
+			if msgs[2] != "" {
+				channel = msgs[2][9:]
+			}
+			if msg == "" {
+				ctx.SendChain(message.Text("消息为空!"))
+				return
+			}
+			logrus.Debugln("[driftbottle]", grp, channel, msg)
+			err = newBottle(
+				ctx.Event.UserID,
+				grp,
+				ctx.CardOrNickName(ctx.Event.UserID),
+				msg,
+			).throw(sea, channel)
+			if err != nil {
+				ctx.SendChain(message.Text("ERROR:", err))
+				return
+			}
+			ctx.Send(message.ReplyWithMessage(ctx.Event.MessageID, message.Text("你将它扔进大海，希望有人捞到吧~")))
+		})
+	en.OnRegex(`^(从频道\w+)?捡漂流瓶$`).SetBlock(true).
+		Handle(func(ctx *zero.Ctx) {
+			msgs := ctx.State["regex_matched"].([]string)
+			grp := ctx.Event.GroupID
+			if grp == 0 {
+				grp = -ctx.Event.UserID
+			}
+			if grp == 0 {
+				ctx.SendChain(message.Text("找不到对象!"))
+				return
+			}
+			channel := "global"
+			if msgs[1] != "" {
+				channel = msgs[1][9:]
+			}
+			logrus.Debugln("[driftbottle]", grp, channel)
+			b, err := fetchBottle(sea, channel, grp)
+			if err != nil {
+				ctx.SendChain(message.Text("ERROR:", err))
+				return
+			}
+			var wg sync.WaitGroup
+			wg.Add(1)
+			go func() {
+				err = b.destroy(sea, channel)
+				wg.Done()
+			}()
+			ctx.Send(
+				message.ReplyWithMessage(
+					ctx.Event.MessageID,
+					message.Text("你在海边捡到了一个来自 ", b.Name, " 的漂流瓶，打开瓶子，里面有一张纸条，写着："),
+					message.Text(b.Msg),
+				),
+			)
+			wg.Wait()
+			if err != nil {
+				ctx.SendChain(message.Text("ERROR:", err))
+				return
+			}
+		})
+	en.OnPrefix("创建频道", zero.SuperUserPermission, zero.OnlyToMe).SetBlock(true).
+		Handle(func(ctx *zero.Ctx) {
+			channel := strings.TrimRight(ctx.State["args"].(string), " ")
+			if channel == "" {
+				ctx.SendChain(message.Text("频道名为空!"))
+				return
+			}
+			err := createChannel(sea, channel)
+			if err != nil {
+				ctx.SendChain(message.Text("ERROR:", err))
+				return
+			}
+			ctx.Send(message.ReplyWithMessage(ctx.Event.MessageID, message.Text("成功~")))
+		})
+	en.OnRegex(`^跳入(\w+)?海中$`).SetBlock(true).
+		Handle(func(ctx *zero.Ctx) {
+			msgs := ctx.State["regex_matched"].([]string)
+			channel := "global"
+			if msgs[1] != "" {
+				channel = msgs[1]
+			}
+			seamu.RLock()
+			c, err := sea.Count(channel)
+			seamu.RUnlock()
+			if err != nil {
+				ctx.SendChain(message.Text("ERROR:", err))
+				return
+			}
+			ctx.Send(message.ReplyWithMessage(ctx.Event.MessageID, message.Text("你缓缓走入大海，感受着海浪轻柔地拍打着你的小腿，膝盖……\n波浪卷着你的腰腹，你感觉有些把握不住平衡了……\n……\n你沉入海中，", c, " 个物体与你一同沉浮。\n不知何处涌来一股暗流，你失去了意识。")))
+		})
+}

plugin/emojimix/emoji.go

@@ -0,0 +1,249 @@
+// Package emojimix 合成emoji
+package emojimix
+
+var emojis = map[rune]int64{
+	128516: 20201001, // 😄 grinning face with smiling eyes
+	128512: 20201001, // 😀 grinning face
+	128578: 20201001, // 🙂 slightly smiling face
+	128579: 20201001, // 🙃 upside-down face
+	128521: 20201001, // 😉 winking face
+	128522: 20201001, // 😊 smiling face with smiling eyes
+	128518: 20201001, // 😆 grinning squinting face
+	128515: 20201001, // 😃 grinning face with big eyes
+	128513: 20201001, // 😁 beaming face with smiling eyes
+	129315: 20201001, // 🤣 rolling on the floor laughing
+	128517: 20201001, // 😅 grinning face with sweat
+	128514: 20201001, // 😂 face with tears of joy
+	128519: 20201001, // 😇 smiling face with halo
+	129392: 20201001, // 🥰 smiling face with hearts
+	128525: 20201001, // 😍 smiling face with heart-eyes
+	128536: 20201001, // 😘 face blowing a kiss
+	129321: 20201001, // 🤩 star-struck
+	128535: 20201001, // 😗 kissing face
+	128538: 20201001, // 😚 kissing face with closed eyes
+	128537: 20201001, // 😙 kissing face with smiling eyes
+	128539: 20201001, // 😛 face with tongue
+	128541: 20201001, // 😝 squinting face with tongue
+	128523: 20201001, // 😋 face savoring food
+	129394: 20201001, // 🥲 smiling face with tear
+	129297: 20201001, // 🤑 money-mouth face
+	128540: 20201001, // 😜 winking face with tongue
+	129303: 20201001, // 🤗 smiling face with open hands hugs
+	129323: 20201001, // 🤫 shushing face quiet whisper
+	129300: 20201001, // 🤔 thinking face question hmmm
+	129325: 20201001, // 🤭 face with hand over mouth embarrassed
+	129320: 20201001, // 🤨 face with raised eyebrow question
+	129296: 20201001, // 🤐 zipper-mouth face
+	128528: 20201001, // 😐 neutral face
+	128529: 20201001, // 😑 expressionless face
+	128566: 20201001, // 😶 face without mouth
+	129322: 20201001, // 🤪 zany face
+	128527: 20201001, // 😏 smirking face suspicious
+	128530: 20201001, // 😒 unamused face
+	128580: 20201001, // 🙄 face with rolling eyes
+	128556: 20201001, // 😬 grimacing face
+	128558: 20210218, // 😮 face exhaling
+	129317: 20201001, // 🤥 lying face
+	128524: 20201001, // 😌 relieved face
+	128532: 20201001, // 😔 pensive face
+	128554: 20201001, // 😪 sleepy face
+	129316: 20201001, // 🤤 drooling face
+	128564: 20201001, // 😴 sleeping face
+	128567: 20201001, // 😷 face with medical mask
+	129298: 20201001, // 🤒 face with thermometer
+	129301: 20201001, // 🤕 face with head-bandage
+	129314: 20201001, // 🤢 nauseated face
+	129326: 20201001, // 🤮 face vomiting throw
+	129319: 20201001, // 🤧 sneezing face
+	129397: 20201001, // 🥵 hot face warm
+	129398: 20201001, // 🥶 cold face freezing ice
+	128565: 20201001, // 😵 face with crossed-out eyes
+	129396: 20201001, // 🥴 woozy face drunk tipsy drug high
+	129327: 20201001, // 🤯 exploding head mindblow
+	129312: 20201001, // 🤠 cowboy hat face
+	129395: 20201001, // 🥳 partying face
+	129400: 20201001, // 🥸 disguised face
+	129488: 20201001, // 🧐 face with monocle glasses
+	128526: 20201001, // 😎 smiling face with sunglasses
+	128533: 20201001, // 😕 confused face
+	128543: 20201001, // 😟 worried face
+	128577: 20201001, // 🙁 slightly frowning face
+	128559: 20201001, // 😯 hushed face
+	128562: 20201001, // 😲 astonished face
+	129299: 20201001, // 🤓 nerd face glasses
+	128563: 20201001, // 😳 flushed face
+	129402: 20201001, // 🥺 pleading face
+	128551: 20201001, // 😧 anguished face
+	128552: 20201001, // 😨 fearful face
+	128550: 20201001, // 😦 frowning face with open mouth
+	128560: 20201001, // 😰 anxious face with sweat
+	128549: 20201001, // 😥 sad but relieved face
+	128557: 20201001, // 😭 loudly crying face
+	128553: 20201001, // 😩 weary face
+	128546: 20201001, // 😢 crying face
+	128547: 20201001, // 😣 persevering face
+	128544: 20201001, // 😠 angry face
+	128531: 20201001, // 😓 downcast face with sweat
+	128534: 20201001, // 😖 confounded face
+	129324: 20201001, // 🤬 face with symbols on mouth
+	128542: 20201001, // 😞 disappointed face
+	128555: 20201001, // 😫 tired face
+	128548: 20201001, // 😤 face with steam from nose
+	129393: 20201001, // 🥱 yawning face
+	128169: 20201001, // 💩 pile of poo
+	128545: 20201001, // 😡 pouting face
+	128561: 20201001, // 😱 face screaming in fear
+	128127: 20201001, // 👿 angry face with horns
+	128128: 20201001, // 💀 skull
+	128125: 20201001, // 👽 alien
+	128520: 20201001, // 😈 smiling face with horns devil
+	129313: 20201001, // 🤡 clown face
+	128123: 20201001, // 👻 ghost
+	129302: 20201001, // 🤖 robot
+	128175: 20201001, // 💯 hundred points percent
+	128064: 20201001, // 👀 eyes
+	127801: 20201001, // 🌹 rose flower
+	127804: 20201001, // 🌼 blossom flower
+	127799: 20201001, // 🌷 tulip flower
+	127797: 20201001, // 🌵 cactus
+	127821: 20201001, // 🍍 pineapple
+	127874: 20201001, // 🎂 birthday cake
+	127751: 20210831, // 🌇 sunset
+	129473: 20201001, // 🧁 cupcake muffin
+	127911: 20210521, // 🎧 headphone earphone
+	127800: 20210218, // 🌸 cherry blossom flower
+	129440: 20201001, // 🦠 microbe germ bacteria virus covid corona
+	128144: 20201001, // 💐 bouquet flowers
+	127789: 20201001, // 🌭 hot dog food
+	128139: 20201001, // 💋 kiss mark lips
+	127875: 20201001, // 🎃 jack-o-lantern pumpkin
+	129472: 20201001, // 🧀 cheese wedge
+	9749:   20201001, // ☕ hot beverage coffee cup tea
+	127882: 20201001, // 🎊 confetti ball
+	127880: 20201001, // 🎈 balloon
+	9924:   20201001, // ⛄ snowman without snow
+	128142: 20201001, // 💎 gem stone crystal diamond
+	127794: 20201001, // 🌲 evergreen tree
+	129410: 20210218, // 🦂 scorpion
+	128584: 20201001, // 🙈 see-no-evil monkey
+	128148: 20201001, // 💔 broken heart
+	128140: 20201001, // 💌 love letter heart
+	128152: 20201001, // 💘 heart with arrow
+	128159: 20201001, // 💟 heart decoration
+	128158: 20201001, // 💞 revolving hearts
+	128147: 20201001, // 💓 beating heart
+	128149: 20201001, // 💕 two hearts
+	128151: 20201001, // 💗 growing heart
+	129505: 20201001, // 🧡 orange heart
+	128155: 20201001, // 💛 yellow heart
+	10084:  20210218, // ❤ mending heart
+	128156: 20201001, // 💜 purple heart
+	128154: 20201001, // 💚 green heart
+	128153: 20201001, // 💙 blue heart
+	129294: 20201001, // 🤎 brown heart
+	129293: 20201001, // 🤍 white heart
+	128420: 20201001, // 🖤 black heart
+	128150: 20201001, // 💖 sparkling heart
+	128157: 20201001, // 💝 heart with ribbon
+	127873: 20211115, // 🎁 wrapped-gift
+	129717: 20211115, // 🪵 wood
+	127942: 20211115, // 🏆 trophy
+	127838: 20210831, // 🍞 bread
+	128240: 20201001, // 📰 newspaper
+	128302: 20201001, // 🔮 crystal ball
+	128081: 20201001, // 👑 crown
+	128055: 20201001, // 🐷 pig face
+	129412: 20210831, // 🦄 unicorn
+	127771: 20201001, // 🌛 first quarter moon face
+	129420: 20201001, // 🦌 deer
+	129668: 20210521, // 🪄 magic wand
+	128171: 20201001, // 💫 dizzy
+	128049: 20201001, // 🐱 meow cat face
+	129409: 20201001, // 🦁 lion
+	128293: 20201001, // 🔥 fire
+	128038: 20210831, // 🐦 bird
+	129415: 20201001, // 🦇 bat
+	129417: 20210831, // 🦉 owl
+	127752: 20201001, // 🌈 rainbow
+	128053: 20201001, // 🐵 monkey face
+	128029: 20201001, // 🐝 honeybee bumblebee wasp
+	128034: 20201001, // 🐢 turtle
+	128025: 20201001, // 🐙 octopus
+	129433: 20201001, // 🦙 llama alpaca
+	128016: 20210831, // 🐐 goat
+	128060: 20201001, // 🐼 panda
+	128040: 20201001, // 🐨 koala
+	129445: 20201001, // 🦥 sloth
+	128059: 20210831, // 🐻 bear
+	128048: 20201001, // 🐰 rabbit face
+	129428: 20201001, // 🦔 hedgehog
+	128054: 20211115, // 🐶 dog puppy
+	128041: 20211115, // 🐩 poodle dog
+	129437: 20211115, // 🦝 raccoon
+	128039: 20211115, // 🐧 penguin
+	128012: 20210218, // 🐌 snail
+	128045: 20201001, // 🐭 mouse face rat
+	128031: 20210831, // 🐟 fish
+	127757: 20201001, // 🌍 globe showing Europe-Africa
+	127774: 20201001, // 🌞 sun with face
+	127775: 20201001, // 🌟 glowing star
+	11088:  20201001, // ⭐ star
+	127772: 20201001, // 🌜 last quarter moon face
+	129361: 20201001, // 🥑 avocado
+	127820: 20211115, // 🍌 banana
+	127827: 20210831, // 🍓 strawberry
+	127819: 20210521, // 🍋 lemon
+	127818: 20211115, // 🍊 tangerine orange
+}
+
+var qqface = map[int]rune{
+	0:   128558, // 😮 face exhaling
+	1:   128556, // 😬 grimacing face
+	2:   128525, // 😍 smiling face with heart-eyes
+	4:   128526, // 😎 smiling face with sunglasses
+	5:   128557, // 😭 loudly crying face
+	6:   129402, // 🥺 pleading face
+	7:   129296, // 🤐 zipper-mouth face
+	8:   128554, // 😪 sleepy face
+	11:  128545, // 😡 pouting face
+	12:  128539, // 😛 face with tongue
+	13:  128513, // 😁 beaming face with smiling eyes
+	14:  128578, // 🙂 slightly smiling face
+	15:  128577, // 🙁 slightly frowning face
+	16:  128526, // 😎 smiling face with sunglasses
+	19:  129326, // 🤮 face vomiting throw
+	20:  129325, // 🤭 face with hand over mouth embarrassed
+	21:  128522, // 😊 smiling face with smiling eyes
+	23:  128533, // 😕 confused face
+	24:  128523, // 😋 face savoring food
+	27:  128531, // 😓 downcast face with sweat
+	28:  128516, // 😄 grinning face with smiling eyes
+	31:  129324, // 🤬 face with symbols on mouth
+	32:  129300, // 🤔 thinking face question hmmm
+	33:  129323, // 🤫 shushing face quiet whisper
+	34:  128565, // 😵 face with crossed-out eyes
+	35:  128547, // 😣 persevering face
+	37:  128128, // 💀 skull
+	46:  128055, // 🐷 pig face
+	53:  127874, // 🎂 birthday cake
+	59:  128169, // 💩 pile of poo
+	60:  9749,   // ☕ hot beverage coffee cup tea
+	63:  127801, // 🌹 rose flower
+	66:  10084,  // ❤ mending heart
+	67:  128148, // 💔 broken heart
+	69:  127873, // 🎁 wrapped-gift
+	74:  127774, // 🌞 sun with face
+	75:  127772, // 🌜 last quarter moon face
+	96:  128517, // 😅 grinning face with sweat
+	104: 129393, // 🥱 yawning face
+	109: 128535, // 😗 kissing face
+	110: 128562, // 😲 astonished face
+	111: 129402, // 🥺 pleading face
+	172: 128539, // 😛 face with tongue
+	182: 128514, // 😂 face with tears of joy
+	187: 128123, // 👻 ghost
+	247: 128567, // 😷 face with medical mask
+	272: 128579, // 🙃 upside-down face
+	320: 129395, // 🥳 partying face
+	325: 128561, // 😱 face screaming in fear
+}

plugin/emojimix/mix.go

@@ -0,0 +1,101 @@
+// Package emojimix 合成emoji
+package emojimix
+
+import (
+	"fmt"
+	"net/http"
+	"strconv"
+
+	"github.com/FloatTech/zbputils/control"
+	"github.com/FloatTech/zbputils/control/order"
+	"github.com/FloatTech/zbputils/ctxext"
+	"github.com/sirupsen/logrus"
+	zero "github.com/wdvxdr1123/ZeroBot"
+	"github.com/wdvxdr1123/ZeroBot/message"
+)
+
+const bed = "https://www.gstatic.com/android/keyboard/emojikitchen/%d/u%x/u%x_u%x.png"
+
+func init() {
+	control.Register("emojimix", order.AcquirePrio(), &control.Options{
+		DisableOnDefault: false,
+		Help: "合成emoji\n" +
+			"- [emoji][emoji]",
+	}).OnMessage(match).SetBlock(true).Limit(ctxext.LimitByUser).
+		Handle(func(ctx *zero.Ctx) {
+			r := ctx.State["emojimix"].([]rune)
+			logrus.Debugln("[emojimix] match:", r)
+			r1, r2 := r[0], r[1]
+			u1 := fmt.Sprintf(bed, emojis[r1], r1, r1, r2)
+			u2 := fmt.Sprintf(bed, emojis[r2], r2, r2, r1)
+			logrus.Debugln("[emojimix] u1:", u1)
+			logrus.Debugln("[emojimix] u2:", u2)
+			resp1, err := http.Head(u1)
+			if err == nil {
+				resp1.Body.Close()
+				if resp1.StatusCode == http.StatusOK {
+					ctx.SendChain(message.Image(u1))
+					return
+				}
+			}
+			resp2, err := http.Head(u2)
+			if err == nil {
+				resp2.Body.Close()
+				if resp2.StatusCode == http.StatusOK {
+					ctx.SendChain(message.Image(u2))
+					return
+				}
+			}
+		})
+}
+
+func match(ctx *zero.Ctx) bool {
+	logrus.Debugln("[emojimix] msg:", ctx.Event.Message)
+	if len(ctx.Event.Message) == 2 {
+		r1 := face2emoji(ctx.Event.Message[0])
+		if _, ok := emojis[r1]; !ok {
+			return false
+		}
+		r2 := face2emoji(ctx.Event.Message[1])
+		if _, ok := emojis[r2]; !ok {
+			return false
+		}
+		ctx.State["emojimix"] = []rune{r1, r2}
+		return true
+	}
+
+	r := []rune(ctx.Event.RawMessage)
+	logrus.Debugln("[emojimix] raw msg:", ctx.Event.RawMessage)
+	if len(r) == 2 {
+		if _, ok := emojis[r[0]]; !ok {
+			return false
+		}
+		if _, ok := emojis[r[1]]; !ok {
+			return false
+		}
+		ctx.State["emojimix"] = r
+		return true
+	}
+	return false
+}
+
+func face2emoji(face message.MessageSegment) rune {
+	if face.Type == "text" {
+		r := []rune(face.Data["text"])
+		if len(r) != 1 {
+			return 0
+		}
+		return r[0]
+	}
+	if face.Type != "face" {
+		return 0
+	}
+	id, err := strconv.Atoi(face.Data["id"])
+	if err != nil {
+		return 0
+	}
+	if r, ok := qqface[id]; ok {
+		return r
+	}
+	return 0
+}

plugin/epidemic/epidemic.go

@@ -0,0 +1,127 @@
+// Package epidemic 城市疫情查询
+package epidemic
+
+import (
+	"encoding/json"
+
+	zero "github.com/wdvxdr1123/ZeroBot"
+	"github.com/wdvxdr1123/ZeroBot/message"
+
+	"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/web"
+)
+
+const (
+	servicename = "epidemic"
+	txurl       = "https://view.inews.qq.com/g2/getOnsInfo?name=disease_h5"
+)
+
+// result 疫情查询结果
+type result struct {
+	Data string `json:"data"`
+}
+
+// epidemic 疫情数据
+type epidemic struct {
+	LastUpdateTime string  `json:"lastUpdateTime"`
+	AreaTree       []*area `json:"areaTree"`
+}
+
+// area 城市疫情数据
+type area struct {
+	Name  string `json:"name"`
+	Today struct {
+		Confirm int `json:"confirm"`
+		Wzzadd  int `json:"wzz_add"`
+	} `json:"today"`
+	Total struct {
+		NowConfirm int    `json:"nowConfirm"`
+		Confirm    int    `json:"confirm"`
+		Dead       int    `json:"dead"`
+		Heal       int    `json:"heal"`
+		Grade      string `json:"grade"`
+		Wzz        int    `json:"wzz"`
+	} `json:"total"`
+	Children []*area `json:"children"`
+}
+
+func init() {
+	engine := control.Register(servicename, order.AcquirePrio(), &control.Options{
+		DisableOnDefault: false,
+		Help: "城市疫情查询\n" +
+			"- xxx疫情\n",
+	})
+	engine.OnSuffix("疫情").SetBlock(true).Limit(ctxext.LimitByUser).
+		Handle(func(ctx *zero.Ctx) {
+			city := ctx.State["args"].(string)
+			if city == "" {
+				ctx.SendChain(message.Text("你还没有输入城市名字呢！"))
+				return
+			}
+			data, time, err := queryEpidemic(city)
+			if err != nil {
+				ctx.SendChain(message.Text("ERROR:", err))
+				return
+			}
+			if data == nil {
+				ctx.SendChain(message.Text("没有找到【", city, "】城市的疫情数据."))
+				return
+			}
+			ctx.SendChain(
+				message.Text(
+					"【", data.Name, "】疫情数据\n",
+					"新增人数：", data.Today.Confirm, "\n",
+					"现有确诊：", data.Total.NowConfirm, "\n",
+					"累计确诊：", data.Total.Confirm, "\n",
+					"治愈人数：", data.Total.Heal, "\n",
+					"死亡人数：", data.Total.Dead, "\n",
+					"无症状人数：", data.Total.Wzz, "\n",
+					"新增无症状：", data.Today.Wzzadd, "\n",
+					"更新时间：\n『", time, "』",
+				),
+			)
+		})
+}
+
+// rcity 查找城市
+func rcity(a *area, cityName string) *area {
+	if a == nil {
+		return nil
+	}
+	if a.Name == cityName {
+		return a
+	}
+	for _, v := range a.Children {
+		if v.Name == cityName {
+			return v
+		}
+		c := rcity(v, cityName)
+		if c != nil {
+			return c
+		}
+	}
+	return nil
+}
+
+// queryEpidemic 查询城市疫情
+func queryEpidemic(findCityName string) (citydata *area, times string, err error) {
+	data, err := web.GetData(txurl)
+	if err != nil {
+		return
+	}
+	var r result
+	err = json.Unmarshal(data, &r)
+	if err != nil {
+		return
+	}
+	var e epidemic
+	err = json.Unmarshal(binary.StringToBytes(r.Data), &e)
+	if err != nil {
+		return
+	}
+	citydata = rcity(e.AreaTree[0], findCityName)
+	return citydata, e.LastUpdateTime, nil
+}

plugin/font/main.go

@@ -0,0 +1,43 @@
+// Package font 渲染任意文字到图片
+package font
+
+import (
+	"github.com/FloatTech/zbputils/binary"
+	"github.com/FloatTech/zbputils/control"
+	"github.com/FloatTech/zbputils/control/order"
+	"github.com/FloatTech/zbputils/ctxext"
+	"github.com/FloatTech/zbputils/img/text"
+	zero "github.com/wdvxdr1123/ZeroBot"
+	"github.com/wdvxdr1123/ZeroBot/message"
+)
+
+func init() {
+	control.Register("font", order.AcquirePrio(), &control.Options{
+		DisableOnDefault: false,
+		Help:             "渲染任意文字到图片\n- (用[终末体|终末变体|紫罗兰体|樱酥体|Consolas体|苹方体])渲染文字xxx",
+	}).OnRegex(`^(用.+)?渲染文字([\s\S]+)$`).SetBlock(true).Limit(ctxext.LimitByUser).Handle(func(ctx *zero.Ctx) {
+		fnt := ctx.State["regex_matched"].([]string)[1]
+		txt := ctx.State["regex_matched"].([]string)[2]
+		switch fnt {
+		case "用终末体":
+			fnt = text.SyumatuFontFile
+		case "用终末变体":
+			fnt = text.NisiFontFile
+		case "用紫罗兰体":
+			fnt = text.VioletEvergardenFontFile
+		case "用樱酥体":
+			fnt = text.SakuraFontFile
+		case "用Consolas体":
+			fnt = text.ConsolasFontFile
+		case "用苹方体":
+		default:
+			fnt = text.FontFile
+		}
+		b, err := text.RenderToBase64(txt, fnt, 400, 20)
+		if err != nil {
+			ctx.SendChain(message.Text("ERROR:", err))
+			return
+		}
+		ctx.SendChain(message.Image("base64://" + binary.BytesToString(b)))
+	})
+}

plugin/fortune/fortune.go

@@ -41,9 +41,8 @@ const (
 )
 
 var (
-	// 底图类型列表：车万 DC4 爱因斯坦 星空列车 樱云之恋 富婆妹 李清歌
-	// 				公主连结 原神 明日方舟 碧蓝航线 碧蓝幻想 战双 阴阳师 赛马娘
-	table = [...]string{"车万", "DC4", "爱因斯坦", "星空列车", "樱云之恋", "富婆妹", "李清歌", "公主连结", "原神", "明日方舟", "碧蓝航线", "碧蓝幻想", "战双", "阴阳师", "赛马娘"}
+	// 底图类型列表
+	table = [...]string{"车万", "DC4", "爱因斯坦", "星空列车", "樱云之恋", "富婆妹", "李清歌", "公主连结", "原神", "明日方舟", "碧蓝航线", "碧蓝幻想", "战双", "阴阳师", "赛马娘", "东方归言录"}
 	// 映射底图与 index
 	index = make(map[string]uint8)
 	// 签文
@@ -51,37 +50,36 @@ var (
 )
 
 func init() {
-	for i, s := range table {
-		index[s] = uint8(i)
-	}
-	err := os.MkdirAll(images, 0755)
-	if err != nil {
-		panic(err)
-	}
-	_ = os.RemoveAll(cache)
-	err = os.MkdirAll(cache, 0755)
-	if err != nil {
-		panic(err)
-	}
-	data, err := file.GetLazyData(omikujson, true, false)
-	if err != nil {
-		panic(err)
-	}
-	err = json.Unmarshal(data, &omikujis)
-	if err != nil {
-		panic(err)
-	}
-	_, err = file.GetLazyData(font, false, true)
-	if err != nil {
-		panic(err)
-	}
 	// 插件主体
 	en := control.Register("fortune", order.AcquirePrio(), &control.Options{
 		DisableOnDefault: false,
 		Help: "每日运势: \n" +
 			"- 运势 | 抽签\n" +
-			"- 设置底图[车万 | DC4 | 爱因斯坦 | 星空列车 | 樱云之恋 | 富婆妹 | 李清歌 | 公主连结 | 原神 | 明日方舟 | 碧蓝航线 | 碧蓝幻想 | 战双 | 阴阳师 | 赛马娘]",
+			"- 设置底图[车万 | DC4 | 爱因斯坦 | 星空列车 | 樱云之恋 | 富婆妹 | 李清歌 | 公主连结 | 原神 | 明日方舟 | 碧蓝航线 | 碧蓝幻想 | 战双 | 阴阳师 | 赛马娘 | 东方归言录]",
+		PublicDataFolder: "Fortune",
 	})
+	go func() {
+		for i, s := range table {
+			index[s] = uint8(i)
+		}
+		_ = os.RemoveAll(cache)
+		err := os.MkdirAll(cache, 0755)
+		if err != nil {
+			panic(err)
+		}
+		data, err := file.GetLazyData(omikujson, true, false)
+		if err != nil {
+			panic(err)
+		}
+		err = json.Unmarshal(data, &omikujis)
+		if err != nil {
+			panic(err)
+		}
+		_, err = file.GetLazyData(font, false, true)
+		if err != nil {
+			panic(err)
+		}
+	}()
 	en.OnRegex(`^设置底图\s?(.*)`).SetBlock(true).
 		Handle(func(ctx *zero.Ctx) {
 			gid := ctx.Event.GroupID
@@ -93,7 +91,7 @@ func init() {
 			if ok {
 				c, ok := control.Lookup("fortune")
 				if ok {
-					err = c.SetData(gid, int64(i)&0xff)
+					err := c.SetData(gid, int64(i)&0xff)
 					if err != nil {
 						ctx.SendChain(message.Text("设置失败:", err))
 						return
@@ -125,9 +123,9 @@ func init() {
 			}
 			// 检查背景图片是否存在
 			zipfile := images + kind + ".zip"
-			_, err = file.GetLazyData(zipfile, false, false)
+			_, err := file.GetLazyData(zipfile, false, false)
 			if err != nil {
-				ctx.SendChain(message.Text("ERROR: ", err))
+				ctx.SendChain(message.Text("ERROR:", err))
 				return
 			}
 
@@ -138,7 +136,7 @@ func init() {
 			// 随机获取背景
 			background, index, err := randimage(zipfile, seed)
 			if err != nil {
-				ctx.SendChain(message.Text("ERROR: ", err))
+				ctx.SendChain(message.Text("ERROR:", err))
 				return
 			}
 
@@ -147,34 +145,19 @@ 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))
+			err = pool.SendImageFromPool(cachefile, cachefile, func() error {
+				f, err := os.Create(cachefile)
 				if err != nil {
-					ctx.SendChain(message.Text("ERROR: ", err))
-					return
-				}
-				if hassent {
-					return
+					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
 			}
-			// 发送图片
-			ctx.SendChain(message.Image(m.String()))
 		})
 }
 
@@ -189,8 +172,8 @@ func randimage(path string, seed int64) (im image.Image, index int, err error) {
 	}
 	defer reader.Close()
 
-	rand.Seed(seed)
-	index = rand.Intn(len(reader.File))
+	r := rand.New(rand.NewSource(seed))
+	index = r.Intn(len(reader.File))
 	file := reader.File[index]
 	f, err := file.Open()
 	if err != nil {
@@ -207,9 +190,9 @@ func randimage(path string, seed int64) (im image.Image, index int, err error) {
 // @param seed 随机数种子
 // @return 签名 & 签文 & 错误信息
 func randtext(seed int64) (string, string) {
-	rand.Seed(seed)
-	r := rand.Intn(len(omikujis))
-	return omikujis[r]["title"], omikujis[r]["content"]
+	r := rand.New(rand.NewSource(seed))
+	i := r.Intn(len(omikujis))
+	return omikujis[i]["title"], omikujis[i]["content"]
 }
 
 // @function draw 绘制运势图

plugin/funny/laugh.go

@@ -4,26 +4,51 @@ package funny
 import (
 	"strings"
 
+	"github.com/sirupsen/logrus"
 	zero "github.com/wdvxdr1123/ZeroBot"
 	"github.com/wdvxdr1123/ZeroBot/message"
 
 	sql "github.com/FloatTech/sqlite"
 	control "github.com/FloatTech/zbputils/control"
 	"github.com/FloatTech/zbputils/ctxext"
+	"github.com/FloatTech/zbputils/file"
 
 	"github.com/FloatTech/zbputils/control/order"
 )
 
-var db = &sql.Sqlite{DBPath: dbfile}
+type joke struct {
+	ID   uint32 `db:"id"`
+	Text string `db:"text"`
+}
+
+var db = &sql.Sqlite{}
 
 func init() {
-	control.Register("funny", order.AcquirePrio(), &control.Options{
+	en := control.Register("funny", order.AcquirePrio(), &control.Options{
 		DisableOnDefault: false,
 		Help: "讲个笑话\n" +
 			"- 讲个笑话[@xxx] | 讲个笑话[qq号]",
-	}).OnPrefix("讲个笑话").SetBlock(true).Limit(ctxext.LimitByUser).Handle(func(ctx *zero.Ctx) {
+		PublicDataFolder: "Funny",
+	})
+
+	go func() {
+		dbpath := en.DataFolder()
+		db.DBPath = dbpath + "jokes.db"
+		_, err := file.GetLazyData(db.DBPath, false, true)
+		if err != nil {
+			panic(err)
+		}
+		err = db.Create("jokes", &joke{})
+		if err != nil {
+			panic(err)
+		}
+		c, _ := db.Count("jokes")
+		logrus.Infoln("[funny]加载", c, "个笑话")
+	}()
+
+	en.OnPrefix("讲个笑话").SetBlock(true).Limit(ctxext.LimitByUser).Handle(func(ctx *zero.Ctx) {
 		// 获取名字
-		name := ctxext.NickName(ctx)
+		name := ctx.NickName()
 		var j joke
 		err := db.Pick("jokes", &j)
 		if err != nil {

plugin/genshin/data.go

@@ -0,0 +1,16 @@
+package genshin
+
+type storage uint64
+
+func (s *storage) is5starsmode() bool {
+	return *s&1 == 1
+}
+
+func (s *storage) setmode(is5stars bool) bool {
+	if is5stars {
+		*s |= 1
+	} else {
+		*s &= 0xffffffff_fffffffe
+	}
+	return is5stars
+}

plugin/genshin/ys.go

@@ -0,0 +1,343 @@
+// Package genshin 原神抽卡
+package genshin
+
+import (
+	"archive/zip"
+	"image"
+	"image/color"
+	"image/draw"
+	"image/jpeg"
+	"image/png"
+	"math/rand"
+	"strings"
+	"sync/atomic"
+
+	"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/writer"
+	"github.com/FloatTech/zbputils/process"
+	"github.com/golang/freetype"
+	"github.com/sirupsen/logrus"
+	zero "github.com/wdvxdr1123/ZeroBot"
+	"github.com/wdvxdr1123/ZeroBot/message"
+)
+
+type zipfilestructure map[string][]*zip.File
+
+var (
+	totl                   uint64 // 累计抽奖次数
+	filetree               = make(zipfilestructure, 32)
+	starN3, starN4, starN5 *zip.File
+)
+
+func init() {
+	engine := control.Register("genshin", order.AcquirePrio(), &control.Options{
+		DisableOnDefault: false,
+		Help:             "原神抽卡\n- 原神十连\n- 切换原神卡池",
+		PublicDataFolder: "Genshin",
+	}).ApplySingle(ctxext.DefaultSingle)
+
+	go func() {
+		zipfile := engine.DataFolder() + "Genshin.zip"
+		_, err := file.GetLazyData(zipfile, false, false)
+		if err != nil {
+			panic(err)
+		}
+		err = parsezip(zipfile)
+		if err != nil {
+			panic(err)
+		}
+	}()
+
+	engine.OnFullMatch("切换原神卡池").SetBlock(true).Limit(ctxext.LimitByUser).
+		Handle(func(ctx *zero.Ctx) {
+			c, ok := control.Lookup("genshin")
+			if !ok {
+				ctx.SendChain(message.Text("找不到服务!"))
+				return
+			}
+			gid := ctx.Event.GroupID
+			if gid == 0 {
+				gid = -ctx.Event.UserID
+			}
+			store := (storage)(c.GetData(gid))
+			if store.setmode(!store.is5starsmode()) {
+				process.SleepAbout1sTo2s()
+				ctx.SendChain(message.Text("切换到五星卡池~"))
+			} else {
+				process.SleepAbout1sTo2s()
+				ctx.SendChain(message.Text("切换到普通卡池~"))
+			}
+			err := c.SetData(gid, int64(store))
+			if err != nil {
+				process.SleepAbout1sTo2s()
+				ctx.SendChain(message.Text("ERROR:", err))
+			}
+		})
+
+	engine.OnFullMatch("原神十连").SetBlock(true).Limit(ctxext.LimitByUser).
+		Handle(func(ctx *zero.Ctx) {
+			c, ok := control.Lookup("genshin")
+			if !ok {
+				ctx.SendChain(message.Text("找不到服务!"))
+				return
+			}
+			gid := ctx.Event.GroupID
+			if gid == 0 {
+				gid = -ctx.Event.UserID
+			}
+			store := (storage)(c.GetData(gid))
+			img, err := randnums(10, store)
+			if err != nil {
+				ctx.SendChain(message.Text("ERROR:", err))
+				return
+			}
+			b, cl := writer.ToBytes(img)
+			ctx.Send(message.ReplyWithMessage(ctx.Event.MessageID, message.ImageBytes(b)))
+			cl()
+		})
+}
+
+func randnums(nums int, store storage) (rgba *image.RGBA, err error) {
+	var (
+		fours, fives                  = make([]*zip.File, 0, 10), make([]*zip.File, 0, 10)                           // 抽到 四, 五星角色
+		threeArms, fourArms, fiveArms = make([]*zip.File, 0, 10), make([]*zip.File, 0, 10), make([]*zip.File, 0, 10) // 抽到 三 , 四, 五星武器
+		fourN, fiveN                  = 0, 0                                                                         // 抽到 四, 五星角色的数量
+		bgs                           = make([]*zip.File, 0, 10)                                                     // 背景图片名
+		threeN2, fourN2, fiveN2       = 0, 0, 0                                                                      // 抽到 三 , 四, 五星武器的数量
+		hero, stars                   = make([]*zip.File, 0, 10), make([]*zip.File, 0, 10)                           // 角色武器名, 储存星级图标
+
+		cicon                   = make([]*zip.File, 0, 10)                                                            // 元素图标
+		fivebg, fourbg, threebg = filetree["five_bg.jpg"][0], filetree["four_bg.jpg"][0], filetree["three_bg.jpg"][0] // 背景图片名
+		fivelen                 = len(filetree["five"])
+		five2len                = len(filetree["five2"])
+		threelen                = len(filetree["Three"])
+		fourlen                 = len(filetree["four"])
+		four2len                = len(filetree["four2"])
+	)
+
+	if totl%9 == 0 { // 累计9次加入一个五星
+		switch rand.Intn(2) {
+		case 0:
+			fiveN++
+			fives = append(fives, filetree["five"][rand.Intn(fivelen)])
+		case 1:
+			fiveN2++
+			fiveArms = append(fiveArms, filetree["five2"][rand.Intn(five2len)])
+		}
+		nums--
+	}
+
+	if store.is5starsmode() { // 5星模式
+		for i := 0; i < nums; i++ {
+			switch rand.Intn(2) {
+			case 0:
+				fiveN++
+				fives = append(fives, filetree["five"][rand.Intn(fivelen)])
+			case 1:
+				fiveN2++
+				fiveArms = append(fiveArms, filetree["five2"][rand.Intn(five2len)])
+			}
+		}
+	} else { // 默认模式
+		for i := 0; i < nums; i++ {
+			a := rand.Intn(1000)
+			switch { // 抽卡几率 三星75% 四星18% 五星7%
+			case a >= 0 && a <= 750:
+				threeN2++
+				threeArms = append(threeArms, filetree["Three"][rand.Intn(threelen)])
+			case a > 750 && a <= 840:
+				fourN++
+				fours = append(fours, filetree["four"][rand.Intn(fourlen)]) // 随机角色
+			case a > 840 && a <= 930:
+				fourN2++
+				fourArms = append(fourArms, filetree["four2"][rand.Intn(four2len)]) // 随机武器
+			case a > 930 && a <= 965:
+				fiveN++
+				fives = append(fives, filetree["five"][rand.Intn(fivelen)])
+			default:
+				fiveN2++
+				fiveArms = append(fiveArms, filetree["five2"][rand.Intn(five2len)])
+			}
+		}
+		if fourN+fourN2 == 0 && threeN2 > 0 { // 没有四星时自动加入
+			threeN2--
+			threeArms = threeArms[:len(threeArms)-1]
+			switch rand.Intn(2) {
+			case 0:
+				fourN++
+				fours = append(fours, filetree["four"][rand.Intn(fourlen)]) // 随机角色
+			case 1:
+				fourN2++
+				fourArms = append(fourArms, filetree["four2"][rand.Intn(four2len)]) // 随机武器
+			}
+		}
+		_ = atomic.AddUint64(&totl, 1)
+	}
+
+	icon := func(f *zip.File) *zip.File {
+		name := f.Name
+		name = name[strings.LastIndex(name, "/")+1:strings.Index(name, "_")] + ".png"
+		logrus.Debugln("[genshin]get named file", name)
+		return filetree[name][0]
+	}
+
+	he := func(cnt int, id int, f *zip.File, bg *zip.File) {
+		var hen *[]*zip.File
+		for i := 0; i < cnt; i++ {
+			switch id {
+			case 1:
+				hen = &threeArms
+			case 2:
+				hen = &fourArms
+			case 3:
+				hen = &fours
+			case 4:
+				hen = &fiveArms
+			case 5:
+				hen = &fives
+			}
+			bgs = append(bgs, bg) // 加入颜色背景
+			hero = append(hero, (*hen)[i])
+			stars = append(stars, f)               // 加入星级图标
+			cicon = append(cicon, icon((*hen)[i])) // 加入元素图标
+		}
+	}
+
+	if fiveN > 0 { // 按顺序加入
+		he(fiveN, 5, starN5, fivebg) // 五星角色
+	}
+	if fourN > 0 {
+		he(fourN, 3, starN4, fourbg) // 四星角色
+	}
+	if fiveN2 > 0 {
+		he(fiveN2, 4, starN5, fivebg) // 五星武器
+	}
+	if fourN2 > 0 {
+		he(fourN2, 2, starN4, fourbg) // 四星武器
+	}
+	if threeN2 > 0 {
+		he(threeN2, 1, starN3, threebg) // 三星武器
+	}
+
+	var c1, c2, c3 uint8 = 50, 50, 50 // 背景颜色
+
+	img00, err := filetree["bg0.jpg"][0].Open() // 打开背景图片
+	if err != nil {
+		return
+	}
+
+	rectangle := image.Rect(0, 0, 1920, 1080) // 图片宽度, 图片高度
+	rgba = image.NewRGBA(rectangle)
+	draw.Draw(rgba, rgba.Bounds(), image.NewUniform(color.RGBA{c1, c2, c3, 255}), image.Point{}, draw.Over)
+	context := freetype.NewContext() // 创建一个新的上下文
+	context.SetDPI(72)               // 每英寸 dpi
+	context.SetClip(rgba.Bounds())
+	context.SetDst(rgba)
+
+	defer img00.Close()
+	img0, err := jpeg.Decode(img00) // 读取一个本地图像
+	if err != nil {
+		return
+	}
+
+	offset := image.Pt(0, 0) // 图片在背景上的位置
+	draw.Draw(rgba, img0.Bounds().Add(offset), img0, image.Point{}, draw.Over)
+
+	w1, h1 := 230, 0
+	for i := 0; i < len(hero); i++ {
+		if i > 0 {
+			w1 += 146 // 图片宽度
+		}
+
+		imgs, err := bgs[i].Open() // 取出背景图片
+		if err != nil {
+			return nil, err
+		}
+		defer imgs.Close()
+
+		img, _ := jpeg.Decode(imgs)
+		offset := image.Pt(w1, h1)
+		draw.Draw(rgba, img.Bounds().Add(offset), img, image.Point{}, draw.Over)
+
+		imgs1, err := hero[i].Open() // 取出图片名
+		if err != nil {
+			return nil, err
+		}
+		defer imgs1.Close()
+
+		img1, _ := png.Decode(imgs1)
+		offset1 := image.Pt(w1, h1)
+		draw.Draw(rgba, img1.Bounds().Add(offset1), img1, image.Point{}, draw.Over)
+
+		imgs2, err := stars[i].Open() // 取出星级图标
+		if err != nil {
+			return nil, err
+		}
+		defer imgs2.Close()
+
+		img2, _ := png.Decode(imgs2)
+		offset2 := image.Pt(w1, h1)
+		draw.Draw(rgba, img2.Bounds().Add(offset2), img2, image.Point{}, draw.Over)
+
+		imgs3, err := cicon[i].Open() // 取出类型图标
+		if err != nil {
+			return nil, err
+		}
+		defer imgs3.Close()
+
+		img3, _ := png.Decode(imgs3)
+		offset3 := image.Pt(w1, h1)
+		draw.Draw(rgba, img3.Bounds().Add(offset3), img3, image.Point{}, draw.Over)
+	}
+	imgs4, err := filetree["Reply.png"][0].Open() // "分享" 图标
+	if err != nil {
+		return nil, err
+	}
+	defer imgs4.Close()
+	img4, err := png.Decode(imgs4)
+	if err != nil {
+		return nil, err
+	}
+	offset4 := image.Pt(1270, 945) // 宽, 高
+	draw.Draw(rgba, img4.Bounds().Add(offset4), img4, image.Point{}, draw.Over)
+	return
+}
+
+func parsezip(zipFile string) error {
+	zipReader, err := zip.OpenReader(zipFile) // will not close
+	if err != nil {
+		return err
+	}
+	for _, f := range zipReader.File {
+		if f.FileInfo().IsDir() {
+			filetree[f.Name] = make([]*zip.File, 0, 32)
+			continue
+		}
+		f.Name = f.Name[8:]
+		i := strings.LastIndex(f.Name, "/")
+		if i < 0 {
+			filetree[f.Name] = []*zip.File{f}
+			logrus.Debugln("[genshin]insert file", f.Name)
+			continue
+		}
+		folder := f.Name[:i]
+		if folder != "" {
+			filetree[folder] = append(filetree[folder], f)
+			logrus.Debugln("[genshin]insert file into", folder)
+			if folder == "gacha" {
+				switch f.Name[i+1:] {
+				case "ThreeStar.png":
+					starN3 = f
+				case "FourStar.png":
+					starN4 = f
+				case "FiveStar.png":
+					starN5 = f
+				}
+			}
+		}
+	}
+	return nil
+}

plugin/gif/context.go

@@ -0,0 +1,85 @@
+package gif
+
+import (
+	"os"
+	"strconv"
+	"sync"
+
+	"github.com/FloatTech/zbputils/file"
+	"github.com/FloatTech/zbputils/img"
+	"github.com/sirupsen/logrus"
+)
+
+type context struct {
+	usrdir      string
+	headimgsdir []string
+}
+
+func dlchan(name string, s *string, wg *sync.WaitGroup, exit func(error)) {
+	defer wg.Done()
+	target := datapath + `materials/` + name
+	var err error
+	if file.IsNotExist(target) {
+		err = file.DownloadTo(`https://codechina.csdn.net/u011570312/imagematerials/-/raw/main/`+name, target, true)
+		if err != nil {
+			exit(err)
+			return
+		}
+		logrus.Debugln("[gif] dl", name, "to", target, "succeeded")
+	} else {
+		logrus.Debugln("[gif] dl", name, "exists at", target)
+	}
+	*s = target
+}
+
+func dlblock(name string) (string, error) {
+	target := datapath + `materials/` + name
+	if file.IsNotExist(target) {
+		err := file.DownloadTo(`https://codechina.csdn.net/u011570312/imagematerials/-/raw/main/`+name, target, true)
+		if err != nil {
+			return "", err
+		}
+		logrus.Debugln("[gif] dl", name, "to", target, "succeeded")
+	} else {
+		logrus.Debugln("[gif] dl", name, "exists at", target)
+	}
+	return target, nil
+}
+
+func dlrange(prefix string, end int, wg *sync.WaitGroup, exit func(error)) []string {
+	if file.IsNotExist(datapath + `materials/` + prefix) {
+		err := os.MkdirAll(datapath+`materials/`+prefix, 0755)
+		if err != nil {
+			exit(err)
+			return nil
+		}
+	}
+	c := make([]string, end)
+	for i := range c {
+		wg.Add(1)
+		go dlchan(prefix+"/"+strconv.Itoa(i)+".png", &c[i], wg, exit)
+	}
+	return c
+}
+
+// 新的上下文
+func newContext(user int64) *context {
+	c := new(context)
+	c.usrdir = datapath + "users/" + strconv.FormatInt(user, 10) + `/`
+	_ = os.MkdirAll(c.usrdir, 0755)
+	c.headimgsdir = make([]string, 2)
+	c.headimgsdir[0] = c.usrdir + "0.gif"
+	c.headimgsdir[1] = c.usrdir + "1.gif"
+	return c
+}
+
+func loadFirstFrames(paths []string, size int) (imgs []*img.ImgFactory, err error) {
+	imgs = make([]*img.ImgFactory, size)
+	for i := range imgs {
+		imgs[i], err = img.LoadFirstFrame(paths[i], 0, 0)
+		if err != nil {
+			return nil, err
+		}
+	}
+	return imgs, nil
+}

plugin/gif/gif.go

@@ -0,0 +1,345 @@
+package gif
+
+import (
+	"image"
+	"sync"
+
+	"github.com/FloatTech/zbputils/img"
+	"github.com/FloatTech/zbputils/img/writer"
+)
+
+// A摸
+func (cc *context) A摸() (string, error) {
+	var wg sync.WaitGroup
+	var err error
+	var m sync.Mutex
+	name := cc.usrdir + "摸.gif"
+	c := dlrange("mo", 5, &wg, func(e error) {
+		m.Lock()
+		err = e
+		m.Unlock()
+	})
+	if err != nil {
+		return "", err
+	}
+	tou, err := cc.getLogo(0, 0)
+	if err != nil {
+		return "", err
+	}
+	wg.Wait()
+	if err != nil {
+		return "", err
+	}
+	imgs, err := loadFirstFrames(c, 5)
+	if err != nil {
+		return "", err
+	}
+	mo := []*image.NRGBA{
+		imgs[0].InsertBottom(tou, 80, 80, 32, 32).Im,
+		imgs[1].InsertBottom(tou, 70, 90, 42, 22).Im,
+		imgs[2].InsertBottom(tou, 75, 85, 37, 27).Im,
+		imgs[3].InsertBottom(tou, 85, 75, 27, 37).Im,
+		imgs[4].InsertBottom(tou, 90, 70, 22, 42).Im,
+	}
+	return "file:///" + name, writer.SaveGIF2Path(name, img.MergeGif(1, mo))
+}
+
+// A搓
+func (cc *context) A搓() (string, error) {
+	var wg sync.WaitGroup
+	var err error
+	var m sync.Mutex
+	name := cc.usrdir + "搓.gif"
+	c := dlrange("cuo", 5, &wg, func(e error) {
+		m.Lock()
+		err = e
+		m.Unlock()
+	})
+	if err != nil {
+		return "", err
+	}
+	tou, err := cc.getLogo(110, 110)
+	if err != nil {
+		return "", err
+	}
+	m1 := img.Rotate(tou, 72, 0, 0)
+	m2 := img.Rotate(tou, 144, 0, 0)
+	m3 := img.Rotate(tou, 216, 0, 0)
+	m4 := img.Rotate(tou, 288, 0, 0)
+	wg.Wait()
+	if err != nil {
+		return "", err
+	}
+	imgs, err := loadFirstFrames(c, 5)
+	if err != nil {
+		return "", err
+	}
+	cuo := []*image.NRGBA{
+		imgs[0].InsertBottomC(tou, 0, 0, 75, 130).Im,
+		imgs[1].InsertBottomC(m1.Im, 0, 0, 75, 130).Im,
+		imgs[2].InsertBottomC(m2.Im, 0, 0, 75, 130).Im,
+		imgs[3].InsertBottomC(m3.Im, 0, 0, 75, 130).Im,
+		imgs[4].InsertBottomC(m4.Im, 0, 0, 75, 130).Im,
+	}
+	return "file:///" + name, writer.SaveGIF2Path(name, img.MergeGif(5, cuo))
+}
+
+// A敲
+func (cc *context) A敲() (string, error) {
+	var wg sync.WaitGroup
+	var err error
+	var m sync.Mutex
+	name := cc.usrdir + "敲.gif"
+	c := dlrange("qiao", 2, &wg, func(e error) {
+		m.Lock()
+		err = e
+		m.Unlock()
+	})
+	if err != nil {
+		return "", err
+	}
+	tou, err := cc.getLogo(40, 40)
+	if err != nil {
+		return "", err
+	}
+	wg.Wait()
+	if err != nil {
+		return "", err
+	}
+	imgs, err := loadFirstFrames(c, 2)
+	if err != nil {
+		return "", err
+	}
+	qiao := []*image.NRGBA{
+		imgs[0].InsertUp(tou, 40, 33, 57, 52).Im,
+		imgs[1].InsertUp(tou, 38, 36, 58, 50).Im,
+	}
+	return "file:///" + name, writer.SaveGIF2Path(name, img.MergeGif(1, qiao))
+}
+
+// A吃
+func (cc *context) A吃() (string, error) {
+	var wg sync.WaitGroup
+	var err error
+	var m sync.Mutex
+	name := cc.usrdir + "吃.gif"
+	c := dlrange("chi", 3, &wg, func(e error) {
+		m.Lock()
+		err = e
+		m.Unlock()
+	})
+	if err != nil {
+		return "", err
+	}
+	tou, err := cc.getLogo(32, 32)
+	if err != nil {
+		return "", err
+	}
+	wg.Wait()
+	if err != nil {
+		return "", err
+	}
+	imgs, err := loadFirstFrames(c, 3)
+	if err != nil {
+		return "", err
+	}
+	chi := []*image.NRGBA{
+		imgs[0].InsertBottom(tou, 0, 0, 1, 38).Im,
+		imgs[1].InsertBottom(tou, 0, 0, 1, 38).Im,
+		imgs[2].InsertBottom(tou, 0, 0, 1, 38).Im,
+	}
+	return "file:///" + name, writer.SaveGIF2Path(name, img.MergeGif(1, chi))
+}
+
+// A蹭
+func (cc *context) A蹭() (string, error) {
+	var wg sync.WaitGroup
+	var err error
+	var m sync.Mutex
+	name := cc.usrdir + "蹭.gif"
+	c := dlrange("ceng", 6, &wg, func(e error) {
+		m.Lock()
+		err = e
+		m.Unlock()
+	})
+	if err != nil {
+		return "", err
+	}
+	tou, err := cc.getLogo(100, 100)
+	if err != nil {
+		return "", err
+	}
+	tou2, err := cc.getLogo2(100, 100)
+	if err != nil {
+		return "", err
+	}
+	wg.Wait()
+	if err != nil {
+		return "", err
+	}
+	imgs, err := loadFirstFrames(c, 6)
+	if err != nil {
+		return "", err
+	}
+	ceng := []*image.NRGBA{
+		imgs[0].InsertUp(tou, 75, 77, 40, 88).InsertUp(tou2, 77, 103, 102, 81).Im,
+		imgs[1].InsertUp(tou, 75, 77, 46, 100).InsertUp(img.Rotate(tou2, 10, 62, 127).Im, 0, 0, 92, 40).Im,
+		imgs[2].InsertUp(tou, 75, 77, 67, 99).InsertUp(tou2, 76, 117, 90, 8).Im,
+		imgs[3].InsertUp(tou, 75, 77, 52, 83).InsertUp(img.Rotate(tou2, -40, 94, 94).Im, 0, 0, 53, -20).Im,
+		imgs[4].InsertUp(tou, 75, 77, 56, 110).InsertUp(img.Rotate(tou2, -66, 132, 80).Im, 0, 0, 78, 40).Im,
+		imgs[5].InsertUp(tou, 75, 77, 62, 102).InsertUp(tou2, 71, 100, 110, 94).Im,
+	}
+	return "file:///" + name, writer.SaveGIF2Path(name, img.MergeGif(8, ceng))
+}
+
+// A啃
+func (cc *context) A啃() (string, error) {
+	var wg sync.WaitGroup
+	var err error
+	var m sync.Mutex
+	name := cc.usrdir + "啃.gif"
+	c := dlrange("ken", 16, &wg, func(e error) {
+		m.Lock()
+		err = e
+		m.Unlock()
+	})
+	if err != nil {
+		return "", err
+	}
+	tou, err := cc.getLogo(100, 100)
+	if err != nil {
+		return "", err
+	}
+	wg.Wait()
+	if err != nil {
+		return "", err
+	}
+	imgs, err := loadFirstFrames(c, 16)
+	if err != nil {
+		return "", err
+	}
+	ken := []*image.NRGBA{
+		imgs[0].InsertBottom(tou, 90, 90, 105, 150).Im,
+		imgs[1].InsertBottom(tou, 90, 83, 96, 172).Im,
+		imgs[2].InsertBottom(tou, 90, 90, 106, 148).Im,
+		imgs[3].InsertBottom(tou, 88, 88, 97, 167).Im,
+		imgs[4].InsertBottom(tou, 90, 85, 89, 179).Im,
+		imgs[5].InsertBottom(tou, 90, 90, 106, 151).Im,
+		imgs[6].Im,
+		imgs[7].Im,
+		imgs[8].Im,
+		imgs[9].Im,
+		imgs[10].Im,
+		imgs[11].Im,
+		imgs[12].Im,
+		imgs[13].Im,
+		imgs[14].Im,
+		imgs[15].Im,
+	}
+	return "file:///" + name, writer.SaveGIF2Path(name, img.MergeGif(7, ken))
+}
+
+// A拍
+func (cc *context) A拍() (string, error) {
+	var wg sync.WaitGroup
+	var err error
+	var m sync.Mutex
+	name := cc.usrdir + "拍.gif"
+	c := dlrange("pai", 2, &wg, func(e error) {
+		m.Lock()
+		err = e
+		m.Unlock()
+	})
+	if err != nil {
+		return "", err
+	}
+	tou, err := cc.getLogo(30, 30)
+	if err != nil {
+		return "", err
+	}
+	wg.Wait()
+	if err != nil {
+		return "", err
+	}
+	imgs, err := loadFirstFrames(c, 2)
+	if err != nil {
+		return "", err
+	}
+	pai := []*image.NRGBA{
+		imgs[0].InsertUp(tou, 0, 0, 1, 47).Im,
+		imgs[1].InsertUp(tou, 0, 0, 1, 67).Im,
+	}
+	return "file:///" + name, writer.SaveGIF2Path(name, img.MergeGif(1, pai))
+}
+
+// A冲
+func (cc *context) A冲() (string, error) {
+	var wg sync.WaitGroup
+	var err error
+	var m sync.Mutex
+	name := cc.usrdir + "冲.gif"
+	c := dlrange("xqe", 2, &wg, func(e error) {
+		m.Lock()
+		err = e
+		m.Unlock()
+	})
+	if err != nil {
+		return "", err
+	}
+	tou, err := cc.getLogo(0, 0)
+	if err != nil {
+		return "", err
+	}
+	wg.Wait()
+	if err != nil {
+		return "", err
+	}
+	imgs, err := loadFirstFrames(c, 2)
+	if err != nil {
+		return "", err
+	}
+	chong := []*image.NRGBA{
+		imgs[0].InsertUp(tou, 30, 30, 15, 53).Im,
+		imgs[1].InsertUp(tou, 30, 30, 40, 53).Im,
+	}
+	return "file:///" + name, writer.SaveGIF2Path(name, img.MergeGif(1, chong))
+}
+
+// A丢
+func (cc *context) A丢() (string, error) {
+	var wg sync.WaitGroup
+	var err error
+	var m sync.Mutex
+	name := cc.usrdir + "丢.gif"
+	c := dlrange("diu", 8, &wg, func(e error) {
+		m.Lock()
+		err = e
+		m.Unlock()
+	})
+	if err != nil {
+		return "", err
+	}
+	tou, err := cc.getLogo(0, 0)
+	if err != nil {
+		return "", err
+	}
+	wg.Wait()
+	if err != nil {
+		return "", err
+	}
+	imgs, err := loadFirstFrames(c, 8)
+	if err != nil {
+		return "", err
+	}
+	diu := []*image.NRGBA{
+		imgs[0].InsertUp(tou, 32, 32, 108, 36).Im,
+		imgs[1].InsertUp(tou, 32, 32, 122, 36).Im,
+		imgs[2].Im,
+		imgs[3].InsertUp(tou, 123, 123, 19, 129).Im,
+		imgs[4].InsertUp(tou, 185, 185, -50, 200).InsertUp(tou, 33, 33, 289, 70).Im,
+		imgs[5].InsertUp(tou, 32, 32, 280, 73).Im,
+		imgs[6].InsertUp(tou, 35, 35, 259, 31).Im,
+		imgs[7].InsertUp(tou, 175, 175, -50, 220).Im,
+	}
+	return "file:///" + name, writer.SaveGIF2Path(name, img.MergeGif(7, diu))
+}

plugin/gif/logo.go

@@ -0,0 +1,41 @@
+package gif
+
+import (
+	"image"
+	"strconv"
+	"strings"
+
+	"github.com/FloatTech/zbputils/file"
+	"github.com/FloatTech/zbputils/img"
+)
+
+func (cc *context) prepareLogos(s ...string) error {
+	for i, v := range s {
+		_, err := strconv.Atoi(v)
+		if err != nil {
+			err = file.DownloadTo("https://gchat.qpic.cn/gchatpic_new//--"+strings.ToUpper(v)+"/0", cc.usrdir+strconv.Itoa(i)+".gif", true)
+		} else {
+			err = file.DownloadTo("http://q4.qlogo.cn/g?b=qq&nk="+v+"&s=640", cc.usrdir+strconv.Itoa(i)+".gif", true)
+		}
+		if err != nil {
+			return err
+		}
+	}
+	return nil
+}
+
+func (cc *context) getLogo(w int, h int) (*image.NRGBA, error) {
+	frame, err := img.LoadFirstFrame(cc.headimgsdir[0], w, h)
+	if err != nil {
+		return nil, err
+	}
+	return frame.Circle(0).Im, nil
+}
+
+func (cc *context) getLogo2(w int, h int) (*image.NRGBA, error) {
+	frame, err := img.LoadFirstFrame(cc.headimgsdir[1], w, h)
+	if err != nil {
+		return nil, err
+	}
+	return frame.Circle(0).Im, nil
+}

plugin/gif/png.go

@@ -0,0 +1,108 @@
+package gif
+
+import (
+	"errors"
+	"image"
+	"math/rand"
+	"os"
+	"strconv"
+
+	"github.com/FloatTech/zbputils/file"
+	"github.com/FloatTech/zbputils/img"
+	"github.com/FloatTech/zbputils/img/writer"
+)
+
+// A爬
+func (cc *context) A爬() (string, error) {
+	name := cc.usrdir + `爬.png`
+	tou, err := cc.getLogo(0, 0)
+	if err != nil {
+		return "", err
+	}
+	// 随机爬图序号
+	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
+	}
+	imgf, err := img.LoadFirstFrame(f, 0, 0)
+	if err != nil {
+		return "", err
+	}
+	return "file:///" + name, writer.SavePNG2Path(name, imgf.InsertBottom(tou, 100, 100, 0, 400).Im)
+}
+
+// A撕
+func (cc *context) A撕() (string, error) {
+	name := cc.usrdir + `撕.png`
+	tou, err := cc.getLogo(0, 0)
+	if err != nil {
+		return "", err
+	}
+	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
+	}
+	imgf, err := img.LoadFirstFrame(f, 0, 0)
+	if err != nil {
+		return "", err
+	}
+	return "file:///" + name, writer.SavePNG2Path(name, imgf.InsertBottom(im1.Im, im1.W, im1.H, -3, 370).InsertBottom(im2.Im, im2.W, im2.H, 653, 310).Im)
+}
+
+// 简单
+func (cc *context) other(value ...string) (string, error) {
+	name := cc.usrdir + value[0] + `.png`
+	// 加载图片
+	im, err := img.LoadFirstFrame(cc.headimgsdir[0], 0, 0)
+	if err != nil {
+		return "", err
+	}
+	var imgnrgba *image.NRGBA
+	switch value[0] {
+	case "上翻", "下翻":
+		imgnrgba = im.FlipV().Im
+	case "左翻", "右翻":
+		imgnrgba = im.FlipH().Im
+	case "反色":
+		imgnrgba = im.Invert().Im
+	case "灰度":
+		imgnrgba = im.Grayscale().Im
+	case "负片":
+		imgnrgba = im.Invert().Grayscale().Im
+	case "浮雕":
+		imgnrgba = im.Convolve3x3().Im
+	case "打码":
+		imgnrgba = im.Blur(10).Im
+	case "旋转":
+		r, _ := strconv.ParseFloat(value[1], 64)
+		imgnrgba = img.Rotate(im.Im, r, 0, 0).Im
+	case "变形":
+		w, err := strconv.Atoi(value[1])
+		if err != nil {
+			return "", err
+		}
+		h, err := strconv.Atoi(value[2])
+		if err != nil {
+			return "", err
+		}
+		imgnrgba = img.Size(im.Im, w, h).Im
+	default:
+		return "", errors.New("no such method")
+	}
+	return "file:///" + name, writer.SavePNG2Path(name, imgnrgba)
+}

plugin/gif/run.go

@@ -0,0 +1,56 @@
+// Package gif 制图
+package gif
+
+import (
+	"reflect"
+	"strconv"
+	"strings"
+
+	control "github.com/FloatTech/zbputils/control"
+	"github.com/FloatTech/zbputils/ctxext"
+	"github.com/FloatTech/zbputils/file"
+	zero "github.com/wdvxdr1123/ZeroBot"
+	"github.com/wdvxdr1123/ZeroBot/message"
+
+	"github.com/FloatTech/zbputils/control/order"
+)
+
+var (
+	cmds = []string{"搓", "冲", "摸", "拍", "丢", "吃", "敲", "啃", "蹭", "爬", "撕",
+		"灰度", "上翻", "下翻", "左翻", "右翻", "反色", "浮雕", "打码", "负片"}
+	datapath string
+)
+
+func init() { // 插件主体
+	en := control.Register("gif", order.AcquirePrio(), &control.Options{
+		DisableOnDefault:  false,
+		Help:              "制图\n- " + strings.Join(cmds, "\n- "),
+		PrivateDataFolder: "gif",
+	}).ApplySingle(ctxext.DefaultSingle)
+	datapath = file.BOTPATH + "/" + en.DataFolder()
+	en.OnRegex(`^(` + strings.Join(cmds, "|") + `)\D*?(\[CQ:(image\,file=([0-9a-zA-Z]{32}).*|at.+?(\d{5,11}))\].*|(\d+))$`).
+		SetBlock(true).Handle(func(ctx *zero.Ctx) {
+		c := newContext(ctx.Event.UserID)
+		list := ctx.State["regex_matched"].([]string)
+		err := c.prepareLogos(list[4]+list[5]+list[6], strconv.FormatInt(ctx.Event.UserID, 10))
+		if err != nil {
+			ctx.SendChain(message.Text("ERROR:", err))
+			return
+		}
+		var picurl string
+		if len([]rune(list[1])) == 1 {
+			r := reflect.ValueOf(c).MethodByName("A" + list[1]).Call(nil)
+			picurl = r[0].String()
+			if !r[1].IsNil() {
+				err = r[1].Interface().(error)
+			}
+		} else {
+			picurl, err = c.other(list[1]) // "灰度", "上翻", "下翻", "左翻", "右翻", "反色", "倒放", "浮雕", "打码", "负片"
+		}
+		if err != nil {
+			ctx.SendChain(message.Text("ERROR:", err))
+			return
+		}
+		ctx.SendChain(message.Image(picurl))
+	})
+}

plugin/github/repo_searcher.go

@@ -4,7 +4,7 @@ package github
 import (
 	"errors"
 	"fmt"
-	"io/ioutil"
+	"io"
 	"net/http"
 	"net/url"
 	"strings"
@@ -36,12 +36,12 @@ func init() { // 插件主体
 			}.Encode()
 			body, err := netGet(api.String(), header)
 			if err != nil {
-				ctx.SendChain(message.Text("ERROR: ", err))
+				ctx.SendChain(message.Text("ERROR:", err))
 			}
 			// 解析请求
 			info := gjson.ParseBytes(body)
 			if info.Get("total_count").Int() == 0 {
-				ctx.SendChain(message.Text("ERROR: 没有找到这样的仓库"))
+				ctx.SendChain(message.Text("ERROR:没有找到这样的仓库"))
 				return
 			}
 			repo := info.Get("items.0")
@@ -97,7 +97,7 @@ func init() { // 插件主体
 }
 
 // notnull 如果传入文本为空，则返回默认值
-//nolint: unparam
+
 func notnull(text, defstr string) string {
 	if text == "" {
 		return defstr
@@ -119,7 +119,7 @@ func netGet(dest string, header http.Header) ([]byte, error) {
 		return nil, err
 	}
 	defer resp.Body.Close()
-	body, err := ioutil.ReadAll(resp.Body)
+	body, err := io.ReadAll(resp.Body)
 	if err != nil {
 		return nil, err
 	}

plugin/hs/run.go

@@ -20,11 +20,8 @@ import (
 	"github.com/FloatTech/zbputils/control/order"
 )
 
-var (
-	cachedir = file.BOTPATH + "/data/hs/"
-	reqconf  = [...]string{"GET", "https://hs.fbigame.com",
-		"Mozilla/5.0 (Linux; Android 6.0; Nexus 5 Build/MRA58N) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/86.0.4240.198 Mobile Safari/537.36"}
-)
+var reqconf = [...]string{"GET", "https://hs.fbigame.com",
+	"Mozilla/5.0 (Linux; Android 6.0; Nexus 5 Build/MRA58N) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/86.0.4240.198 Mobile Safari/537.36"}
 
 const (
 	hs   = `https://hs.fbigame.com/ajax.php?`
@@ -46,19 +43,15 @@ const (
 )
 
 func init() {
-	os.RemoveAll(cachedir)
-	err := os.MkdirAll(cachedir, 0755)
-	if err != nil {
-		panic(err)
-	}
-
 	engine := control.Register("hs", order.AcquirePrio(), &control.Options{
 		DisableOnDefault: false,
 		Help: "炉石\n" +
 			"- 搜卡[xxxx]\n" +
 			"- [卡组代码xxx]\n" +
 			"- 更多搜卡指令参数：https://hs.fbigame.com/misc/searchhelp",
+		PrivateDataFolder: "hs",
 	}).ApplySingle(ctxext.DefaultSingle)
+	cachedir := file.BOTPATH + "/" + engine.DataFolder()
 	engine.OnRegex(`^搜卡(.+)$`).
 		SetBlock(true).Handle(func(ctx *zero.Ctx) {
 		List := ctx.State["regex_matched"].([]string)[1]
@@ -73,7 +66,7 @@ func init() {
 			cid := gjson.Get(g, `list.`+strconv.Itoa(i)+`.CardID`).String()
 			cachefile := cachedir + cid
 			if file.IsNotExist(cachefile) {
-				data, err := web.ReqWith(
+				data, err := web.RequestDataWith(web.NewDefaultClient(),
 					`https://res.fbigame.com/hs/v13/`+cid+`.png?auth_key=`+
 						gjson.Get(g, `list.`+strconv.Itoa(i)+`.auth_key`).String(),
 					reqconf[0], reqconf[1], reqconf[2])
@@ -84,20 +77,13 @@ func init() {
 					continue
 				}
 			}
-			sk = append(
-				sk,
-				message.CustomNode(
-					zero.BotConfig.NickName[0],
-					ctx.Event.SelfID,
-					[]message.MessageSegment{message.Image("file:///" + cachefile)}, // 图片
-				),
-			)
+			sk = append(sk, ctxext.FakeSenderForwardNode(ctx, message.Image("file:///"+cachefile)))
 		}
 		if id := ctx.SendGroupForwardMessage(
 			ctx.Event.GroupID,
 			sk,
 		).Get("message_id").Int(); id == 0 {
-			ctx.SendChain(message.Text("ERROR: 可能被风控了"))
+			ctx.SendChain(message.Text("ERROR:可能被风控了"))
 		}
 	})
 	// 卡组
@@ -112,10 +98,10 @@ func init() {
 }
 
 func sh(s string) string {
-	data, err := web.ReqWith("https://hs.fbigame.com", reqconf[0], reqconf[1], reqconf[2])
+	data, err := web.RequestDataWith(web.NewDefaultClient(), "https://hs.fbigame.com", reqconf[0], reqconf[1], reqconf[2])
 	if err == nil {
 		url := hs + para + "&hash=" + strings.SplitN(strings.SplitN(helper.BytesToString(data), `var hash = "`, 2)[1], `"`, 2)[0] + "&search=" + s
-		r, err := web.ReqWith(url, reqconf[0], reqconf[1], reqconf[2])
+		r, err := web.RequestDataWith(web.NewDefaultClient(), url, reqconf[0], reqconf[1], reqconf[2])
 		if err == nil {
 			return helper.BytesToString(r)
 		}
@@ -124,10 +110,10 @@ func sh(s string) string {
 }
 
 func kz(s string) string {
-	data, err := web.ReqWith("https://hs.fbigame.com", reqconf[0], reqconf[1], reqconf[2])
+	data, err := web.RequestDataWith(web.NewDefaultClient(), "https://hs.fbigame.com", reqconf[0], reqconf[1], reqconf[2])
 	if err == nil {
 		url := hs + para + "mod=general_deck_image&deck_code=" + s + "&deck_text=&hash=" + strings.SplitN(strings.SplitN(helper.BytesToString(data), `var hash = "`, 2)[1], `"`, 2)[0] + "&search=" + s
-		r, err := web.ReqWith(url, reqconf[0], reqconf[1], reqconf[2])
+		r, err := web.RequestDataWith(web.NewDefaultClient(), url, reqconf[0], reqconf[1], reqconf[2])
 		if err == nil {
 			return "base64://" + gjson.Get(helper.BytesToString(r), "img").String()
 		}

plugin/image_finder/keyword.go

@@ -0,0 +1,82 @@
+// Package imagefinder 关键字搜图
+package imagefinder
+
+import (
+	"encoding/json"
+	"errors"
+	"math/rand"
+	"net/url"
+	"strings"
+
+	zero "github.com/wdvxdr1123/ZeroBot"
+	"github.com/wdvxdr1123/ZeroBot/message"
+
+	"github.com/FloatTech/AnimeAPI/pixiv"
+
+	"github.com/FloatTech/zbputils/control"
+	"github.com/FloatTech/zbputils/control/order"
+	"github.com/FloatTech/zbputils/ctxext"
+	"github.com/FloatTech/zbputils/img/pool"
+	"github.com/FloatTech/zbputils/web"
+)
+
+type resultjson struct {
+	Data struct {
+		Illusts []struct {
+			ID          int64  `json:"id"`
+			Title       string `json:"title"`
+			AltTitle    string `json:"altTitle"`
+			Description string `json:"description"`
+			Sanity      int    `json:"sanity"`
+		} `json:"illusts"`
+	} `json:"data"`
+	Error   bool   `json:"error"`
+	Message string `json:"message"`
+}
+
+func init() {
+	control.Register("imgfinder", order.AcquirePrio(), &control.Options{
+		DisableOnDefault: false,
+		Help: "关键字搜图\n" +
+			"- 来张 [xxx]",
+	}).OnRegex(`^来张\s?(.*)$`, zero.AdminPermission).SetBlock(true).
+		Handle(func(ctx *zero.Ctx) {
+			keyword := ctx.State["regex_matched"].([]string)[1]
+			soutujson, err := soutuapi(keyword)
+			if err != nil {
+				ctx.SendChain(message.Text("ERROR:", err))
+				return
+			}
+			rannum := rand.Intn(len(soutujson.Data.Illusts))
+			illust, err := pixiv.Works(soutujson.Data.Illusts[rannum].ID)
+			if err != nil {
+				ctx.SendChain(message.Text("ERROR:", err))
+				return
+			}
+			u := illust.ImageUrls[0]
+			n := u[strings.LastIndex(u, "/")+1 : len(u)-4]
+			f := illust.Path(0)
+
+			err = pool.SendImageFromPool(n, f, func() error {
+				// 下载图片
+				return illust.DownloadToCache(0)
+			}, ctxext.SendFakeForwardToGroup(ctx), ctxext.GetFirstMessageInForward(ctx))
+			if err != nil {
+				ctx.SendChain(message.Text("ERROR:", err))
+				return
+			}
+		})
+}
+
+// soutuapi 请求api
+func soutuapi(keyword string) (r resultjson, err error) {
+	data, err := web.GetData("https://copymanga.azurewebsites.net/api/pixivel?" + url.QueryEscape(keyword) + "?page=0")
+	if err != nil {
+		return
+	}
+	err = json.Unmarshal(data, &r)
+	if err == nil && r.Error {
+		err = errors.New(r.Message)
+	}
+	return
+}

plugin/inject/main.go

@@ -0,0 +1,23 @@
+// Package inject 注入指令
+package inject
+
+import (
+	"github.com/FloatTech/zbputils/control"
+	"github.com/FloatTech/zbputils/control/order"
+	zero "github.com/wdvxdr1123/ZeroBot"
+	"github.com/wdvxdr1123/ZeroBot/message"
+)
+
+func init() {
+	en := control.Register("inject", order.AcquirePrio(), &control.Options{
+		DisableOnDefault: false,
+		Help: "注入指令\n" +
+			"- run[CQ码]",
+	})
+	// 运行 CQ 码
+	en.OnPrefix("run", zero.SuperUserPermission).SetBlock(true).
+		Handle(func(ctx *zero.Ctx) {
+			// 可注入，权限为主人
+			ctx.Send(message.UnescapeCQCodeText(ctx.State["args"].(string)))
+		})
+}

plugin/jandan/data.go

@@ -0,0 +1,24 @@
+package jandan
+
+import (
+	"sync"
+
+	sql "github.com/FloatTech/sqlite"
+)
+
+var db = &sql.Sqlite{}
+var mu sync.RWMutex
+
+type picture struct {
+	ID  uint64 `db:"id"`
+	URL string `db:"url"`
+}
+
+func getRandomPicture() (u string, err error) {
+	var p picture
+	mu.RLock()
+	err = db.Pick("picture", &p)
+	mu.RUnlock()
+	u = p.URL
+	return
+}

plugin/jandan/jandan.go

@@ -9,6 +9,7 @@ import (
 
 	"github.com/FloatTech/zbputils/binary"
 	"github.com/FloatTech/zbputils/control"
+	"github.com/FloatTech/zbputils/file"
 	"github.com/antchfx/htmlquery"
 	"github.com/sirupsen/logrus"
 	zero "github.com/wdvxdr1123/ZeroBot"
@@ -24,10 +25,26 @@ const (
 func init() {
 	engine := control.Register("jandan", order.AcquirePrio(), &control.Options{
 		DisableOnDefault: false,
-		Help:             "煎蛋网无聊图\n- 来份屌图\n- 更新屌图\n",
+		Help:             "煎蛋网无聊图\n- 来份[屌|弔|吊]图\n- 更新[屌|弔|吊]图\n",
+		PublicDataFolder: "Jandan",
 	})
 
-	engine.OnFullMatch("来份屌图").SetBlock(true).
+	go func() {
+		dbpath := engine.DataFolder()
+		db.DBPath = dbpath + "pics.db"
+		_, _ = file.GetLazyData(db.DBPath, false, false)
+		err := db.Create("picture", &picture{})
+		if err != nil {
+			panic(err)
+		}
+		n, err := db.Count("picture")
+		if err != nil {
+			panic(err)
+		}
+		logrus.Printf("[jandan]读取%d张图片", n)
+	}()
+
+	engine.OnRegex(`来份[屌|弔|吊]图`).SetBlock(true).
 		Handle(func(ctx *zero.Ctx) {
 			u, err := getRandomPicture()
 			if err != nil {
@@ -37,7 +54,7 @@ func init() {
 			ctx.SendChain(message.Image(u))
 		})
 
-	engine.OnFullMatch("更新屌图", zero.SuperUserPermission).SetBlock(true).
+	engine.OnRegex(`更新[屌|弔|吊]图`, zero.SuperUserPermission).SetBlock(true).
 		Handle(func(ctx *zero.Ctx) {
 			ctx.Send("少女更新中...")
 			webpageURL := api

plugin/lolicon/lolicon.go

@@ -2,8 +2,6 @@
 package lolicon
 
 import (
-	"io/ioutil"
-	"net/http"
 	"strings"
 	"time"
 
@@ -16,6 +14,7 @@ import (
 	"github.com/FloatTech/zbputils/img/pool"
 	"github.com/FloatTech/zbputils/math"
 	"github.com/FloatTech/zbputils/process"
+	"github.com/FloatTech/zbputils/web"
 
 	"github.com/FloatTech/zbputils/control/order"
 )
@@ -38,20 +37,14 @@ func init() {
 		Handle(func(ctx *zero.Ctx) {
 			go func() {
 				for i := 0; i < math.Min(cap(queue)-len(queue), 2); i++ {
-					resp, err := http.Get(api)
+					data, err := web.GetData(api)
 					if err != nil {
-						ctx.SendChain(message.Text("ERROR: ", err))
+						ctx.SendChain(message.Text("ERROR:", err))
 						continue
 					}
-					if resp.StatusCode != http.StatusOK {
-						ctx.SendChain(message.Text("ERROR: code ", resp.StatusCode))
-						continue
-					}
-					data, _ := ioutil.ReadAll(resp.Body)
-					resp.Body.Close()
 					json := gjson.ParseBytes(data)
 					if e := json.Get("error").Str; e != "" {
-						ctx.SendChain(message.Text("ERROR: ", e))
+						ctx.SendChain(message.Text("ERROR:", e))
 						continue
 					}
 					url := json.Get("data.0.urls.original").Str
@@ -72,9 +65,15 @@ func init() {
 			}()
 			select {
 			case <-time.After(time.Minute):
-				ctx.SendChain(message.Text("ERROR: 等待填充，请稍后再试......"))
-			case url := <-queue:
-				ctx.SendChain(message.Image(url))
+				ctx.SendChain(message.Text("ERROR:等待填充，请稍后再试......"))
+			case img := <-queue:
+				id := ctx.SendChain(message.Image(img))
+				if id.ID() == 0 {
+					id = ctx.SendChain(message.Image(img).Add("cache", "0"))
+					if id.ID() == 0 {
+						ctx.SendChain(message.Text("ERROR:图片发送失败，可能被风控了~"))
+					}
+				}
 			}
 		})
 }

plugin/manager/manager.go

@@ -4,7 +4,6 @@ package manager
 import (
 	"fmt"
 	"math/rand"
-	"os"
 	"sort"
 	"strconv"
 	"strings"
@@ -22,13 +21,11 @@ import (
 
 	"github.com/FloatTech/zbputils/control/order"
 
-	"github.com/FloatTech/ZeroBot-Plugin/plugin_manager/timer"
+	"github.com/FloatTech/ZeroBot-Plugin/plugin/manager/timer"
 )
 
 const (
-	datapath = "data/manager/"
-	confile  = datapath + "config.db"
-	hint     = "====群管====\n" +
+	hint = "====群管====\n" +
 		"- 禁言@QQ 1分钟\n" +
 		"- 解除禁言 @QQ\n" +
 		"- 我要自闭 1分钟\n" +
@@ -51,25 +48,27 @@ const (
 		"- 取消在\"cron\"的提醒\n" +
 		"- 列出所有提醒\n" +
 		"- 翻牌\n" +
-		"- 设置欢迎语XXX\n" +
+		"- 设置欢迎语XXX 可选添加 [{at}] [{nickname}] [{avatar}] [{id}] {at}可在发送时艾特被欢迎者 {nickname}是被欢迎者名字 {avatar}是被欢迎者头像 {id}是被欢迎者QQ号\n" +
+		"- 测试欢迎语\n" +
+		"- 设置告别辞 参数同设置欢迎语\n" +
+		"- 测试告别辞\n" +
 		"- [开启 | 关闭]入群验证"
 )
 
 var (
-	db    = &sql.Sqlite{DBPath: confile}
+	db    = &sql.Sqlite{}
 	clock timer.Clock
 )
 
 func init() { // 插件主体
 	engine := control.Register("manager", order.AcquirePrio(), &control.Options{
-		DisableOnDefault: false,
-		Help:             hint,
+		DisableOnDefault:  false,
+		Help:              hint,
+		PrivateDataFolder: "manager",
 	})
 
 	go func() {
-		defer order.DoneOnExit()()
-		process.SleepAbout1sTo2s()
-		_ = os.MkdirAll(datapath, 0755)
+		db.DBPath = engine.DataFolder() + "config.db"
 		clock = timer.NewClock(db)
 		err := db.Create("welcome", &welcome{})
 		if err != nil {
@@ -79,6 +78,10 @@ func init() { // 插件主体
 		if err != nil {
 			panic(err)
 		}
+		err = db.Create("farewell", &welcome{})
+		if err != nil {
+			panic(err)
+		}
 	}()
 
 	// 升为管理
@@ -213,6 +216,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]), // 被修改群名片的人
@@ -223,6 +230,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]), // 被修改群头衔的人
@@ -233,6 +244,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,                         // 被修改群头衔的人
@@ -272,7 +287,7 @@ func init() { // 插件主体
 			dateStrs := ctx.State["regex_matched"].([]string)
 			ts := timer.GetFilledTimer(dateStrs, ctx.Event.SelfID, ctx.Event.GroupID, false)
 			if ts.En() {
-				go clock.RegisterTimer(ts, true)
+				go clock.RegisterTimer(ts, true, false)
 				ctx.SendChain(message.Text("记住了~"))
 			} else {
 				ctx.SendChain(message.Text("参数非法:" + ts.Alert))
@@ -285,7 +300,7 @@ func init() { // 插件主体
 			var url, alert string
 			switch len(dateStrs) {
 			case 4:
-				url = dateStrs[2]
+				url = strings.TrimPrefix(dateStrs[2], "用")
 				alert = dateStrs[3]
 			case 3:
 				alert = dateStrs[2]
@@ -295,7 +310,7 @@ func init() { // 插件主体
 			}
 			logrus.Debugln("[manager] cron:", dateStrs[1])
 			ts := timer.GetFilledCronTimer(dateStrs[1], alert, url, ctx.Event.SelfID, ctx.Event.GroupID)
-			if clock.RegisterTimer(ts, true) {
+			if clock.RegisterTimer(ts, true, false) {
 				ctx.SendChain(message.Text("记住了~"))
 			} else {
 				ctx.SendChain(message.Text("参数非法:" + ts.Alert))
@@ -345,7 +360,6 @@ func init() { // 插件主体
 				return temp[i].Get("last_sent_time").Int() < temp[j].Get("last_sent_time").Int()
 			})
 			temp = temp[math.Max(0, len(temp)-10):]
-			rand.Seed(time.Now().UnixNano())
 			who := temp[rand.Intn(len(temp))]
 			if who.Get("user_id").Int() == ctx.Event.SelfID {
 				ctx.SendChain(message.Text("幸运儿居然是我自己"))
@@ -373,7 +387,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(welcometocq(ctx, w.Msg)))
 				} else {
 					ctx.SendChain(message.Text("欢迎~"))
 				}
@@ -403,13 +417,13 @@ func init() { // 插件主体
 							}
 							return false
 						}
-						next := zero.NewFutureEvent("message", 999, false, zero.CheckUser(ctx.Event.UserID), rule)
+						next := zero.NewFutureEvent("message", 999, false, ctx.CheckSession(), rule)
 						recv, cancel := next.Repeat()
 						select {
 						case <-time.After(time.Minute):
+							cancel()
 							ctx.SendChain(message.Text("拜拜啦~"))
 							ctx.SetGroupKick(ctx.Event.GroupID, uid, false)
-							cancel()
 						case <-recv:
 							cancel()
 							ctx.SendChain(message.Text("答对啦~"))
@@ -422,8 +436,14 @@ func init() { // 插件主体
 	engine.OnNotice().SetBlock(false).
 		Handle(func(ctx *zero.Ctx) {
 			if ctx.Event.NoticeType == "group_decrease" {
-				userid := ctx.Event.UserID
-				ctx.SendChain(message.Text(ctxext.CardOrNickName(ctx, userid), "(", userid, ")", "离开了我们..."))
+				var w welcome
+				err := db.Find("farewell", &w, "where gid = "+strconv.FormatInt(ctx.Event.GroupID, 10))
+				if err == nil {
+					ctx.SendGroupMessage(ctx.Event.GroupID, message.ParseMessageFromString(welcometocq(ctx, w.Msg)))
+				} else {
+					userid := ctx.Event.UserID
+					ctx.SendChain(message.Text(ctx.CardOrNickName(userid), "(", userid, ")", "离开了我们..."))
+				}
 			}
 		})
 	// 设置欢迎语
@@ -440,6 +460,43 @@ 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(welcometocq(ctx, w.Msg)))
+			} else {
+				ctx.SendChain(message.Text("欢迎~"))
+			}
+		})
+	// 设置告别辞
+	engine.OnRegex(`^设置告别辞([\s\S]*)$`, zero.OnlyGroup, zero.AdminPermission).SetBlock(true).
+		Handle(func(ctx *zero.Ctx) {
+			w := &welcome{
+				GrpID: ctx.Event.GroupID,
+				Msg:   ctx.State["regex_matched"].([]string)[1],
+			}
+			err := db.Insert("farewell", w)
+			if err == nil {
+				ctx.SendChain(message.Text("记住啦!"))
+			} else {
+				ctx.SendChain(message.Text("出错啦: ", err))
+			}
+		})
+	// 测试告别辞
+	engine.OnFullMatch("测试告别辞", zero.OnlyGroup, zero.AdminPermission).SetBlock(true).
+		Handle(func(ctx *zero.Ctx) {
+			var w welcome
+			err := db.Find("farewell", &w, "where gid = "+strconv.FormatInt(ctx.Event.GroupID, 10))
+			if err == nil {
+				ctx.SendGroupMessage(ctx.Event.GroupID, message.ParseMessageFromString(welcometocq(ctx, w.Msg)))
+			} else {
+				userid := ctx.Event.UserID
+				ctx.SendChain(message.Text(ctx.CardOrNickName(userid), "(", userid, ")", "离开了我们..."))
+			}
+		})
 	// 入群后验证开关
 	engine.OnRegex(`^(.*)入群验证$`, zero.OnlyGroup, zero.AdminPermission).SetBlock(true).
 		Handle(func(ctx *zero.Ctx) {
@@ -490,15 +547,6 @@ func init() { // 插件主体
 			}
 			ctx.SendChain(message.Text("找不到服务!"))
 		})
-	// 运行 CQ 码
-	engine.OnRegex(`^run(.*)$`, zero.SuperUserPermission).SetBlock(true).
-		Handle(func(ctx *zero.Ctx) {
-			var cmd = ctx.State["regex_matched"].([]string)[1]
-			cmd = strings.ReplaceAll(cmd, "&#91;", "[")
-			cmd = strings.ReplaceAll(cmd, "&#93;", "]")
-			// 可注入，权限为主人
-			ctx.Send(cmd)
-		})
 	// 根据 gist 自动同意加群
 	// 加群请在github新建一个gist，其文件名为本群群号的字符串的md5(小写)，内容为一行，是当前unix时间戳(10分钟内有效)。
 	// 然后请将您的用户名和gist哈希(小写)按照username/gisthash的格式填写到回答即可。
@@ -530,3 +578,16 @@ func init() { // 插件主体
 		}
 	})
 }
+
+// 传入 ctx 和 welcome格式string 返回cq格式string  使用方法:welcometocq(ctx,w.Msg)
+func welcometocq(ctx *zero.Ctx, welcome string) string {
+	at := "[CQ:at,qq=" + strconv.FormatInt(ctx.Event.UserID, 10) + "]"
+	avatar := "[CQ:image,file=" + "http://q4.qlogo.cn/g?b=qq&nk=" + strconv.FormatInt(ctx.Event.UserID, 10) + "&s=640]"
+	id := strconv.FormatInt(ctx.Event.UserID, 10)
+	nickname := ctx.CardOrNickName(ctx.Event.UserID)
+	cqstring := strings.ReplaceAll(welcome, "{at}", at)
+	cqstring = strings.ReplaceAll(cqstring, "{nickname}", nickname)
+	cqstring = strings.ReplaceAll(cqstring, "{avatar}", avatar)
+	cqstring = strings.ReplaceAll(cqstring, "{id}", id)
+	return cqstring
+}

plugin/manager/timer/timer.go

@@ -8,6 +8,7 @@ import (
 	"time"
 
 	sql "github.com/FloatTech/sqlite"
+	"github.com/FloatTech/zbputils/process"
 	"github.com/fumiama/cron"
 	"github.com/sirupsen/logrus"
 	zero "github.com/wdvxdr1123/ZeroBot"
@@ -47,7 +48,7 @@ func NewClock(db *sql.Sqlite) (c Clock) {
 }
 
 // RegisterTimer 注册计时器
-func (c *Clock) RegisterTimer(ts *Timer, save bool) bool {
+func (c *Clock) RegisterTimer(ts *Timer, save, isinit bool) bool {
 	var key uint32
 	if save {
 		key = ts.GetTimerID()
@@ -62,6 +63,9 @@ func (c *Clock) RegisterTimer(ts *Timer, save bool) bool {
 	logrus.Println("[群管]注册计时器", key)
 	if ts.Cron != "" {
 		var ctx *zero.Ctx
+		if isinit {
+			process.GlobalInitMutex.Lock()
+		}
 		if ts.SelfID != 0 {
 			ctx = zero.GetBot(ts.SelfID)
 		} else {
@@ -71,6 +75,9 @@ func (c *Clock) RegisterTimer(ts *Timer, save bool) bool {
 				return false
 			})
 		}
+		if isinit {
+			process.GlobalInitMutex.Unlock()
+		}
 		eid, err := c.cron.AddFunc(ts.Cron, func() { ts.sendmsg(ts.GrpID, ctx) })
 		if err == nil {
 			c.entmu.Lock()
@@ -187,7 +194,7 @@ func (c *Clock) loadTimers(db *sql.Sqlite) {
 		var t Timer
 		_ = c.db.FindFor("timer", &t, "", func() error {
 			tescape := t
-			go c.RegisterTimer(&tescape, false)
+			go c.RegisterTimer(&tescape, false, true)
 			return nil
 		})
 	}

plugin/moyu/holiday_test.go

@@ -8,11 +8,10 @@ import (
 	reg "github.com/fumiama/go-registry"
 )
 
-var sr = reg.NewRegedit("reilia.fumiama.top:32664", "fumiama", "--")
+var sr = reg.NewRegedit("reilia.westeurope.cloudapp.azure.com:32664", "fumiama", "--")
 
 func TestGetHoliday(t *testing.T) {
 	registry.Connect()
-	holidaymap = make(map[string]*Holiday)
 	h := GetHoliday("元旦")
 	registry.Close()
 	t.Fatal(h)
@@ -28,7 +27,7 @@ func TestSetHoliday(t *testing.T) {
 	if err != nil {
 		t.Fatal(err)
 	}
-	err = SetHoliday("春节", 7, 2022, 1, 31)
+	err = SetHoliday("春节", 7, 2023, 1, 21)
 	if err != nil {
 		t.Fatal(err)
 	}

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.westeurope.cloudapp.azure.com: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,63 @@
+// Package moyu 摸鱼
+package moyu
+
+import (
+	"sync"
+	"time"
+
+	control "github.com/FloatTech/zbputils/control"
+	zero "github.com/wdvxdr1123/ZeroBot"
+	"github.com/wdvxdr1123/ZeroBot/message"
+
+	"github.com/FloatTech/zbputils/control/order"
+)
+
+var (
+	msg        message.Message
+	mu         sync.Mutex
+	lastupdate time.Time
+)
+
+func init() { // 插件主体
+	control.Register("moyu", order.AcquirePrio(), &control.Options{
+		DisableOnDefault: true,
+		Help: "moyu\n" +
+			"- /启用 moyu\n" +
+			"- /禁用 moyu\n" +
+			"- 记录在\"0 10 * * *\"触发的指令\n" +
+			"   - 摸鱼提醒",
+	}).OnFullMatch("摸鱼提醒").SetBlock(true).
+		Handle(func(ctx *zero.Ctx) {
+			mu.Lock()
+			defer mu.Unlock()
+			if msg == nil || time.Since(lastupdate) > time.Hour*20 {
+				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()
+				lastupdate = time.Now()
+			}
+			ctx.Send(msg)
+		})
+}

plugin/moyu_calendar/calendar.go

@@ -0,0 +1,193 @@
+// 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"
+	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\n" +
+			"- 记录在\"30 8 * * *\"触发的指令\n" +
+			"   - 摸鱼人日历",
+	}).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))
+		})
+}
+
+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/music/selecter.go

@@ -5,7 +5,7 @@ import (
 	"crypto/md5"
 	"encoding/hex"
 	"fmt"
-	"io/ioutil"
+	"io"
 	"net/http"
 	"net/url"
 	"strings"
@@ -231,7 +231,7 @@ func netGet(url string, header http.Header) []byte {
 		return nil
 	}
 	defer res.Body.Close()
-	result, _ := ioutil.ReadAll(res.Body)
+	result, _ := io.ReadAll(res.Body)
 	return result
 }
 
@@ -245,6 +245,6 @@ func netPost(url string, data url.Values, header http.Header) []byte {
 		return nil
 	}
 	defer res.Body.Close()
-	result, _ := ioutil.ReadAll(res.Body)
+	result, _ := io.ReadAll(res.Body)
 	return result
 }

plugin/nativesetu/data.go

@@ -10,14 +10,10 @@ import (
 
 	"github.com/corona10/goimagehash"
 	"github.com/sirupsen/logrus"
-	"github.com/wdvxdr1123/ZeroBot/utils/helper"
 	_ "golang.org/x/image/webp" // import webp decoding
 
 	sql "github.com/FloatTech/sqlite"
 	"github.com/FloatTech/zbputils/file"
-	"github.com/FloatTech/zbputils/process"
-
-	"github.com/FloatTech/zbputils/control/order"
 )
 
 // setuclass holds setus in a folder, which is the class name.
@@ -27,25 +23,7 @@ type setuclass struct {
 	Path  string `db:"path"`  // Path 图片路径
 }
 
-var ns = &nsetu{db: &sql.Sqlite{DBPath: dbfile}}
-
-func init() {
-	go func() {
-		defer order.DoneOnExit()()
-		process.SleepAbout1sTo2s()
-		err := os.MkdirAll(datapath, 0755)
-		if err != nil {
-			panic(err)
-		}
-		if file.IsExist(cfgfile) {
-			b, err := os.ReadFile(cfgfile)
-			if err == nil {
-				setupath = helper.BytesToString(b)
-				logrus.Println("[nsetu] set setu dir to", setupath)
-			}
-		}
-	}()
-}
+var ns = &nsetu{db: &sql.Sqlite{}}
 
 type nsetu struct {
 	db *sql.Sqlite

plugin/nativesetu/main.go

@@ -12,16 +12,11 @@ import (
 
 	"github.com/FloatTech/zbputils/control"
 	"github.com/FloatTech/zbputils/ctxext"
+	"github.com/FloatTech/zbputils/file"
 
 	"github.com/FloatTech/zbputils/control/order"
 )
 
-const (
-	datapath = "data/nsetu"
-	dbfile   = datapath + "/data.db"
-	cfgfile  = datapath + "/setupath.txt"
-)
-
 var (
 	setupath = "/tmp" // 绝对路径，图片根目录
 )
@@ -35,7 +30,19 @@ func init() {
 			"- 设置本地setu绝对路径[xxx]\n" +
 			"- 刷新所有本地setu\n" +
 			"- 所有本地setu分类",
+		PrivateDataFolder: "nsetu",
 	})
+
+	ns.db.DBPath = engine.DataFolder() + "data.db"
+	cfgfile := engine.DataFolder() + "setupath.txt"
+	if file.IsExist(cfgfile) {
+		b, err := os.ReadFile(cfgfile)
+		if err == nil {
+			setupath = helper.BytesToString(b)
+			logrus.Println("[nsetu] set setu dir to", setupath)
+		}
+	}
+
 	engine.OnRegex(`^本地(.*)$`, ctxext.FirstValueInList(ns)).SetBlock(true).
 		Handle(func(ctx *zero.Ctx) {
 			imgtype := ctx.State["regex_matched"].([]string)[1]
@@ -44,9 +51,16 @@ func init() {
 			err := ns.db.Pick(imgtype, sc)
 			ns.mu.RUnlock()
 			if err != nil {
-				ctx.SendChain(message.Text("ERROR: ", err))
+				ctx.SendChain(message.Text("ERROR:", err))
 			} else {
 				p := "file:///" + setupath + "/" + sc.Path
+				if ctx.Event.GroupID != 0 {
+					ctx.SendGroupForwardMessage(ctx.Event.GroupID, message.Message{
+						ctxext.FakeSenderForwardNode(ctx,
+							message.Text(imgtype, ": ", sc.Name, "\n"), message.Image(p),
+						)})
+					return
+				}
 				ctx.SendChain(message.Text(imgtype, ": ", sc.Name, "\n"), message.Image(p))
 			}
 		})
@@ -57,7 +71,7 @@ func init() {
 			if err == nil {
 				ctx.SendChain(message.Text("成功！"))
 			} else {
-				ctx.SendChain(message.Text("ERROR: ", err))
+				ctx.SendChain(message.Text("ERROR:", err))
 			}
 		})
 	engine.OnRegex(`^设置本地setu绝对路径(.*)$`, zero.SuperUserPermission).SetBlock(true).
@@ -67,7 +81,7 @@ func init() {
 			if err == nil {
 				ctx.SendChain(message.Text("成功！"))
 			} else {
-				ctx.SendChain(message.Text("ERROR: ", err))
+				ctx.SendChain(message.Text("ERROR:", err))
 			}
 		})
 	engine.OnFullMatch("刷新所有本地setu", zero.SuperUserPermission).SetBlock(true).
@@ -76,7 +90,7 @@ func init() {
 			if err == nil {
 				ctx.SendChain(message.Text("成功！"))
 			} else {
-				ctx.SendChain(message.Text("ERROR: ", err))
+				ctx.SendChain(message.Text("ERROR:", err))
 			}
 		})
 	engine.OnFullMatch("所有本地setu分类").SetBlock(true).

plugin/nativewife/main.go

@@ -19,23 +19,17 @@ import (
 	"github.com/FloatTech/zbputils/control/order"
 
 	control "github.com/FloatTech/zbputils/control"
-	"github.com/FloatTech/zbputils/ctxext"
 	"github.com/FloatTech/zbputils/file"
 )
 
-const base = "data/nwife"
-
-var baseuri = "file:///" + file.BOTPATH + "/" + base
-
 func init() {
-	err := os.MkdirAll(base, 0755)
-	if err != nil {
-		panic(err)
-	}
 	engine := control.Register("nwife", order.AcquirePrio(), &control.Options{
-		DisableOnDefault: false,
-		Help:             "nativewife\n- 抽wife[@xxx]\n- 添加wife[名字][图片]\n- 删除wife[名字]\n- [让 | 不让]所有人均可添加wife",
+		DisableOnDefault:  false,
+		Help:              "nativewife\n- 抽wife[@xxx]\n- 添加wife[名字][图片]\n- 删除wife[名字]\n- [让 | 不让]所有人均可添加wife",
+		PrivateDataFolder: "nwife",
 	})
+	base := engine.DataFolder()
+	baseuri := "file:///" + file.BOTPATH + "/" + base
 	engine.OnPrefix("抽wife", zero.OnlyGroup).SetBlock(true).
 		Handle(func(ctx *zero.Ctx) {
 			grpf := strconv.FormatInt(ctx.Event.GroupID, 36)
@@ -52,7 +46,7 @@ func init() {
 				ctx.SendChain(message.Text("大家的wife都是", wn, "\n"), message.Image(baseuri+"/"+grpf+"/"+wn), message.Text("\n哦~"))
 			default:
 				// 获取名字
-				name := ctxext.NickName(ctx)
+				name := ctx.NickName()
 				now := time.Now()
 				s := md5.Sum(helper.StringToBytes(fmt.Sprintf("%s%d%d%d", name, now.Year(), now.Month(), now.Day())))
 				r := rand.New(rand.NewSource(int64(binary.LittleEndian.Uint64(s[:]))))
@@ -62,7 +56,7 @@ func init() {
 			}
 		})
 	// 上传一张图
-	engine.OnPrefix("添加wife", zero.OnlyGroup, chkAddWifePermission, ctxext.MustProvidePicture).SetBlock(true).
+	engine.OnPrefix("添加wife", zero.OnlyGroup, chkAddWifePermission, zero.MustProvidePicture).SetBlock(true).
 		Handle(func(ctx *zero.Ctx) {
 			name := ""
 			for _, elem := range ctx.Event.Message {
@@ -78,13 +72,13 @@ func init() {
 				url := ctx.State["image_url"].([]string)[0]
 				grpfolder := base + "/" + strconv.FormatInt(ctx.Event.GroupID, 36)
 				if file.IsNotExist(grpfolder) {
-					err = os.Mkdir(grpfolder, 0755)
+					err := os.Mkdir(grpfolder, 0755)
 					if err != nil {
 						ctx.SendChain(message.Reply(ctx.Event.MessageID), message.Text("错误：", err.Error()))
 						return
 					}
 				}
-				err = file.DownloadTo(url, grpfolder+"/"+name, true)
+				err := file.DownloadTo(url, grpfolder+"/"+name, true)
 				if err == nil {
 					ctx.SendChain(message.Reply(ctx.Event.MessageID), message.Text("成功！"))
 				} else {
@@ -108,7 +102,7 @@ func init() {
 			}
 			if name != "" {
 				grpfolder := base + "/" + strconv.FormatInt(ctx.Event.GroupID, 36)
-				err = os.Remove(grpfolder + "/" + name)
+				err := os.Remove(grpfolder + "/" + name)
 				if err == nil {
 					ctx.SendChain(message.Reply(ctx.Event.MessageID), message.Text("成功！"))
 				} else {

plugin/nbnhhsh/nbnhhsh.go

@@ -2,7 +2,7 @@
 package nbnhhsh
 
 import (
-	"io/ioutil"
+	"io"
 	"net/http"
 	"net/url"
 	"strings"
@@ -31,7 +31,7 @@ func getValue(text string) []string {
 	urlValues.Add("text", text)
 	resp, err := http.PostForm("https://lab.magiconch.com/api/nbnhhsh/guess", urlValues)
 	if err == nil {
-		body, err := ioutil.ReadAll(resp.Body)
+		body, err := io.ReadAll(resp.Body)
 		if err == nil {
 			resp.Body.Close()
 			json := gjson.ParseBytes(body)

plugin/novel/qianbi.go

@@ -3,7 +3,7 @@ package novel
 
 import (
 	"fmt"
-	"io/ioutil"
+	"io"
 	"net/http"
 	"net/http/cookiejar"
 	"net/url"
@@ -25,14 +25,14 @@ import (
 )
 
 const (
-	websiteURL   = "https://www.23qb.net"
+	websiteURL   = "https://www.23qb.com"
 	websiteTitle = "铅笔小说"
 	errorTitle   = "出现错误！"
 	username     = "zerobot"
 	password     = "123456"
 	submit       = "%26%23160%3B%B5%C7%26%23160%3B%26%23160%3B%C2%BC%26%23160%3B"
 	ua           = "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/96.0.4664.110 Safari/537.36"
-	loginURL     = websiteURL + "/login.php?do=submit&jumpurl=https%3A%2F%2Fwww.23qb.net%2F"
+	loginURL     = websiteURL + "/login.php?do=submit&jumpurl=https%3A%2F%2Fwww.23qb.com%2F"
 	searchURL    = websiteURL + "/saerch.php"
 	idReg        = `/(\d+)/`
 )
@@ -84,7 +84,7 @@ func init() {
 						log.Println("err:", err)
 					}
 					if id := ctx.SendChain(message.Image("base64://" + helper.BytesToString(data))); id.ID() == 0 {
-						ctx.SendChain(message.Text("ERROR: 可能被风控了"))
+						ctx.SendChain(message.Text("ERROR:可能被风控了"))
 					}
 				} else {
 					text := htmlquery.InnerText(htmlquery.FindOne(doc, "//div[@id='tipss']"))
@@ -164,7 +164,7 @@ func search(searchKey string) (searchHTML string) {
 		log.Errorln("[novel]", err)
 	}
 	defer searchResp.Body.Close()
-	searchData, err := ioutil.ReadAll(searchResp.Body)
+	searchData, err := io.ReadAll(searchResp.Body)
 	if err != nil {
 		log.Errorf("[novel] get response for url=%s got error=%s\n", searchURL, err.Error())
 	}

plugin/nsfw/main.go

@@ -18,7 +18,7 @@ func init() {
 		Help:             "nsfw图片识别\n- nsfw打分[图片]",
 	}).ApplySingle(ctxext.DefaultSingle)
 	// 上传一张图进行评价
-	engine.OnKeywordGroup([]string{"nsfw打分"}, zero.OnlyGroup, ctxext.MustProvidePicture).SetBlock(true).
+	engine.OnKeywordGroup([]string{"nsfw打分"}, zero.OnlyGroup, zero.MustProvidePicture).SetBlock(true).
 		Handle(func(ctx *zero.Ctx) {
 			url := ctx.State["image_url"].([]string)
 			if len(url) > 0 {
@@ -35,7 +35,7 @@ func init() {
 		DisableOnDefault: true,
 		Help:             "nsfw图片自动识别\n- 当图片属于非 neutral 类别时自动发送评价",
 	})
-	en.OnMessage(ctxext.IsPicExists).SetBlock(false).
+	en.OnMessage(zero.IsPicExists).SetBlock(false).
 		Handle(func(ctx *zero.Ctx) {
 			url := ctx.State["image_url"].([]string)
 			if len(url) > 0 {

plugin/omikuji/model.go

@@ -1,12 +1,18 @@
 package omikuji
 
-import "strconv"
+import (
+	"strconv"
+
+	sql "github.com/FloatTech/sqlite"
+)
 
 type kuji struct {
 	ID   uint8  `db:"id"`
 	Text string `db:"text"`
 }
 
+var db = &sql.Sqlite{}
+
 // 返回一个解签
 func getKujiByBango(id uint8) string {
 	var s kuji

plugin/omikuji/sensou.go

@@ -14,6 +14,7 @@ import (
 
 	control "github.com/FloatTech/zbputils/control"
 	"github.com/FloatTech/zbputils/ctxext"
+	"github.com/FloatTech/zbputils/file"
 	"github.com/FloatTech/zbputils/img/text"
 
 	"github.com/FloatTech/zbputils/control/order"
@@ -26,7 +27,24 @@ func init() { // 插件主体
 		DisableOnDefault: false,
 		Help: "浅草寺求签\n" +
 			"- 求签 | 占卜\n- 解签",
+		PublicDataFolder: "Omikuji",
 	}).ApplySingle(ctxext.DefaultSingle)
+
+	go func() {
+		dbpath := engine.DataFolder()
+		db.DBPath = dbpath + "kuji.db"
+		_, _ = file.GetLazyData(db.DBPath, false, true)
+		err := db.Create("kuji", &kuji{})
+		if err != nil {
+			panic(err)
+		}
+		n, err := db.Count("kuji")
+		if err != nil {
+			panic(err)
+		}
+		log.Printf("[kuji]读取%d条签文", n)
+	}()
+
 	engine.OnFullMatchGroup([]string{"求签", "占卜"}).SetBlock(true).
 		Handle(func(ctx *zero.Ctx) {
 			miku := bangoToday(ctx.Event.UserID)
@@ -43,7 +61,7 @@ func init() { // 插件主体
 				log.Errorln("[omikuji]:", err)
 			}
 			if id := ctx.SendChain(message.At(ctx.Event.UserID), message.Image("base64://"+helper.BytesToString(kujiBytes))); id.ID() == 0 {
-				ctx.SendChain(message.Text("ERROR: 可能被风控了"))
+				ctx.SendChain(message.Text("ERROR:可能被风控了"))
 			}
 		})
 }

plugin/reborn/born.go

@@ -4,7 +4,13 @@ import (
 	wr "github.com/mroth/weightedrand"
 )
 
+type rate []struct {
+	Name   string  `json:"name"`
+	Weight float64 `json:"weight"`
+}
+
 var (
+	areac     *wr.Chooser
 	gender, _ = wr.NewChooser(
 		wr.Choice{Item: "男孩子", Weight: 50707},
 		wr.Choice{Item: "女孩子", Weight: 48292},

plugin/reborn/load.go

@@ -0,0 +1,16 @@
+package reborn
+
+import (
+	"encoding/json"
+
+	"github.com/FloatTech/zbputils/file"
+)
+
+// load 加载rate数据
+func load(area *rate, jsonfile string) error {
+	data, err := file.GetLazyData(jsonfile, true, true)
+	if err != nil {
+		return err
+	}
+	return json.Unmarshal(data, area)
+}

plugin/reborn/main.go

@@ -4,9 +4,10 @@ package reborn
 import (
 	"fmt"
 	"math/rand"
-	"time"
 
 	control "github.com/FloatTech/zbputils/control"
+	wr "github.com/mroth/weightedrand"
+	"github.com/sirupsen/logrus"
 	zero "github.com/wdvxdr1123/ZeroBot"
 	"github.com/wdvxdr1123/ZeroBot/message"
 
@@ -14,11 +15,31 @@ import (
 )
 
 func init() {
-	rand.Seed(time.Now().UnixNano())
-	control.Register("reborn", order.AcquirePrio(), &control.Options{
+	en := control.Register("reborn", order.AcquirePrio(), &control.Options{
 		DisableOnDefault: false,
 		Help:             "投胎\n- reborn",
-	}).OnFullMatch("reborn").SetBlock(true).
+		PublicDataFolder: "Reborn",
+	})
+	go func() {
+		datapath := en.DataFolder()
+		jsonfile := datapath + "rate.json"
+		area := make(rate, 226)
+		err := load(&area, jsonfile)
+		if err != nil {
+			panic(err)
+		}
+		choices := make([]wr.Choice, len(area))
+		for i, a := range area {
+			choices[i].Item = a.Name
+			choices[i].Weight = uint(a.Weight * 1e9)
+		}
+		areac, err = wr.NewChooser(choices...)
+		if err != nil {
+			panic(err)
+		}
+		logrus.Printf("[Reborn]读取%d个国家/地区", len(area))
+	}()
+	en.OnFullMatch("reborn").SetBlock(true).
 		Handle(func(ctx *zero.Ctx) {
 			if rand.Int31() > 1<<27 {
 				ctx.SendChain(message.At(ctx.Event.UserID), message.Text(fmt.Sprintf("投胎成功！\n您出生在 %s, 是 %s。", randcoun(), randgen())))

plugin/runcode/code_runner.go

@@ -3,7 +3,7 @@ package runcode
 
 import (
 	"errors"
-	"io/ioutil"
+	"io"
 	"net/http"
 	"net/url"
 	"strings"
@@ -104,9 +104,10 @@ func init() {
 			"JavaScript || TypeScript || PHP || Shell \n" +
 			"Kotlin  || Rust || Erlang || Ruby || Swift \n" +
 			"R || VB || Py2 || Perl || Pascal || Scala",
-	}).ApplySingle(ctxext.DefaultSingle).OnRegex(`^>runcode\s(.+?)\s([\s\S]+)$`).SetBlock(true).Limit(ctxext.LimitByUser).
+	}).ApplySingle(ctxext.DefaultSingle).OnRegex(`^>runcode(raw)?\s(.+?)\s([\s\S]+)$`).SetBlock(true).Limit(ctxext.LimitByUser).
 		Handle(func(ctx *zero.Ctx) {
-			language := ctx.State["regex_matched"].([]string)[1]
+			israw := ctx.State["regex_matched"].([]string)[1] != ""
+			language := ctx.State["regex_matched"].([]string)[2]
 			language = strings.ToLower(language)
 			if runType, exist := table[language]; !exist {
 				// 不支持语言
@@ -116,10 +117,9 @@ func init() {
 				)
 			} else {
 				// 执行运行
-				block := ctx.State["regex_matched"].([]string)[2]
-				block = message.UnescapeCQCodeText(block)
-				if block == "help" {
-					// 输出模板
+				block := message.UnescapeCQText(ctx.State["regex_matched"].([]string)[3])
+				switch block {
+				case "help":
 					ctx.SendChain(
 						message.Text("> ", ctx.Event.Sender.NickName, "  ", language, "-template:\n"),
 						message.Text(
@@ -127,19 +127,23 @@ func init() {
 							templates[language],
 						),
 					)
-				} else {
+				default:
 					if output, err := runCode(block, runType); err != nil {
 						// 运行失败
 						ctx.SendChain(
 							message.Text("> ", ctx.Event.Sender.NickName, "\n"),
-							message.Text("ERROR: ", err),
+							message.Text("ERROR:", err),
 						)
 					} else {
 						// 运行成功
-						ctx.SendChain(
-							message.Text("> ", ctx.Event.Sender.NickName, "\n"),
-							message.Text(output),
-						)
+						if israw {
+							ctx.SendChain(message.Text(output))
+						} else {
+							ctx.SendChain(
+								message.Text("> ", ctx.Event.Sender.NickName, "\n"),
+								message.Text(output),
+							)
+						}
 					}
 				}
 			}
@@ -177,7 +181,7 @@ func runCode(code string, runType [2]string) (string, error) {
 	if body.StatusCode != http.StatusOK {
 		return "", errors.New("code not 200")
 	}
-	res, err := ioutil.ReadAll(body.Body)
+	res, err := io.ReadAll(body.Body)
 	if err != nil {
 		return "", err
 	}

plugin/saucenao/searcher.go

@@ -5,19 +5,20 @@ import (
 	"fmt"
 	"strconv"
 
-	"github.com/FloatTech/AnimeAPI/ascii2d"
-	"github.com/FloatTech/AnimeAPI/pixiv"
-	"github.com/FloatTech/AnimeAPI/saucenao"
-	control "github.com/FloatTech/zbputils/control"
-	"github.com/FloatTech/zbputils/ctxext"
-	"github.com/FloatTech/zbputils/file"
-	"github.com/FloatTech/zbputils/img/pool"
-	"github.com/FloatTech/zbputils/process"
 	"github.com/sirupsen/logrus"
 	zero "github.com/wdvxdr1123/ZeroBot"
 	"github.com/wdvxdr1123/ZeroBot/message"
 
+	"github.com/FloatTech/AnimeAPI/ascii2d"
+	"github.com/FloatTech/AnimeAPI/pixiv"
+	"github.com/FloatTech/AnimeAPI/saucenao"
+	"github.com/FloatTech/AnimeAPI/yandex"
+
+	"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"
 )
 
 func init() { // 插件主体
@@ -35,48 +36,34 @@ func init() { // 插件主体
 			// 获取P站插图信息
 			illust, err := pixiv.Works(id)
 			if err != nil {
-				ctx.SendChain(message.Text("ERROR: ", err))
+				ctx.SendChain(message.Text("ERROR:", err))
 				return
 			}
 			if illust.Pid > 0 {
 				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 := ""
-					m, err := pool.GetImage(n)
-					if err == nil {
-						imgs = append(imgs, message.Image(m.String()))
-						continue
-					}
-					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 = illust.DownloadToCache(i, n)
-						if err == nil {
-							f = file.BOTPATH + "/" + filepath
-						}
-					}
-					if f != "" {
-						m.SetFile(f)
-						hassent, err := m.Push(ctxext.SendToSelf(ctx), ctxext.GetMessage(ctx))
+					var m *pool.Image
+					if file.IsNotExist(f) {
+						m, err = pool.GetImage(n)
 						if err == nil {
 							imgs = append(imgs, message.Image(m.String()))
-							if hassent {
-								process.SleepAbout1sTo2s()
-							}
-						} else {
-							logrus.Debugln("[saucenao]", err)
-							imgs = append(imgs, message.Image("file:///"+f))
+							continue
+						}
+						logrus.Debugln("[sausenao]开始下载", n)
+						logrus.Debugln("[sausenao]urls:", illust.ImageUrls)
+						err1 := illust.DownloadToCache(i)
+						if err1 == nil {
+							m.SetFile(f)
+							_, _ = m.Push(ctxext.SendToSelf(ctx), ctxext.GetMessage(ctx))
+						}
+						if err1 != nil {
+							logrus.Debugln("[sausenao]下载err:", err1)
 						}
 					}
+					imgs = append(imgs, message.Image("file:///"+f))
 				}
 				txt := message.Text(
 					"标题：", illust.Title, "\n",
@@ -97,14 +84,14 @@ func init() { // 插件主体
 			}
 		})
 	// 以图搜图
-	engine.OnKeywordGroup([]string{"以图搜图", "搜索图片", "以图识图"}, zero.OnlyGroup, ctxext.MustProvidePicture).SetBlock(true).
+	engine.OnKeywordGroup([]string{"以图搜图", "搜索图片", "以图识图"}, zero.OnlyGroup, zero.MustProvidePicture).SetBlock(true).
 		Handle(func(ctx *zero.Ctx) {
 			// 开始搜索图片
 			ctx.SendChain(message.Text("少女祈祷中......"))
 			for _, pic := range ctx.State["image_url"].([]string) {
 				fmt.Println(pic)
 				if result, err := saucenao.SauceNAO(pic); err != nil {
-					ctx.SendChain(message.Text("ERROR: ", err))
+					ctx.SendChain(message.Text("ERROR:", err))
 				} else {
 					// 返回SauceNAO的结果
 					ctx.SendChain(
@@ -122,41 +109,45 @@ func init() { // 插件主体
 					)
 					continue
 				}
+				if result, err := yandex.Yandex(pic); err != nil {
+					ctx.SendChain(message.Text("ERROR:", err))
+				} else {
+					ctx.SendChain(
+						message.Text("也许是这个？"),
+						message.Text(
+							"\n",
+							"标题：", result.Title, "\n",
+							"插画ID：", result.Pid, "\n",
+							"画师：", result.UserName, "\n",
+							"画师ID：", result.UserId, "\n",
+							"直链：", "https://pixivel.moe/detail?id=", result.Pid,
+						),
+					)
+				}
+				// 不论结果如何都执行 ascii2d 搜索
 				if result, err := ascii2d.Ascii2d(pic); err != nil {
-					ctx.SendChain(message.Text("ERROR: ", err))
+					ctx.SendChain(message.Text("ERROR:", err))
 					continue
 				} else {
-					var msg message.Message = []message.MessageSegment{
-						message.CustomNode(
-							ctx.Event.Sender.Name(),
-							ctx.Event.UserID,
-							"ascii2d搜图结果",
-						)}
+					msg := message.Message{ctxext.FakeSenderForwardNode(ctx, message.Text("ascii2d搜图结果"))}
 					for i := 0; i < len(result) && i < 5; i++ {
-						msg = append(
-							msg,
-							message.CustomNode(
-								ctx.Event.Sender.Name(),
-								ctx.Event.UserID,
-								[]message.MessageSegment{
-									message.Image(result[i].Thumb),
-									message.Text(fmt.Sprintf(
-										"标题：%s\n图源：%s\n画师：%s\n画师链接：%s\n图片链接：%s",
-										result[i].Name,
-										result[i].Type,
-										result[i].AuthNm,
-										result[i].Author,
-										result[i].Link,
-									)),
-								},
-							),
+						msg = append(msg, ctxext.FakeSenderForwardNode(ctx,
+							message.Image(result[i].Thumb),
+							message.Text(fmt.Sprintf(
+								"标题：%s\n图源：%s\n画师：%s\n画师链接：%s\n图片链接：%s",
+								result[i].Name,
+								result[i].Type,
+								result[i].AuthNm,
+								result[i].Author,
+								result[i].Link,
+							))),
 						)
 					}
 					if id := ctx.SendGroupForwardMessage(
 						ctx.Event.GroupID,
 						msg,
 					).Get("message_id").Int(); id == 0 {
-						ctx.SendChain(message.Text("ERROR: 可能被风控了"))
+						ctx.SendChain(message.Text("ERROR:可能被风控了"))
 					}
 				}
 			}

plugin/scale/main.go

@@ -2,39 +2,56 @@
 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"
+	_ "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"
 )
 
-const cachedir = "data/scale/"
-
 func init() {
-	_ = os.RemoveAll(cachedir)
-	err := os.MkdirAll(cachedir, 0755)
-	if err != nil {
-		panic(err)
-	}
 	engine := control.Register("scale", order.AcquirePrio(), &control.Options{
-		DisableOnDefault: false,
-		Help:             "叔叔的AI二次元图片放大\n- 放大图片[图片]",
+		DisableOnDefault:  false,
+		Help:              "叔叔的AI二次元图片放大\n- 放大图片[图片]",
+		PrivateDataFolder: "scale",
 	}).ApplySingle(ctxext.DefaultSingle)
+	cachedir := engine.DataFolder()
 	// 上传一张图进行评价
-	engine.OnKeywordGroup([]string{"放大图片"}, zero.OnlyGroup, ctxext.MustProvidePicture, getPara).SetBlock(true).
+	engine.OnKeywordGroup([]string{"放大图片"}, zero.OnlyGroup, zero.MustProvidePicture, getPara).SetBlock(true).
 		Handle(func(ctx *zero.Ctx) {
 			url := ctx.State["image_url"].([]string)
 			if len(url) > 0 {
+				datachan := make(chan []byte, 1)
+				var errsub error
+				go func() {
+					var d []byte
+					d, errsub = web.GetData(url[0])
+					datachan <- d
+				}()
 				ctx.SendChain(message.Text("少女祈祷中..."))
+
 				p, err := nsfw.Classify(url[0])
 				if err != nil {
 					ctx.SendChain(message.Text("ERROR:", err))
@@ -44,12 +61,42 @@ func init() {
 					ctx.SendChain(message.Text("请发送二次元图片!"))
 					return
 				}
-				paras := ctx.State["scale_paras"].([2]int)
-				data, err := scale.Get(url[0], paras[0], paras[1], 2)
+
+				data := <-datachan
+				if errsub != nil {
+					ctx.SendChain(message.Text("ERROR:", errsub))
+					return
+				}
+				im, _, err := image.Decode(bytes.NewReader(data))
 				if err != nil {
 					ctx.SendChain(message.Text("ERROR:", err))
 					return
 				}
+				px := im.Bounds().Size().X * im.Bounds().Size().Y
+				paras := ctx.State["scale_paras"].([2]int)
+
+				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 {
@@ -64,7 +111,7 @@ func init() {
 }
 
 func getPara(ctx *zero.Ctx) bool {
-	next := zero.NewFutureEvent("message", 999, false, zero.CheckUser(ctx.Event.UserID))
+	next := zero.NewFutureEvent("message", 999, false, ctx.CheckSession())
 	recv, cancel := next.Repeat()
 	i := 0
 	paras := [2]int{}
@@ -72,9 +119,10 @@ func getPara(ctx *zero.Ctx) bool {
 	for {
 		select {
 		case <-time.After(time.Second * 120):
+			cancel()
 			return false
-		case e := <-recv:
-			msg := e.Message.ExtractPlainText()
+		case c := <-recv:
+			msg := c.Event.Message.ExtractPlainText()
 			num, err := strconv.Atoi(msg)
 			if err != nil {
 				ctx.SendChain(message.Text("请输入数字!"))

plugin/score/model.go

@@ -4,10 +4,13 @@ import (
 	"os"
 	"time"
 
+	_ "github.com/fumiama/sqlite3" // import sql
 	"github.com/jinzhu/gorm"
-	_ "github.com/logoove/sqlite" // import sql
 )
 
+// sdb 得分数据库
+var sdb *scoredb
+
 // scoredb 分数数据库
 type scoredb gorm.DB
 

plugin/score/sign_in.go

@@ -12,11 +12,10 @@ 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"
 	"github.com/FloatTech/zbputils/file"
+	"github.com/FloatTech/zbputils/img"
 	"github.com/FloatTech/zbputils/img/text"
 	"github.com/FloatTech/zbputils/img/writer"
 	"github.com/FloatTech/zbputils/web"
@@ -37,9 +36,28 @@ var levelArray = [...]int{0, 1, 2, 5, 10, 20, 35, 55, 75, 100, 120}
 
 func init() {
 	engine := control.Register("score", order.AcquirePrio(), &control.Options{
-		DisableOnDefault: false,
-		Help:             "签到得分\n- 签到\n- 获得签到背景[@xxx] | 获得签到背景",
+		DisableOnDefault:  false,
+		Help:              "签到得分\n- 签到\n- 获得签到背景[@xxx] | 获得签到背景",
+		PrivateDataFolder: "score",
 	})
+	cachePath := engine.DataFolder() + "cache/"
+	go func() {
+		os.RemoveAll(cachePath)
+		err := os.MkdirAll(cachePath, 0755)
+		if err != nil {
+			panic(err)
+		}
+		_, err = file.GetLazyData(text.BoldFontFile, false, true)
+		if err != nil {
+			panic(err)
+		}
+		_, err = file.GetLazyData(text.FontFile, false, true)
+		if err != nil {
+			panic(err)
+		}
+		sdb = initialize(engine.DataFolder() + "score.db")
+		log.Println("[score]加载score数据库")
+	}()
 	engine.OnFullMatch("签到", zero.OnlyGroup).SetBlock(true).
 		Handle(func(ctx *zero.Ctx) {
 			uid := ctx.Event.UserID
@@ -70,6 +88,10 @@ func init() {
 				ctx.SendChain(message.Text("ERROR:", err))
 				return
 			}
+
+			// 避免图片过大，最大 1280*720
+			back = img.Limit(back, 1280, 720)
+
 			canvas := gg.NewContext(back.Bounds().Size().X, int(float64(back.Bounds().Size().Y)*1.7))
 			canvas.SetRGB(1, 1, 1)
 			canvas.Clear()
@@ -84,7 +106,7 @@ func init() {
 			canvas.SetRGB(0, 0, 0)
 			canvas.DrawString(hourWord, float64(back.Bounds().Size().X)*0.1, float64(back.Bounds().Size().Y)*1.2)
 			canvas.DrawString(monthWord, float64(back.Bounds().Size().X)*0.6, float64(back.Bounds().Size().Y)*1.2)
-			nickName := ctxext.CardOrNickName(ctx, uid)
+			nickName := ctx.CardOrNickName(uid)
 			if err = canvas.LoadFontFace(text.FontFile, float64(back.Bounds().Size().X)*0.04); err != nil {
 				ctx.SendChain(message.Text("ERROR:", err))
 				return
@@ -119,12 +141,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)
@@ -183,12 +202,12 @@ func getLevel(count int) int {
 
 func initPic(picFile string) {
 	if file.IsNotExist(picFile) {
-		data, err := web.ReqWith(backgroundURL, "GET", referer, ua)
+		data, err := web.RequestDataWith(web.NewDefaultClient(), backgroundURL, "GET", referer, ua)
 		if err != nil {
 			log.Errorln("[score]", err)
 		}
 		picURL := gjson.Get(string(data), "pic").String()
-		data, err = web.ReqWith(picURL, "GET", "", ua)
+		data, err = web.RequestDataWith(web.NewDefaultClient(), picURL, "GET", "", ua)
 		if err != nil {
 			log.Errorln("[score]", err)
 		}

plugin/setutime/setu_geter.go

@@ -2,9 +2,7 @@
 package setutime
 
 import (
-	"errors"
 	"fmt"
-	"os"
 	"strconv"
 	"strings"
 	"sync"
@@ -26,15 +24,18 @@ import (
 
 // Pools 图片缓冲池
 type imgpool struct {
-	lock sync.Mutex
-	db   *sql.Sqlite
-	path string
-	max  int
-	pool map[string][]*pixiv.Illust
+	db     *sql.Sqlite
+	dbmu   sync.RWMutex
+	path   string
+	max    int
+	pool   map[string][]*message.MessageSegment
+	poolmu sync.Mutex
 }
 
 func (p *imgpool) List() (l []string) {
 	var err error
+	p.dbmu.RLock()
+	defer p.dbmu.RUnlock()
 	l, err = p.db.ListTables()
 	if err != nil {
 		l = []string{"涩图", "二次元", "风景", "车万"}
@@ -43,19 +44,26 @@ func (p *imgpool) List() (l []string) {
 }
 
 var pool = &imgpool{
-	db:   &sql.Sqlite{DBPath: "data/SetuTime/SetuTime.db"},
+	db:   &sql.Sqlite{},
 	path: pixiv.CacheDir,
 	max:  10,
-	pool: map[string][]*pixiv.Illust{},
+	pool: make(map[string][]*message.MessageSegment),
 }
 
 func init() { // 插件主体
-	_ = os.MkdirAll("data/SetuTime", 0755)
+	engine := control.Register("setutime", order.AcquirePrio(), &control.Options{
+		DisableOnDefault: false,
+		Help: "涩图\n" +
+			"- 来份[涩图/二次元/风景/车万]\n" +
+			"- 添加[涩图/二次元/风景/车万][P站图片ID]\n" +
+			"- 删除[涩图/二次元/风景/车万][P站图片ID]\n" +
+			"- >setu status",
+		PublicDataFolder: "SetuTime",
+	})
 
 	go func() {
-		defer order.DoneOnExit()()
-		process.SleepAbout1sTo2s()
 		// 如果数据库不存在则下载
+		pool.db.DBPath = engine.DataFolder() + "SetuTime.db"
 		_, _ = fileutil.GetLazyData(pool.db.DBPath, false, false)
 		err := pool.db.Open()
 		if err != nil {
@@ -68,14 +76,6 @@ func init() { // 插件主体
 		}
 	}()
 
-	engine := control.Register("setutime", order.AcquirePrio(), &control.Options{
-		DisableOnDefault: false,
-		Help: "涩图\n" +
-			"- 来份[涩图/二次元/风景/车万]\n" +
-			"- 添加[涩图/二次元/风景/车万][P站图片ID]\n" +
-			"- 删除[涩图/二次元/风景/车万][P站图片ID]\n" +
-			"- >setu status",
-	})
 	engine.OnRegex(`^来份(.*)$`, ctxext.FirstValueInList(pool)).SetBlock(true).Limit(ctxext.LimitByUser).
 		Handle(func(ctx *zero.Ctx) {
 			var imgtype = ctx.State["regex_matched"].([]string)[1]
@@ -86,13 +86,13 @@ func init() { // 插件主体
 				ctx.SendChain(message.Text("INFO: 正在填充弹药......"))
 				time.Sleep(time.Second * 10)
 				if pool.size(imgtype) == 0 {
-					ctx.SendChain(message.Text("ERROR: 等待填充，请稍后再试......"))
+					ctx.SendChain(message.Text("ERROR:等待填充，请稍后再试......"))
 					return
 				}
 			}
 			// 从缓冲池里抽一张
-			if id := ctx.SendChain(message.Image(pool.popfile(imgtype))); id.ID() == 0 {
-				ctx.SendChain(message.Text("ERROR: 可能被风控了"))
+			if id := ctx.SendChain(*pool.pop(imgtype)); id.ID() == 0 {
+				ctx.SendChain(message.Text("ERROR:可能被风控了"))
 			}
 		})
 
@@ -118,7 +118,7 @@ func init() { // 插件主体
 			)
 			// 查询数据库
 			if err := pool.remove(imgtype, id); err != nil {
-				ctx.SendChain(message.Text("ERROR: ", err))
+				ctx.SendChain(message.Text("ERROR:", err))
 				return
 			}
 			ctx.SendChain(message.Text("删除成功"))
@@ -128,6 +128,8 @@ func init() { // 插件主体
 	engine.OnFullMatchGroup([]string{">setu status"}).SetBlock(true).
 		Handle(func(ctx *zero.Ctx) {
 			state := []string{"[SetuTime]"}
+			pool.dbmu.RLock()
+			defer pool.dbmu.RUnlock()
 			for _, imgtype := range pool.List() {
 				num, err := pool.db.Count(imgtype)
 				if err != nil {
@@ -151,64 +153,51 @@ func (p *imgpool) push(ctx *zero.Ctx, imgtype string, illust *pixiv.Illust) {
 	u := illust.ImageUrls[0]
 	n := u[strings.LastIndex(u, "/")+1 : len(u)-4]
 	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
+			}
 		}
-		m.SetFile(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())
+		if ctxext.SendToSelf(ctx)(msg) == 0 {
+			msg = msg.Add("cache", "0")
+		}
 	}
-	p.lock.Lock()
-	p.pool[imgtype] = append(p.pool[imgtype], illust)
-	p.lock.Unlock()
+	p.poolmu.Lock()
+	p.pool[imgtype] = append(p.pool[imgtype], &msg)
+	p.poolmu.Unlock()
 }
 
-func (p *imgpool) pop(imgtype string) (illust *pixiv.Illust) {
-	p.lock.Lock()
-	defer p.lock.Unlock()
+func (p *imgpool) pop(imgtype string) (msg *message.MessageSegment) {
+	p.poolmu.Lock()
+	defer p.poolmu.Unlock()
 	if p.size(imgtype) == 0 {
 		return
 	}
-	illust = p.pool[imgtype][0]
+	msg = p.pool[imgtype][0]
 	p.pool[imgtype] = p.pool[imgtype][1:]
 	return
 }
 
-func (p *imgpool) file(i *pixiv.Illust) string {
-	u := i.ImageUrls[0]
-	m, err := imagepool.GetImage(u[strings.LastIndex(u, "/")+1 : len(u)-4])
-	if err == nil {
-		return m.String()
-	}
-	filename := fmt.Sprint(i.Pid) + "_p0"
-	filepath := fileutil.BOTPATH + `/` + 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 ""
-}
-
-func (p *imgpool) popfile(imgtype string) string {
-	return p.file(p.pop(imgtype))
-}
-
 // fill 补充池子
 func (p *imgpool) fill(ctx *zero.Ctx, imgtype string) {
 	times := math.Min(p.max-p.size(imgtype), 2)
+	p.dbmu.RLock()
+	defer p.dbmu.RUnlock()
 	for i := 0; i < times; i++ {
 		illust := &pixiv.Illust{}
 		// 查询出一张图片
 		if err := p.db.Pick(imgtype, illust); err != nil {
-			ctx.SendChain(message.Text("ERROR: ", err))
+			ctx.SendChain(message.Text("ERROR:", err))
 			continue
 		}
 		// 向缓冲池添加一张图片
@@ -218,6 +207,8 @@ func (p *imgpool) fill(ctx *zero.Ctx, imgtype string) {
 }
 
 func (p *imgpool) add(ctx *zero.Ctx, imgtype string, id int64) error {
+	p.dbmu.Lock()
+	defer p.dbmu.Unlock()
 	if err := p.db.Create(imgtype, &pixiv.Illust{}); err != nil {
 		return err
 	}
@@ -227,14 +218,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.file(illust))); id.ID() == 0 {
-		return errors.New("可能被风控，发送失败")
-	}
 	// 添加插画到对应的数据库table
 	if err := p.db.Insert(imgtype, illust); err != nil {
 		return err
@@ -243,5 +232,7 @@ func (p *imgpool) add(ctx *zero.Ctx, imgtype string, id int64) error {
 }
 
 func (p *imgpool) remove(imgtype string, id int64) error {
+	p.dbmu.Lock()
+	defer p.dbmu.Unlock()
 	return p.db.Del(imgtype, fmt.Sprintf("WHERE pid=%d", id))
 }

plugin/shadiao/caihongpi.go

@@ -11,7 +11,7 @@ import (
 
 func init() {
 	engine.OnFullMatch("哄我").SetBlock(true).Limit(ctxext.LimitByUser).Handle(func(ctx *zero.Ctx) {
-		data, err := web.ReqWith(chpURL, "GET", chpReferer, ua)
+		data, err := web.RequestDataWith(web.NewDefaultClient(), chpURL, "GET", chpReferer, ua)
 		if err != nil {
 			ctx.SendChain(message.Text("ERROR:", err))
 			return

plugin/shadiao/dujitang.go

@@ -11,7 +11,7 @@ import (
 
 func init() {
 	engine.OnFullMatch("来碗毒鸡汤").SetBlock(true).Limit(ctxext.LimitByUser).Handle(func(ctx *zero.Ctx) {
-		data, err := web.ReqWith(duURL, "GET", duReferer, ua)
+		data, err := web.RequestDataWith(web.NewDefaultClient(), duURL, "GET", duReferer, ua)
 		if err != nil {
 			ctx.SendChain(message.Text("ERROR:", err))
 			return

plugin/shadiao/pengyouquan.go

@@ -11,7 +11,7 @@ import (
 
 func init() {
 	engine.OnFullMatch("发个朋友圈").SetBlock(true).Limit(ctxext.LimitByUser).Handle(func(ctx *zero.Ctx) {
-		data, err := web.ReqWith(pyqURL, "GET", pyqReferer, ua)
+		data, err := web.RequestDataWith(web.NewDefaultClient(), pyqURL, "GET", pyqReferer, ua)
 		if err != nil {
 			ctx.SendChain(message.Text("ERROR:", err))
 			return