🐛 fix saucenao relative path

* Create readme.md

* 调用网易云热评API

* Update main.go

* Delete readme.md

* Delete main.go

* Create main.go

* Add files via upload

* Update prio.go

* Add files via upload

* Add files via upload

* Update prio.go

* Add files via upload

* Update prio.go

* Add files via upload

* Add files via upload

* Add files via upload

* Add files via upload

* Add files via upload

* revert main

Co-authored-by: 源文雨 <41315874+fumiama@users.noreply.github.com>

.github/workflows/nightly.yml

@@ -15,13 +15,9 @@ jobs:
     strategy:
       matrix:
         # build and publish in parallel: linux/386, linux/amd64, windows/386, windows/amd64, darwin/amd64, darwin/arm64
-        goos: [linux, windows, darwin]
+        goos: [linux, windows]
         goarch: ["386", amd64, arm, arm64]
         exclude:
-          - goos: darwin
-            goarch: arm
-          - goos: darwin
-            goarch: "386"
           - goos: windows
             goarch: arm
           - goos: windows

.gitignore

@@ -1,14 +1,3 @@
-data/SetuTime/cache
-data/control
-data/SetuTime/search
-data/manager
-data/acgimage
-data/saucenao
-data/fortune
-data/hs
-data/nsetu
-data/nwife
-data/sleep
 plugins/*.so
 plugins/*.dll
 .idea/

.gitmodules

@@ -0,0 +1,3 @@
+[submodule "data"]
+	path = data
+	url = https://github.com/FloatTech/zbpdata

.golangci.yml

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

.goreleaser.yml

@@ -11,7 +11,6 @@ builds:
       - GO111MODULE=on
     goos:
       - linux
-      - darwin
     goarch:
       - 386
       - amd64
@@ -20,11 +19,6 @@ builds:
     goarm:
       - 6
       - 7
-    ignore:
-      - goos: darwin
-        goarch: arm
-      - goos: darwin
-        goarch: 386
     mod_timestamp: "{{ .CommitTimestamp }}"
     flags:
       - -trimpath

README.md

@@ -28,20 +28,24 @@
 > 如果您不知道什么是 [OneBot](https://github.com/howmanybots/onebot) 或不希望运行多个程序，还可以直接前往 [gocqzbp](https://github.com/FloatTech/gocqzbp) 的 [Release](https://github.com/FloatTech/gocqzbp/releases) 页面下载单一可执行文件或前往 [Packages](https://github.com/FloatTech/gocqzbp/pkgs/container/gocqzbp) 页面使用`docker`，运行后按提示登录即可。
 
 ## 命令行参数
+> `[]`代表是可选参数
 ```bash
-zerobot -h -t token -u url [-d|w] [-g 监听地址:端口] qq1 qq2 qq3 ...
+zerobot [-h] [-t token] [-u url] [-n nickname] [-p prefix] [-d|w] [-g 监听地址:端口] [qq1 qq2 qq3 ...] [&]
 ```
 - **-h**: 显示帮助
 - **-t token**: 设置`AccessToken`，默认为空
 - **-u url**: 设置`Url`，默认为`ws://127.0.0.1:6700`
+- **-n nickname**: 设置默认昵称，默认为`椛椛`
+- **-p prefix**: 设置命令前缀，默认为`/`
 - **-d|w**: 开启 debug | warning 级别及以上日志输出
 - **-g 监听地址:端口**: 在 http://监听地址:端口 上开启 [webgui](https://github.com/FloatTech/bot-manager)
 - **qqs**: superusers 的 qq 号
+- **&**: 驻留在后台，必须放在最后，仅`Linux`下有效
 
 ## 功能
 > 在编译时，以下功能除插件控制外，均可通过注释`main.go`中的相应`import`而物理禁用，减小插件体积。
 > 通过插件控制，还可动态管理某个功能在某个群的打开/关闭。
-- **web管理** `import _ "github.com/FloatTech/ZeroBot-Plugin/control/web"`
+- **web管理** `import _ "github.com/FloatTech/zbputils/control/web"`
     - 开启后可执行文件大约增加 5M ，默认注释不开启。如需开启请自行编辑`main.go`取消注释
     - 需要配合 [webgui](https://github.com/FloatTech/bot-manager) 使用
 - **动态加载插件** `import _ github.com/FloatTech/ZeroBot-Plugin-Dynamic/dyloader`
@@ -65,14 +69,14 @@ zerobot -h -t token -u url [-d|w] [-g 监听地址:端口] qq1 qq2 qq3 ...
     - [x] 空调关
     - [x] 群温度
     - [x] 设置温度[正整数]
-    - [x] @Bot mua|啾咪|摸|上你|傻|裸|贴|老婆|抱|亲|一下|咬|操|123|进去|调教|搓|让|捏|挤|略|呐|原味|胖次|内裤|内衣|衣服|ghs|批|憨批|kkp|咕|骚|喜欢|suki|好き|看|不能|砸了|透|口我|草我|自慰|onani|オナニー|炸了|色图|涩图|告白|对不起|回来|吻|软|壁咚|掰开|女友|是|喵|嗷呜|叫|拜|佬|awsl|臭|香|腿|张开|脚|脸|头发|手|pr|舔|小穴|腰|诶嘿嘿|可爱|扭蛋|鼻|眼|色气|推|床|举|手冲|饿|变|敲|爬|怕|冲|射|不穿|迫害|猫粮|揪尾巴|薄荷|早|晚安|揉|榨|掐|胸|奶子|欧派|嫩|蹭|牵手|握手|拍照|w|睡不着|欧尼酱|哥|爱你|过来|自闭|打不过|么么哒|很懂|膝枕|累了|安慰|洗澡|一起睡觉|一起|多大|姐姐|糖|嗦|牛子|🐂子|🐮子|嫌弃|紧|baka|笨蛋|插|插进来|屁股|翘|翘起来|抬|抬起|爸|傲娇|rua|咕噜咕噜|咕噜|上床|做爱|吃掉|吃|揪|种草莓|种草|掀|妹|病娇|嘻
+    - [x] @Bot mua | 啾咪 | 摸 | 上你 | 傻 | 裸 | 贴 | 老婆 | 抱 | 亲 | 一下 | 咬 | 操 | 123 | 进去 | 调教 | 搓 | 让 | 捏 | 挤 | 略 | 呐 | 原味 | 胖次 | 内裤 | 内衣 | 衣服 | ghs | 批 | 憨批 | kkp | 咕 | 骚 | 喜欢 | suki | 好き | 看 | 不能 | 砸了 | 透 | 口我 | 草我 | 自慰 | onani | オナニー | 炸了 | 色图 | 涩图 | 告白 | 对不起 | 回来 | 吻 | 软 | 壁咚 | 掰开 | 女友 | 是 | 喵 | 嗷呜 | 叫 | 拜 | 佬 | awsl | 臭 | 香 | 腿 | 张开 | 脚 | 脸 | 头发 | 手 | pr | 舔 | 小穴 | 腰 | 诶嘿嘿 | 可爱 | 扭蛋 | 鼻 | 眼 | 色气 | 推 | 床 | 举 | 手冲 | 饿 | 变 | 敲 | 爬 | 怕 | 冲 | 射 | 不穿 | 迫害 | 猫粮 | 揪尾巴 | 薄荷 | 早 | 晚安 | 揉 | 榨 | 掐 | 胸 | 奶子 | 欧派 | 嫩 | 蹭 | 牵手 | 握手 | 拍照 | w | 睡不着 | 欧尼酱 | 哥 | 爱你 | 过来 | 自闭 | 打不过 | 么么哒 | 很懂 | 膝枕 | 累了 | 安慰 | 洗澡 | 一起睡觉 | 一起 | 多大 | 姐姐 | 糖 | 嗦 | 牛子 | 🐂子 | 🐮子 | 嫌弃 | 紧 | baka | 笨蛋 | 插 | 插进来 | 屁股 | 翘 | 翘起来 | 抬 | 抬起 | 爸 | 傲娇 | rua | 咕噜咕噜 | 咕噜 | 上床 | 做爱 | 吃掉 | 吃 | 揪 | 种草莓 | 种草 | 掀 | 妹 | 病娇 | 嘻
 - **ATRI** `import _ "github.com/FloatTech/ZeroBot-Plugin/plugin_atri"`
     - [x] 具体指令看 /用法 atri
     - 注：本插件基于 [ATRI](https://github.com/Kyomotoi/ATRI) ，为 Golang 移植版
 - **群管** `import _ "github.com/FloatTech/ZeroBot-Plugin/plugin_manager"`
     - [x] 禁言[@xxx][分钟]
     - [x] 解除禁言[@xxx]
-    - [x] 我要自闭|禅定 x [分钟|小时|天]
+    - [x] 我要自闭 | 禅定 x [分钟 | 小时 | 天]
     - [x] 开启全员禁言
     - [x] 解除全员禁言
     - [x] 升为管理[@xxx]
@@ -86,15 +90,15 @@ zerobot -h -t token -u url [-d|w] [-g 监听地址:端口] qq1 qq2 qq3 ...
     - [x] *退群通知
     - [x] 设置欢迎语[欢迎~]
     - [x] 在[MM]月[dd]日的[hh]点[mm]分时(用[url])提醒大家[xxx]
-    - [x] 在[MM]月[每周|周几]的[hh]点[mm]分时(用[url])提醒大家[xxx]
+    - [x] 在[MM]月[每周 | 周几]的[hh]点[mm]分时(用[url])提醒大家[xxx]
     - [x] 取消在[MM]月[dd]日的[hh]点[mm]分的提醒
-    - [x] 取消在[MM]月[每周|周几]的[hh]点[mm]分的提醒
+    - [x] 取消在[MM]月[每周 | 周几]的[hh]点[mm]分的提醒
     - [x] 在"cron"时(用[url])提醒大家[xxx]
     - [x] 取消在"cron"的提醒
     - [x] 列出所有提醒
     - [x] 翻牌
-    - [x] [开启|关闭]入群验证
-    - [x] [开启|关闭]gist加群自动审批
+    - [x] [开启 | 关闭]入群验证
+    - [x] [开启 | 关闭]gist加群自动审批
     - [ ] 同意好友请求
     - [ ] 撤回[@xxx] [xxx]
     - [ ] 警告[@xxx]
@@ -117,8 +121,8 @@ zerobot -h -t token -u url [-d|w] [-g 监听地址:端口] qq1 qq2 qq3 ...
     - [x] 卖萌[@xxx]
     - [x] 抽老婆[@xxx]
 - **AIWife** `import _ "github.com/FloatTech/ZeroBot-Plugin/plugin_aiwife"`
-    - [x] waifu|随机waifu(从[100000个AI生成的waifu](https://www.thiswaifudoesnotexist.net/)中随机一位)
-- **gif** `import _ "github.com/tdf1939/ZeroBot-Plugin-Gif/plugin_gif"`
+    - [x] waifu | 随机waifu(从[100000个AI生成的waifu](https://www.thiswaifudoesnotexist.net/)中随机一位)
+- **gif** `import _ "github.com/FloatTech/ZeroBot-Plugin/plugin_gif"`
     - [x] 爬[@xxx]
     - [x] 摸[@xxx]
     - [x] 搓[@xxx]
@@ -146,27 +150,29 @@ zerobot -h -t token -u url [-d|w] [-g 监听地址:端口] qq1 qq2 qq3 ...
 - **lolicon** `import _ "github.com/FloatTech/ZeroBot-Plugin/plugin_lolicon"`
     - [x] 来份萝莉
 - **搜图** `import _ "github.com/FloatTech/ZeroBot-Plugin/plugin_saucenao"`
-    - [x] 以图搜图|搜索图片|以图识图[图片]
+    - [x] 以图搜图 | 搜索图片 | 以图识图[图片]
     - [x] 搜图[P站图片ID]
 - **搜番** `import _ "github.com/FloatTech/ZeroBot-Plugin/plugin_tracemoe"`
-    - [x] 搜番|搜索番剧[图片]
-- **随机图片与AI点评** `github.com/FloatTech/ZeroBot-Plugin/plugin_acgimage`
+    - [x] 搜番 | 搜索番剧[图片]
+- **随机图片与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`
+    - [x] 鉴赏图片[图片]
 - **每日运势** `import _ github.com/FloatTech/ZeroBot-Plugin/plugin_fortune`
-    - [x] 运势|抽签
-    - [x] 设置底图[车万 DC4 爱因斯坦 星空列车 樱云之恋 富婆妹 李清歌 公主连结 原神 明日方舟 碧蓝航线 碧蓝幻想 战双 阴阳师]
+    - [x] 运势 | 抽签
+    - [x] 设置底图[车万 DC4 爱因斯坦 星空列车 樱云之恋 富婆妹 李清歌 公主连结 原神 明日方舟 碧蓝航线 碧蓝幻想 战双 阴阳师 赛马娘]
 - **睡眠管理** `import _ github.com/FloatTech/ZeroBot-Plugin/plugin_sleep_manage`
-    - [x] 早安|晚安
+    - [x] 早安 | 晚安
 - **浅草寺求签** `import _ github.com/FloatTech/ZeroBot-Plugin/plugin_omikuji`
-    - [x] 求签|占卜
+    - [x] 求签 | 占卜
     - [x] 解签
 - **bilibili** `import _ "github.com/FloatTech/ZeroBot-Plugin/plugin_bilibili"`
-    - [x] >vup info [名字|uid]
-    - [x] >user info [名字|uid]
+    - [x] >vup info [名字 | uid]
+    - [x] >user info [名字 | uid]
     - [x] /开启粉丝日报
 - **嘉然** `import _ "github.com/FloatTech/ZeroBot-Plugin/plugin_diana"`
     - [x] 小作文
@@ -178,7 +184,7 @@ zerobot -h -t token -u url [-d|w] [-g 监听地址:端口] qq1 qq2 qq3 ...
     - [x] 查询鬼东西[序号][@xxx]
     - 注：由于需要科学，默认注释。
 - **AIfalse** `import _ "github.com/FloatTech/ZeroBot-Plugin/plugin_ai_false"`
-    - [x] 查询计算机当前活跃度: [检查身体|自检|启动自检|系统状态]
+    - [x] 查询计算机当前活跃度: [检查身体 | 自检 | 启动自检 | 系统状态]
     - [x] 清理缓存 (仅适用于 gocq 且需要 bot 的运行目录和 gocq 相同)
     - [ ] 简易语音
     - [ ] 爬图合成 [@xxx]
@@ -186,7 +192,7 @@ zerobot -h -t token -u url [-d|w] [-g 监听地址:端口] qq1 qq2 qq3 ...
     - [x] 抽wife[@xxx]
     - [x] 添加wife[名字][图片]
     - [x] 删除wife[名字]
-    - [x] [让|不让]所有人均可添加wife
+    - [x] [让 | 不让]所有人均可添加wife
     - 注：不同群添加后不会重叠
 - **minecraft** `import _ "github.com/FloatTech/ZeroBot-Plugin/plugin_minecraft"`
     - [x] /mcstart xxx
@@ -197,8 +203,9 @@ zerobot -h -t token -u url [-d|w] [-g 监听地址:端口] qq1 qq2 qq3 ...
     - [x] 搜卡[xxxx]
     - [x] [卡组代码xxx]
     - 注：更多搜卡指令参数：https://hs.fbigame.com/misc/searchhelp
-- **青云客** `import _ "github.com/FloatTech/ZeroBot-Plugin/plugin_qingyunke"`
+- **人工智能回复** `import _ "github.com/FloatTech/ZeroBot-Plugin/plugin_ai_reply"`
     - [x] @Bot 任意文本(任意一句话回复)
+    - [x] 设置回复模式[青云客 | 小爱]
 - **关键字搜图** `import _ "github.com/FloatTech/ZeroBot-Plugin/plugin_image_finder"`
     - [x] 来张 [xxx]
 - **拼音首字母释义工具** `import _ "github.com/FloatTech/ZeroBot-Plugin/plugin_nbnhhsh"`
@@ -221,8 +228,6 @@ zerobot -h -t token -u url [-d|w] [-g 监听地址:端口] qq1 qq2 qq3 ...
 - **小说** `import _ "github.com/FloatTech/ZeroBot-Plugin/plugin_novel" `
     - [x] 小说[xxx]
 - **沙雕app插件** `import _ "github.com/FloatTech/ZeroBot-Plugin/plugin_shadiao"`
-    - [x] 骂他[@xxx]|骂他[qq号] (停用)
-    - [x] 骂我 (停用)
     - [x] 哄我
     - [x] 渣我
     - [x] 来碗绿茶
@@ -230,7 +235,31 @@ zerobot -h -t token -u url [-d|w] [-g 监听地址:端口] qq1 qq2 qq3 ...
     - [x] 来碗毒鸡汤
     - [x] 讲个段子
 - **笑话** `import _ "github.com/FloatTech/ZeroBot-Plugin/plugin_funny"`
-    - [x] 讲个笑话[@xxx]|讲个笑话[qq号]
+    - [x] 讲个笑话[@xxx] | 讲个笑话[qq号]
+- **抽象话** `import _ "github.com/FloatTech/ZeroBot-Plugin/plugin_chouxianghua"`
+    - [x] 抽象翻译[xxx]
+- **绝绝子** `import _ "github.com/FloatTech/ZeroBot-Plugin/plugin_juejuezi"`
+    - [x] 喝奶茶绝绝子 | 绝绝子吃饭
+- **藏头诗** `import _ "github.com/FloatTech/ZeroBot-Plugin/plugin_cangtoushi"`
+    - [x] 藏头诗[xxx]
+    - [x] 藏尾诗[xxx]
+- **cp短打** `import _ "github.com/FloatTech/ZeroBot-Plugin/plugin_cpstory"`
+    - [x] 组cp[@xxx][@xxx]
+    - [x] 组cp大老师 雪乃
+- **签到得分** `import _ "github.com/FloatTech/ZeroBot-Plugin/plugin_score"`
+    - [x] 签到
+    - [x] 获得签到背景[@xxx] | 获得签到背景
+- **骂人** `import _ "github.com/FloatTech/ZeroBot-Plugin/plugin_curse"`
+    - [x] 骂我
+    - [x] 大力骂我
+- **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"`
+    - [x] 来份网易云热评
 - **TODO...**
 
 ## 使用方法

control/cd.go

@@ -1,93 +0,0 @@
-package control
-
-import (
-	"encoding/binary"
-	"strings"
-	"time"
-
-	b14 "github.com/fumiama/go-base16384"
-	zero "github.com/wdvxdr1123/ZeroBot"
-	"github.com/wdvxdr1123/ZeroBot/message"
-	"github.com/wdvxdr1123/ZeroBot/utils/helper"
-
-	"github.com/FloatTech/ZeroBot-Plugin/utils/process"
-)
-
-var startTime int64
-
-func init() {
-	// 插件冲突检测 会在本群发送一条消息并在约 1s 后撤回
-	zero.OnFullMatch("插件冲突检测", zero.OnlyGroup, zero.AdminPermission, zero.OnlyToMe).SetBlock(true).FirstPriority().
-		Handle(func(ctx *zero.Ctx) {
-			tok, err := genToken()
-			if err != nil {
-				return
-			}
-			t := message.Text("●cd" + tok)
-			startTime = time.Now().Unix()
-			id := ctx.SendChain(t)
-			process.SleepAbout1sTo2s()
-			ctx.DeleteMessage(id)
-		})
-
-	zero.OnRegex("^●cd([\u4e00-\u8e00]{4})$", zero.OnlyGroup).SetBlock(true).FirstPriority().
-		Handle(func(ctx *zero.Ctx) {
-			if isValidToken(ctx.State["regex_matched"].([]string)[1]) {
-				msg := ""
-				gid := ctx.Event.GroupID
-				ForEach(func(key string, manager *Control) bool {
-					if manager.IsEnabledIn(gid) {
-						msg += "\xfe\xff" + key
-					}
-					return true
-				})
-				if len(msg) > 2 {
-					my, err := b14.UTF16be2utf8(b14.EncodeString(msg[2:]))
-					mys := "●cd●" + helper.BytesToString(my)
-					if err == nil {
-						id := ctx.SendChain(message.Text(mys))
-						process.SleepAbout1sTo2s()
-						ctx.DeleteMessage(id)
-					}
-				}
-			}
-		})
-
-	zero.OnRegex("^●cd●(([\u4e00-\u8e00]*[\u3d01-\u3d06]?))", zero.OnlyGroup).SetBlock(true).FirstPriority().
-		Handle(func(ctx *zero.Ctx) {
-			if time.Now().Unix()-startTime < 10 {
-				msg, err := b14.UTF82utf16be(helper.StringToBytes(ctx.State["regex_matched"].([]string)[1]))
-				if err == nil {
-					gid := ctx.Event.GroupID
-					for _, s := range strings.Split(b14.DecodeString(msg), "\xfe\xff") {
-						mu.RLock()
-						c, ok := managers[s]
-						mu.RUnlock()
-						if ok && c.IsEnabledIn(gid) {
-							c.Disable(gid)
-						}
-					}
-				}
-			}
-		})
-}
-
-func genToken() (tok string, err error) {
-	timebytes := make([]byte, 8)
-	binary.BigEndian.PutUint64(timebytes, uint64(time.Now().Unix()))
-	timebytes, err = b14.UTF16be2utf8(b14.Encode(timebytes[1:]))
-	if err == nil {
-		tok = helper.BytesToString(timebytes)
-	}
-	return
-}
-
-func isValidToken(tok string) (yes bool) {
-	s, err := b14.UTF82utf16be(helper.StringToBytes(tok))
-	if err == nil {
-		timebytes := make([]byte, 1, 8)
-		timebytes = append(timebytes, b14.Decode(s)...)
-		yes = time.Now().Unix()-int64(binary.BigEndian.Uint64(timebytes)) < 10
-	}
-	return
-}

control/cd_test.go

@@ -1,19 +0,0 @@
-package control
-
-import "testing"
-
-func TestGenToken(t *testing.T) {
-	tok, err := genToken()
-	if err == nil {
-		t.Log(tok)
-		t.Log(isValidToken(tok))
-		t.Fail()
-	} else {
-		t.Fatal(err)
-	}
-}
-
-func TestMaru(t *testing.T) {
-	t.Log(len("\xff"))
-	t.Fail()
-}

control/register.go

@@ -1,31 +0,0 @@
-package control
-
-import (
-	zero "github.com/wdvxdr1123/ZeroBot"
-)
-
-var enmap = make(map[string]*zero.Engine)
-
-// Register 注册插件控制器
-func Register(service string, o *Options) *zero.Engine {
-	engine := zero.New()
-	engine.UsePreHandler(newctrl(service, o).Handler)
-	enmap[service] = engine
-	return engine
-}
-
-// Delete 删除插件控制器，不会删除数据
-func Delete(service string) {
-	engine, ok := enmap[service]
-	if ok {
-		engine.Delete()
-		mu.RLock()
-		_, ok = managers[service]
-		mu.RUnlock()
-		if ok {
-			mu.Lock()
-			delete(managers, service)
-			mu.Unlock()
-		}
-	}
-}

control/rule.go

@@ -1,473 +0,0 @@
-// Package control 控制插件的启用与优先级等
-package control
-
-import (
-	"crypto/md5"
-	"encoding/binary"
-	"fmt"
-	"os"
-	"strconv"
-	"strings"
-	"sync"
-
-	"github.com/sirupsen/logrus"
-	zero "github.com/wdvxdr1123/ZeroBot"
-	"github.com/wdvxdr1123/ZeroBot/extension"
-	"github.com/wdvxdr1123/ZeroBot/message"
-	"github.com/wdvxdr1123/ZeroBot/utils/helper"
-
-	"github.com/FloatTech/ZeroBot-Plugin/utils/sql"
-)
-
-var (
-	db = &sql.Sqlite{DBPath: "data/control/plugins.db"}
-	// managers 每个插件对应的管理
-	managers = map[string]*Control{}
-	mu       = sync.RWMutex{}
-	hasinit  bool
-)
-
-// Control is to control the plugins.
-type Control struct {
-	sync.RWMutex
-	service string
-	options Options
-}
-
-// newctrl returns Manager with settings.
-func newctrl(service string, o *Options) *Control {
-	m := &Control{service: service,
-		options: func() Options {
-			if o == nil {
-				return Options{}
-			}
-			return *o
-		}(),
-	}
-	mu.Lock()
-	managers[service] = m
-	mu.Unlock()
-	err := db.Create(service, &grpcfg{})
-	if err != nil {
-		panic(err)
-	}
-	err = db.Create(service+"ban", &ban{})
-	if err != nil {
-		panic(err)
-	}
-	return m
-}
-
-// Enable enables a group to pass the Manager.
-// groupID == 0 (ALL) will operate on all grps.
-func (m *Control) Enable(groupID int64) {
-	var c grpcfg
-	m.RLock()
-	err := db.Find(m.service, &c, "WHERE gid = "+strconv.FormatInt(groupID, 10))
-	m.RUnlock()
-	if err != nil {
-		c.GroupID = groupID
-	}
-	c.Disable = int64(uint64(c.Disable) & 0xffffffff_fffffffe)
-	m.Lock()
-	err = db.Insert(m.service, &c)
-	m.Unlock()
-	if err != nil {
-		logrus.Errorf("[control] %v", err)
-	}
-}
-
-// Disable disables a group to pass the Manager.
-// groupID == 0 (ALL) will operate on all grps.
-func (m *Control) Disable(groupID int64) {
-	var c grpcfg
-	m.RLock()
-	err := db.Find(m.service, &c, "WHERE gid = "+strconv.FormatInt(groupID, 10))
-	m.RUnlock()
-	if err != nil {
-		c.GroupID = groupID
-	}
-	c.Disable |= 1
-	m.Lock()
-	err = db.Insert(m.service, &c)
-	m.Unlock()
-	if err != nil {
-		logrus.Errorf("[control] %v", err)
-	}
-}
-
-// Reset resets the default config of a group.
-// groupID == 0 (ALL) is not allowed.
-func (m *Control) Reset(groupID int64) {
-	if groupID != 0 {
-		m.Lock()
-		err := db.Del(m.service, "WHERE gid = "+strconv.FormatInt(groupID, 10))
-		m.Unlock()
-		if err != nil {
-			logrus.Errorf("[control] %v", err)
-		}
-	}
-}
-
-// IsEnabledIn 开启群
-func (m *Control) IsEnabledIn(gid int64) bool {
-	var c grpcfg
-	var err error
-	logrus.Debugln("[control] IsEnabledIn recv gid =", gid)
-	if gid != 0 {
-		m.RLock()
-		err = db.Find(m.service, &c, "WHERE gid = "+strconv.FormatInt(gid, 10))
-		m.RUnlock()
-		if err == nil && gid == c.GroupID {
-			logrus.Debugf("[control] plugin %s of grp %d : %d", m.service, c.GroupID, c.Disable&1)
-			return c.Disable&1 == 0
-		}
-	}
-	m.RLock()
-	err = db.Find(m.service, &c, "WHERE gid = 0")
-	m.RUnlock()
-	if err == nil && c.GroupID == 0 {
-		logrus.Debugf("[control] plugin %s of all : %d", m.service, c.Disable&1)
-		return c.Disable&1 == 0
-	}
-	return !m.options.DisableOnDefault
-}
-
-// Ban 禁止某人在某群使用本插件
-func (m *Control) Ban(uid, gid int64) {
-	var err error
-	var digest [16]byte
-	logrus.Debugln("[control] Ban recv gid =", gid, "uid =", uid)
-	if gid != 0 { // 特定群
-		digest = md5.Sum(helper.StringToBytes(fmt.Sprintf("%d_%d", uid, gid)))
-		m.RLock()
-		err = db.Insert(m.service+"ban", &ban{ID: int64(binary.LittleEndian.Uint64(digest[:8])), UserID: uid, GroupID: gid})
-		m.RUnlock()
-		if err == nil {
-			logrus.Debugf("[control] plugin %s is banned in grp %d for usr %d.", m.service, gid, uid)
-			return
-		}
-	}
-	// 所有群
-	digest = md5.Sum(helper.StringToBytes(fmt.Sprintf("%d_all", uid)))
-	m.RLock()
-	err = db.Insert(m.service+"ban", &ban{ID: int64(binary.LittleEndian.Uint64(digest[:8])), UserID: uid, GroupID: 0})
-	m.RUnlock()
-	if err == nil {
-		logrus.Debugf("[control] plugin %s is banned in all grp for usr %d.", m.service, uid)
-	}
-}
-
-// Permit 允许某人在某群使用本插件
-func (m *Control) Permit(uid, gid int64) {
-	var digest [16]byte
-	logrus.Debugln("[control] Permit recv gid =", gid, "uid =", uid)
-	if gid != 0 { // 特定群
-		digest = md5.Sum(helper.StringToBytes(fmt.Sprintf("%d_%d", uid, gid)))
-		m.RLock()
-		_ = db.Del(m.service+"ban", "WHERE id = "+strconv.FormatInt(int64(binary.LittleEndian.Uint64(digest[:8])), 10))
-		m.RUnlock()
-		logrus.Debugf("[control] plugin %s is permitted in grp %d for usr %d.", m.service, gid, uid)
-		return
-	}
-	// 所有群
-	digest = md5.Sum(helper.StringToBytes(fmt.Sprintf("%d_all", uid)))
-	m.RLock()
-	_ = db.Del(m.service+"ban", "WHERE id = "+strconv.FormatInt(int64(binary.LittleEndian.Uint64(digest[:8])), 10))
-	m.RUnlock()
-	logrus.Debugf("[control] plugin %s is permitted in all grp for usr %d.", m.service, uid)
-}
-
-// IsBannedIn 某人是否在某群被 ban
-func (m *Control) IsBannedIn(uid, gid int64) bool {
-	var b ban
-	var err error
-	var digest [16]byte
-	logrus.Debugln("[control] IsBannedIn recv gid =", gid, "uid =", uid)
-	if gid != 0 {
-		digest = md5.Sum(helper.StringToBytes(fmt.Sprintf("%d_%d", uid, gid)))
-		m.RLock()
-		err = db.Find(m.service+"ban", &b, "WHERE id = "+strconv.FormatInt(int64(binary.LittleEndian.Uint64(digest[:8])), 10))
-		m.RUnlock()
-		if err == nil && gid == b.GroupID && uid == b.UserID {
-			logrus.Debugf("[control] plugin %s is banned in grp %d for usr %d.", m.service, b.GroupID, b.UserID)
-			return true
-		}
-	}
-	digest = md5.Sum(helper.StringToBytes(fmt.Sprintf("%d_all", uid)))
-	m.RLock()
-	err = db.Find(m.service+"ban", &b, "WHERE id = "+strconv.FormatInt(int64(binary.LittleEndian.Uint64(digest[:8])), 10))
-	m.RUnlock()
-	if err == nil && b.GroupID == 0 && uid == b.UserID {
-		logrus.Debugf("[control] plugin %s is banned in all grp for usr %d.", m.service, b.UserID)
-		return true
-	}
-	return false
-}
-
-// GetData 获取某个群的 63 字节配置信息
-func (m *Control) GetData(gid int64) int64 {
-	var c grpcfg
-	var err error
-	logrus.Debugln("[control] IsEnabledIn recv gid =", gid)
-	if gid != 0 {
-		m.RLock()
-		err = db.Find(m.service, &c, "WHERE gid = "+strconv.FormatInt(gid, 10))
-		m.RUnlock()
-		if err == nil && gid == c.GroupID {
-			logrus.Debugf("[control] plugin %s of grp %d : %x", m.service, c.GroupID, c.Disable>>1)
-			return c.Disable >> 1
-		}
-	}
-	m.RLock()
-	err = db.Find(m.service, &c, "WHERE gid = 0")
-	m.RUnlock()
-	if err == nil && c.GroupID == 0 {
-		logrus.Debugf("[control] plugin %s of all : %x", m.service, c.Disable>>1)
-		return c.Disable >> 1
-	}
-	return 0
-}
-
-// SetData 为某个群设置低 63 位配置数据
-func (m *Control) SetData(groupID int64, data int64) error {
-	var c grpcfg
-	m.RLock()
-	err := db.Find(m.service, &c, "WHERE gid = "+strconv.FormatInt(groupID, 10))
-	m.RUnlock()
-	if err != nil {
-		c.GroupID = groupID
-		if m.options.DisableOnDefault {
-			c.Disable = 1
-		}
-	}
-	c.Disable |= data << 1
-	logrus.Debugf("[control] set plugin %s of all : %x", m.service, data)
-	m.Lock()
-	err = db.Insert(m.service, &c)
-	m.Unlock()
-	if err != nil {
-		logrus.Errorf("[control] %v", err)
-	}
-	return err
-}
-
-// Handler 返回 预处理器
-func (m *Control) Handler(ctx *zero.Ctx) bool {
-	ctx.State["manager"] = m
-	grp := ctx.Event.GroupID
-	if grp == 0 {
-		// 个人用户
-		return m.IsEnabledIn(-ctx.Event.UserID)
-	}
-	logrus.Debugln("[control] handler get gid =", grp)
-	return m.IsEnabledIn(grp) && !m.IsBannedIn(ctx.Event.UserID, grp)
-}
-
-// Lookup returns a Manager by the service name, if
-// not exist, it will return nil.
-func Lookup(service string) (*Control, bool) {
-	mu.RLock()
-	m, ok := managers[service]
-	mu.RUnlock()
-	return m, ok
-}
-
-// ForEach iterates through managers.
-func ForEach(iterator func(key string, manager *Control) bool) {
-	mu.RLock()
-	m := copyMap(managers)
-	mu.RUnlock()
-	for k, v := range m {
-		if !iterator(k, v) {
-			return
-		}
-	}
-}
-
-func copyMap(m map[string]*Control) map[string]*Control {
-	ret := make(map[string]*Control, len(m))
-	for k, v := range m {
-		ret[k] = v
-	}
-	return ret
-}
-
-func userOrGrpAdmin(ctx *zero.Ctx) bool {
-	if zero.OnlyGroup(ctx) {
-		return zero.AdminPermission(ctx)
-	}
-	return zero.OnlyToMe(ctx)
-}
-
-func init() {
-	if !hasinit {
-		mu.Lock()
-		if !hasinit {
-			err := os.MkdirAll("data/control", 0755)
-			if err != nil {
-				panic(err)
-			} else {
-				hasinit = true
-				zero.OnCommandGroup([]string{
-					"启用", "enable", "禁用", "disable",
-					"全局启用", "enableall", "全局禁用", "disableall",
-				}, userOrGrpAdmin).Handle(func(ctx *zero.Ctx) {
-					model := extension.CommandModel{}
-					_ = ctx.Parse(&model)
-					service, ok := Lookup(model.Args)
-					if !ok {
-						ctx.SendChain(message.Text("没有找到指定服务!"))
-						return
-					}
-					grp := ctx.Event.GroupID
-					if grp == 0 {
-						// 个人用户
-						grp = -ctx.Event.UserID
-					}
-					if strings.Contains(model.Command, "全局") || strings.Contains(model.Command, "all") {
-						grp = 0
-					}
-					if strings.Contains(model.Command, "启用") || strings.Contains(model.Command, "enable") {
-						service.Enable(grp)
-						ctx.SendChain(message.Text("已启用服务: " + model.Args))
-					} else {
-						service.Disable(grp)
-						ctx.SendChain(message.Text("已禁用服务: " + model.Args))
-					}
-				})
-
-				zero.OnCommandGroup([]string{"还原", "reset"}, userOrGrpAdmin).Handle(func(ctx *zero.Ctx) {
-					model := extension.CommandModel{}
-					_ = ctx.Parse(&model)
-					service, ok := Lookup(model.Args)
-					if !ok {
-						ctx.SendChain(message.Text("没有找到指定服务!"))
-						return
-					}
-					grp := ctx.Event.GroupID
-					if grp == 0 {
-						// 个人用户
-						grp = -ctx.Event.UserID
-					}
-					service.Reset(grp)
-					ctx.SendChain(message.Text("已还原服务的默认启用状态: " + model.Args))
-				})
-
-				zero.OnCommandGroup([]string{
-					"禁止", "ban", "允许", "permit",
-					"全局禁止", "banall", "全局允许", "permitall",
-				}, zero.OnlyGroup, zero.AdminPermission).Handle(func(ctx *zero.Ctx) {
-					model := extension.CommandModel{}
-					_ = ctx.Parse(&model)
-					args := strings.Split(model.Args, " ")
-					if len(args) >= 2 {
-						service, ok := Lookup(args[0])
-						if !ok {
-							ctx.SendChain(message.Text("没有找到指定服务!"))
-							return
-						}
-						grp := ctx.Event.GroupID
-						if strings.Contains(model.Command, "全局") || strings.Contains(model.Command, "all") {
-							grp = 0
-						}
-						msg := "**" + args[0] + "报告**"
-						if strings.Contains(model.Command, "允许") || strings.Contains(model.Command, "permit") {
-							for _, usr := range args[1:] {
-								uid, err := strconv.ParseInt(usr, 10, 64)
-								if err == nil {
-									service.Permit(uid, grp)
-									msg += "\n+ 已允许" + usr
-								}
-							}
-						} else {
-							for _, usr := range args[1:] {
-								uid, err := strconv.ParseInt(usr, 10, 64)
-								if err == nil {
-									service.Ban(uid, grp)
-									msg += "\n- 已禁止" + usr
-								}
-							}
-						}
-						ctx.SendChain(message.Text(msg))
-						return
-					}
-					ctx.SendChain(message.Text("参数错误!"))
-				})
-
-				zero.OnCommandGroup([]string{"用法", "usage"}, userOrGrpAdmin).
-					Handle(func(ctx *zero.Ctx) {
-						model := extension.CommandModel{}
-						_ = ctx.Parse(&model)
-						service, ok := Lookup(model.Args)
-						if !ok {
-							ctx.SendChain(message.Text("没有找到指定服务!"))
-							return
-						}
-						if service.options.Help != "" {
-							ctx.SendChain(message.Text(service.options.Help))
-						} else {
-							ctx.SendChain(message.Text("该服务无帮助!"))
-						}
-					})
-
-				zero.OnCommandGroup([]string{"服务列表", "service_list"}, userOrGrpAdmin).
-					Handle(func(ctx *zero.Ctx) {
-						msg := "--------服务列表--------\n发送\"/用法 name\"查看详情"
-						i := 0
-						gid := ctx.Event.GroupID
-						ForEach(func(key string, manager *Control) bool {
-							i++
-							msg += "\n" + strconv.Itoa(i) + `: `
-							if manager.IsEnabledIn(gid) {
-								msg += "●" + key
-							} else {
-								msg += "○" + key
-							}
-							return true
-						})
-						ctx.SendChain(message.Text(msg))
-					})
-
-				zero.OnCommandGroup([]string{"服务详情", "service_detail"}, userOrGrpAdmin, zero.OnlyGroup).
-					Handle(func(ctx *zero.Ctx) {
-						var m message.Message
-						m = append(m,
-							message.CustomNode(
-								zero.BotConfig.NickName[0],
-								ctx.Event.SelfID,
-								"---服务详情---",
-							))
-						i := 0
-						ForEach(func(key string, manager *Control) bool {
-							service, _ := Lookup(key)
-							help := service.options.Help
-							i++
-							msg := strconv.Itoa(i) + `: `
-							if manager.IsEnabledIn(ctx.Event.GroupID) {
-								msg += "●" + key
-							} else {
-								msg += "○" + key
-							}
-							msg += "\n" + help
-							m = append(m,
-								message.CustomNode(
-									zero.BotConfig.NickName[0],
-									ctx.Event.SelfID,
-									msg,
-								))
-							return true
-						})
-
-						if id := ctx.SendGroupForwardMessage(
-							ctx.Event.GroupID,
-							m,
-						).Get("message_id").Int(); id == 0 {
-							ctx.SendChain(message.Text("ERROR: 可能被风控了"))
-						}
-					})
-			}
-		}
-		mu.Unlock()
-	}
-}

control/tables.go

@@ -1,19 +0,0 @@
-package control
-
-// grpcfg holds the group config for the Manager.
-type grpcfg struct {
-	GroupID int64 `db:"gid"`     // GroupID 群号
-	Disable int64 `db:"disable"` // Disable 默认启用该插件
-}
-
-type ban struct {
-	ID      int64 `db:"id"`
-	UserID  int64 `db:"uid"`
-	GroupID int64 `db:"gid"`
-}
-
-// Options holds the optional parameters for the Manager.
-type Options struct {
-	DisableOnDefault bool
-	Help             string // 帮助文本信息
-}

control/web/gui.go

@@ -1,561 +0,0 @@
-// Package webctrl 包含 webui 所需的所有内容
-package webctrl
-
-import (
-	"encoding/json"
-	"fmt"
-	"io"
-	"net/http"
-	"os"
-	"strconv"
-	"sync"
-
-	manager "github.com/FloatTech/bot-manager"
-	// 依赖gin监听server
-	"github.com/gin-gonic/gin"
-	"github.com/gorilla/websocket"
-
-	// 前端静态文件
-	log "github.com/sirupsen/logrus"
-	zero "github.com/wdvxdr1123/ZeroBot"
-	"github.com/wdvxdr1123/ZeroBot/message"
-
-	ctrl "github.com/FloatTech/ZeroBot-Plugin/control"
-)
-
-var (
-	// 向前端推送消息的ws链接
-	conn *websocket.Conn
-	// 向前端推送日志的ws链接
-	logConn *websocket.Conn
-
-	l logWriter
-	// 存储请求事件，flag作为键，一个request对象作为值
-	requestData sync.Map
-)
-
-// logWriter
-// @Description:
-//
-type logWriter struct {
-}
-
-// request
-// @Description: 一个请求事件的结构体
-//
-type request struct {
-	RequestType string `json:"request_type"`
-	SubType     string `json:"sub_type"`
-	Type        string `json:"type"`
-	Comment     string `json:"comment"`
-	GroupID     int64  `json:"group_id"`
-	UserID      int64  `json:"user_id"`
-	Flag        string `json:"flag"`
-	SelfID      int64  `json:"self_id"`
-}
-
-// InitGui 初始化gui
-func InitGui(addr string) {
-	// 将日志重定向到前端hook
-	writer := io.MultiWriter(l, os.Stdout)
-	log.SetOutput(writer)
-	// 监听后端
-	go controller(addr)
-	// 注册消息handle
-	messageHandle()
-}
-
-// websocket的协议升级
-var upGrader = websocket.Upgrader{
-	CheckOrigin: func(r *http.Request) bool {
-		return true
-	},
-}
-
-func controller(addr string) {
-	defer func() {
-		err := recover()
-		if err != nil {
-			log.Errorln("[gui]" + "bot-manager出现不可恢复的错误")
-			log.Errorln("[gui]", err)
-		}
-	}()
-
-	engine := gin.New()
-	// 支持跨域
-	engine.Use(cors())
-	// 注册静态文件
-	engine.StaticFS("/dist", http.FS(manager.Dist))
-	engine.POST("/get_bots", getBots)
-	engine.POST("/get_group_list", getGroupList)
-	engine.POST("/get_friend_list", getFriendList)
-	// 注册主路径路由，使其跳转到主页面
-	engine.GET("/", func(context *gin.Context) {
-		context.Redirect(http.StatusMovedPermanently, "/dist/dist/default.html")
-	})
-	// 更改某个插件状态
-	engine.POST("/update_plugin_status", updatePluginStatus)
-	// 更改某一个插件在所有群的状态
-	engine.POST("/update_plugin_all_group_status", updatePluginAllGroupStatus)
-	// 更改所有插件状态
-	engine.POST("/update_all_plugin_status", updateAllPluginStatus)
-	// 获取所有插件状态
-	engine.POST("/get_plugins_status", getPluginsStatus)
-	// 获取一个插件状态
-	engine.POST("/get_plugin_status", getPluginStatus)
-	// 获取插件列表
-	engine.POST("/get_plugins", func(context *gin.Context) {
-		var datas []map[string]interface{}
-		ctrl.ForEach(func(key string, manager *ctrl.Control) bool {
-			datas = append(datas, map[string]interface{}{"id": 1, "handle_type": "", "name": key, "enable": manager.IsEnabledIn(0)})
-			return true
-		})
-		context.JSON(200, datas)
-	})
-	// 获取所有请求
-	engine.POST("/get_requests", getRequests)
-	// 执行一个请求事件
-	engine.POST("handle_request", handelRequest)
-	// 链接日志
-	engine.GET("/get_log", getLogs)
-	// 获取前端标签
-	engine.GET("/get_label", func(context *gin.Context) {
-		context.JSON(200, "ZeroBot-Plugin")
-	})
-
-	// 发送信息
-	engine.POST("/send_msg", sendMsg)
-	engine.GET("/data", upgrade)
-	log.Infoln("[gui] the webui is running on", addr)
-	log.Infoln("[gui] ", "you input the `ZeroBot-Plugin.exe -g` can disable the gui")
-	if err := engine.Run(addr); err != nil {
-		log.Debugln("[gui] ", err.Error())
-	}
-}
-
-// handelRequest
-/**
- * @Description: 处理一个请求
- * @param context
- */
-func handelRequest(context *gin.Context) {
-	var data map[string]interface{}
-	err := context.BindJSON(&data)
-	if err != nil {
-		context.JSON(404, nil)
-		return
-	}
-	r, ok := requestData.LoadAndDelete(data["flag"].(string))
-	if !ok {
-		context.JSON(404, "flag not found")
-	}
-	r2 := r.(*request)
-	r2.handle(data["approve"].(bool), data["reason"].(string))
-	context.JSON(200, "操作成功")
-}
-
-// getRequests
-/**
- * @Description: 获取所有的请求
- * @param context
- */
-func getRequests(context *gin.Context) {
-	var data []interface{}
-	requestData.Range(func(key, value interface{}) bool {
-		data = append(data, value)
-		return true
-	})
-	context.JSON(200, data)
-}
-
-// updateAllPluginStatus
-/**
- * @Description: 改变所有插件的状态
- * @param context
- * example
- */
-func updateAllPluginStatus(context *gin.Context) {
-	enable, err := strconv.ParseBool(context.PostForm("enable"))
-	if err != nil {
-		var parse map[string]interface{}
-		err := context.BindJSON(&parse)
-		if err != nil {
-			log.Errorln("[gui] " + err.Error())
-			return
-		}
-		enable = parse["enable"].(bool)
-	}
-	ctrl.ForEach(func(key string, manager *ctrl.Control) bool {
-		if enable {
-			manager.Enable(0)
-		} else {
-			manager.Disable(0)
-		}
-		return true
-	})
-	context.JSON(200, nil)
-}
-
-// updatePluginAllGroupStatus
-/**
- * @Description: 改变插件在所有群的状态
- * @param context
- * example
- */
-func updatePluginAllGroupStatus(context *gin.Context) {
-	name := context.PostForm("name")
-	enable, err := strconv.ParseBool(context.PostForm("enable"))
-	if err != nil {
-		var parse map[string]interface{}
-		err := context.BindJSON(&parse)
-		if err != nil {
-			log.Errorln("[gui]" + err.Error())
-			return
-		}
-		name = parse["name"].(string)
-		enable = parse["enable"].(bool)
-	}
-	control, b := ctrl.Lookup(name)
-	if !b {
-		context.JSON(404, nil)
-		return
-	}
-	if enable {
-		control.Enable(0)
-	} else {
-		control.Disable(0)
-	}
-	context.JSON(200, nil)
-}
-
-// updatePluginStatus
-/**
- * @Description: 更改某一个插件状态
- * @param context
- * example
- */
-func updatePluginStatus(context *gin.Context) {
-	var parse map[string]interface{}
-	err := context.BindJSON(&parse)
-	if err != nil {
-		log.Errorln("[gui] ", err)
-		return
-	}
-	groupID := int64(parse["group_id"].(float64))
-	name := parse["name"].(string)
-	enable := parse["enable"].(bool)
-	fmt.Println(name)
-	control, b := ctrl.Lookup(name)
-	if !b {
-		context.JSON(404, "服务不存在")
-		return
-	}
-	if enable {
-		control.Enable(groupID)
-	} else {
-		control.Disable(groupID)
-	}
-	context.JSON(200, nil)
-}
-
-// getPluginStatus
-/**
- * @Description: 获取一个插件的状态
- * @param context
- * example
- */
-func getPluginStatus(context *gin.Context) {
-	groupID, err := strconv.ParseInt(context.PostForm("group_id"), 10, 64)
-	name := context.PostForm("name")
-	if err != nil {
-		var parse map[string]interface{}
-		err := context.BindJSON(&parse)
-		if err != nil {
-			log.Errorln("[gui]" + err.Error())
-			return
-		}
-		groupID = int64(parse["group_id"].(float64))
-		name = parse["name"].(string)
-	}
-	control, b := ctrl.Lookup(name)
-	if !b {
-		context.JSON(404, "服务不存在")
-		return
-	}
-	context.JSON(200, gin.H{"enable": control.IsEnabledIn(groupID)})
-}
-
-// getPluginsStatus
-/**
- * @Description: 获取所有插件的状态
- * @param context
- * example
- */
-func getPluginsStatus(context *gin.Context) {
-	groupID, err := strconv.ParseInt(context.PostForm("group_id"), 10, 64)
-	if err != nil {
-		var parse map[string]interface{}
-		err := context.BindJSON(&parse)
-		if err != nil {
-			log.Errorln("[gui]" + err.Error())
-			return
-		}
-		groupID = int64(parse["group_id"].(float64))
-	}
-	var datas []map[string]interface{}
-	ctrl.ForEach(func(key string, manager *ctrl.Control) bool {
-		enable := manager.IsEnabledIn(groupID)
-		datas = append(datas, map[string]interface{}{"name": key, "enable": enable})
-		return true
-	})
-	context.JSON(200, datas)
-}
-
-// getLogs
-/**
- * @Description: 连接日志
- * @param context
- * example
- */
-func getLogs(context *gin.Context) {
-	con1, err := upGrader.Upgrade(context.Writer, context.Request, nil)
-	if err != nil {
-		return
-	}
-	logConn = con1
-}
-
-// getFriendList
-/**
- * @Description: 获取好友列表
- * @param context
- * example
- */
-func getFriendList(context *gin.Context) {
-	selfID, err := strconv.Atoi(context.PostForm("self_id"))
-	if err != nil {
-		log.Errorln("[gui]" + err.Error())
-		var data map[string]interface{}
-		err := context.BindJSON(&data)
-		if err != nil {
-			log.Errorln("[gui]" + err.Error())
-			log.Errorln("[gui]" + "绑定错误")
-			return
-		}
-		selfID = int(data["self_id"].(float64))
-	}
-	bot := zero.GetBot(int64(selfID))
-	var resp []interface{}
-	list := bot.GetFriendList().String()
-	err = json.Unmarshal([]byte(list), &resp)
-	if err != nil {
-		log.Errorln("[gui]" + err.Error())
-		log.Errorln("[gui]" + "解析json错误")
-	}
-	context.JSON(200, resp)
-}
-
-// getGroupList
-/**
- * @Description: 获取群列表
- * @param context
- * example
- */
-func getGroupList(context *gin.Context) {
-	selfID, err := strconv.Atoi(context.PostForm("self_id"))
-	if err != nil {
-		var data map[string]interface{}
-		err := context.BindJSON(&data)
-		if err != nil {
-			log.Errorln("[gui]" + err.Error())
-			return
-		}
-		selfID = int(data["self_id"].(float64))
-	}
-
-	bot := zero.GetBot(int64(selfID))
-	var resp []interface{}
-	list := bot.GetGroupList().String()
-	err = json.Unmarshal([]byte(list), &resp)
-	if err != nil {
-		log.Errorln("[gui]" + err.Error())
-	}
-	context.JSON(200, resp)
-}
-
-// getBots
-/**
- * @Description: 获取机器人qq号
- * @param context
- * example
- */
-func getBots(context *gin.Context) {
-	var bots []int64
-
-	zero.RangeBot(func(id int64, ctx *zero.Ctx) bool {
-		bots = append(bots, id)
-		return true
-	})
-	context.JSON(200, bots)
-}
-
-// MessageHandle
-/**
- * @Description: 定义一个向前端发送信息的handle
- * example
- */
-func messageHandle() {
-	defer func() {
-		err := recover()
-		if err != nil {
-			log.Errorln("[gui]" + "bot-manager出现不可恢复的错误")
-			log.Errorln("[gui] ", err)
-		}
-	}()
-
-	matcher := zero.OnMessage().SetBlock(false).SetPriority(1)
-
-	matcher.Handle(func(ctx *zero.Ctx) {
-		if conn != nil {
-			err := conn.WriteJSON(ctx.Event)
-			if err != nil {
-				log.Debugln("[gui] " + "向发送错误")
-				return
-			}
-		}
-	})
-	// 直接注册一个request请求监听器，优先级设置为最高，设置不阻断事件传播
-	zero.OnRequest(func(ctx *zero.Ctx) bool {
-		if ctx.Event.RequestType == "friend" {
-			ctx.State["type_name"] = "好友添加"
-		} else {
-			if ctx.Event.SubType == "add" {
-				ctx.State["type_name"] = "加群请求"
-			} else {
-				ctx.State["type_name"] = "群邀请"
-			}
-		}
-		return true
-	}).SetBlock(false).FirstPriority().Handle(func(ctx *zero.Ctx) {
-		r := &request{
-			RequestType: ctx.Event.RequestType,
-			SubType:     ctx.Event.SubType,
-			Type:        ctx.State["type_name"].(string),
-			GroupID:     ctx.Event.GroupID,
-			UserID:      ctx.Event.UserID,
-			Flag:        ctx.Event.Flag,
-			Comment:     ctx.Event.Comment,
-			SelfID:      ctx.Event.SelfID,
-		}
-		requestData.Store(ctx.Event.Flag, r)
-	})
-}
-
-// upgrade
-/**
- * @Description: 连接ws，向前端推送message
- * @param context
- * example
- */
-func upgrade(context *gin.Context) {
-	con, err := upGrader.Upgrade(context.Writer, context.Request, nil)
-	if err != nil {
-		return
-	}
-	conn = con
-}
-
-// sendMsg
-/**
- * @Description: 前端调用发送信息
- * @param context
- * example
- */
-func sendMsg(context *gin.Context) {
-	var data map[string]interface{}
-	err := context.BindJSON(&data)
-	if err != nil {
-		context.JSON(404, nil)
-		return
-	}
-	selfID := int64(data["self_id"].(float64))
-	id := int64(data["id"].(float64))
-	message1 := data["message"].(string)
-	messageType := data["message_type"].(string)
-
-	bot := zero.GetBot(selfID)
-	var msgID int64
-	if messageType == "group" {
-		msgID = bot.SendGroupMessage(id, message.ParseMessageFromString(message1))
-	} else {
-		msgID = bot.SendPrivateMessage(id, message.ParseMessageFromString(message1))
-	}
-	context.JSON(200, msgID)
-}
-
-// cors
-/**
- * @Description: 支持跨域访问
- * @return gin.HandlerFunc
- * example
- */
-func cors() gin.HandlerFunc {
-	return func(c *gin.Context) {
-		method := c.Request.Method
-		origin := c.Request.Header.Get("Origin") // 请求头部
-		if origin != "" {
-			// 接收客户端发送的origin （重要！）
-			c.Writer.Header().Set("Access-Control-Allow-Origin", origin)
-			// 服务器支持的所有跨域请求的方法
-			c.Header("Access-Control-Allow-Methods", "POST, GET, OPTIONS, PUT, DELETE,UPDATE")
-			// 允许跨域设置可以返回其他子段，可以自定义字段
-			c.Header("Access-Control-Allow-Headers", "Authorization, Content-Length, X-CSRF-Token, Token,session, Content-Type")
-			// 允许浏览器（客户端）可以解析的头部 （重要）
-			c.Header("Access-Control-Expose-Headers", "Content-Length, Access-Control-Allow-Origin, Access-Control-Allow-Headers")
-			// 设置缓存时间
-			c.Header("Access-Control-Max-Age", "172800")
-			// 允许客户端传递校验信息比如 cookie (重要)
-			c.Header("Access-Control-Allow-Credentials", "true")
-		}
-
-		// 允许类型校验
-		if method == "OPTIONS" {
-			c.JSON(http.StatusOK, "ok!")
-		}
-
-		defer func() {
-			if err := recover(); err != nil {
-				log.Printf("Panic info is: %v", err)
-			}
-		}()
-
-		c.Next()
-	}
-}
-
-// handle
-/**
- * @Description: 提交一个请求
- * @receiver r
- * @param approve 是否通过
- * @param reason 拒绝的理由
- */
-func (r *request) handle(approve bool, reason string) {
-	bot := zero.GetBot(r.SelfID)
-	if r.RequestType == "friend" {
-		bot.SetFriendAddRequest(r.Flag, approve, "")
-	} else {
-		bot.SetGroupAddRequest(r.Flag, r.SubType, approve, reason)
-	}
-	log.Debugln("[gui] ", "已处理", r.UserID, "的"+r.Type)
-}
-
-func (l logWriter) Write(p []byte) (n int, err error) {
-	if logConn != nil {
-		err := logConn.WriteMessage(websocket.TextMessage, p)
-		if err != nil {
-			return len(p), nil
-		}
-	}
-	return len(p), nil
-}

data/Reborn/rate.json

@@ -1,906 +0,0 @@
-[
-    {
-      "name": "印度",
-      "weight": 0.179369185
-    },
-    {
-      "weight": 0.116660088,
-      "name": "中华人民共和国"
-    },
-    {
-      "name": "尼日利亚",
-      "weight": 0.052104876
-    },
-    {
-      "weight": 0.04490831,
-      "name": "巴基斯坦"
-    },
-    {
-      "weight": 0.029767875,
-      "name": "印尼"
-    },
-    {
-      "weight": 0.02917347,
-      "name": "美国"
-    },
-    {
-      "name": "刚果民主共和国",
-      "weight": 0.026980482
-    },
-    {
-      "weight": 0.02653533,
-      "name": "埃塞俄比亚"
-    },
-    {
-      "name": "孟加拉国",
-      "weight": 0.022001723
-    },
-    {
-      "name": "巴西",
-      "weight": 0.020641351
-    },
-    {
-      "name": "埃及",
-      "weight": 0.019722924
-    },
-    {
-      "name": "菲律宾",
-      "weight": 0.017944256
-    },
-    {
-      "name": "墨西哥",
-      "weight": 0.015798468
-    },
-    {
-      "weight": 0.015156998,
-      "name": "坦桑尼亚"
-    },
-    {
-      "weight": 0.013686862,
-      "name": "乌干达"
-    },
-    {
-      "weight": 0.010405389,
-      "name": "俄罗斯"
-    },
-    {
-      "weight": 0.010217107,
-      "name": "苏丹"
-    },
-    {
-      "weight": 0.010079201,
-      "name": "越南"
-    },
-    {
-      "name": "阿富汗",
-      "weight": 0.009796745
-    },
-    {
-      "name": "伊朗",
-      "weight": 0.009789926
-    },
-    {
-      "name": "肯尼亚",
-      "weight": 0.009216044
-    },
-    {
-      "weight": 0.008870993,
-      "name": "安哥拉"
-    },
-    {
-      "name": "土耳其",
-      "weight": 0.008815318
-    },
-    {
-      "weight": 0.008267509,
-      "name": "莫桑比克"
-    },
-    {
-      "name": "南非",
-      "weight": 0.007826801
-    },
-    {
-      "weight": 0.00755071,
-      "name": "尼日尔"
-    },
-    {
-      "name": "伊拉克",
-      "weight": 0.007350484
-    },
-    {
-      "name": "喀麦隆",
-      "weight": 0.006786572
-    },
-    {
-      "weight": 0.006782117,
-      "name": "缅甸"
-    },
-    {
-      "name": "日本",
-      "weight": 0.006518972
-    },
-    {
-      "weight": 0.006384764,
-      "name": "加纳"
-    },
-    {
-      "weight": 0.006183538,
-      "name": "阿尔及利亚"
-    },
-    {
-      "weight": 0.006075416,
-      "name": "马里"
-    },
-    {
-      "name": "法国",
-      "weight": 0.00571344
-    },
-    {
-      "name": "英国",
-      "weight": 0.005662409
-    },
-    {
-      "name": "马达加斯加",
-      "weight": 0.00559132
-    },
-    {
-      "weight": 0.005562893,
-      "name": "也门"
-    },
-    {
-      "name": "哥伦比亚",
-      "weight": 0.005525953
-    },
-    {
-      "name": "布基纳法索",
-      "weight": 0.005378297
-    },
-    {
-      "name": "科特迪瓦",
-      "weight": 0.005352997
-    },
-    {
-      "name": "阿根廷",
-      "weight": 0.005171935
-    },
-    {
-      "name": "赞比亚",
-      "weight": 0.005147159
-    },
-    {
-      "name": "德国",
-      "weight": 0.005096501
-    },
-    {
-      "weight": 0.005067552,
-      "name": "泰国"
-    },
-    {
-      "name": "马拉维",
-      "weight": 0.005017242
-    },
-    {
-      "name": "乍得",
-      "weight": 0.004825619
-    },
-    {
-      "name": "摩洛哥",
-      "weight": 0.004571552
-    },
-    {
-      "weight": 0.004266592,
-      "name": "马来西亚"
-    },
-    {
-      "weight": 0.004130712,
-      "name": "南苏丹"
-    },
-    {
-      "name": "委内瑞拉",
-      "weight": 0.00410843
-    },
-    {
-      "weight": 0.003903682,
-      "name": "乌兹别克斯坦"
-    },
-    {
-      "weight": 0.003891083,
-      "name": "秘鲁"
-    },
-    {
-      "weight": 0.003854943,
-      "name": "尼泊尔"
-    },
-    {
-      "name": "沙特阿拉伯",
-      "weight": 0.003683713
-    },
-    {
-      "name": "塞内加尔",
-      "weight": 0.003671814
-    },
-    {
-      "name": "津巴布韦",
-      "weight": 0.003628572
-    },
-    {
-      "name": "意大利",
-      "weight": 0.003591173
-    },
-    {
-      "weight": 0.003564036,
-      "name": "贝宁"
-    },
-    {
-      "weight": 0.003318383,
-      "name": "索马里"
-    },
-    {
-      "name": "几内亚",
-      "weight": 0.003229938
-    },
-    {
-      "name": "韩国",
-      "weight": 0.00302709
-    },
-    {
-      "name": "危地马拉",
-      "weight": 0.002989448
-    },
-    {
-      "weight": 0.002933277,
-      "name": "西班牙"
-    },
-    {
-      "name": "布隆迪",
-      "weight": 0.002916273
-    },
-    {
-      "name": "乌克兰",
-      "weight": 0.002865519
-    },
-    {
-      "name": "叙利亚",
-      "weight": 0.002803866
-    },
-    {
-      "name": "加拿大",
-      "weight": 0.002769376
-    },
-    {
-      "name": "朝鲜",
-      "weight": 0.002663995
-    },
-    {
-      "name": "柬埔寨",
-      "weight": 0.002507218
-    },
-    {
-      "weight": 0.002459301,
-      "name": "卢旺达"
-    },
-    {
-      "weight": 0.002433661,
-      "name": "波兰"
-    },
-    {
-      "weight": 0.002264484,
-      "name": "澳大利亚"
-    },
-    {
-      "name": "斯里兰卡",
-      "weight": 0.002205474
-    },
-    {
-      "weight": 0.00217928,
-      "name": "哈萨克斯坦"
-    },
-    {
-      "name": "厄瓜多尔",
-      "weight": 0.002114416
-    },
-    {
-      "name": "塞拉利昂",
-      "weight": 0.002042686
-    },
-    {
-      "name": "海地",
-      "weight": 0.001815248
-    },
-    {
-      "name": "智利",
-      "weight": 0.001761297
-    },
-    {
-      "name": "多哥",
-      "weight": 0.001756614
-    },
-    {
-      "name": "约旦",
-      "weight": 0.001738363
-    },
-    {
-      "weight": 0.001716995,
-      "name": "玻利维亚"
-    },
-    {
-      "weight": 0.001432103,
-      "name": "巴布亚新几内亚"
-    },
-    {
-      "weight": 0.001424043,
-      "name": "塔吉克斯坦"
-    },
-    {
-      "name": "多米尼加",
-      "weight": 0.001376899
-    },
-    {
-      "name": "荷兰",
-      "weight": 0.001365722
-    },
-    {
-      "name": "罗马尼亚",
-      "weight": 0.001342703
-    },
-    {
-      "weight": 0.001340039,
-      "name": "台湾"
-    },
-    {
-      "name": "突尼斯",
-      "weight": 0.001327688
-    },
-    {
-      "name": "中非",
-      "weight": 0.001269639
-    },
-    {
-      "name": "洪都拉斯",
-      "weight": 0.001219191
-    },
-    {
-      "name": "刚果共和国",
-      "weight": 0.001209073
-    },
-    {
-      "weight": 0.001189154,
-      "name": "利比里亚"
-    },
-    {
-      "weight": 0.001150376,
-      "name": "以色列"
-    },
-    {
-      "weight": 0.001149654,
-      "name": "厄立特里亚"
-    },
-    {
-      "weight": 0.001119049,
-      "name": "老挝"
-    },
-    {
-      "name": "阿塞拜疆",
-      "weight": 0.001039837
-    },
-    {
-      "name": "利比亚",
-      "weight": 0.001029222
-    },
-    {
-      "name": "巴勒斯坦",
-      "weight": 0.000992651
-    },
-    {
-      "name": "吉尔吉斯斯坦",
-      "weight": 0.000957294
-    },
-    {
-      "weight": 0.000907425,
-      "name": "比利时"
-    },
-    {
-      "name": "瑞典",
-      "weight": 0.000890654
-    },
-    {
-      "name": "巴拉圭",
-      "weight": 0.00085764
-    },
-    {
-      "name": "毛里塔尼亚",
-      "weight": 0.000842302
-    },
-    {
-      "weight": 0.000830493,
-      "name": "古巴"
-    },
-    {
-      "name": "萨尔瓦多",
-      "weight": 0.000822881
-    },
-    {
-      "name": "尼加拉瓜",
-      "weight": 0.000782782
-    },
-    {
-      "weight": 0.000764766,
-      "name": "阿曼"
-    },
-    {
-      "name": "黎巴嫩",
-      "weight": 0.000751395
-    },
-    {
-      "name": "土库曼斯坦",
-      "weight": 0.000743841
-    },
-    {
-      "weight": 0.000680867,
-      "name": "阿联酋"
-    },
-    {
-      "weight": 0.000677997,
-      "name": "捷克"
-    },
-    {
-      "weight": 0.000643037,
-      "name": "白俄罗斯"
-    },
-    {
-      "weight": 0.000642255,
-      "name": "瑞士"
-    },
-    {
-      "name": "匈牙利",
-      "weight": 0.000612393
-    },
-    {
-      "name": "奥地利",
-      "weight": 0.000602473
-    },
-    {
-      "name": "希腊",
-      "weight": 0.000595922
-    },
-    {
-      "weight": 0.000592992,
-      "name": "葡萄牙"
-    },
-    {
-      "weight": 0.000566764,
-      "name": "科威特"
-    },
-    {
-      "weight": 0.000538867,
-      "name": "哥斯达黎加"
-    },
-    {
-      "name": "巴拿马",
-      "weight": 0.000513904
-    },
-    {
-      "name": "挪威",
-      "weight": 0.000466485
-    },
-    {
-      "name": "丹麦",
-      "weight": 0.000460789
-    },
-    {
-      "name": "爱尔兰",
-      "weight": 0.000455762
-    },
-    {
-      "name": "新西兰",
-      "weight": 0.000451486
-    },
-    {
-      "name": "纳米比亚",
-      "weight": 0.000450165
-    },
-    {
-      "name": "香港",
-      "weight": 0.000448826
-    },
-    {
-      "weight": 0.000441931,
-      "name": "冈比亚"
-    },
-    {
-      "weight": 0.000436542,
-      "name": "塞尔维亚"
-    },
-    {
-      "name": "芬兰",
-      "weight": 0.000417327
-    },
-    {
-      "weight": 0.00041658,
-      "name": "几内亚比绍"
-    },
-    {
-      "weight": 0.000410456,
-      "name": "保加利亚"
-    },
-    {
-      "weight": 0.000382945,
-      "name": "蒙古"
-    },
-    {
-      "name": "莱索托",
-      "weight": 0.00037228
-    },
-    {
-      "weight": 0.000361607,
-      "name": "新加坡"
-    },
-    {
-      "name": "斯洛伐克",
-      "weight": 0.000361482
-    },
-    {
-      "weight": 0.00035722,
-      "name": "加蓬"
-    },
-    {
-      "name": "博茨瓦纳",
-      "weight": 0.000348221
-    },
-    {
-      "weight": 0.000323338,
-      "name": "乌拉圭"
-    },
-    {
-      "name": "赤道几内亚",
-      "weight": 0.000318155
-    },
-    {
-      "name": "东帝汶",
-      "weight": 0.000316195
-    },
-    {
-      "name": "牙买加",
-      "weight": 0.000312724
-    },
-    {
-      "name": "格鲁吉亚",
-      "weight": 0.000307685
-    },
-    {
-      "weight": 0.000265076,
-      "name": "阿尔巴尼亚"
-    },
-    {
-      "weight": 0.000252622,
-      "name": "克罗地亚"
-    },
-    {
-      "weight": 0.000250708,
-      "name": "亚美尼亚"
-    },
-    {
-      "name": "波黑",
-      "weight": 0.000232069
-    },
-    {
-      "name": "摩尔多瓦",
-      "weight": 0.000204405
-    },
-    {
-      "name": "科索沃",
-      "weight": 0.000196993
-    },
-    {
-      "weight": 0.000189047,
-      "name": "立陶宛"
-    },
-    {
-      "weight": 0.000182006,
-      "name": "卡塔尔"
-    },
-    {
-      "name": "波多黎各",
-      "weight": 0.000182004
-    },
-    {
-      "name": "吉布提",
-      "weight": 0.000174383
-    },
-    {
-      "name": "北马其顿",
-      "weight": 0.000158321
-    },
-    {
-      "weight": 0.000146886,
-      "name": "科摩罗"
-    },
-    {
-      "weight": 0.000144027,
-      "name": "巴林"
-    },
-    {
-      "weight": 0.000129782,
-      "name": "斯洛文尼亚"
-    },
-    {
-      "weight": 0.000126232,
-      "name": "西撒哈拉"
-    },
-    {
-      "name": "拉脱维亚",
-      "weight": 0.000124966
-    },
-    {
-      "name": "所罗门群岛",
-      "weight": 0.000120169
-    },
-    {
-      "name": "斐济",
-      "weight": 0.000110985
-    },
-    {
-      "weight": 0.000110769,
-      "name": "特立尼达和多巴哥"
-    },
-    {
-      "weight": 0.000109656,
-      "name": "毛里求斯"
-    },
-    {
-      "weight": 8.8e-5,
-      "name": "爱沙尼亚"
-    },
-    {
-      "weight": 8.61e-5,
-      "name": "圭亚那"
-    },
-    {
-      "name": "不丹",
-      "weight": 8.61e-5
-    },
-    {
-      "weight": 7.49e-5,
-      "name": "佛得角"
-    },
-    {
-      "name": "塞浦路斯",
-      "weight": 6.8e-5
-    },
-    {
-      "name": "伯利兹",
-      "weight": 6.4e-5
-    },
-    {
-      "weight": 6.01e-5,
-      "name": "苏里南"
-    },
-    {
-      "name": "文莱",
-      "weight": 5.2e-5
-    },
-    {
-      "weight": 5.1e-5,
-      "name": "黑山"
-    },
-    {
-      "name": "瓦努阿图",
-      "weight": 5.1e-5
-    },
-    {
-      "name": "卢森堡",
-      "weight": 5.07e-5
-    },
-    {
-      "name": "马尔代夫",
-      "weight": 4.27e-5
-    },
-    {
-      "name": "巴哈马",
-      "weight": 4.06e-5
-    },
-    {
-      "weight": 3.82e-5,
-      "name": "澳门"
-    },
-    {
-      "weight": 3.48e-5,
-      "name": "马耳他"
-    },
-    {
-      "name": "冰岛",
-      "weight": 3.45e-5
-    },
-    {
-      "weight": 3.03e-5,
-      "name": "新喀里多尼亚"
-    },
-    {
-      "name": "萨摩亚",
-      "weight": 2.83e-5
-    },
-    {
-      "weight": 2.8e-5,
-      "name": "法属波利尼西亚"
-    },
-    {
-      "name": "关岛",
-      "weight": 2.36e-5
-    },
-    {
-      "weight": 2.32e-5,
-      "name": "巴巴多斯"
-    },
-    {
-      "name": "基里巴斯",
-      "weight": 1.83e-5
-    },
-    {
-      "weight": 1.71e-5,
-      "name": "圣卢西亚"
-    },
-    {
-      "name": "库拉索",
-      "weight": 1.51e-5
-    },
-    {
-      "weight": 1.5e-5,
-      "name": "汤加"
-    },
-    {
-      "weight": 1.42e-5,
-      "name": "密克罗尼西亚联邦"
-    },
-    {
-      "weight": 1.13e-5,
-      "name": "格林纳达"
-    },
-    {
-      "name": "安提瓜和巴布达",
-      "weight": 1.05e-5
-    },
-    {
-      "weight": 9.93e-6,
-      "name": "圣文森特和格林纳丁斯"
-    },
-    {
-      "name": "泽西",
-      "weight": 9.66e-6
-    },
-    {
-      "weight": 9.64e-6,
-      "name": "阿鲁巴"
-    },
-    {
-      "weight": 9.15e-6,
-      "name": "美属维尔京群岛"
-    },
-    {
-      "weight": 9.08e-6,
-      "name": "马绍尔群岛"
-    },
-    {
-      "weight": 8.9e-6,
-      "name": "塞舌尔"
-    },
-    {
-      "name": "美属萨摩亚",
-      "weight": 7.97e-6
-    },
-    {
-      "name": "多米尼克",
-      "weight": 7.57e-6
-    },
-    {
-      "weight": 6.41e-6,
-      "name": "马恩岛"
-    },
-    {
-      "weight": 6.09e-6,
-      "name": "北马里亚纳群岛"
-    },
-    {
-      "name": "开曼群岛",
-      "weight": 5.77e-6
-    },
-    {
-      "name": "格陵兰",
-      "weight": 5.63e-6
-    },
-    {
-      "weight": 5.54e-6,
-      "name": "法罗群岛"
-    },
-    {
-      "weight": 5.17e-6,
-      "name": "圣基茨和尼维斯"
-    },
-    {
-      "weight": 5.11e-6,
-      "name": "百慕大"
-    },
-    {
-      "weight": 4.38e-6,
-      "name": "根西"
-    },
-    {
-      "weight": 4.31e-6,
-      "name": "特克斯和凯科斯群岛"
-    },
-    {
-      "name": "荷属圣马丁",
-      "weight": 4.14e-6
-    },
-    {
-      "weight": 3.87e-6,
-      "name": "安道尔"
-    },
-    {
-      "name": "法国(法属圣马丁)",
-      "weight": 3.6e-6
-    },
-    {
-      "name": "直布罗陀",
-      "weight": 3.2e-6
-    },
-    {
-      "weight": 2.87e-6,
-      "name": "列支敦士登"
-    },
-    {
-      "name": "英属维尔京群岛",
-      "weight": 2.57e-6
-    },
-    {
-      "weight": 2.1e-6,
-      "name": "圣马力诺"
-    },
-    {
-      "weight": 1.75e-6,
-      "name": "瑙鲁"
-    },
-    {
-      "name": "摩纳哥",
-      "weight": 1.75e-6
-    },
-    {
-      "name": "图瓦卢",
-      "weight": 1.72e-6
-    },
-    {
-      "name": "库克群岛",
-      "weight": 1.44e-6
-    },
-    {
-      "name": "帕劳",
-      "weight": 1.44e-6
-    },
-    {
-      "weight": 1.41e-6,
-      "name": "安圭拉"
-    },
-    {
-      "weight": 1.05e-6,
-      "name": "法国(瓦利斯和富图纳)"
-    },
-    {
-      "weight": 6.6e-7,
-      "name": "法国(圣巴泰勒米)"
-    },
-    {
-      "name": "蒙特塞拉特",
-      "weight": 4.35e-7
-    },
-    {
-      "weight": 3.77e-7,
-      "name": "圣赫勒拿、阿森松和特里斯坦-达库尼亚"
-    },
-    {
-      "name": "法国(圣皮埃尔和密克隆)",
-      "weight": 2.86e-7
-    },
-    {
-      "name": "福克兰群岛",
-      "weight": 2.48e-7
-    }
-]

go.mod

@@ -1,12 +1,11 @@
 module github.com/FloatTech/ZeroBot-Plugin
 
-go 1.16
+go 1.17
 
 require (
-	github.com/FloatTech/AnimeAPI v1.1.11
-	github.com/FloatTech/ZeroBot-Plugin-Gif v0.2.4
-	github.com/FloatTech/bot-manager v1.0.1-0.20211112011524-85b9895271ed
-	github.com/antchfx/htmlquery v1.2.3
+	github.com/FloatTech/AnimeAPI v1.2.4-fix12
+	github.com/FloatTech/zbputils v1.2.4-fix6
+	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
@@ -14,16 +13,51 @@ require (
 	github.com/fumiama/go-registry v0.0.2
 	github.com/fumiama/gofastTEA v0.0.6
 	github.com/fumiama/gotracemoe v0.0.3
-	github.com/gin-gonic/gin v1.7.7
-	github.com/gorilla/websocket v1.4.2
 	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.11
+	github.com/shirou/gopsutil/v3 v3.21.12
 	github.com/sirupsen/logrus v1.8.1
-	github.com/t-tomalak/logrus-easy-formatter v0.0.0-20190827215021-c074f06c5816
-	github.com/tidwall/gjson v1.12.1
-	github.com/wdvxdr1123/ZeroBot v1.4.1
+	github.com/tidwall/gjson v1.13.0
+	github.com/wdvxdr1123/ZeroBot v1.4.2-0.20220122162257-bc71c479f3d1
 	golang.org/x/image v0.0.0-20211028202545-6944b10bf410
-	golang.org/x/text v0.3.6
+)
+
+require (
+	github.com/antchfx/xpath v1.2.0 // indirect
+	github.com/disintegration/imaging v1.6.2 // indirect
+	github.com/ericpauley/go-quantize v0.0.0-20200331213906-ae555eb2afa4 // indirect
+	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/gorilla/websocket v1.4.2 // indirect
+	github.com/jinzhu/inflection v1.0.0 // indirect
+	github.com/kballard/go-shellquote v0.0.0-20180428030007-95032a82bc51 // indirect
+	github.com/lufia/plan9stats v0.0.0-20211012122336-39d0f177ccd0 // indirect
+	github.com/mattn/go-isatty v0.0.14 // indirect
+	github.com/nfnt/resize v0.0.0-20180221191011-83c6a9932646 // indirect
+	github.com/power-devops/perfstat v0.0.0-20210106213030-5aafc221ea8c // indirect
+	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/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-20220114195835-da31bd327af9 // indirect
+	golang.org/x/text v0.3.7 // indirect
+	golang.org/x/tools v0.1.8 // indirect
+	golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1 // indirect
+	lukechampine.com/uint128 v1.2.0 // indirect
+	modernc.org/cc/v3 v3.35.22 // indirect
+	modernc.org/ccgo/v3 v3.15.12 // indirect
+	modernc.org/libc v1.14.4 // indirect
+	modernc.org/mathutil v1.4.1 // indirect
+	modernc.org/memory v1.0.5 // indirect
+	modernc.org/opt v0.1.1 // indirect
+	modernc.org/sqlite v1.14.5 // indirect
+	modernc.org/strutil v1.1.1 // indirect
+	modernc.org/token v1.0.0 // indirect
 )

go.sum

@@ -1,25 +1,19 @@
-github.com/FloatTech/AnimeAPI v1.1.9/go.mod h1:CC+vF30UGBlcIUxwFOcXIEHoJ4r7c5x2iLQsnUCVdDI=
-github.com/FloatTech/AnimeAPI v1.1.11 h1:uuV4v5qweh0mI0E2KMiG5XGt0pKboV/EFAlIfSJxIi8=
-github.com/FloatTech/AnimeAPI v1.1.11/go.mod h1:CC+vF30UGBlcIUxwFOcXIEHoJ4r7c5x2iLQsnUCVdDI=
-github.com/FloatTech/ZeroBot-Plugin v1.1.5/go.mod h1:kWuUARvU7gs4xLggi8Sy37ja2GRL6k0X6kewe5TiZRs=
-github.com/FloatTech/ZeroBot-Plugin-Gif v0.2.4 h1:WW0BmmLLqAg+m6qGkrKbsfSIm91fkj3/udt3R7Myodo=
-github.com/FloatTech/ZeroBot-Plugin-Gif v0.2.4/go.mod h1:W7ag6hml1pZTNzRXKU74OMr6rS8awQKSU+o2g7Gj4O0=
-github.com/FloatTech/ZeroBot-Plugin-Timer v1.4.3/go.mod h1:MVOQQ4e6AVGFm993blXXU4Sd6bAsLY2+Zb+/HMrEeEc=
-github.com/FloatTech/bot-manager v1.0.1-0.20211112011524-85b9895271ed h1:GEOgDVbvaxXqZxgWE/y5JOlbMXrmq7n0M+m9g3md2To=
-github.com/FloatTech/bot-manager v1.0.1-0.20211112011524-85b9895271ed/go.mod h1:8YYRJ16oroGHQGD2En0oVnmcKJkxR9O/jd5BPSfWfOQ=
-github.com/FloatTech/imgfactory v0.1.1 h1:ooL2+fV8yrMhv1ShGGKsN0Rm/flWoKnvqXaUD+dC3DQ=
-github.com/FloatTech/imgfactory v0.1.1/go.mod h1:ThDALab8aOuU6KVYESVWFqmjcqtm03e0SvGlTw6s+aw=
+github.com/FloatTech/AnimeAPI v1.2.4-fix12 h1:MtLPKhoSl6DSiR+nz1W1RD2XP1j2iZTZ4MBwijvfURw=
+github.com/FloatTech/AnimeAPI v1.2.4-fix12/go.mod h1:V+cIUIRxFsKniFqC2zfaT+2rhZQ0fIE0K+fWo+0qEpk=
+github.com/FloatTech/bot-manager v1.0.0/go.mod h1:8YYRJ16oroGHQGD2En0oVnmcKJkxR9O/jd5BPSfWfOQ=
+github.com/FloatTech/zbputils v1.2.4-fix6 h1:dEoOyYdCg05XhRivLU1CWNBzvzqv2hrJkv+eHXdOO0A=
+github.com/FloatTech/zbputils v1.2.4-fix6/go.mod h1:ZXKT80QiMNZ2EP9Ga69hzjo3PV+NVrS9zZdJ9njNqWE=
 github.com/Mrs4s/MiraiGo v0.0.0-20211120033824-43b23f4e6fcb h1:Rkj28fqIwGx/EgBzRYtpmJRfH6wqVn7cNdc7aJ0QE4M=
 github.com/Mrs4s/MiraiGo v0.0.0-20211120033824-43b23f4e6fcb/go.mod h1:imVKbfKqqeit+C/eaWGb4MKQ3z3gN6pRpBU5RMtp5so=
 github.com/PuerkitoBio/goquery v1.5.1/go.mod h1:GsLWisAFVj4WgDibEWF4pvYnkVQBpKBKeU+7zCJoLcc=
-github.com/StackExchange/wmi v1.2.1/go.mod h1:rcmrprowKIVzvc+NUiLncP2uuArMWLCbu9SBzvHz7e8=
 github.com/andybalholm/cascadia v1.1.0/go.mod h1:GsXiBklL0woXo1j/WYWtSYYC4ouU9PqHO0sqidkEA4Y=
-github.com/antchfx/htmlquery v1.2.3 h1:sP3NFDneHx2stfNXCKbhHFo8XgNjCACnU/4AO5gWz6M=
-github.com/antchfx/htmlquery v1.2.3/go.mod h1:B0ABL+F5irhhMWg54ymEZinzMSi0Kt3I2if0BLYa3V0=
-github.com/antchfx/xpath v1.1.6 h1:6sVh6hB5T6phw1pFpHRQ+C4bd8sNI+O58flqtg7h0R0=
-github.com/antchfx/xpath v1.1.6/go.mod h1:Yee4kTMuNiPYJ7nSNorELQMr1J33uOpXDMByNYhvtNk=
+github.com/antchfx/htmlquery v1.2.4 h1:qLteofCMe/KGovBI6SQgmou2QNyedFUW+pE+BpeZ494=
+github.com/antchfx/htmlquery v1.2.4/go.mod h1:2xO6iu3EVWs7R2JYqBbp8YzG50gj/ofqs5/0VZoDZLc=
+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=
@@ -46,44 +40,42 @@ github.com/fumiama/gofastTEA v0.0.6 h1:Yni3MXDbJVa/c4CecgdZDgCJK+fLdvGph+OBqY2mt
 github.com/fumiama/gofastTEA v0.0.6/go.mod h1:+sBZ05nCA2skZkursHNvyr8kULlEetrYTM2y5kA4rQc=
 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 h1:Y/yl/+YNO8GZSjAhjMsSuLt29uWRFHdHYUb5lYOV9qE=
 github.com/gin-contrib/sse v0.1.0/go.mod h1:RHrZQHXnP2xjPF+u1gW/2HnVO7nvIa9PG3Gm+fLHvGI=
-github.com/gin-gonic/gin v1.7.7 h1:3DoBmSbJbZAWqXJC3SLjAPfutPJJRN1U5pALB7EeTTs=
 github.com/gin-gonic/gin v1.7.7/go.mod h1:axIBovoeJpVj8S3BwE0uPMTeReE4+AfFtqpqaZ1qq1U=
-github.com/go-ole/go-ole v1.2.5/go.mod h1:pprOEPIfldk/42T2oK7lQ4v4JSDwmV0As9GaiUsvbm0=
 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 h1:MsBgLAaY856+nPRTKrp3/OZK38U/wa0CcBYNjji3q3A=
 github.com/go-playground/assert/v2 v2.0.1/go.mod h1:VDjEfimB/XKnb+ZQfWdccd7VUvScMdVu0Titje2rxJ4=
-github.com/go-playground/locales v0.13.0 h1:HyWk6mgj5qFqCT5fjGBuRArbVDfE4hi8+e8ceBS/t7Q=
 github.com/go-playground/locales v0.13.0/go.mod h1:taPMhCMXrRLJO55olJkUXHZBHCxTMfnGwq/HNwmWNS8=
-github.com/go-playground/universal-translator v0.17.0 h1:icxd5fm+REJzpZx7ZfpaD876Lmtgy7VtROAbHHXk8no=
+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/validator/v10 v10.4.1 h1:pH2c5ADXtd66mxoE0Zm9SUhxE20r7aM3F26W0hOn+GE=
+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-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=
 github.com/golang-sql/civil v0.0.0-20190719163853-cb61b32ac6fe/go.mod h1:8vg3r2VgvsThLBIFL93Qb5yWzgyZWhEmBwUJWevAkK0=
 github.com/golang/freetype v0.0.0-20170609003504-e2365dfdc4a0 h1:DACJavvAHhabrF08vX0COfcOBJRhZ8lUbR+ZWIs0Y5g=
 github.com/golang/freetype v0.0.0-20170609003504-e2365dfdc4a0/go.mod h1:E/TSTwGwJL78qG/PmXZO1EjYhfJinVAhrmmHX6Z8B9k=
-github.com/golang/groupcache v0.0.0-20200121045136-8c9f03a8e57e h1:1r7pUrabqp18hOBcwBwiTsbnFeTZHV9eER/QT5JVZxY=
 github.com/golang/groupcache v0.0.0-20200121045136-8c9f03a8e57e/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc=
+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 h1:ROPKBNFfQgOUMifHyP+KYbvpjbdoFNs+aK7DXlji0Tw=
 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 h1:BKbKCqvP6I+rmFHt06ZmyQtvB8xAkWdhFyr0ZUNZcxQ=
 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/gorilla/websocket v1.4.2 h1:+/TMaTYc4QFitKJxsQ7Yye35DkWvkdLcvGKqM+x0Ufc=
 github.com/gorilla/websocket v1.4.2/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE=
 github.com/hpcloud/tail v1.0.0/go.mod h1:ab1qPbhIpdTxEkNHXyeSf5vhxWSCs/tWer42PpOxQnU=
-github.com/imroc/req v0.3.0/go.mod h1:F+NZ+2EFSo6EFXdeIbpfE9hcC233id70kf0byW97Caw=
 github.com/jinzhu/gorm v1.9.16 h1:+IyIjPEABKRpsu/F8OvDPy9fyQlgsg2luMV2ZIH5i5o=
 github.com/jinzhu/gorm v1.9.16/go.mod h1:G3LB3wezTOWM2ITLzPxEXgSkOXAntiLHS7UdBefADcs=
 github.com/jinzhu/inflection v1.0.0 h1:K317FqzuhWc8YvSVlFMCCUb36O/S9MCKRDI7QkRKD/E=
@@ -91,30 +83,35 @@ github.com/jinzhu/inflection v1.0.0/go.mod h1:h+uFLlag+Qp1Va5pdKtLDYj+kHp5pxUVkr
 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.11 h1:uVUAXhF2To8cbw/3xN3pxj6kk7TYKs98NIrTqPlMWAQ=
-github.com/json-iterator/go v1.1.11/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/klauspost/compress v1.13.6/go.mod h1:/3/Vjq9QcHkK5uEr5lBEmyoZ1iFhe47etQ6QUkpK6sk=
 github.com/konsorten/go-windows-terminal-sequences v1.0.1/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ=
-github.com/leodido/go-urn v1.2.0 h1:hpXL4XnriNwQ/ABnpepYM/1vCLWNDfUNts8dX3xTG6Y=
+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 h1:wuysRhFDzyxgEmMf5xjvJ2M9dZoWAXNNr5LSBS7uHXY=
 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.8 h1:gDp86IdQsN/xWjIEmr9MF6o9mpksUgh0fu+9ByFxzIU=
-github.com/mattn/go-sqlite3 v1.14.8/go.mod h1:NyWgC/yNuGj7Q9rpYnZvas74GogHl5/Z4A/KQRfk6bU=
-github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421 h1:ZqeYNhU3OHLH3mGKHDcjJRFFRrJa6eAM5H+CtDdOsPc=
+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-0.20210109003243-333559e1834b h1:6Xjqolv/0DDdUqlpnsTomXQvjvvkz7Ux7TcMALvozEw=
-github.com/modern-go/reflect2 v1.0.2-0.20210109003243-333559e1834b/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3RllmbCylyMrvgv0=
+github.com/modern-go/reflect2 v1.0.2/go.mod h1:yWuevngMOJpCy52FWWMvUC8ws7m/LJsjYzDa0/r8luk=
 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=
@@ -122,6 +119,7 @@ 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/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4=
 github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
 github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
@@ -130,11 +128,10 @@ github.com/power-devops/perfstat v0.0.0-20210106213030-5aafc221ea8c h1:ncq/mPwQF
 github.com/power-devops/perfstat v0.0.0-20210106213030-5aafc221ea8c/go.mod h1:OmDBASR4679mdNQnz2pUhc2G8CO2JrUAVFDRBDP/hJE=
 github.com/remyoudompheng/bigfft v0.0.0-20200410134404-eec4a21b6bb0 h1:OdAsTTz6OkFY5QxjkYwrChwuRruF69c169dPK26NUlk=
 github.com/remyoudompheng/bigfft v0.0.0-20200410134404-eec4a21b6bb0/go.mod h1:qqbHyh8v60DhA7CoWK5oRCqLrMHRGoxYCSS9EjAz6Eo=
-github.com/robfig/cron v1.2.0/go.mod h1:JGuDeoQd7Z6yL4zQhZ3OPEVHB7fL6Ka6skscFHfmt2k=
-github.com/shirou/gopsutil v3.21.8+incompatible h1:sh0foI8tMRlCidUJR+KzqWYWxrkuuPIGiO6Vp+KXdCU=
-github.com/shirou/gopsutil v3.21.8+incompatible/go.mod h1:5b4v6he4MtMOwMlS0TUMTu2PcXUg8+E1lC7eC3UO/RA=
-github.com/shirou/gopsutil/v3 v3.21.11 h1:d5tOAP5+bmJ8Hf2+4bxOSkQ/64+sjEbjU9nSW9nJgG0=
-github.com/shirou/gopsutil/v3 v3.21.11/go.mod h1:BToYZVTlSVlfazpDDYFnsVZLaoRG+g8ufT6fPQLdJzA=
+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/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=
@@ -143,18 +140,15 @@ github.com/stretchr/objx v0.1.1/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+
 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/syndtr/goleveldb v1.0.0/go.mod h1:ZVVdQEZoIme9iO1Ch2Jdy24qqXrMMOU6lpPAyBWyWuQ=
-github.com/t-tomalak/logrus-easy-formatter v0.0.0-20190827215021-c074f06c5816 h1:J6v8awz+me+xeb/cUTotKgceAYouhIB3pjzgRd6IlGk=
 github.com/t-tomalak/logrus-easy-formatter v0.0.0-20190827215021-c074f06c5816/go.mod h1:tzym/CEb5jnFI+Q0k4Qq3+LvRF4gO3E2pxS8fHP8jcA=
-github.com/tdf1939/ZeroBot-Plugin-Gif v0.0.0-20210828060956-389b1dc33652/go.mod h1:bkxKi7un9gCDvUUZAiIJF6k90pyj8rmxiXLJkiHcsMY=
-github.com/tdf1939/img v0.0.0-20210827153520-90cb4e9580a3/go.mod h1:FgTEOcosTWrkOr7++gbtPSj1rX5loRWrf/AL+hm3Cnw=
 github.com/tidwall/gjson v1.8.0/go.mod h1:5/xDoumyyDNerp2U36lyolv46b3uF/9Bu6OfyQ9GImk=
-github.com/tidwall/gjson v1.9.0/go.mod h1:5/xDoumyyDNerp2U36lyolv46b3uF/9Bu6OfyQ9GImk=
 github.com/tidwall/gjson v1.11.0/go.mod h1:/wbyibRr2FHMks5tjHJ5F8dMZh3AcwJEMf5vlfC0lxk=
-github.com/tidwall/gjson v1.12.1 h1:ikuZsLdhr8Ws0IdROXUS1Gi4v9Z4pGqpX/CvJkxvfpo=
-github.com/tidwall/gjson v1.12.1/go.mod h1:/wbyibRr2FHMks5tjHJ5F8dMZh3AcwJEMf5vlfC0lxk=
+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/match v1.0.3/go.mod h1:eRSPERbgtNPcGhD8UCthc6PmLEQXEWd3PRB5JTxsfmM=
 github.com/tidwall/match v1.1.1 h1:+Ho715JplO36QYgwN9PGYNhgZvoUSc9X2c80KVTi+GA=
 github.com/tidwall/match v1.1.1/go.mod h1:eRSPERbgtNPcGhD8UCthc6PmLEQXEWd3PRB5JTxsfmM=
@@ -165,31 +159,32 @@ github.com/tklauser/go-sysconf v0.3.9 h1:JeUVdAOWhhxVcU6Eqr/ATFHgXk/mmiItdKeJPev
 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/numcpus v0.3.0/go.mod h1:yFGUr7TUHQRAhyqBcEg0Ge34zDBAsIvJJcyE6boqnA8=
-github.com/ugorji/go v1.1.7 h1:/68gy2h+1mWMrwZFeD1kQialdSzAb432dtpeJ42ovdo=
 github.com/ugorji/go v1.1.7/go.mod h1:kZn38zHttfInRq0xu/PH0az30d+z6vm202qpg1oXVMw=
-github.com/ugorji/go/codec v1.1.7 h1:2SvQaVZ1ouYrrKKwoSk2pzd4A9evlKJb9oTL+OaLUSs=
+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/wdvxdr1123/ZeroBot v1.2.2/go.mod h1:83nHtG8V5TAxPwH/LCDxLpZk4khIgs29dkr5TBWf7fc=
-github.com/wdvxdr1123/ZeroBot v1.2.3/go.mod h1:83nHtG8V5TAxPwH/LCDxLpZk4khIgs29dkr5TBWf7fc=
-github.com/wdvxdr1123/ZeroBot v1.2.4/go.mod h1:83nHtG8V5TAxPwH/LCDxLpZk4khIgs29dkr5TBWf7fc=
+github.com/ugorji/go/codec v1.2.6/go.mod h1:V6TCNZ4PHqoHGFZuSG1W8nrCzzdgA2DozYxWFFpvxTw=
 github.com/wdvxdr1123/ZeroBot v1.3.2/go.mod h1:i2DIqQjtjE+3gvVi9r9sc+QpNaUuyTXx/HNXXayIpwI=
-github.com/wdvxdr1123/ZeroBot v1.4.1 h1:fk/8RH2D1gB3YeC1eI/SZi/kG31Rh7Z8lAiDc60VZFM=
 github.com/wdvxdr1123/ZeroBot v1.4.1/go.mod h1:7t9m4vDZPwWAmzKlhP6IvUoisOIiqNdm/3AJgiY3+ew=
+github.com/wdvxdr1123/ZeroBot v1.4.2-0.20220122162257-bc71c479f3d1 h1:x56lA0u6hSRpD1YJ/4BDiLydJ8qp5mF50xYS8ZlbkWU=
+github.com/wdvxdr1123/ZeroBot v1.4.2-0.20220122162257-bc71c479f3d1/go.mod h1:7t9m4vDZPwWAmzKlhP6IvUoisOIiqNdm/3AJgiY3+ew=
 github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
+github.com/yuin/goldmark v1.4.1/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k=
 github.com/yusufpapurcu/wmi v1.2.2 h1:KBNDSne4vP5mbSWnJbO+51IMOXJB67QiYCSBrubbPRg=
 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=
 golang.org/x/crypto v0.0.0-20190325154230-a5d413f7728c/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
 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 h1:psW17arqaxU48Z5kZ0CQnkZWQJsqcURM6tKiBApRjXI=
 golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
+golang.org/x/crypto v0.0.0-20210711020723-a769d52b0f97/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc=
+golang.org/x/crypto v0.0.0-20220112180741-5e0467b6c7ce h1:Roh6XWxHFKrPgC/EQhVubSAGQ6Ozk6IdxHSzt1mR0EI=
+golang.org/x/crypto v0.0.0-20220112180741-5e0467b6c7ce/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4=
 golang.org/x/image v0.0.0-20191009234506-e7c1f5e7dbb8/go.mod h1:FeLwcggjj3mMvU+oOTbSwawSJRM1uh48EjtB4UJZlP0=
-golang.org/x/image v0.0.0-20210628002857-a66eb6448b8d/go.mod h1:023OzeP/+EPmXeapQh35lcL3II3LrY8Ic+EFFKVhULM=
 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/mod v0.3.0 h1:RM4zey1++hCTbCVQfnWeKs9/IEsaBLA8vTkd0WVtmH4=
 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=
@@ -198,8 +193,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-20211015210444-4f30a5c0130f h1:OfiFi4JbukWwe3lzw+xunroH1mnC1e2Gy5cxNJApiSY=
+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/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=
@@ -217,20 +215,28 @@ golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7w
 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-20211013075003-97ac67df715c h1:taxlMj0D/1sOAuv/CbSD+MMDof2vbyPTqz5FNYKpXt8=
+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-20220114195835-da31bd327af9 h1:XfKQ4OlFl8okEOr5UvAqFRVj8pY/4yfcXrddB8qAbU0=
+golang.org/x/sys v0.0.0-20220114195835-da31bd327af9/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
 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 h1:aRYxNxv6iGQlyVaZmk6ZgYEDa+Jg18DxebPSrd6bg1M=
 golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
+golang.org/x/text v0.3.7 h1:olpwvP2KacW1ZWvsR7uQhoyTYvKAupfQrRGBFM352Gk=
+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 h1:M8tBwCtWD/cZV9DZpFYRUgaymAYAr+aIUTWzDaM3uPs=
 golang.org/x/tools v0.0.0-20201124115921-2c860bdd6e78/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA=
+golang.org/x/tools v0.1.8 h1:P1HhGGuLW4aAclzjtmJdf0mJOjVUZUzOTqkAkWL+l6w=
+golang.org/x/tools v0.1.8/go.mod h1:nABZi5QlRsZVlzPpHl034qft6wpY4eDcsTt5AaioBiU=
 golang.org/x/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=
@@ -238,38 +244,133 @@ golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1 h1:go1bK/D/BFZV2I8cIQd1N
 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 h1:SnqbnDw1V7RiZcXPx5MEeqPv2s79L9i7BJUlG/+RurQ=
 google.golang.org/protobuf v1.27.1/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc=
-gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+SDo693bJlVdllGtEeKM=
 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 h1:obN1ZagJSUGI0Ek/LBmuj4SNLPfIny3KsKFopxRdj10=
 gopkg.in/yaml.v2 v2.2.8/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
-gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c h1:dUUwHk2QECo/6vqA44rthZ8ie2QXMNeKRTHCNY2nXvo=
+gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ=
 gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
-lukechampine.com/uint128 v1.1.1 h1:pnxCASz787iMf+02ssImqk6OLt+Z5QHMoZyUXR4z6JU=
+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=
-modernc.org/cc/v3 v3.34.0 h1:dFhZc/HKR3qp92sYQxKRRaDMz+sr1bwcFD+m7LSCrAs=
 modernc.org/cc/v3 v3.34.0/go.mod h1:iPJg1pkwXqAV16SNgFBVYmggfMg6xhs+2oiO0vclK3g=
+modernc.org/cc/v3 v3.35.0/go.mod h1:iPJg1pkwXqAV16SNgFBVYmggfMg6xhs+2oiO0vclK3g=
+modernc.org/cc/v3 v3.35.4/go.mod h1:iPJg1pkwXqAV16SNgFBVYmggfMg6xhs+2oiO0vclK3g=
+modernc.org/cc/v3 v3.35.5/go.mod h1:iPJg1pkwXqAV16SNgFBVYmggfMg6xhs+2oiO0vclK3g=
+modernc.org/cc/v3 v3.35.7/go.mod h1:iPJg1pkwXqAV16SNgFBVYmggfMg6xhs+2oiO0vclK3g=
+modernc.org/cc/v3 v3.35.8/go.mod h1:iPJg1pkwXqAV16SNgFBVYmggfMg6xhs+2oiO0vclK3g=
+modernc.org/cc/v3 v3.35.10/go.mod h1:iPJg1pkwXqAV16SNgFBVYmggfMg6xhs+2oiO0vclK3g=
+modernc.org/cc/v3 v3.35.15/go.mod h1:iPJg1pkwXqAV16SNgFBVYmggfMg6xhs+2oiO0vclK3g=
+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/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=
 modernc.org/ccgo/v3 v3.11.1/go.mod h1:lWHxfsn13L3f7hgGsGlU28D9eUOf6y3ZYHKoPaKU0ag=
-modernc.org/ccgo/v3 v3.11.2 h1:gqa8PQ2v7SjrhHCgxUO5dzoAJWSLAveJqZTNkPCN0kc=
-modernc.org/ccgo/v3 v3.11.2/go.mod h1:6kii3AptTDI+nUrM9RFBoIEUEisSWCbdczD9ZwQH2FE=
+modernc.org/ccgo/v3 v3.11.3/go.mod h1:0oHunRBMBiXOKdaglfMlRPBALQqsfrCKXgw9okQ3GEw=
+modernc.org/ccgo/v3 v3.12.4/go.mod h1:Bk+m6m2tsooJchP/Yk5ji56cClmN6R1cqc9o/YtbgBQ=
+modernc.org/ccgo/v3 v3.12.6/go.mod h1:0Ji3ruvpFPpz+yu+1m0wk68pdr/LENABhTrDkMDWH6c=
+modernc.org/ccgo/v3 v3.12.8/go.mod h1:Hq9keM4ZfjCDuDXxaHptpv9N24JhgBZmUG5q60iLgUo=
+modernc.org/ccgo/v3 v3.12.11/go.mod h1:0jVcmyDwDKDGWbcrzQ+xwJjbhZruHtouiBEvDfoIsdg=
+modernc.org/ccgo/v3 v3.12.14/go.mod h1:GhTu1k0YCpJSuWwtRAEHAol5W7g1/RRfS4/9hc9vF5I=
+modernc.org/ccgo/v3 v3.12.18/go.mod h1:jvg/xVdWWmZACSgOiAhpWpwHWylbJaSzayCqNOJKIhs=
+modernc.org/ccgo/v3 v3.12.20/go.mod h1:aKEdssiu7gVgSy/jjMastnv/q6wWGRbszbheXgWRHc8=
+modernc.org/ccgo/v3 v3.12.21/go.mod h1:ydgg2tEprnyMn159ZO/N4pLBqpL7NOkJ88GT5zNU2dE=
+modernc.org/ccgo/v3 v3.12.22/go.mod h1:nyDVFMmMWhMsgQw+5JH6B6o4MnZ+UQNw1pp52XYFPRk=
+modernc.org/ccgo/v3 v3.12.25/go.mod h1:UaLyWI26TwyIT4+ZFNjkyTbsPsY3plAEB6E7L/vZV3w=
+modernc.org/ccgo/v3 v3.12.29/go.mod h1:FXVjG7YLf9FetsS2OOYcwNhcdOLGt8S9bQ48+OP75cE=
+modernc.org/ccgo/v3 v3.12.36/go.mod h1:uP3/Fiezp/Ga8onfvMLpREq+KUjUmYMxXPO8tETHtA8=
+modernc.org/ccgo/v3 v3.12.38/go.mod h1:93O0G7baRST1vNj4wnZ49b1kLxt0xCW5Hsa2qRaZPqc=
+modernc.org/ccgo/v3 v3.12.43/go.mod h1:k+DqGXd3o7W+inNujK15S5ZYuPoWYLpF5PYougCmthU=
+modernc.org/ccgo/v3 v3.12.46/go.mod h1:UZe6EvMSqOxaJ4sznY7b23/k13R8XNlyWsO5bAmSgOE=
+modernc.org/ccgo/v3 v3.12.47/go.mod h1:m8d6p0zNps187fhBwzY/ii6gxfjob1VxWb919Nk1HUk=
+modernc.org/ccgo/v3 v3.12.50/go.mod h1:bu9YIwtg+HXQxBhsRDE+cJjQRuINuT9PUK4orOco/JI=
+modernc.org/ccgo/v3 v3.12.51/go.mod h1:gaIIlx4YpmGO2bLye04/yeblmvWEmE4BBBls4aJXFiE=
+modernc.org/ccgo/v3 v3.12.53/go.mod h1:8xWGGTFkdFEWBEsUmi+DBjwu/WLy3SSOrqEmKUjMeEg=
+modernc.org/ccgo/v3 v3.12.54/go.mod h1:yANKFTm9llTFVX1FqNKHE0aMcQb1fuPJx6p8AcUx+74=
+modernc.org/ccgo/v3 v3.12.55/go.mod h1:rsXiIyJi9psOwiBkplOaHye5L4MOOaCjHg1Fxkj7IeU=
+modernc.org/ccgo/v3 v3.12.56/go.mod h1:ljeFks3faDseCkr60JMpeDb2GSO3TKAmrzm7q9YOcMU=
+modernc.org/ccgo/v3 v3.12.57/go.mod h1:hNSF4DNVgBl8wYHpMvPqQWDQx8luqxDnNGCMM4NFNMc=
+modernc.org/ccgo/v3 v3.12.60/go.mod h1:k/Nn0zdO1xHVWjPYVshDeWKqbRWIfif5dtsIOCUVMqM=
+modernc.org/ccgo/v3 v3.12.66/go.mod h1:jUuxlCFZTUZLMV08s7B1ekHX5+LIAurKTTaugUr/EhQ=
+modernc.org/ccgo/v3 v3.12.67/go.mod h1:Bll3KwKvGROizP2Xj17GEGOTrlvB1XcVaBrC90ORO84=
+modernc.org/ccgo/v3 v3.12.73/go.mod h1:hngkB+nUUqzOf3iqsM48Gf1FZhY599qzVg1iX+BT3cQ=
+modernc.org/ccgo/v3 v3.12.81/go.mod h1:p2A1duHoBBg1mFtYvnhAnQyI6vL0uw5PGYLSIgF6rYY=
+modernc.org/ccgo/v3 v3.12.84/go.mod h1:ApbflUfa5BKadjHynCficldU1ghjen84tuM5jRynB7w=
+modernc.org/ccgo/v3 v3.12.86/go.mod h1:dN7S26DLTgVSni1PVA3KxxHTcykyDurf3OgUzNqTSrU=
+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.14.0/go.mod h1:hBrkiBlUwvr5vV/ZH9YzXIp982jKE8Ek8tR1ytoAL6Q=
+modernc.org/ccgo/v3 v3.15.1/go.mod h1:md59wBwDT2LznX/OTCPoVS6KIsdRgY8xqQwBV+hkTH0=
+modernc.org/ccgo/v3 v3.15.9/go.mod h1:md59wBwDT2LznX/OTCPoVS6KIsdRgY8xqQwBV+hkTH0=
+modernc.org/ccgo/v3 v3.15.10/go.mod h1:wQKxoFn0ynxMuCLfFD09c8XPUCc8obfchoVR9Cn0fI8=
+modernc.org/ccgo/v3 v3.15.12 h1:wAQ7FSn02pUf0CeGYDK0x2YEBQBWxcOU7vG2/w7ctAM=
+modernc.org/ccgo/v3 v3.15.12/go.mod h1:VFePOWoCd8uDGRJpq/zfJ29D0EVzMSyID8LCMWYbX6I=
+modernc.org/ccorpus v1.11.1 h1:K0qPfpVG1MJh5BYazccnmhywH4zHuOgJXgbjzyp6dWA=
+modernc.org/ccorpus v1.11.1/go.mod h1:2gEUTrWqdpH2pXsmTM1ZkjeSrUWDpjMu2T6m29L/ErQ=
+modernc.org/httpfs v1.0.6 h1:AAgIpFZRXuYnkjftxTAZwMIiwEqAfk8aVB2/oA6nAeM=
 modernc.org/httpfs v1.0.6/go.mod h1:7dosgurJGp0sPaRanU53W4xZYKh14wfzX420oZADeHM=
 modernc.org/libc v1.9.8/go.mod h1:U1eq8YWr/Kc1RWCMFUWEdkTg8OTcfLw2kY8EDwl039w=
 modernc.org/libc v1.9.11/go.mod h1:NyF3tsA5ArIjJ83XB0JlqhjTabTCHm9aX4XMPHyQn0Q=
 modernc.org/libc v1.11.0/go.mod h1:2lOfPmj7cz+g1MrPNmX65QCzVxgNq2C5o0jdLY2gAYg=
 modernc.org/libc v1.11.2/go.mod h1:ioIyrl3ETkugDO3SGZ+6EOKvlP3zSOycUETe4XM4n8M=
-modernc.org/libc v1.11.3 h1:q//spBhqp23lC/if8/o8hlyET57P8mCZqrqftzT2WmY=
-modernc.org/libc v1.11.3/go.mod h1:k3HDCP95A6U111Q5TmG3nAyUcp3kR5YFZTeDS9v8vSU=
+modernc.org/libc v1.11.5/go.mod h1:k3HDCP95A6U111Q5TmG3nAyUcp3kR5YFZTeDS9v8vSU=
+modernc.org/libc v1.11.6/go.mod h1:ddqmzR6p5i4jIGK1d/EiSw97LBcE3dK24QEwCFvgNgE=
+modernc.org/libc v1.11.11/go.mod h1:lXEp9QOOk4qAYOtL3BmMve99S5Owz7Qyowzvg6LiZso=
+modernc.org/libc v1.11.13/go.mod h1:ZYawJWlXIzXy2Pzghaf7YfM8OKacP3eZQI81PDLFdY8=
+modernc.org/libc v1.11.16/go.mod h1:+DJquzYi+DMRUtWI1YNxrlQO6TcA5+dRRiq8HWBWRC8=
+modernc.org/libc v1.11.19/go.mod h1:e0dgEame6mkydy19KKaVPBeEnyJB4LGNb0bBH1EtQ3I=
+modernc.org/libc v1.11.24/go.mod h1:FOSzE0UwookyT1TtCJrRkvsOrX2k38HoInhw+cSCUGk=
+modernc.org/libc v1.11.26/go.mod h1:SFjnYi9OSd2W7f4ct622o/PAYqk7KHv6GS8NZULIjKY=
+modernc.org/libc v1.11.27/go.mod h1:zmWm6kcFXt/jpzeCgfvUNswM0qke8qVwxqZrnddlDiE=
+modernc.org/libc v1.11.28/go.mod h1:Ii4V0fTFcbq3qrv3CNn+OGHAvzqMBvC7dBNyC4vHZlg=
+modernc.org/libc v1.11.31/go.mod h1:FpBncUkEAtopRNJj8aRo29qUiyx5AvAlAxzlx9GNaVM=
+modernc.org/libc v1.11.34/go.mod h1:+Tzc4hnb1iaX/SKAutJmfzES6awxfU1BPvrrJO0pYLg=
+modernc.org/libc v1.11.37/go.mod h1:dCQebOwoO1046yTrfUE5nX1f3YpGZQKNcITUYWlrAWo=
+modernc.org/libc v1.11.39/go.mod h1:mV8lJMo2S5A31uD0k1cMu7vrJbSA3J3waQJxpV4iqx8=
+modernc.org/libc v1.11.42/go.mod h1:yzrLDU+sSjLE+D4bIhS7q1L5UwXDOw99PLSX0BlZvSQ=
+modernc.org/libc v1.11.44/go.mod h1:KFq33jsma7F5WXiYelU8quMJasCCTnHK0mkri4yPHgA=
+modernc.org/libc v1.11.45/go.mod h1:Y192orvfVQQYFzCNsn+Xt0Hxt4DiO4USpLNXBlXg/tM=
+modernc.org/libc v1.11.47/go.mod h1:tPkE4PzCTW27E6AIKIR5IwHAQKCAtudEIeAV1/SiyBg=
+modernc.org/libc v1.11.49/go.mod h1:9JrJuK5WTtoTWIFQ7QjX2Mb/bagYdZdscI3xrvHbXjE=
+modernc.org/libc v1.11.51/go.mod h1:R9I8u9TS+meaWLdbfQhq2kFknTW0O3aw3kEMqDDxMaM=
+modernc.org/libc v1.11.53/go.mod h1:5ip5vWYPAoMulkQ5XlSJTy12Sz5U6blOQiYasilVPsU=
+modernc.org/libc v1.11.54/go.mod h1:S/FVnskbzVUrjfBqlGFIPA5m7UwB3n9fojHhCNfSsnw=
+modernc.org/libc v1.11.55/go.mod h1:j2A5YBRm6HjNkoSs/fzZrSxCuwWqcMYTDPLNx0URn3M=
+modernc.org/libc v1.11.56/go.mod h1:pakHkg5JdMLt2OgRadpPOTnyRXm/uzu+Yyg/LSLdi18=
+modernc.org/libc v1.11.58/go.mod h1:ns94Rxv0OWyoQrDqMFfWwka2BcaF6/61CqJRK9LP7S8=
+modernc.org/libc v1.11.71/go.mod h1:DUOmMYe+IvKi9n6Mycyx3DbjfzSKrdr/0Vgt3j7P5gw=
+modernc.org/libc v1.11.75/go.mod h1:dGRVugT6edz361wmD9gk6ax1AbDSe0x5vji0dGJiPT0=
+modernc.org/libc v1.11.82/go.mod h1:NF+Ek1BOl2jeC7lw3a7Jj5PWyHPwWD4aq3wVKxqV1fI=
+modernc.org/libc v1.11.86/go.mod h1:ePuYgoQLmvxdNT06RpGnaDKJmDNEkV7ZPKI2jnsvZoE=
+modernc.org/libc v1.11.87/go.mod h1:Qvd5iXTeLhI5PS0XSyqMY99282y+3euapQFxM7jYnpY=
+modernc.org/libc v1.11.88/go.mod h1:h3oIVe8dxmTcchcFuCcJ4nAWaoiwzKCdv82MM0oiIdQ=
+modernc.org/libc v1.11.98/go.mod h1:ynK5sbjsU77AP+nn61+k+wxUGRx9rOFcIqWYYMaDZ4c=
+modernc.org/libc v1.11.101/go.mod h1:wLLYgEiY2D17NbBOEp+mIJJJBGSiy7fLL4ZrGGZ+8jI=
+modernc.org/libc v1.12.0/go.mod h1:2MH3DaF/gCU8i/UBiVE1VFRos4o523M7zipmwH8SIgQ=
+modernc.org/libc v1.13.1/go.mod h1:npFeGWjmZTjFeWALQLrvklVmAxv4m80jnG3+xI8FdJk=
+modernc.org/libc v1.13.2/go.mod h1:npFeGWjmZTjFeWALQLrvklVmAxv4m80jnG3+xI8FdJk=
+modernc.org/libc v1.14.1/go.mod h1:npFeGWjmZTjFeWALQLrvklVmAxv4m80jnG3+xI8FdJk=
+modernc.org/libc v1.14.2/go.mod h1:MX1GBLnRLNdvmK9azU9LCxZ5lMyhrbEMK8rG3X/Fe34=
+modernc.org/libc v1.14.3/go.mod h1:GPIvQVOVPizzlqyRX3l756/3ppsAgg1QgPxjr5Q4agQ=
+modernc.org/libc v1.14.4 h1:Sw2GDhSQbQF75VKC6RSd5//QH2gj9TgBzjLNZTW6m00=
+modernc.org/libc v1.14.4/go.mod h1:GPIvQVOVPizzlqyRX3l756/3ppsAgg1QgPxjr5Q4agQ=
 modernc.org/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=
@@ -280,11 +381,12 @@ 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/opt v0.1.1/go.mod h1:WdSiB5evDcignE70guQKxYUl14mgWtbClRi5wmkkTX0=
-modernc.org/sqlite v1.13.0 h1:cwhUj0jTBgPjk/demWheV+T6xi6ifTfsGIFKFq0g3Ck=
-modernc.org/sqlite v1.13.0/go.mod h1:2qO/6jZJrcQaxFUHxOwa6Q6WfiGSsiVj6GXX0Ker+Jg=
+modernc.org/sqlite v1.14.5 h1:bYrrjwH9Y7QUGk1MbchZDhRfmpGuEAs/D45sVjNbfvs=
+modernc.org/sqlite v1.14.5/go.mod h1:YyX5Rx0WbXokitdWl2GJIDy4BrPxBP0PwwhpXOHCDLE=
 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.5.9/go.mod h1:bcwjvBJ2u0exY6K35eAmxXBBij5kXb1dHlAWmfhqThE=
+modernc.org/tcl v1.10.0/go.mod h1:WzWapmP/7dHVhFoyPpEaNSVTL8xtewhouN/cqSJ5A2s=
 modernc.org/token v1.0.0 h1:a0jaWiNMDhDUtqOj09wvjWWAqd3q7WpBulmL9H2egsk=
 modernc.org/token v1.0.0/go.mod h1:UGzOrNV1mAFSEB63lOFHIpNRUVMvYTc6yu1SMY/XTDM=
-modernc.org/z v1.1.2/go.mod h1:sj9T1AGBG0dm6SCVzldPOHWrif6XBpooJtbttMn1+Js=
+modernc.org/z v1.2.21/go.mod h1:uXrObx4pGqXWIMliC5MiKuwAyMrltzwpteOFUP1PWCc=
+modernc.org/z v1.3.0/go.mod h1:+mvgLH814oDjtATDdT3rs84JnUIpkvAF5B8AVkNlE2g=

main.go

@@ -10,12 +10,12 @@ import (
 	// 下列插件可与 wdvxdr1123/ZeroBot v1.1.2 以上配合单独使用
 
 	// 插件控制
-	// webctrl "github.com/FloatTech/ZeroBot-Plugin/control/web" // web 后端控制
+	// webctrl "github.com/FloatTech/zbputils/control/web" // web 后端控制
 
 	// 词库类
-	_ "github.com/FloatTech/ZeroBot-Plugin/plugin_atri"      // ATRI词库
-	_ "github.com/FloatTech/ZeroBot-Plugin/plugin_chat"      // 基础词库
-	_ "github.com/FloatTech/ZeroBot-Plugin/plugin_qingyunke" // 青云客
+	_ "github.com/FloatTech/ZeroBot-Plugin/plugin_ai_reply" // 人工智能回复
+	_ "github.com/FloatTech/ZeroBot-Plugin/plugin_atri"     // ATRI词库
+	_ "github.com/FloatTech/ZeroBot-Plugin/plugin_chat"     // 基础词库
 
 	// 实用类
 	_ "github.com/FloatTech/ZeroBot-Plugin/plugin_b14"          // base16384加解密
@@ -27,31 +27,40 @@ import (
 	_ "github.com/FloatTech/ZeroBot-Plugin/plugin_translation"  // 翻译
 
 	// 娱乐类
-	// _ "github.com/FloatTech/ZeroBot-Plugin/plugin_wtf"    // 鬼东西
-	_ "github.com/FloatTech/ZeroBot-Plugin-Gif"                // 制图
-	_ "github.com/FloatTech/ZeroBot-Plugin/plugin_ai_false"    // 服务器监控
-	_ "github.com/FloatTech/ZeroBot-Plugin/plugin_book_review" // 哀伤雪刃吧推书记录
-	_ "github.com/FloatTech/ZeroBot-Plugin/plugin_choose"      // 选择困难症帮手
-	_ "github.com/FloatTech/ZeroBot-Plugin/plugin_coser"       // 三次元小姐姐
-	_ "github.com/FloatTech/ZeroBot-Plugin/plugin_fortune"     // 运势
-	_ "github.com/FloatTech/ZeroBot-Plugin/plugin_funny"       // 笑话
-	_ "github.com/FloatTech/ZeroBot-Plugin/plugin_hs"          // 炉石
-	_ "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_novel"       // 铅笔小说网搜索
-	_ "github.com/FloatTech/ZeroBot-Plugin/plugin_omikuji"     // 浅草寺求签
-	_ "github.com/FloatTech/ZeroBot-Plugin/plugin_reborn"      // 投胎
-	_ "github.com/FloatTech/ZeroBot-Plugin/plugin_shadiao"     // 沙雕app
-	_ "github.com/FloatTech/ZeroBot-Plugin/plugin_shindan"     // 测定
+	// _ "github.com/FloatTech/ZeroBot-Plugin/plugin_wtf"       // 鬼东西
+	_ "github.com/FloatTech/ZeroBot-Plugin/plugin_ai_false"     // 服务器监控
+	_ "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_cpstory"      // cp短打
+	_ "github.com/FloatTech/ZeroBot-Plugin/plugin_curse"        // 骂人
+	_ "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_hs"           // 炉石
+	_ "github.com/FloatTech/ZeroBot-Plugin/plugin_juejuezi"     // 绝绝子生成器
+	_ "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_novel"        // 铅笔小说网搜索
+	_ "github.com/FloatTech/ZeroBot-Plugin/plugin_omikuji"      // 浅草寺求签
+	_ "github.com/FloatTech/ZeroBot-Plugin/plugin_reborn"       // 投胎
+	_ "github.com/FloatTech/ZeroBot-Plugin/plugin_score"        // 分数
+	_ "github.com/FloatTech/ZeroBot-Plugin/plugin_shadiao"      // 沙雕app
+	_ "github.com/FloatTech/ZeroBot-Plugin/plugin_shindan"      // 测定
+	_ "github.com/FloatTech/ZeroBot-Plugin/plugin_wangyiyun"    // 网易云音乐热评
 
 	// b站相关
 	_ "github.com/FloatTech/ZeroBot-Plugin/plugin_bilibili" // 查询b站用户信息
-	_ "github.com/FloatTech/ZeroBot-Plugin/plugin_diana"    // 嘉心糖发病
+	// _ "github.com/FloatTech/ZeroBot-Plugin/plugin_bilibili_push" // b站推送
+	_ "github.com/FloatTech/ZeroBot-Plugin/plugin_diana" // 嘉心糖发病
 
 	// 二次元图片
 	_ "github.com/FloatTech/ZeroBot-Plugin/plugin_acgimage"      // 随机图片与AI点评
 	_ "github.com/FloatTech/ZeroBot-Plugin/plugin_aiwife"        // 随机老婆
+	_ "github.com/FloatTech/ZeroBot-Plugin/plugin_coser"         // 三次元小姐姐
+	_ "github.com/FloatTech/ZeroBot-Plugin/plugin_danbooru"      // DeepDanbooru二次元图标签识别
 	_ "github.com/FloatTech/ZeroBot-Plugin/plugin_image_finder"  // 关键字搜图
 	_ "github.com/FloatTech/ZeroBot-Plugin/plugin_lolicon"       // lolicon 随机图片
 	_ "github.com/FloatTech/ZeroBot-Plugin/plugin_nativesetu"    // 本地涩图
@@ -72,14 +81,17 @@ import (
 var (
 	contents = []string{
 		"* OneBot + ZeroBot + Golang",
-		"* Version 1.2.2 - 2021-12-13 21:22:45 +0800 CST",
+		"* Version 1.2.4 - 2022-01-14 20:05:43 +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
-	reg    = registry.NewRegReader("reilia.eastasia.azurecontainer.io:32664", "fumiama")
+	adana  *string
+	prefix *string
+	reg    = registry.NewRegReader("reilia.fumiama.top:32664", "fumiama")
 )
 
 func init() {
@@ -94,6 +106,9 @@ func init() {
 	token = flag.String("t", "", "Set AccessToken of WSClient.")
 	// 直接写死 URL 时，请更改下面第二个参数
 	url = flag.String("u", "ws://127.0.0.1:6700", "Set Url of WSClient.")
+	// 默认昵称
+	adana = flag.String("n", "椛椛", "Set default nickname.")
+	prefix = flag.String("p", "/", "Set command prefix.")
 
 	flag.Parse()
 	if *h {
@@ -109,6 +124,7 @@ func init() {
 			logrus.SetLevel(logrus.WarnLevel)
 		}
 	}
+
 	// 启用 gui
 	// webctrl.InitGui(*g)
 }
@@ -125,10 +141,10 @@ func printBanner() {
 
 func getKanban() string {
 	err := reg.Connect()
-	defer reg.Close()
 	if err != nil {
 		return err.Error()
 	}
+	defer reg.Close()
 	text, err := reg.Get("ZeroBot-Plugin/kanban")
 	if err != nil {
 		return err.Error()
@@ -139,22 +155,21 @@ func getKanban() string {
 func main() {
 	printBanner()
 	// 帮助
-	zero.OnFullMatchGroup([]string{"/help", ".help", "菜单"}, zero.OnlyToMe).SetBlock(true).FirstPriority().
+	zero.OnFullMatchGroup([]string{"/help", ".help", "菜单"}, zero.OnlyToMe).SetBlock(true).
 		Handle(func(ctx *zero.Ctx) {
 			ctx.SendChain(message.Text(banner, "\n可发送\"/服务列表\"查看 bot 功能"))
 		})
-	zero.OnFullMatch("查看zbp公告", zero.OnlyToMe, zero.AdminPermission).SetBlock(true).FirstPriority().
+	zero.OnFullMatch("查看zbp公告", zero.OnlyToMe, zero.AdminPermission).SetBlock(true).
 		Handle(func(ctx *zero.Ctx) {
 			ctx.SendChain(message.Text(getKanban()))
 		})
 	zero.RunAndBlock(
 		zero.Config{
-			NickName:      []string{"椛椛", "ATRI", "atri", "亚托莉", "アトリ"},
-			CommandPrefix: "/",
+			NickName:      append([]string{*adana}, nicks...),
+			CommandPrefix: *prefix,
 			// SuperUsers 某些功能需要主人权限，可通过以下两种方式修改
-			// "12345678", "87654321"：通过代码写死的方式添加主人账号
-			// flag.Args()：通过命令行参数的方式添加主人账号，无需修改下方任何代码
-			SuperUsers: append([]string{"12345678", "87654321"}, flag.Args()...),
+			// SuperUsers: []string{"12345678", "87654321"}, // 通过代码写死的方式添加主人账号
+			SuperUsers: flag.Args(), // 通过命令行参数的方式添加主人账号
 			Driver:     []zero.Driver{driver.NewWebSocketClient(*url, *token)},
 		},
 	)

main_win.go

@@ -4,13 +4,67 @@
 package main
 
 import (
+	"bytes"
+	"strings"
+
 	"github.com/sirupsen/logrus"
-	easy "github.com/t-tomalak/logrus-easy-formatter"
 )
 
 func init() {
-	// windows 不支持带颜色的 log，故自定义格式
-	logrus.SetFormatter(&easy.Formatter{
-		LogFormat: "[%lvl%] %msg%\n",
-	})
+	// windows 带颜色 log 自定义格式
+	logrus.SetFormatter(&LogFormat{})
+}
+
+const (
+	colorCodePanic = "\x1b[1;31m" // color.Style{color.Bold, color.Red}.String()
+	colorCodeFatal = "\x1b[1;31m" // color.Style{color.Bold, color.Red}.String()
+	colorCodeError = "\x1b[31m"   // color.Style{color.Red}.String()
+	colorCodeWarn  = "\x1b[33m"   // color.Style{color.Yellow}.String()
+	colorCodeInfo  = "\x1b[37m"   // color.Style{color.White}.String()
+	colorCodeDebug = "\x1b[32m"   // color.Style{color.Green}.String()
+	colorCodeTrace = "\x1b[36m"   // color.Style{color.Cyan}.String()
+	colorReset     = "\x1b[0m"
+)
+
+// LogFormat specialize for zbp
+type LogFormat struct{}
+
+// Format implements logrus.Formatter
+func (f LogFormat) Format(entry *logrus.Entry) ([]byte, error) {
+	buf := new(bytes.Buffer)
+
+	buf.WriteString(getLogLevelColorCode(entry.Level))
+
+	buf.WriteByte('[')
+	buf.WriteString(strings.ToUpper(entry.Level.String()))
+	buf.WriteString("] ")
+	buf.WriteString(entry.Message)
+	buf.WriteString(" \n")
+
+	buf.WriteString(colorReset)
+
+	return buf.Bytes(), nil
+}
+
+// getLogLevelColorCode 获取日志等级对应色彩code
+func getLogLevelColorCode(level logrus.Level) string {
+	switch level {
+	case logrus.PanicLevel:
+		return colorCodePanic
+	case logrus.FatalLevel:
+		return colorCodeFatal
+	case logrus.ErrorLevel:
+		return colorCodeError
+	case logrus.WarnLevel:
+		return colorCodeWarn
+	case logrus.InfoLevel:
+		return colorCodeInfo
+	case logrus.DebugLevel:
+		return colorCodeDebug
+	case logrus.TraceLevel:
+		return colorCodeTrace
+
+	default:
+		return colorCodeInfo
+	}
 }

order/prio.go

@@ -0,0 +1,57 @@
+// Package order 各个插件的优先级
+package order
+
+const (
+	PrioChat = iota * 10
+	PrioSleepManage
+	PrioAtri
+	PrioManager
+
+	PrioACGImage
+	PrioAIFalse
+	PrioAIWife
+	PrioBase14
+	PrioBilibili
+	PrioBilibiliPush
+	PrioBookReview
+	PrioCangTouShi
+	PrioChoose
+	PrioChouXiangHua
+	PrioCoser
+	PrioCPStory
+	PrioDanbooru
+	PrioDiana
+	PrioFansDaily
+	PrioFortune
+	PrioFunny
+	PrioGIF
+	PrioGithub
+	PrioHS
+	PrioImageFinder
+	PrioJueJueZi
+	PrioLolicon
+	PrioMinecraft
+	PrioMoyu
+	PrioMusic
+	PrioNativeSetu
+	PrioNativeWife
+	PrioNBNHHSH
+	PrioNovel
+	PrioOmikuji
+	PrioReborn
+	PrioRuncode
+	PrioSauceNao
+	PrioScore
+	PrioSetuTime
+	PrioShaDiao
+	PrioShinDan
+	PrioTraceMoe
+	PrioTranslation
+	PrioVtbQuotation
+	PrioWtf
+
+	PrioCurse
+	PrioMockingBird
+	PrioAIReply
+        PrioWangYiYun
+)

plugin_acgimage/classify.go

@@ -3,39 +3,37 @@ package acgimage
 
 import (
 	"net/url"
-	"strconv"
 	"strings"
 	"time"
 
 	"github.com/FloatTech/AnimeAPI/classify"
-	"github.com/FloatTech/AnimeAPI/picture"
+	"github.com/FloatTech/AnimeAPI/imgpool"
+	control "github.com/FloatTech/zbputils/control"
+	"github.com/FloatTech/zbputils/ctxext"
+	"github.com/FloatTech/zbputils/web"
 	zero "github.com/wdvxdr1123/ZeroBot"
 	"github.com/wdvxdr1123/ZeroBot/extension/rate"
 	"github.com/wdvxdr1123/ZeroBot/message"
 
-	"github.com/FloatTech/ZeroBot-Plugin/control"
-	"github.com/FloatTech/ZeroBot-Plugin/utils/file"
+	"github.com/FloatTech/ZeroBot-Plugin/order"
 )
 
 const (
-	lolipxy = "https://sayuri.fumiama.top/dice?class=0&loli=true&r18=true"
-	apihead = "https://sayuri.fumiama.top/img?path="
+	lolipxy   = "https://sayuri.fumiama.top/dice?class=0&loli=true&r18=true"
+	apihead   = "https://sayuri.fumiama.top/img?path="
+	apiheadv6 = "http://aikae.v6.army:62002/img?arg=get&name="
 )
 
 var (
-	datapath = file.BOTPATH + "/data/acgimage/"
-	cacheuri = "file:///" + datapath + "cache"
 	// r18有一定保护，一般不会发出图片
 	randapi = "&loli=true&r18=true"
-	msgof   = make(map[int64]int64)
+	msgof   = make(map[int64]message.MessageID)
 	block   = false
 	limit   = rate.NewManager(time.Minute, 5)
 )
 
 func init() { // 插件主体
-	// 初始化 classify
-	classify.Init(datapath)
-	engine := control.Register("acgimage", &control.Options{
+	engine := control.Register("acgimage", order.PrioACGImage, &control.Options{
 		DisableOnDefault: false,
 		Help: "随机图片与AI点评\n" +
 			"- 随机图片(评级大于6的图将私发)\n" +
@@ -44,7 +42,7 @@ func init() { // 插件主体
 			"- 太涩了(撤回最近发的图)\n" +
 			"- 评价图片(发送一张图片让bot评分)",
 	})
-	engine.OnRegex(`^设置随机图片网址(.*)$`, zero.OnlyPrivate, zero.SuperUserPermission).SetBlock(true).SetPriority(20).
+	engine.OnRegex(`^设置随机图片网址(.*)$`, zero.OnlyPrivate, zero.SuperUserPermission).SetBlock(true).
 		Handle(func(ctx *zero.Ctx) {
 			url := ctx.State["regex_matched"].([]string)[1]
 			if !strings.HasPrefix(url, "http") {
@@ -55,19 +53,17 @@ func init() { // 插件主体
 			}
 		})
 	// 有保护的随机图片
-	engine.OnFullMatch("随机图片", zero.OnlyGroup).SetBlock(true).SetPriority(24).
+	engine.OnFullMatch("随机图片", zero.OnlyGroup).SetBlock(true).
 		Handle(func(ctx *zero.Ctx) {
-			if classify.CanVisit(5) && limit.Load(ctx.Event.UserID).Acquire() {
-				go func() {
-					class, lastvisit, dhash, comment := classify.Classify(randapi, false)
-					replyClass(ctx, dhash, class, false, lastvisit, comment)
-				}()
-			} else {
-				ctx.SendChain(message.Text("你太快啦!"))
+			if limit.Load(ctx.Event.UserID).Acquire() {
+				class, dhash, comment, _ := classify.Classify(randapi, true)
+				replyClass(ctx, class, dhash, comment, false)
+				return
 			}
+			ctx.SendChain(message.Text("你太快啦!"))
 		})
 	// 直接随机图片，无r18保护，后果自负。如果出r18图可尽快通过发送"太涩了"撤回
-	engine.OnFullMatch("直接随机", zero.OnlyGroup, zero.AdminPermission).SetBlock(true).SetPriority(24).
+	engine.OnFullMatch("直接随机", ctxext.UserOrGrpAdmin).SetBlock(true).
 		Handle(func(ctx *zero.Ctx) {
 			if block {
 				ctx.SendChain(message.Text("请稍后再试哦"))
@@ -84,60 +80,81 @@ func init() { // 插件主体
 			}
 		})
 	// 撤回最后的直接随机图片
-	engine.OnFullMatch("太涩了").SetBlock(true).SetPriority(24).
+	engine.OnFullMatch("太涩了", zero.OnlyGroup).SetBlock(true).
 		Handle(func(ctx *zero.Ctx) {
-			go cancel(ctx)
+			msg, ok := msgof[ctx.Event.GroupID]
+			if ok {
+				ctx.DeleteMessage(msg)
+				delete(msgof, ctx.Event.GroupID)
+			}
 		})
 	// 上传一张图进行评价
-	engine.OnKeywordGroup([]string{"评价图片"}, zero.OnlyGroup, picture.CmdMatch, picture.MustGiven).SetBlock(true).SetPriority(24).
+	engine.OnKeywordGroup([]string{"评价图片"}, zero.OnlyPublic, ctxext.CmdMatch, ctxext.MustGiven).SetBlock(true).
 		Handle(func(ctx *zero.Ctx) {
 			ctx.SendChain(message.Text("少女祈祷中..."))
 			for _, url := range ctx.State["image_url"].([]string) {
-				go func(target string) {
-					class, lastvisit, dhash, comment := classify.Classify(target, true)
-					replyClass(ctx, dhash, class, true, lastvisit, comment)
-				}(url)
+				class, dhash, comment, _ := classify.Classify(url, true)
+				replyClass(ctx, class, dhash, comment, true)
+				break
 			}
 		})
-	engine.OnRegex(`^给你点提示哦：(.*)$`, zero.OnlyPrivate).SetBlock(true).SetPriority(20).
+	engine.OnRegex(`^给你点提示哦：(.*)$`, zero.OnlyPrivate).SetBlock(true).
 		Handle(func(ctx *zero.Ctx) {
 			dhash := ctx.State["regex_matched"].([]string)[1]
 			if len(dhash) == 5*3 {
-				ctx.SendChain(message.Image(apihead + dhash))
+				var u string
+				if web.IsSupportIPv6 {
+					u = apiheadv6 + dhash + ".webp"
+				} else {
+					u = apihead + dhash
+				}
+
+				m, hassent, err := imgpool.NewImage(ctxext.Send(ctx), ctxext.GetMessage(ctx), dhash, u)
+				if err == nil && !hassent {
+					ctx.SendChain(message.Image(m.String()))
+				}
 			}
 		})
 }
 
-func setLastMsg(id int64, msg int64) {
+func setLastMsg(id int64, msg message.MessageID) {
 	msgof[id] = msg
 }
 
-func cancel(ctx *zero.Ctx) {
-	msg, ok := msgof[ctx.Event.GroupID]
-	if ok {
-		ctx.DeleteMessage(msg)
-		delete(msgof, ctx.Event.GroupID)
+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 replyClass(ctx *zero.Ctx, dhash string, class int, noimg bool, lv int64, comment string) {
-	img := message.Image(cacheuri + strconv.FormatInt(lv, 10))
+	b14, err := url.QueryUnescape(dhash)
+	if err != nil {
+		return
+	}
+
+	var u string
+	if web.IsSupportIPv6 {
+		u = apiheadv6 + dhash + ".webp"
+	} else {
+		u = apihead + dhash
+	}
+
+	var send ctxext.NoCtxSendMsg
 	if class > 5 {
-		if dhash != "" && !noimg {
-			b14, err3 := url.QueryUnescape(dhash)
-			if err3 == nil {
-				ctx.SendChain(message.Text(comment + "\n给你点提示哦：" + b14))
-				ctx.Event.GroupID = 0
-				ctx.SendChain(img)
-			}
+		send = ctxext.SendTo(ctx, ctx.Event.UserID)
+		if dhash != "" {
+			ctx.SendChain(message.Text(comment + "\n给你点提示哦：" + b14))
 		} else {
 			ctx.SendChain(message.Text(comment))
 		}
 	} else {
-		if !noimg {
-			ctx.SendChain(img, message.Text(comment))
-		} else {
-			ctx.SendChain(message.Reply(ctx.Event.MessageID), message.Text(comment))
+		send = func(msg interface{}) int64 {
+			return ctx.Send(append(msg.(message.Message), message.Text(comment))).ID()
 		}
 	}
+
+	m, hassent, err := imgpool.NewImage(send, ctxext.GetMessage(ctx), b14, u)
+	if err == nil && !hassent {
+		send(message.Message{message.Image(m.String())})
+	}
 }

plugin_ai_false/ai_false.go

@@ -7,21 +7,22 @@ import (
 	"os"
 	"time"
 
+	control "github.com/FloatTech/zbputils/control"
 	"github.com/shirou/gopsutil/v3/cpu"
 	"github.com/shirou/gopsutil/v3/disk"
 	"github.com/shirou/gopsutil/v3/mem"
 
-	"github.com/FloatTech/ZeroBot-Plugin/control"
+	"github.com/FloatTech/ZeroBot-Plugin/order"
 
 	zero "github.com/wdvxdr1123/ZeroBot"
 	"github.com/wdvxdr1123/ZeroBot/message"
 )
 
 func init() { // 插件主体
-	engine := control.Register("aifalse", &control.Options{
+	engine := control.Register("aifalse", order.PrioAIFalse, &control.Options{
 		DisableOnDefault: false,
 		Help: "AIfalse\n" +
-			"- 查询计算机当前活跃度: [检查身体|自检|启动自检|系统状态]",
+			"- 查询计算机当前活跃度: [检查身体 | 自检 | 启动自检 | 系统状态]",
 	})
 	engine.OnFullMatchGroup([]string{"检查身体", "自检", "启动自检", "系统状态"}, zero.AdminPermission).SetBlock(true).
 		Handle(func(ctx *zero.Ctx) {
@@ -44,20 +45,33 @@ func init() { // 插件主体
 }
 
 func cpuPercent() float64 {
-	percent, _ := cpu.Percent(time.Second, false)
+	percent, err := cpu.Percent(time.Second, false)
+	if err != nil {
+		return -1
+	}
 	return math.Round(percent[0])
 }
 
 func memPercent() float64 {
-	memInfo, _ := mem.VirtualMemory()
+	memInfo, err := mem.VirtualMemory()
+	if err != nil {
+		return -1
+	}
 	return math.Round(memInfo.UsedPercent)
 }
 
 func diskPercent() string {
-	parts, _ := disk.Partitions(true)
+	parts, err := disk.Partitions(true)
+	if err != nil {
+		return err.Error()
+	}
 	msg := ""
 	for _, p := range parts {
-		diskInfo, _ := disk.Usage(p.Mountpoint)
+		diskInfo, err := disk.Usage(p.Mountpoint)
+		if err != nil {
+			msg += "\n  - " + err.Error()
+			continue
+		}
 		pc := uint(math.Round(diskInfo.UsedPercent))
 		if pc > 0 {
 			msg += fmt.Sprintf("\n  - %s(%dM) %d%%", p.Mountpoint, diskInfo.Total/1024/1024, pc)

plugin_ai_reply/main.go

@@ -0,0 +1,97 @@
+// Package aireply AI 回复
+package aireply
+
+import (
+	"errors"
+	"time"
+
+	"github.com/FloatTech/AnimeAPI/aireply"
+	control "github.com/FloatTech/zbputils/control"
+	zero "github.com/wdvxdr1123/ZeroBot"
+	"github.com/wdvxdr1123/ZeroBot/extension/rate"
+	"github.com/wdvxdr1123/ZeroBot/message"
+
+	"github.com/FloatTech/ZeroBot-Plugin/order"
+)
+
+const (
+	serviceName = "aireply"
+)
+
+var modes = [...]string{"青云客", "小爱"}
+
+func init() { // 插件主体
+	bucket := rate.NewManager(time.Minute, 20) // 接口回复限速器
+	engine := control.Register(serviceName, order.PrioAIReply, &control.Options{
+		DisableOnDefault: false,
+		Help: "人工智能回复\n" +
+			"- @Bot 任意文本(任意一句话回复)\n- 设置回复模式[青云客  |  小爱]\n- ",
+	})
+	// 回复 @和包括名字
+	engine.OnMessage(zero.OnlyToMe).SetBlock(true).
+		Handle(func(ctx *zero.Ctx) {
+			aireply := aireply.NewAIReply(getReplyMode(ctx))
+			if !bucket.Load(ctx.Event.UserID).Acquire() {
+				// 频繁触发，不回复
+				return
+			}
+			reply := aireply.Talk(ctx.ExtractPlainText())
+			// 回复
+			time.Sleep(time.Second * 1)
+			if zero.OnlyPublic(ctx) {
+				reply = append(reply, message.Reply(ctx.Event.MessageID))
+				ctx.Send(reply)
+				return
+			}
+			ctx.Send(reply)
+		})
+	engine.OnPrefix(`设置回复模式`).SetBlock(true).
+		Handle(func(ctx *zero.Ctx) {
+			param := ctx.State["args"].(string)
+			err := setReplyMode(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("成功"))
+		})
+}
+
+func setReplyMode(ctx *zero.Ctx, name string) error {
+	gid := ctx.Event.GroupID
+	if gid == 0 {
+		gid = -ctx.Event.UserID
+	}
+	var ok bool
+	var index int64
+	for i, s := range modes {
+		if s == name {
+			ok = true
+			index = int64(i)
+			break
+		}
+	}
+	if !ok {
+		return errors.New("no such mode")
+	}
+	m, ok := control.Lookup(serviceName)
+	if !ok {
+		return errors.New("no such plugin")
+	}
+	return m.SetData(gid, index)
+}
+
+func getReplyMode(ctx *zero.Ctx) (name string) {
+	gid := ctx.Event.GroupID
+	if gid == 0 {
+		gid = -ctx.Event.UserID
+	}
+	m, ok := control.Lookup(serviceName)
+	if ok {
+		index := m.GetData(gid)
+		if int(index) < len(modes) {
+			return modes[index]
+		}
+	}
+	return "青云客"
+}

plugin_ai_reply/tts.go

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

plugin_aiwife/non-existent.go

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

plugin_atri/atri.go

@@ -12,30 +12,30 @@ import (
 	zero "github.com/wdvxdr1123/ZeroBot"
 	"github.com/wdvxdr1123/ZeroBot/message"
 
-	"github.com/FloatTech/ZeroBot-Plugin/control"
-	"github.com/FloatTech/ZeroBot-Plugin/utils/process"
+	control "github.com/FloatTech/zbputils/control"
+	"github.com/FloatTech/zbputils/process"
+
+	"github.com/FloatTech/ZeroBot-Plugin/order"
 )
 
 const (
 	// 服务名
 	servicename = "atri"
-	// ATRI 所有命令的优先级
-	prio = 15
 	// ATRI 表情的 codechina 镜像
-	res = "https://gitcode.net/u011570312/ZeroBot-Plugin/-/raw/master/plugin_atri/"
+	res = "https://gitcode.net/u011570312/zbpdata/-/raw/main/Atri/"
 )
 
 func init() { // 插件主体
-	engine := control.Register(servicename, &control.Options{
+	engine := control.Register(servicename, order.PrioAtri, &control.Options{
 		DisableOnDefault: false,
 		Help: "本插件基于 ATRI ，为 Golang 移植版\n" +
-			"- ATRI醒醒\n- ATRI睡吧\n- 萝卜子\n- 喜欢|爱你|爱|suki|daisuki|すき|好き|贴贴|老婆|亲一个|mua\n" +
-			"- 草你妈|操你妈|脑瘫|废柴|fw|废物|战斗|爬|爪巴|sb|SB|傻B\n- 早安|早哇|早上好|ohayo|哦哈哟|お早う|早好|早|早早早\n" +
-			"- 中午好|午安|午好\n- 晚安|oyasuminasai|おやすみなさい|晚好|晚上好\n- 高性能|太棒了|すごい|sugoi|斯国一|よかった\n" +
-			"- 没事|没关系|大丈夫|还好|不要紧|没出大问题|没伤到哪\n- 好吗|是吗|行不行|能不能|可不可以\n- 啊这\n- 我好了\n- ？|?|¿\n" +
+			"- ATRI醒醒\n- ATRI睡吧\n- 萝卜子\n- 喜欢 | 爱你 | 爱 | suki | daisuki | すき | 好き | 贴贴 | 老婆 | 亲一个 | mua\n" +
+			"- 草你妈 | 操你妈 | 脑瘫 | 废柴 | fw | 废物 | 战斗 | 爬 | 爪巴 | sb | SB | 傻B\n- 早安 | 早哇 | 早上好 | ohayo | 哦哈哟 | お早う | 早好 | 早 | 早早早\n" +
+			"- 中午好 | 午安 | 午好\n- 晚安 | oyasuminasai | おやすみなさい | 晚好 | 晚上好\n- 高性能 | 太棒了 | すごい | sugoi | 斯国一 | よかった\n" +
+			"- 没事 | 没关系 | 大丈夫 | 还好 | 不要紧 | 没出大问题 | 没伤到哪\n- 好吗 | 是吗 | 行不行 | 能不能 | 可不可以\n- 啊这\n- 我好了\n- ？ | ? | ¿\n" +
 			"- 离谱\n- 答应我",
 	})
-	zero.OnFullMatch("ATRI醒醒", zero.AdminPermission).SetBlock(true).SetPriority(prio).
+	zero.OnFullMatch("ATRI醒醒", zero.AdminPermission).SetBlock(true).
 		Handle(func(ctx *zero.Ctx) {
 			c, ok := control.Lookup(servicename)
 			if ok && !c.IsEnabledIn(ctx.Event.GroupID) {
@@ -44,7 +44,7 @@ func init() { // 插件主体
 				ctx.SendChain(message.Text("嗯呜呜……夏生先生……？"))
 			}
 		})
-	engine.OnFullMatch("ATRI睡吧", zero.AdminPermission).SetBlock(true).SetPriority(prio).
+	engine.OnFullMatch("ATRI睡吧", zero.AdminPermission).SetBlock(true).
 		Handle(func(ctx *zero.Ctx) {
 			c, ok := control.Lookup(servicename)
 			if ok && c.IsEnabledIn(ctx.Event.GroupID) {
@@ -53,7 +53,7 @@ func init() { // 插件主体
 				ctx.SendChain(message.Text("Zzz……Zzz……"))
 			}
 		})
-	engine.OnFullMatch("萝卜子", atriSleep).SetBlock(true).SetPriority(prio).
+	engine.OnFullMatch("萝卜子", atriSleep).SetBlock(true).
 		Handle(func(ctx *zero.Ctx) {
 			process.SleepAbout1sTo2s()
 			switch rand.Intn(2) {
@@ -63,17 +63,17 @@ func init() { // 插件主体
 				ctx.SendChain(randRecord("RocketPunch.amr"))
 			}
 		})
-	engine.OnFullMatchGroup([]string{"喜欢", "爱你", "爱", "suki", "daisuki", "すき", "好き", "贴贴", "老婆", "亲一个", "mua"}, atriSleep, zero.OnlyToMe).SetBlock(true).SetPriority(prio).
+	engine.OnFullMatchGroup([]string{"喜欢", "爱你", "爱", "suki", "daisuki", "すき", "好き", "贴贴", "老婆", "亲一个", "mua"}, atriSleep, zero.OnlyToMe).SetBlock(true).
 		Handle(func(ctx *zero.Ctx) {
 			process.SleepAbout1sTo2s()
 			ctx.SendChain(randImage("SUKI.jpg", "SUKI1.jpg", "SUKI2.png"))
 		})
-	engine.OnKeywordGroup([]string{"草你妈", "操你妈", "脑瘫", "废柴", "fw", "five", "废物", "战斗", "爬", "爪巴", "sb", "SB", "傻B"}, atriSleep, zero.OnlyToMe).SetBlock(true).SetPriority(prio - 1).
+	engine.OnKeywordGroup([]string{"草你妈", "操你妈", "脑瘫", "废柴", "fw", "five", "废物", "战斗", "爬", "爪巴", "sb", "SB", "傻B"}, atriSleep, zero.OnlyToMe).SetBlock(true).
 		Handle(func(ctx *zero.Ctx) {
 			process.SleepAbout1sTo2s()
 			ctx.SendChain(randImage("FN.jpg", "WQ.jpg", "WQ1.jpg"))
 		})
-	engine.OnFullMatchGroup([]string{"早安", "早哇", "早上好", "ohayo", "哦哈哟", "お早う", "早好", "早", "早早早"}).SetBlock(true).SetPriority(prio).
+	engine.OnFullMatchGroup([]string{"早安", "早哇", "早上好", "ohayo", "哦哈哟", "お早う", "早好", "早", "早早早"}).SetBlock(true).
 		Handle(func(ctx *zero.Ctx) {
 			now := time.Now().Hour()
 			process.SleepAbout1sTo2s()
@@ -113,7 +113,7 @@ func init() { // 插件主体
 				))
 			}
 		})
-	engine.OnFullMatchGroup([]string{"中午好", "午安", "午好"}).SetBlock(true).SetPriority(prio).
+	engine.OnFullMatchGroup([]string{"中午好", "午安", "午好"}).SetBlock(true).
 		Handle(func(ctx *zero.Ctx) {
 			now := time.Now().Hour()
 			if now > 11 && now < 15 { // 中午
@@ -126,7 +126,7 @@ func init() { // 插件主体
 				))
 			}
 		})
-	engine.OnFullMatchGroup([]string{"晚安", "oyasuminasai", "おやすみなさい", "晚好", "晚上好"}).SetBlock(true).SetPriority(prio).
+	engine.OnFullMatchGroup([]string{"晚安", "oyasuminasai", "おやすみなさい", "晚好", "晚上好"}).SetBlock(true).
 		Handle(func(ctx *zero.Ctx) {
 			now := time.Now().Hour()
 			process.SleepAbout1sTo2s()
@@ -169,7 +169,7 @@ func init() { // 插件主体
 				))
 			}
 		})
-	engine.OnKeywordGroup([]string{"高性能", "太棒了", "すごい", "sugoi", "斯国一", "よかった"}, atriSleep, zero.OnlyToMe).SetBlock(true).SetPriority(prio).
+	engine.OnKeywordGroup([]string{"高性能", "太棒了", "すごい", "sugoi", "斯国一", "よかった"}, atriSleep, zero.OnlyToMe).SetBlock(true).
 		Handle(func(ctx *zero.Ctx) {
 			process.SleepAbout1sTo2s()
 			ctx.SendChain(randText(
@@ -190,7 +190,7 @@ func init() { // 插件主体
 				"呣......我的高性能，毫无遗憾地施展出来了......",
 			))
 		})
-	engine.OnKeywordGroup([]string{"没事", "没关系", "大丈夫", "还好", "不要紧", "没出大问题", "没伤到哪"}, atriSleep, zero.OnlyToMe).SetBlock(true).SetPriority(prio).
+	engine.OnKeywordGroup([]string{"没事", "没关系", "大丈夫", "还好", "不要紧", "没出大问题", "没伤到哪"}, atriSleep, zero.OnlyToMe).SetBlock(true).
 		Handle(func(ctx *zero.Ctx) {
 			process.SleepAbout1sTo2s()
 			ctx.SendChain(randText(
@@ -205,26 +205,26 @@ func init() { // 插件主体
 			))
 		})
 
-	engine.OnKeywordGroup([]string{"好吗", "是吗", "行不行", "能不能", "可不可以"}, atriSleep).SetBlock(true).SetPriority(prio).
+	engine.OnKeywordGroup([]string{"好吗", "是吗", "行不行", "能不能", "可不可以"}, atriSleep).SetBlock(true).
 		Handle(func(ctx *zero.Ctx) {
 			process.SleepAbout1sTo2s()
 			if rand.Intn(2) == 0 {
 				ctx.SendChain(randImage("YES.png", "NO.jpg"))
 			}
 		})
-	engine.OnKeywordGroup([]string{"啊这"}, atriSleep).SetBlock(true).SetPriority(prio).
+	engine.OnKeywordGroup([]string{"啊这"}, atriSleep).SetBlock(true).
 		Handle(func(ctx *zero.Ctx) {
 			process.SleepAbout1sTo2s()
 			if rand.Intn(2) == 0 {
 				ctx.SendChain(randImage("AZ.jpg", "AZ1.jpg"))
 			}
 		})
-	engine.OnKeywordGroup([]string{"我好了"}, atriSleep).SetBlock(true).SetPriority(prio).
+	engine.OnKeywordGroup([]string{"我好了"}, atriSleep).SetBlock(true).
 		Handle(func(ctx *zero.Ctx) {
 			process.SleepAbout1sTo2s()
 			ctx.SendChain(message.Reply(ctx.Event.MessageID), randText("不许好！", "憋回去！"))
 		})
-	engine.OnFullMatchGroup([]string{"？", "?", "¿"}, atriSleep).SetBlock(true).SetPriority(prio).
+	engine.OnFullMatchGroup([]string{"？", "?", "¿"}, atriSleep).SetBlock(true).
 		Handle(func(ctx *zero.Ctx) {
 			process.SleepAbout1sTo2s()
 			switch rand.Intn(5) {
@@ -234,7 +234,7 @@ func init() { // 插件主体
 				ctx.SendChain(randImage("WH.jpg", "WH1.jpg", "WH2.jpg", "WH3.jpg"))
 			}
 		})
-	engine.OnKeyword("离谱", atriSleep).SetBlock(true).SetPriority(prio).
+	engine.OnKeyword("离谱", atriSleep).SetBlock(true).
 		Handle(func(ctx *zero.Ctx) {
 			switch rand.Intn(5) {
 			case 0:
@@ -243,7 +243,7 @@ func init() { // 插件主体
 				ctx.SendChain(randImage("WH.jpg"))
 			}
 		})
-	engine.OnKeyword("答应我", atriSleep, zero.OnlyToMe).SetBlock(true).SetPriority(prio).
+	engine.OnKeyword("答应我", atriSleep, zero.OnlyToMe).SetBlock(true).
 		Handle(func(ctx *zero.Ctx) {
 			process.SleepAbout1sTo2s()
 			ctx.SendChain(randText("我无法回应你的请求"))

plugin_b14/main.go

@@ -4,22 +4,23 @@ package b14coder
 import (
 	"unsafe"
 
+	control "github.com/FloatTech/zbputils/control"
 	base14 "github.com/fumiama/go-base16384"
 	tea "github.com/fumiama/gofastTEA"
 	zero "github.com/wdvxdr1123/ZeroBot"
 	"github.com/wdvxdr1123/ZeroBot/message"
 	"github.com/wdvxdr1123/ZeroBot/utils/helper"
 
-	"github.com/FloatTech/ZeroBot-Plugin/control"
+	"github.com/FloatTech/ZeroBot-Plugin/order"
 )
 
 func init() {
-	en := control.Register("base16384", &control.Options{
+	en := control.Register("base16384", order.PrioBase14, &control.Options{
 		DisableOnDefault: false,
 		Help: "base16384加解密\n" +
 			"- 加密xxx\n- 解密xxx\n- 用yyy加密xxx\n- 用yyy解密xxx",
 	})
-	en.OnRegex(`^加密(.*)`).SetBlock(true).ThirdPriority().
+	en.OnRegex(`^加密(.*)`).SetBlock(true).
 		Handle(func(ctx *zero.Ctx) {
 			str := ctx.State["regex_matched"].([]string)[1]
 			es, err := base14.UTF16be2utf8(base14.EncodeString(str))
@@ -29,7 +30,7 @@ func init() {
 				ctx.SendChain(message.Text("加密失败!"))
 			}
 		})
-	en.OnRegex("^解密([\u4e00-\u8e00]*[\u3d01-\u3d06]?)$").SetBlock(true).ThirdPriority().
+	en.OnRegex("^解密([\u4e00-\u8e00]*[\u3d01-\u3d06]?)$").SetBlock(true).
 		Handle(func(ctx *zero.Ctx) {
 			str := ctx.State["regex_matched"].([]string)[1]
 			es, err := base14.UTF82utf16be(helper.StringToBytes(str))
@@ -39,7 +40,7 @@ func init() {
 				ctx.SendChain(message.Text("解密失败!"))
 			}
 		})
-	en.OnRegex(`^用(.*)加密(.*)`).SetBlock(true).ThirdPriority().
+	en.OnRegex(`^用(.*)加密(.*)`).SetBlock(true).
 		Handle(func(ctx *zero.Ctx) {
 			key, str := ctx.State["regex_matched"].([]string)[1], ctx.State["regex_matched"].([]string)[2]
 			t := getea(key)
@@ -50,7 +51,7 @@ func init() {
 				ctx.SendChain(message.Text("加密失败!"))
 			}
 		})
-	en.OnRegex("^用(.*)解密([\u4e00-\u8e00]*[\u3d01-\u3d06]?)$").SetBlock(true).ThirdPriority().
+	en.OnRegex("^用(.*)解密([\u4e00-\u8e00]*[\u3d01-\u3d06]?)$").SetBlock(true).
 		Handle(func(ctx *zero.Ctx) {
 			key, str := ctx.State["regex_matched"].([]string)[1], ctx.State["regex_matched"].([]string)[2]
 			t := getea(key)

plugin_bilibili/fansDaily.go

@@ -5,11 +5,12 @@ import (
 	"net/http"
 	"time"
 
+	control "github.com/FloatTech/zbputils/control"
 	"github.com/fumiama/cron"
 	zero "github.com/wdvxdr1123/ZeroBot"
 	"github.com/wdvxdr1123/ZeroBot/message"
 
-	"github.com/FloatTech/ZeroBot-Plugin/control"
+	"github.com/FloatTech/ZeroBot-Plugin/order"
 )
 
 type follower struct {
@@ -26,7 +27,7 @@ type follower struct {
 // 开启日报推送
 func init() {
 	fansDaily()
-	en := control.Register("fansdaily", &control.Options{
+	en := control.Register("fansdaily", order.PrioFansDaily, &control.Options{
 		DisableOnDefault: true,
 		Help:             "fansdaily\n- /开启粉丝日报\n- /关闭粉丝日报",
 	})

plugin_bilibili/info.go

@@ -5,18 +5,19 @@ import (
 	"io/ioutil"
 	"net/http"
 
+	control "github.com/FloatTech/zbputils/control"
 	"github.com/tidwall/gjson"
 	zero "github.com/wdvxdr1123/ZeroBot"
 	"github.com/wdvxdr1123/ZeroBot/message"
 
-	"github.com/FloatTech/ZeroBot-Plugin/control"
+	"github.com/FloatTech/ZeroBot-Plugin/order"
 )
 
-var engine = control.Register("bilibili", &control.Options{
+var engine = control.Register("bilibili", order.PrioBilibili, &control.Options{
 	DisableOnDefault: false,
 	Help: "bilibili\n" +
-		"- >vup info [名字|uid]\n" +
-		"- >user info [名字|uid]",
+		"- >vup info [名字 | uid]\n" +
+		"- >user info [名字 | uid]",
 })
 
 // 查成分的

plugin_bilibili_push/bilibili_push.go

@@ -0,0 +1,551 @@
+// Package bilibilipush b站推送
+package bilibilipush
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+	"io"
+	"net/http"
+	"strconv"
+	"time"
+
+	"github.com/FloatTech/zbputils/control"
+	"github.com/FloatTech/zbputils/ctxext"
+	"github.com/FloatTech/zbputils/txt2img"
+	"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/ZeroBot-Plugin/order"
+)
+
+const (
+	ua             = "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/92.0.4515.107 Safari/537.36"
+	referer        = "https://www.bilibili.com/"
+	infoURL        = "https://api.bilibili.com/x/space/acc/info?mid=%d"
+	userDynamicURL = "https://api.vc.bilibili.com/dynamic_svr/v1/dynamic_svr/space_history?host_uid=%d&offset_dynamic_id=0&need_top=0"
+	liveListURL    = "https://api.live.bilibili.com/room/v1/Room/get_status_info_by_uids"
+	tURL           = "https://t.bilibili.com/"
+	liveURL        = "https://live.bilibili.com/"
+	serviceName    = "bilibilipush"
+)
+
+var (
+	lastTime = map[int64]int64{}
+	typeMsg  = map[int64]string{
+		1:   "转发了一条动态",
+		2:   "有图营业",
+		4:   "无图营业",
+		8:   "发布了新投稿",
+		16:  "发布了短视频",
+		64:  "发布了新专栏",
+		256: "发布了新音频",
+	}
+	liveStatus  = map[int64]int{}
+	uidErrorMsg = map[int]string{
+		0:    "输入的uid有效",
+		-400: "uid不存在，注意uid不是房间号",
+		-402: "uid不存在，注意uid不是房间号",
+		-412: "操作过于频繁IP暂时被风控，请半小时后再尝试",
+	}
+	upMap = map[int64]string{}
+)
+
+func init() {
+	go bilibiliPushDaily()
+	en := control.Register(serviceName, order.PrioBilibiliPush, &control.Options{
+		DisableOnDefault: false,
+		Help: "bilibilipush\n" +
+			"- 添加订阅[uid]\n" +
+			"- 取消订阅[uid]\n" +
+			"- 取消动态订阅[uid]\n" +
+			"- 取消直播订阅[uid]\n" +
+			"- 推送列表",
+	})
+
+	en.OnRegex(`^添加订阅(\d+)$`, ctxext.UserOrGrpAdmin).SetBlock(true).Handle(func(ctx *zero.Ctx) {
+		buid, _ := strconv.ParseInt(ctx.State["regex_matched"].([]string)[1], 10, 64)
+		var name string
+		var ok bool
+		if name, ok = upMap[buid]; !ok {
+			var status int
+			status, name = checkBuid(buid)
+			if status != 0 {
+				msg, ok := uidErrorMsg[status]
+				if !ok {
+					msg = "未知错误，请私聊反馈给" + zero.BotConfig.NickName[0]
+				}
+				ctx.SendChain(message.Text(msg))
+				return
+			}
+		}
+		gid := ctx.Event.GroupID
+		if gid == 0 {
+			gid = -ctx.Event.UserID
+		}
+		if err := subscribe(buid, gid); err != nil {
+			log.Errorln("[bilibilipush]:", err)
+		} else {
+			ctx.SendChain(message.Text("已添加" + name + "的订阅"))
+		}
+	})
+	en.OnRegex(`^取消订阅(\d+)$`, ctxext.UserOrGrpAdmin).SetBlock(true).Handle(func(ctx *zero.Ctx) {
+		buid, _ := strconv.ParseInt(ctx.State["regex_matched"].([]string)[1], 10, 64)
+		var name string
+		var ok bool
+		if name, ok = upMap[buid]; !ok {
+			var status int
+			status, name = checkBuid(buid)
+			if status != 0 {
+				msg, ok := uidErrorMsg[status]
+				if !ok {
+					msg = "未知错误，请私聊反馈给" + zero.BotConfig.NickName[0]
+				}
+				ctx.SendChain(message.Text(msg))
+				return
+			}
+		}
+		gid := ctx.Event.GroupID
+		if gid == 0 {
+			gid = -ctx.Event.UserID
+		}
+		if err := unsubscribe(buid, gid); err != nil {
+			log.Errorln("[bilibilipush]:", err)
+		} else {
+			ctx.SendChain(message.Text("已取消" + name + "的订阅"))
+		}
+	})
+	en.OnRegex(`^取消动态订阅(\d+)$`, ctxext.UserOrGrpAdmin).SetBlock(true).Handle(func(ctx *zero.Ctx) {
+		buid, _ := strconv.ParseInt(ctx.State["regex_matched"].([]string)[1], 10, 64)
+		var name string
+		var ok bool
+		if name, ok = upMap[buid]; !ok {
+			var status int
+			status, name = checkBuid(buid)
+			if status != 0 {
+				msg, ok := uidErrorMsg[status]
+				if !ok {
+					msg = "未知错误，请私聊反馈给" + zero.BotConfig.NickName[0]
+				}
+				ctx.SendChain(message.Text(msg))
+				return
+			}
+		}
+		gid := ctx.Event.GroupID
+		if gid == 0 {
+			gid = -ctx.Event.UserID
+		}
+		if err := unsubscribeDynamic(buid, gid); err != nil {
+			log.Errorln("[bilibilipush]:", err)
+		} else {
+			ctx.SendChain(message.Text("已取消" + name + "的动态订阅"))
+		}
+	})
+	en.OnRegex(`^取消直播订阅(\d+)$`, ctxext.UserOrGrpAdmin).SetBlock(true).Handle(func(ctx *zero.Ctx) {
+		buid, _ := strconv.ParseInt(ctx.State["regex_matched"].([]string)[1], 10, 64)
+		var name string
+		var ok bool
+		if name, ok = upMap[buid]; !ok {
+			var status int
+			status, name = checkBuid(buid)
+			if status != 0 {
+				msg, ok := uidErrorMsg[status]
+				if !ok {
+					msg = "未知错误，请私聊反馈给" + zero.BotConfig.NickName[0]
+				}
+				ctx.SendChain(message.Text(msg))
+				return
+			}
+		}
+		gid := ctx.Event.GroupID
+		if gid == 0 {
+			gid = -ctx.Event.UserID
+		}
+		if err := unsubscribeLive(buid, gid); err != nil {
+			log.Errorln("[bilibilipush]:", err)
+		} else {
+			ctx.SendChain(message.Text("已取消" + name + "的直播订阅"))
+		}
+	})
+	en.OnFullMatch("推送列表", ctxext.UserOrGrpAdmin).SetBlock(true).Handle(func(ctx *zero.Ctx) {
+		gid := ctx.Event.GroupID
+		if gid == 0 {
+			gid = -ctx.Event.UserID
+		}
+		bpl := bdb.getAllPushByGroup(gid)
+		fmt.Println(bpl)
+		msg := "--------推送列表--------"
+		for _, v := range bpl {
+			if _, ok := upMap[v.BilibiliUID]; !ok {
+				bdb.updateAllUp()
+				fmt.Println(upMap)
+			}
+			msg += fmt.Sprintf("\nuid:%-12d 动态：", v.BilibiliUID)
+			if v.DynamicDisable == 0 {
+				msg += "●"
+			} else {
+				msg += "○"
+			}
+			msg += " 直播："
+			if v.LiveDisable == 0 {
+				msg += "●"
+			} else {
+				msg += "○"
+			}
+			msg += " up主：" + upMap[v.BilibiliUID]
+		}
+		data, err := txt2img.RenderToBase64(msg, txt2img.FontFile, 600, 20)
+		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: 可能被风控了"))
+		}
+	})
+}
+
+func bilibiliPushDaily() {
+	t := time.NewTicker(time.Second * 10)
+	defer t.Stop()
+	for range t.C {
+		log.Println("-----bilibilipush拉取推送信息-----")
+		sendDynamic()
+		sendLive()
+	}
+}
+
+func checkBuid(buid int64) (status int, name string) {
+	data, err := web.ReqWith(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()
+	if status == 0 {
+		bdb.insertBilibiliUp(buid, name)
+		upMap[buid] = name
+	}
+	return
+}
+
+// subscribe 订阅
+func subscribe(buid, groupid int64) (err error) {
+	bpMap := map[string]interface{}{
+		"bilibili_uid":    buid,
+		"group_id":        groupid,
+		"live_disable":    0,
+		"dynamic_disable": 0,
+	}
+	err = bdb.insertOrUpdateLiveAndDynamic(bpMap)
+	return
+}
+
+// unsubscribe 取消订阅
+func unsubscribe(buid, groupid int64) (err error) {
+	bpMap := map[string]interface{}{
+		"bilibili_uid":    buid,
+		"group_id":        groupid,
+		"live_disable":    1,
+		"dynamic_disable": 1,
+	}
+	err = bdb.insertOrUpdateLiveAndDynamic(bpMap)
+	return
+}
+
+func unsubscribeDynamic(buid, groupid int64) (err error) {
+	bpMap := map[string]interface{}{
+		"bilibili_uid":    buid,
+		"group_id":        groupid,
+		"dynamic_disable": 1,
+	}
+	err = bdb.insertOrUpdateLiveAndDynamic(bpMap)
+	return
+}
+
+func unsubscribeLive(buid, groupid int64) (err error) {
+	bpMap := map[string]interface{}{
+		"bilibili_uid": buid,
+		"group_id":     groupid,
+		"live_disable": 1,
+	}
+	err = bdb.insertOrUpdateLiveAndDynamic(bpMap)
+	return
+}
+
+func getUserDynamicCard(buid int64) (cardList []gjson.Result) {
+	data, err := web.ReqWith(fmt.Sprintf(userDynamicURL, buid), "GET", referer, ua)
+	if err != nil {
+		log.Errorln("[bilibilipush]:", err)
+	}
+	cardList = gjson.Get(helper.BytesToString(data), "data.cards").Array()
+	return
+}
+
+func getLiveList(uids ...int64) string {
+	m := make(map[string]interface{})
+	m["uids"] = uids
+	b, _ := json.Marshal(m)
+	client := &http.Client{}
+	// 提交请求
+	request, err := http.NewRequest("POST", liveListURL, bytes.NewBuffer(b))
+	if err != nil {
+		log.Errorln("[bilibilipush]:", err)
+	}
+	request.Header.Add("Referer", referer)
+	request.Header.Add("User-Agent", ua)
+	response, err := client.Do(request)
+	if err != nil {
+		log.Errorln("[bilibilipush]:", err)
+	}
+	defer response.Body.Close()
+	data, err := io.ReadAll(response.Body)
+	if err != nil {
+		log.Errorln("[bilibilipush]:", err)
+	}
+	return helper.BytesToString(data)
+}
+
+func sendDynamic() {
+	uids := bdb.getAllBuidByDynamic()
+	for _, buid := range uids {
+		cardList := getUserDynamicCard(buid)
+		if len(cardList) == 0 {
+			return
+		}
+		t, ok := lastTime[buid]
+		if !ok {
+			lastTime[buid] = cardList[0].Get("desc.timestamp").Int()
+			return
+		}
+		for i := len(cardList) - 1; i >= 0; i-- {
+			ct := cardList[i].Get("desc.timestamp").Int()
+			if ct > t && ct > time.Now().Unix()-600 {
+				lastTime[buid] = ct
+				m, ok := control.Lookup(serviceName)
+				if ok {
+					groupList := bdb.getAllGroupByBuidAndDynamic(buid)
+					var msg []message.MessageSegment
+					cType := cardList[i].Get("desc.type").Int()
+					cardStr := cardList[i].Get("card").String()
+					switch cType {
+					case 0:
+						cName := cardList[i].Get("desc.user_profile.info.uname").String()
+						cTime := time.Unix(cardList[i].Get("desc.timestamp").Int(), 0).Format("2006-01-02 15:04:05")
+						msg = append(msg, message.Text(cName+"在"+cTime+typeMsg[cType]+"\n"))
+					case 1:
+						cName := gjson.Get(cardStr, "user.uname").String()
+						msg = append(msg, message.Text(cName+typeMsg[cType]+"\n"))
+						cContent := gjson.Get(cardStr, "item.content").String()
+						msg = append(msg, message.Text(cContent+"\n"))
+						msg = append(msg, message.Text("转发的内容：\n"))
+						cOrigType := gjson.Get(cardStr, "item.orig_type").Int()
+						cOrigin := gjson.Get(cardStr, "origin").String()
+						switch cOrigType {
+						case 1:
+							cName := gjson.Get(cOrigin, "user.uname").String()
+							msg = append(msg, message.Text(cName+typeMsg[cOrigType]+"\n"))
+						case 2:
+							cName := gjson.Get(cOrigin, "user.name").String()
+							cUploadTime := time.Unix(gjson.Get(cOrigin, "item.upload_time").Int(), 0).Format("2006-01-02 15:04:05")
+							msg = append(msg, message.Text(cName+"在"+cUploadTime+typeMsg[cOrigType]+"\n"))
+							cDescription := gjson.Get(cOrigin, "item.description")
+							msg = append(msg, message.Text(cDescription))
+							if gjson.Get(cOrigin, "item.pictures.#").Int() != 0 {
+								gjson.Get(cOrigin, "item.pictures").ForEach(func(_, v gjson.Result) bool {
+									msg = append(msg, message.Image(v.Get("img_src").String()))
+									return true
+								})
+							}
+						case 4:
+							cName := gjson.Get(cOrigin, "user.uname").String()
+							cTimestamp := time.Unix(gjson.Get(cOrigin, "item.timestamp").Int(), 0).Format("2006-01-02 15:04:05")
+							msg = append(msg, message.Text(cName+"在"+cTimestamp+typeMsg[cOrigType]+"\n"))
+							cContent := gjson.Get(cOrigin, "item.content").String()
+							msg = append(msg, message.Text(cContent+"\n"))
+						case 8:
+							cName := gjson.Get(cOrigin, "owner.name").String()
+							cTime := time.Unix(gjson.Get(cOrigin, "ctime").Int(), 0).Format("2006-01-02 15:04:05")
+							msg = append(msg, message.Text(cName+"在"+cTime+typeMsg[cOrigType]+"\n"))
+							cTitle := gjson.Get(cOrigin, "title").String()
+							msg = append(msg, message.Text(cTitle))
+							cPic := gjson.Get(cOrigin, "pic").String()
+							msg = append(msg, message.Image(cPic))
+							cDesc := gjson.Get(cOrigin, "desc").String()
+							msg = append(msg, message.Text(cDesc+"\n"))
+							cShareSubtitle := gjson.Get(cOrigin, "share_subtitle").String()
+							msg = append(msg, message.Text(cShareSubtitle+"\n"))
+							cShortLink := gjson.Get(cOrigin, "short_link").String()
+							msg = append(msg, message.Text("视频链接："+cShortLink+"\n"))
+						case 16:
+							cName := gjson.Get(cOrigin, "user.name").String()
+							cUploadTime := gjson.Get(cOrigin, "item.upload_time").String()
+							msg = append(msg, message.Text(cName+"在"+cUploadTime+typeMsg[cOrigType]+"\n"))
+							cDescription := gjson.Get(cOrigin, "item.description")
+							msg = append(msg, message.Text(cDescription))
+							cCover := gjson.Get(cOrigin, "item.cover.default").String()
+							msg = append(msg, message.Image(cCover))
+						case 64:
+							cName := gjson.Get(cOrigin, "author.name").String()
+							cPublishTime := time.Unix(gjson.Get(cOrigin, "publish_time").Int(), 0).Format("2006-01-02 15:04:05")
+							msg = append(msg, message.Text(cName+"在"+cPublishTime+typeMsg[cOrigType]+"\n"))
+							cTitle := gjson.Get(cOrigin, "title").String()
+							msg = append(msg, message.Text(cTitle+"\n"))
+							cSummary := gjson.Get(cOrigin, "summary").String()
+							msg = append(msg, message.Text(cSummary))
+							cBannerURL := gjson.Get(cOrigin, "banner_url").String()
+							msg = append(msg, message.Image(cBannerURL))
+						case 256:
+							cUpper := gjson.Get(cOrigin, "upper").String()
+							cTime := time.UnixMilli(gjson.Get(cOrigin, "ctime").Int()).Format("2006-01-02 15:04:05")
+							msg = append(msg, message.Text(cUpper+"在"+cTime+typeMsg[cOrigType]+"\n"))
+							cTitle := gjson.Get(cOrigin, "title").String()
+							msg = append(msg, message.Text(cTitle))
+							cCover := gjson.Get(cOrigin, "cover").String()
+							msg = append(msg, message.Image(cCover))
+						default:
+							msg = append(msg, message.Text("未知动态类型"+strconv.FormatInt(cOrigType, 10)+"\n"))
+						}
+					case 2:
+						cName := gjson.Get(cardStr, "user.name").String()
+						cUploadTime := time.Unix(gjson.Get(cardStr, "item.upload_time").Int(), 0).Format("2006-01-02 15:04:05")
+						msg = append(msg, message.Text(cName+"在"+cUploadTime+typeMsg[cType]+"\n"))
+						cDescription := gjson.Get(cardStr, "item.description")
+						msg = append(msg, message.Text(cDescription))
+						if gjson.Get(cardStr, "item.pictures.#").Int() != 0 {
+							gjson.Get(cardStr, "item.pictures").ForEach(func(_, v gjson.Result) bool {
+								msg = append(msg, message.Image(v.Get("img_src").String()))
+								return true
+							})
+						}
+					case 4:
+						cName := gjson.Get(cardStr, "user.uname").String()
+						cTimestamp := time.Unix(gjson.Get(cardStr, "item.timestamp").Int(), 0).Format("2006-01-02 15:04:05")
+						msg = append(msg, message.Text(cName+"在"+cTimestamp+typeMsg[cType]+"\n"))
+						cContent := gjson.Get(cardStr, "item.content").String()
+						msg = append(msg, message.Text(cContent+"\n"))
+					case 8:
+						cName := gjson.Get(cardStr, "owner.name").String()
+						cTime := time.Unix(gjson.Get(cardStr, "ctime").Int(), 0).Format("2006-01-02 15:04:05")
+						msg = append(msg, message.Text(cName+"在"+cTime+typeMsg[cType]+"\n"))
+						cTitle := gjson.Get(cardStr, "title").String()
+						msg = append(msg, message.Text(cTitle))
+						cPic := gjson.Get(cardStr, "pic").String()
+						msg = append(msg, message.Image(cPic))
+						cDesc := gjson.Get(cardStr, "desc").String()
+						msg = append(msg, message.Text(cDesc+"\n"))
+						cShareSubtitle := gjson.Get(cardStr, "share_subtitle").String()
+						msg = append(msg, message.Text(cShareSubtitle+"\n"))
+						cShortLink := gjson.Get(cardStr, "short_link").String()
+						msg = append(msg, message.Text("视频链接："+cShortLink+"\n"))
+					case 16:
+						cName := gjson.Get(cardStr, "user.name").String()
+						cUploadTime := gjson.Get(cardStr, "item.upload_time").String()
+						msg = append(msg, message.Text(cName+"在"+cUploadTime+typeMsg[cType]+"\n"))
+						cDescription := gjson.Get(cardStr, "item.description")
+						msg = append(msg, message.Text(cDescription))
+						cCover := gjson.Get(cardStr, "item.cover.default").String()
+						msg = append(msg, message.Image(cCover))
+					case 64:
+						cName := gjson.Get(cardStr, "author.name").String()
+						cPublishTime := time.Unix(gjson.Get(cardStr, "publish_time").Int(), 0).Format("2006-01-02 15:04:05")
+						msg = append(msg, message.Text(cName+"在"+cPublishTime+typeMsg[cType]+"\n"))
+						cTitle := gjson.Get(cardStr, "title").String()
+						msg = append(msg, message.Text(cTitle+"\n"))
+						cSummary := gjson.Get(cardStr, "summary").String()
+						msg = append(msg, message.Text(cSummary))
+						cBannerURL := gjson.Get(cardStr, "banner_url").String()
+						msg = append(msg, message.Image(cBannerURL))
+					case 256:
+						cUpper := gjson.Get(cardStr, "upper").String()
+						cTime := time.UnixMilli(gjson.Get(cardStr, "ctime").Int()).Format("2006-01-02 15:04:05")
+						msg = append(msg, message.Text(cUpper+"在"+cTime+typeMsg[cType]+"\n"))
+						cTitle := gjson.Get(cardStr, "title").String()
+						msg = append(msg, message.Text(cTitle))
+						cCover := gjson.Get(cardStr, "cover").String()
+						msg = append(msg, message.Image(cCover))
+					default:
+						msg = append(msg, message.Text("未知动态类型"+strconv.FormatInt(cType, 10)+"\n"))
+					}
+					cID := cardList[i].Get("desc.dynamic_id").String()
+					msg = append(msg, message.Text("动态链接：", tURL+cID))
+
+					zero.RangeBot(func(id int64, ctx *zero.Ctx) bool {
+						for _, gid := range groupList {
+							if m.IsEnabledIn(gid) {
+								switch {
+								case gid > 0:
+									ctx.SendGroupMessage(gid, msg)
+								case gid < 0:
+									ctx.SendPrivateMessage(-gid, msg)
+								default:
+									log.Errorln("[bilibilipush]:gid为0")
+								}
+							}
+						}
+						return true
+					})
+				}
+			}
+		}
+	}
+}
+
+func sendLive() {
+	uids := bdb.getAllBuidByLive()
+	gjson.Get(getLiveList(uids...), "data").ForEach(func(key, value gjson.Result) bool {
+		newStatus := int(value.Get("live_status").Int())
+		if newStatus == 2 {
+			newStatus = 0
+		}
+		if _, ok := liveStatus[key.Int()]; !ok {
+			liveStatus[key.Int()] = newStatus
+			return true
+		}
+		oldStatus := liveStatus[key.Int()]
+		if newStatus != oldStatus && newStatus == 1 {
+			liveStatus[key.Int()] = newStatus
+			m, ok := control.Lookup(serviceName)
+			if ok {
+				groupList := bdb.getAllGroupByBuidAndLive(key.Int())
+				roomID := value.Get("short_id").Int()
+				if roomID == 0 {
+					roomID = value.Get("room_id").Int()
+				}
+				lURL := liveURL + strconv.FormatInt(roomID, 10)
+				lName := value.Get("uname").String()
+				lTitle := value.Get("title").String()
+				lCover := value.Get("cover_from_user").String()
+				if lCover == "" {
+					lCover = value.Get("keyframe").String()
+				}
+				var msg []message.MessageSegment
+				msg = append(msg, message.Text(lName+" 正在直播：\n"))
+				msg = append(msg, message.Text(lTitle))
+				msg = append(msg, message.Image(lCover))
+				msg = append(msg, message.Text("直播链接：", lURL))
+				zero.RangeBot(func(id int64, ctx *zero.Ctx) bool {
+					for _, gid := range groupList {
+						if m.IsEnabledIn(gid) {
+							switch {
+							case gid > 0:
+								ctx.SendGroupMessage(gid, msg)
+							case gid < 0:
+								ctx.SendPrivateMessage(-gid, msg)
+							default:
+								log.Errorln("[bilibilipush]:gid为0")
+							}
+						}
+					}
+					return true
+				})
+			}
+		} else if newStatus != oldStatus {
+			liveStatus[key.Int()] = newStatus
+		}
+		return true
+	})
+}

plugin_bilibili_push/data.go

@@ -0,0 +1,29 @@
+package bilibilipush
+
+import (
+	"os"
+
+	"github.com/FloatTech/zbputils/process"
+	log "github.com/sirupsen/logrus"
+)
+
+const (
+	cachePath = dbpath + "cache/"
+	dbpath    = "data/bilibilipush/"
+	dbfile    = dbpath + "push.db"
+)
+
+// bdb bilibili推送数据库
+var bdb *bilibilipushdb
+
+// 加载数据库
+func init() {
+	go func() {
+		process.SleepAbout1sTo2s()
+		_ = os.MkdirAll(dbpath, 0755)
+		os.RemoveAll(cachePath)
+		_ = os.MkdirAll(cachePath, 0755)
+		bdb = initialize(dbfile)
+		log.Println("[bilibilipush]加载bilibilipush数据库")
+	}()
+}

plugin_bilibili_push/model.go

@@ -0,0 +1,144 @@
+package bilibilipush
+
+import (
+	"encoding/json"
+	"os"
+
+	"github.com/jinzhu/gorm"
+	_ "github.com/logoove/sqlite" // import sql
+)
+
+// bilibilipushdb bili推送数据库
+type bilibilipushdb gorm.DB
+
+type bilibilipush struct {
+	ID             int64 `gorm:"column:id;primary_key" json:"id"`
+	BilibiliUID    int64 `gorm:"column:bilibili_uid;index:idx_buid_gid" json:"bilibili_uid"`
+	GroupID        int64 `gorm:"column:group_id;index:idx_buid_gid" json:"group_id"`
+	LiveDisable    int64 `gorm:"column:live_disable;default:0" json:"live_disable"`
+	DynamicDisable int64 `gorm:"column:dynamic_disable;default:0" json:"dynamic_disable"`
+}
+
+// TableName ...
+func (bilibilipush) TableName() string {
+	return "bilibili_push"
+}
+
+type bilibiliup struct {
+	BilibiliUID int64  `gorm:"column:bilibili_uid;primary_key"`
+	Name        string `gorm:"column:name"`
+}
+
+// TableName ...
+func (bilibiliup) TableName() string {
+	return "bilibili_up"
+}
+
+// initialize 初始化ScoreDB数据库
+func initialize(dbpath string) *bilibilipushdb {
+	var err error
+	if _, err = os.Stat(dbpath); err != nil || os.IsNotExist(err) {
+		// 生成文件
+		f, err := os.Create(dbpath)
+		if err != nil {
+			return nil
+		}
+		defer f.Close()
+	}
+	gdb, err := gorm.Open("sqlite3", dbpath)
+	if err != nil {
+		panic(err)
+	}
+	gdb.AutoMigrate(&bilibilipush{}).AutoMigrate(&bilibiliup{})
+	return (*bilibilipushdb)(gdb)
+}
+
+// insertOrUpdateLiveAndDynamic 插入或更新数据库
+func (bdb *bilibilipushdb) insertOrUpdateLiveAndDynamic(bpMap map[string]interface{}) (err error) {
+	db := (*gorm.DB)(bdb)
+	bp := bilibilipush{}
+	data, _ := json.Marshal(&bpMap)
+	_ = json.Unmarshal(data, &bp)
+	if err = db.Debug().Model(&bilibilipush{}).First(&bp, "bilibili_uid = ? and group_id = ?", bp.BilibiliUID, bp.GroupID).Error; err != nil {
+		if gorm.IsRecordNotFoundError(err) {
+			err = db.Debug().Model(&bilibilipush{}).Create(&bp).Error
+		}
+	} else {
+		err = db.Debug().Model(&bilibilipush{}).Where("bilibili_uid = ? and group_id = ?", bp.BilibiliUID, bp.GroupID).Update(bpMap).Error
+	}
+	return
+}
+
+func (bdb *bilibilipushdb) getAllBuidByLive() (buidList []int64) {
+	db := (*gorm.DB)(bdb)
+	var bpl []bilibilipush
+	db.Debug().Model(&bilibilipush{}).Find(&bpl, "live_disable = 0")
+	temp := make(map[int64]bool)
+	for _, v := range bpl {
+		_, ok := temp[v.BilibiliUID]
+		if !ok {
+			buidList = append(buidList, v.BilibiliUID)
+			temp[v.BilibiliUID] = true
+		}
+	}
+	return
+}
+
+func (bdb *bilibilipushdb) getAllBuidByDynamic() (buidList []int64) {
+	db := (*gorm.DB)(bdb)
+	var bpl []bilibilipush
+	db.Debug().Model(&bilibilipush{}).Find(&bpl, "dynamic_disable = 0")
+	temp := make(map[int64]bool)
+	for _, v := range bpl {
+		_, ok := temp[v.BilibiliUID]
+		if !ok {
+			buidList = append(buidList, v.BilibiliUID)
+			temp[v.BilibiliUID] = true
+		}
+	}
+	return
+}
+
+func (bdb *bilibilipushdb) getAllGroupByBuidAndLive(buid int64) (groupList []int64) {
+	db := (*gorm.DB)(bdb)
+	var bpl []bilibilipush
+	db.Debug().Model(&bilibilipush{}).Find(&bpl, "bilibili_uid = ? and live_disable = 0", buid)
+	for _, v := range bpl {
+		groupList = append(groupList, v.GroupID)
+	}
+	return
+}
+
+func (bdb *bilibilipushdb) getAllGroupByBuidAndDynamic(buid int64) (groupList []int64) {
+	db := (*gorm.DB)(bdb)
+	var bpl []bilibilipush
+	db.Debug().Model(&bilibilipush{}).Find(&bpl, "bilibili_uid = ? and dynamic_disable = 0", buid)
+	for _, v := range bpl {
+		groupList = append(groupList, v.GroupID)
+	}
+	return
+}
+
+func (bdb *bilibilipushdb) getAllPushByGroup(groupID int64) (bpl []bilibilipush) {
+	db := (*gorm.DB)(bdb)
+	db.Debug().Model(&bilibilipush{}).Find(&bpl, "group_id = ? and (live_disable = 0 or dynamic_disable = 0)", groupID)
+	return
+}
+
+func (bdb *bilibilipushdb) insertBilibiliUp(buid int64, name string) {
+	db := (*gorm.DB)(bdb)
+	bu := bilibiliup{
+		BilibiliUID: buid,
+		Name:        name,
+	}
+	db.Debug().Model(&bilibiliup{}).Create(bu)
+}
+
+func (bdb *bilibilipushdb) updateAllUp() {
+	db := (*gorm.DB)(bdb)
+	var bul []bilibiliup
+	db.Debug().Model(&bilibiliup{}).Find(&bul)
+	for _, v := range bul {
+		upMap[v.BilibiliUID] = v.Name
+	}
+}

plugin_book_review/book_review.go

@@ -1,14 +1,20 @@
-package plugin_book_review
+// Package bookreview 书评
+package bookreview
 
 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/ZeroBot-Plugin/control"
+	control "github.com/FloatTech/zbputils/control"
+	"github.com/FloatTech/zbputils/txt2img"
+
+	"github.com/FloatTech/ZeroBot-Plugin/order"
 )
 
 func init() {
-	engine := control.Register("bookreview", &control.Options{
+	engine := control.Register("bookreview", order.PrioBookReview, &control.Options{
 		DisableOnDefault: false,
 		Help:             "哀伤雪刃推书记录\n- 书评[xxx]\n- 随机书评",
 	})
@@ -17,12 +23,24 @@ func init() {
 	engine.OnRegex("^书评([\u4E00-\u9FA5A-Za-z0-9]{1,25})$").SetBlock(true).
 		Handle(func(ctx *zero.Ctx) {
 			b := getBookReviewByKeyword(ctx.State["regex_matched"].([]string)[1])
-			ctx.SendChain(message.Text(b.BookReview))
+			data, err := txt2img.RenderToBase64(b.BookReview, txt2img.FontFile, 400, 20)
+			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: 可能被风控了"))
+			}
 		})
 
 	engine.OnFullMatch("随机书评").SetBlock(true).
 		Handle(func(ctx *zero.Ctx) {
 			br := getRandomBookReview()
-			ctx.SendChain(message.Text(br.BookReview))
+			data, err := txt2img.RenderToBase64(br.BookReview, txt2img.FontFile, 400, 20)
+			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: 可能被风控了"))
+			}
 		})
 }

plugin_book_review/data.go

@@ -1,13 +1,13 @@
-package plugin_book_review
+package bookreview
 
 import (
 	"os"
 
 	log "github.com/sirupsen/logrus"
 
-	"github.com/FloatTech/ZeroBot-Plugin/utils/file"
-	"github.com/FloatTech/ZeroBot-Plugin/utils/process"
-	"github.com/FloatTech/ZeroBot-Plugin/utils/sql"
+	"github.com/FloatTech/zbputils/file"
+	"github.com/FloatTech/zbputils/process"
+	"github.com/FloatTech/zbputils/sql"
 )
 
 const dbpath = "data/BookReview/"

plugin_book_review/model.go

@@ -1,17 +1,17 @@
-package plugin_book_review
+package bookreview
 
 type book struct {
-	Id         uint64 `db:"id"`
+	ID         uint64 `db:"id"`
 	BookReview string `db:"bookreview"`
 }
 
 // 暂时随机选择一个书评
 func getBookReviewByKeyword(keyword string) (b book) {
-	db.Find("bookreview", &b, "where bookreview LIKE '%"+keyword+"%'")
+	_ = db.Find("bookreview", &b, "where bookreview LIKE '%"+keyword+"%'")
 	return
 }
 
 func getRandomBookReview() (b book) {
-	db.Pick("bookreview", &b)
+	_ = db.Pick("bookreview", &b)
 	return
 }

plugin_cangtoushi/cangtoushi.go

@@ -0,0 +1,123 @@
+// Package cangtoushi 藏头诗
+package cangtoushi
+
+import (
+	"fmt"
+	"io"
+	"net/http"
+	"net/http/cookiejar"
+	"net/url"
+	"strings"
+
+	control "github.com/FloatTech/zbputils/control"
+	"github.com/antchfx/htmlquery"
+	log "github.com/sirupsen/logrus"
+	zero "github.com/wdvxdr1123/ZeroBot"
+	"github.com/wdvxdr1123/ZeroBot/message"
+	"github.com/wdvxdr1123/ZeroBot/utils/helper"
+
+	"github.com/FloatTech/ZeroBot-Plugin/order"
+)
+
+const (
+	loginURL  = "https://www.shicimingju.com/cangtoushi/"
+	searchURL = "https://www.shicimingju.com/cangtoushi/index.html"
+	ua        = "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/96.0.4664.110 Safari/537.36"
+	referer   = "https://www.shicimingju.com/cangtoushi/index.html"
+)
+
+var (
+	gCurCookieJar *cookiejar.Jar
+	csrf          string
+)
+
+func init() {
+	engine := control.Register("cangtoushi", order.PrioCangTouShi, &control.Options{
+		DisableOnDefault: false,
+		Help: "藏头诗\n" +
+			"- 藏头诗[xxx]\n- 藏尾诗[xxx]",
+	})
+	engine.OnRegex("藏头诗([\u4E00-\u9FA5]{3,10})").SetBlock(true).Handle(func(ctx *zero.Ctx) {
+		kw := ctx.State["regex_matched"].([]string)[1]
+		login()
+		data, err := search(kw, "7", "0")
+		if err != nil {
+			log.Errorln("[cangtoushi]:", err)
+		}
+		text := dealHTML(helper.BytesToString(data))
+		ctx.SendChain(message.Text(text))
+	})
+
+	engine.OnRegex("藏尾诗([\u4E00-\u9FA5]{3,10})").SetBlock(true).Handle(func(ctx *zero.Ctx) {
+		kw := ctx.State["regex_matched"].([]string)[1]
+		login()
+		data, err := search(kw, "7", "2")
+		if err != nil {
+			log.Errorln("[cangtoushi]:", err)
+		}
+		text := dealHTML(helper.BytesToString(data))
+		ctx.SendChain(message.Text(text))
+	})
+}
+
+func login() {
+	gCurCookieJar, _ = cookiejar.New(nil)
+	client := &http.Client{
+		Jar: gCurCookieJar,
+	}
+	request, err := http.NewRequest("GET", loginURL, nil)
+	if err != nil {
+		log.Errorln("[cangtoushi]:", err)
+	}
+	request.Header.Add("User-Agent", ua)
+	response, err := client.Do(request)
+	if err != nil {
+		log.Errorln("[cangtoushi]:", err)
+	}
+	data, err := io.ReadAll(response.Body)
+	if err != nil {
+		log.Errorln("[cangtoushi]:", err)
+	}
+	response.Body.Close()
+	doc, err := htmlquery.Parse(strings.NewReader(helper.BytesToString(data)))
+	if err != nil {
+		log.Errorln("[cangtoushi]:", err)
+	}
+	csrf = htmlquery.SelectAttr(htmlquery.FindOne(doc, "//input[@name='_csrf']"), "value")
+}
+
+func search(kw, zishu, position string) (data []byte, err error) {
+	postStr := fmt.Sprintf("_csrf=%s&kw=%s&zishu=%s&position=%s", url.QueryEscape(csrf), url.QueryEscape(kw), zishu, position)
+	log.Println("postStr:", postStr)
+	client := &http.Client{
+		Jar: gCurCookieJar,
+	}
+	request, err := http.NewRequest("POST", searchURL, strings.NewReader(postStr))
+	if err != nil {
+		log.Errorln("[cangtoushi]:", err)
+	}
+	request.Header.Add("Referer", referer)
+	request.Header.Add("User-Agent", ua)
+	request.Header.Add("Content-Type", "application/x-www-form-urlencoded")
+	response, err := client.Do(request)
+	if err != nil {
+		log.Errorln("[cangtoushi]:", err)
+	}
+	data, err = io.ReadAll(response.Body)
+	if err != nil {
+		log.Errorln("[cangtoushi]:", err)
+	}
+	response.Body.Close()
+	return
+}
+
+func dealHTML(data string) (text string) {
+	doc, err := htmlquery.Parse(strings.NewReader(data))
+	if err != nil {
+		log.Errorln("[cangtoushi]:", err)
+	}
+	text = htmlquery.InnerText(htmlquery.FindOne(doc, "//div[@class='card']/div[@class='card']"))
+	text = strings.ReplaceAll(text, " ", "")
+	text = strings.Replace(text, "\n", "", 1)
+	return text
+}

plugin_chat/chat.go

@@ -6,24 +6,24 @@ import (
 	"strconv"
 	"time"
 
+	control "github.com/FloatTech/zbputils/control"
 	zero "github.com/wdvxdr1123/ZeroBot"
 	"github.com/wdvxdr1123/ZeroBot/extension/rate"
 	"github.com/wdvxdr1123/ZeroBot/message"
 
-	"github.com/FloatTech/ZeroBot-Plugin/control"
+	"github.com/FloatTech/ZeroBot-Plugin/order"
 )
 
 const (
 	dbpath = "data/Chat/"
 	dbfile = dbpath + "kimoi.json"
-	prio   = 10
 )
 
 var (
 	poke   = rate.NewManager(time.Minute*5, 8) // 戳一戳
-	engine = control.Register("chat", &control.Options{
+	engine = control.Register("chat", order.PrioChat, &control.Options{
 		DisableOnDefault: false,
-		Help:             "chat\n- [BOT名字]\n- [戳一戳BOT]\n- 空调开\n- 空调关\n- 群温度\n- 设置温度[正整数]\n- mua|啾咪|摸|上你|傻|裸|贴|老婆|抱|亲|一下|咬|操|123|进去|调教|搓|让|捏|挤|略|呐|原味|胖次|内裤|内衣|衣服|ghs|批|憨批|kkp|咕|骚|喜欢|suki|好き|看|不能|砸了|透|口我|草我|自慰|onani|オナニー|炸了|色图|涩图|告白|对不起|回来|吻|软|壁咚|掰开|女友|是|喵|嗷呜|叫|拜|佬|awsl|臭|香|腿|张开|脚|脸|头发|手|pr|舔|小穴|腰|诶嘿嘿|可爱|扭蛋|鼻|眼|色气|推|床|举|手冲|饿|变|敲|爬|怕|冲|射|不穿|迫害|猫粮|揪尾巴|薄荷|早|晚安|揉|榨|掐|胸|奶子|欧派|嫩|蹭|牵手|握手|拍照|w|睡不着|欧尼酱|哥|爱你|过来|自闭|打不过|么么哒|很懂|膝枕|累了|安慰|洗澡|一起睡觉|一起|多大|姐姐|糖|嗦|牛子|🐂子|🐮子|嫌弃|紧|baka|笨蛋|插|插进来|屁股|翘|翘起来|抬|抬起|爸|傲娇|rua|咕噜咕噜|咕噜|上床|做爱|吃掉|吃|揪|种草莓|种草|掀|妹|病娇|嘻",
+		Help:             "chat\n- [BOT名字]\n- [戳一戳BOT]\n- 空调开\n- 空调关\n- 群温度\n- 设置温度[正整数]\n- mua | 啾咪 | 摸 | 上你 | 傻 | 裸 | 贴 | 老婆 | 抱 | 亲 | 一下 | 咬 | 操 | 123 | 进去 | 调教 | 搓 | 让 | 捏 | 挤 | 略 | 呐 | 原味 | 胖次 | 内裤 | 内衣 | 衣服 | ghs | 批 | 憨批 | kkp | 咕 | 骚 | 喜欢 | suki | 好き | 看 | 不能 | 砸了 | 透 | 口我 | 草我 | 自慰 | onani | オナニー | 炸了 | 色图 | 涩图 | 告白 | 对不起 | 回来 | 吻 | 软 | 壁咚 | 掰开 | 女友 | 是 | 喵 | 嗷呜 | 叫 | 拜 | 佬 | awsl | 臭 | 香 | 腿 | 张开 | 脚 | 脸 | 头发 | 手 | pr | 舔 | 小穴 | 腰 | 诶嘿嘿 | 可爱 | 扭蛋 | 鼻 | 眼 | 色气 | 推 | 床 | 举 | 手冲 | 饿 | 变 | 敲 | 爬 | 怕 | 冲 | 射 | 不穿 | 迫害 | 猫粮 | 揪尾巴 | 薄荷 | 早 | 晚安 | 揉 | 榨 | 掐 | 胸 | 奶子 | 欧派 | 嫩 | 蹭 | 牵手 | 握手 | 拍照 | w | 睡不着 | 欧尼酱 | 哥 | 爱你 | 过来 | 自闭 | 打不过 | 么么哒 | 很懂 | 膝枕 | 累了 | 安慰 | 洗澡 | 一起睡觉 | 一起 | 多大 | 姐姐 | 糖 | 嗦 | 牛子 | 🐂子 | 🐮子 | 嫌弃 | 紧 | baka | 笨蛋 | 插 | 插进来 | 屁股 | 翘 | 翘起来 | 抬 | 抬起 | 爸 | 傲娇 | rua | 咕噜咕噜 | 咕噜 | 上床 | 做爱 | 吃掉 | 吃 | 揪 | 种草莓 | 种草 | 掀 | 妹 | 病娇 | 嘻",
 	})
 	kimomap  = make(kimo, 256)
 	chatList = make([]string, 0, 256)
@@ -31,7 +31,7 @@ var (
 
 func init() { // 插件主体
 	// 被喊名字
-	engine.OnFullMatch("", zero.OnlyToMe).SetBlock(true).SetPriority(prio).
+	engine.OnFullMatch("", zero.OnlyToMe).SetBlock(true).
 		Handle(func(ctx *zero.Ctx) {
 			var nickname = zero.BotConfig.NickName[0]
 			time.Sleep(time.Second * 1)
@@ -45,7 +45,7 @@ func init() { // 插件主体
 			))
 		})
 	// 戳一戳
-	engine.On("notice/notify/poke", zero.OnlyToMe).SetBlock(false).SetPriority(prio).
+	engine.On("notice/notify/poke", zero.OnlyToMe).SetBlock(false).
 		Handle(func(ctx *zero.Ctx) {
 			var nickname = zero.BotConfig.NickName[0]
 			switch {
@@ -64,18 +64,18 @@ func init() { // 插件主体
 	// 群空调
 	var AirConditTemp = map[int64]int{}
 	var AirConditSwitch = map[int64]bool{}
-	engine.OnFullMatch("空调开").SetBlock(true).SetPriority(prio).
+	engine.OnFullMatch("空调开").SetBlock(true).
 		Handle(func(ctx *zero.Ctx) {
 			AirConditSwitch[ctx.Event.GroupID] = true
 			ctx.SendChain(message.Text("❄️哔~"))
 		})
-	engine.OnFullMatch("空调关").SetBlock(true).SetPriority(prio).
+	engine.OnFullMatch("空调关").SetBlock(true).
 		Handle(func(ctx *zero.Ctx) {
 			AirConditSwitch[ctx.Event.GroupID] = false
 			delete(AirConditTemp, ctx.Event.GroupID)
 			ctx.SendChain(message.Text("💤哔~"))
 		})
-	engine.OnRegex(`设置温度(\d+)`).SetBlock(true).SetPriority(prio).
+	engine.OnRegex(`设置温度(\d+)`).SetBlock(true).
 		Handle(func(ctx *zero.Ctx) {
 			if _, exist := AirConditTemp[ctx.Event.GroupID]; !exist {
 				AirConditTemp[ctx.Event.GroupID] = 26
@@ -94,7 +94,7 @@ func init() { // 插件主体
 				))
 			}
 		})
-	engine.OnFullMatch(`群温度`).SetBlock(true).SetPriority(prio).
+	engine.OnFullMatch(`群温度`).SetBlock(true).
 		Handle(func(ctx *zero.Ctx) {
 			if _, exist := AirConditTemp[ctx.Event.GroupID]; !exist {
 				AirConditTemp[ctx.Event.GroupID] = 26
@@ -112,7 +112,7 @@ func init() { // 插件主体
 			}
 		})
 	initChatList(func() {
-		engine.OnFullMatchGroup(chatList, zero.OnlyToMe).SetBlock(true).SetPriority(prio).Handle(
+		engine.OnFullMatchGroup(chatList, zero.OnlyToMe).SetBlock(true).Handle(
 			func(ctx *zero.Ctx) {
 				key := ctx.MessageString()
 				val := *kimomap[key]

plugin_chat/data.go

@@ -6,8 +6,8 @@ import (
 
 	"github.com/sirupsen/logrus"
 
-	"github.com/FloatTech/ZeroBot-Plugin/utils/file"
-	"github.com/FloatTech/ZeroBot-Plugin/utils/process"
+	"github.com/FloatTech/zbputils/file"
+	"github.com/FloatTech/zbputils/process"
 )
 
 type kimo = map[string]*[]string
@@ -20,7 +20,10 @@ func initChatList(postinit func()) {
 		if err != nil {
 			panic(err)
 		}
-		json.Unmarshal(data, &kimomap)
+		err = json.Unmarshal(data, &kimomap)
+		if err != nil {
+			panic(err)
+		}
 		for k := range kimomap {
 			chatList = append(chatList, k)
 		}

plugin_choose/choose.go

@@ -6,20 +6,21 @@ import (
 	"strconv"
 	"strings"
 
+	control "github.com/FloatTech/zbputils/control"
 	zero "github.com/wdvxdr1123/ZeroBot"
 	"github.com/wdvxdr1123/ZeroBot/message"
 
-	"github.com/FloatTech/ZeroBot-Plugin/control"
+	"github.com/FloatTech/ZeroBot-Plugin/order"
 )
 
 func init() {
-	engine := control.Register("choose", &control.Options{
+	engine := control.Register("choose", order.PrioChoose, &control.Options{
 		DisableOnDefault: false,
 		Help: "choose\n" +
 			"- 选择可口可乐还是百事可乐\n" +
 			"- 选择肯德基还是麦当劳还是必胜客",
 	})
-	engine.OnPrefix("选择").SetBlock(true).FirstPriority().Handle(handle)
+	engine.OnPrefix("选择").SetBlock(true).Handle(handle)
 }
 func handle(ctx *zero.Ctx) {
 	rawOptions := strings.Split(ctx.State["args"].(string), "还是")

plugin_chouxianghua/chouxianghua.go

@@ -0,0 +1,42 @@
+// Package chouxianghua 抽象话转化
+package chouxianghua
+
+import (
+	control "github.com/FloatTech/zbputils/control"
+	zero "github.com/wdvxdr1123/ZeroBot"
+	"github.com/wdvxdr1123/ZeroBot/message"
+
+	"github.com/FloatTech/ZeroBot-Plugin/order"
+)
+
+func init() {
+	control.Register("chouxianghua", order.PrioChouXiangHua, &control.Options{
+		DisableOnDefault: false,
+		Help:             "抽象话\n- 抽象翻译xxx",
+	}).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))
+		})
+}
+
+func cx(s string) (r string) {
+	h := []rune(s)
+	for i := 0; i < len(h); i++ {
+		if i < len(h)-1 {
+			e := getEmojiByPronun(getPronunByDWord(h[i], h[i+1]))
+			if e != "" {
+				r += e
+				i++
+				continue
+			}
+		}
+		e := getEmojiByPronun(getPinyinByWord(string(h[i])))
+		if e != "" {
+			r += e
+			continue
+		}
+		r += string(h[i])
+	}
+	return
+}

plugin_chouxianghua/data.go

@@ -0,0 +1,37 @@
+package chouxianghua
+
+import (
+	"os"
+
+	log "github.com/sirupsen/logrus"
+
+	"github.com/FloatTech/zbputils/file"
+	"github.com/FloatTech/zbputils/process"
+	"github.com/FloatTech/zbputils/sql"
+)
+
+const (
+	dbpath = "data/ChouXiangHua/"
+	dbfile = dbpath + "cxh.db"
+)
+
+var db = &sql.Sqlite{DBPath: dbfile}
+
+// 加载数据库
+func init() {
+	go func() {
+		process.SleepAbout1sTo2s()
+		// os.RemoveAll(dbpath)
+		_ = os.MkdirAll(dbpath, 0755)
+		_, _ = file.GetLazyData(dbfile, false, true)
+		err := db.Create("pinyin", &pinyin{})
+		if err != nil {
+			panic(err)
+		}
+		n, err := db.Count("pinyin")
+		if err != nil {
+			panic(err)
+		}
+		log.Printf("[chouxianghua]读取%d条拼音", n)
+	}()
+}

plugin_chouxianghua/model.go

@@ -0,0 +1,26 @@
+package chouxianghua
+
+type pinyin struct {
+	Word   string `db:"word"`
+	Pronun string `db:"pronunciation"`
+}
+type emoji struct {
+	Pronun string `db:"pronunciation"`
+	Emoji  string `db:"emoji"`
+}
+
+func getPinyinByWord(word string) string {
+	var p pinyin
+	_ = db.Find("pinyin", &p, "where word = '"+word+"'")
+	return p.Pronun
+}
+
+func getPronunByDWord(w0, w1 rune) string {
+	return getPinyinByWord(string(w0)) + getPinyinByWord(string(w1))
+}
+
+func getEmojiByPronun(pronun string) string {
+	var e emoji
+	_ = db.Find("emoji", &e, "where pronunciation = '"+pronun+"'")
+	return e.Emoji
+}

plugin_coser/coser.go

@@ -12,23 +12,23 @@ import (
 	"github.com/wdvxdr1123/ZeroBot/message"
 	"github.com/wdvxdr1123/ZeroBot/utils/helper"
 
-	"github.com/FloatTech/ZeroBot-Plugin/control"
-	"github.com/FloatTech/ZeroBot-Plugin/utils/web"
+	control "github.com/FloatTech/zbputils/control"
+	"github.com/FloatTech/zbputils/web"
+
+	"github.com/FloatTech/ZeroBot-Plugin/order"
 )
 
 var (
-	engine = control.Register("coser", &control.Options{
-		DisableOnDefault: false,
-		Help:             "三次元小姐姐\n- coser\n",
-	})
-	prio     = 20
 	ua       = "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/96.0.4664.93 Safari/537.36"
 	coserURL = "http://ovooa.com/API/cosplay/api.php"
 	limit    = rate.NewManager(time.Minute, 5)
 )
 
 func init() {
-	engine.OnFullMatch("coser", zero.OnlyGroup).SetBlock(true).SetPriority(prio).
+	control.Register("coser", order.PrioCoser, &control.Options{
+		DisableOnDefault: false,
+		Help:             "三次元小姐姐\n- coser",
+	}).OnFullMatch("coser", zero.OnlyGroup).SetBlock(true).
 		Handle(func(ctx *zero.Ctx) {
 			if !limit.Load(ctx.Event.GroupID).Acquire() {
 				ctx.SendChain(message.Text("请稍后重试0x0..."))

plugin_cpstory/cpstory.go

@@ -0,0 +1,47 @@
+// Package cpstory cp短打
+package cpstory
+
+import (
+	"strings"
+
+	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/math"
+
+	"github.com/FloatTech/ZeroBot-Plugin/order"
+)
+
+func init() {
+	engine := control.Register("cpstory", order.PrioCPStory, &control.Options{
+		DisableOnDefault: false,
+		Help:             "cp短打\n- 组cp[@xxx][@xxx]\n- 组cp大老师 雪乃",
+	})
+	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]))
+		text := strings.ReplaceAll(cs.Story, "<攻>", gong)
+		text = strings.ReplaceAll(text, "<受>", shou)
+		text = strings.ReplaceAll(text, cs.Gong, gong)
+		text = strings.ReplaceAll(text, cs.Shou, gong)
+		ctx.SendChain(message.Text(text))
+	})
+	engine.OnPrefix("组cp").SetBlock(true).Handle(func(ctx *zero.Ctx) {
+		cs := getRandomCpStory()
+		params := strings.Split(ctx.State["args"].(string), " ")
+		if len(params) < 2 {
+			ctx.SendChain(message.Text(ctx.Event.MessageID), message.Text("请用空格分开两个人名"))
+		} else {
+			gong := params[0]
+			shou := params[1]
+			text := strings.ReplaceAll(cs.Story, "<攻>", gong)
+			text = strings.ReplaceAll(text, "<受>", shou)
+			text = strings.ReplaceAll(text, cs.Gong, gong)
+			text = strings.ReplaceAll(text, cs.Shou, gong)
+			ctx.SendChain(message.Text(text))
+		}
+	})
+}

plugin_cpstory/data.go

@@ -0,0 +1,37 @@
+package cpstory
+
+import (
+	"os"
+
+	log "github.com/sirupsen/logrus"
+
+	"github.com/FloatTech/zbputils/file"
+	"github.com/FloatTech/zbputils/process"
+	"github.com/FloatTech/zbputils/sql"
+)
+
+const (
+	dbpath = "data/CpStory/"
+	dbfile = dbpath + "cp.db"
+)
+
+var db = &sql.Sqlite{DBPath: dbfile}
+
+// 加载数据库
+func init() {
+	go func() {
+		process.SleepAbout1sTo2s()
+		// os.RemoveAll(dbpath)
+		_ = os.MkdirAll(dbpath, 0755)
+		_, _ = file.GetLazyData(dbfile, false, true)
+		err := db.Create("cp_story", &cpstory{})
+		if err != nil {
+			panic(err)
+		}
+		n, err := db.Count("cp_story")
+		if err != nil {
+			panic(err)
+		}
+		log.Printf("[cpstory]读取%d条故事", n)
+	}()
+}

plugin_cpstory/model.go

@@ -0,0 +1,13 @@
+package cpstory
+
+type cpstory struct {
+	ID    int64  `db:"id"`
+	Gong  string `db:"gong"`
+	Shou  string `db:"shou"`
+	Story string `db:"story"`
+}
+
+func getRandomCpStory() (cs cpstory) {
+	_ = db.Pick("cp_story", &cs)
+	return
+}

plugin_curse/curse.go

@@ -0,0 +1,52 @@
+// Package curse 骂人插件(求骂,自卫)
+package curse
+
+import (
+	"time"
+
+	zero "github.com/wdvxdr1123/ZeroBot"
+	"github.com/wdvxdr1123/ZeroBot/extension/rate"
+	"github.com/wdvxdr1123/ZeroBot/message"
+
+	control "github.com/FloatTech/zbputils/control"
+	"github.com/FloatTech/zbputils/process"
+
+	"github.com/FloatTech/ZeroBot-Plugin/order"
+)
+
+const (
+	minLevel = "min"
+	maxLevel = "max"
+)
+
+func init() {
+	limit := rate.NewManager(time.Minute, 30)
+	engine := control.Register("curse", order.PrioCurse, &control.Options{
+		DisableOnDefault: true,
+		Help:             "骂人(求骂,自卫)\n- 骂我\n- 大力骂我",
+	})
+
+	engine.OnFullMatch("骂我").SetBlock(true).Handle(func(ctx *zero.Ctx) {
+		if !limit.Load(ctx.Event.GroupID).Acquire() {
+			return
+		}
+		process.SleepAbout1sTo2s()
+		text := getRandomCurseByLevel(minLevel).Text
+		ctx.SendChain(message.Reply(ctx.Event.MessageID), message.Text(text))
+	})
+
+	engine.OnFullMatch("大力骂我").SetBlock(true).Handle(func(ctx *zero.Ctx) {
+		if !limit.Load(ctx.Event.GroupID).Acquire() {
+			return
+		}
+		process.SleepAbout1sTo2s()
+		text := getRandomCurseByLevel(maxLevel).Text
+		ctx.SendChain(message.Reply(ctx.Event.MessageID), message.Text(text))
+	})
+
+	engine.OnKeywordGroup([]string{"他妈", "公交车", "你妈", "操", "屎", "去死", "快死", "我日", "逼", "尼玛", "艾滋", "癌症", "有病", "烦你", "你爹", "屮", "cnm"}, zero.OnlyToMe).SetBlock(true).
+		Handle(func(ctx *zero.Ctx) {
+			text := getRandomCurseByLevel(maxLevel).Text
+			ctx.SendChain(message.Reply(ctx.Event.MessageID), message.Text(text))
+		})
+}

plugin_curse/data.go

@@ -0,0 +1,38 @@
+package curse
+
+import (
+	"os"
+
+	"github.com/sirupsen/logrus"
+
+	"github.com/FloatTech/zbputils/file"
+	"github.com/FloatTech/zbputils/process"
+	"github.com/FloatTech/zbputils/sql"
+)
+
+const (
+	dbpath = "data/Curse/"
+	dbfile = dbpath + "curse.db"
+)
+
+var (
+	db = &sql.Sqlite{DBPath: dbfile}
+)
+
+// 加载数据库
+func init() {
+	go func() {
+		process.SleepAbout1sTo2s()
+		_ = os.MkdirAll(dbpath, 0755)
+		_, err := file.GetLazyData(dbfile, 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, "条骂人语录")
+	}()
+}

plugin_curse/model.go

@@ -0,0 +1,12 @@
+package curse
+
+type curse struct {
+	ID    uint32 `db:"id"`
+	Text  string `db:"text"`
+	Level string `db:"level"`
+}
+
+func getRandomCurseByLevel(level string) (c curse) {
+	_ = db.Find("curse", &c, "where level = '"+level+"' ORDER BY RANDOM() limit 1")
+	return
+}

plugin_danbooru/main.go

@@ -0,0 +1,59 @@
+// Package deepdanbooru 二次元图片标签识别
+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"
+	zero "github.com/wdvxdr1123/ZeroBot"
+	"github.com/wdvxdr1123/ZeroBot/message"
+	"github.com/wdvxdr1123/ZeroBot/utils/helper"
+
+	"github.com/FloatTech/ZeroBot-Plugin/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.PrioDanbooru, &control.Options{
+		DisableOnDefault: false,
+		Help: "二次元图片标签识别\n" +
+			"- 鉴赏图片[图片]",
+	})
+	// 上传一张图进行评价
+	engine.OnKeywordGroup([]string{"鉴赏图片"}, zero.OnlyPublic, ctxext.CmdMatch, ctxext.MustGiven).SetBlock(true).
+		Handle(func(ctx *zero.Ctx) {
+			ctx.SendChain(message.Text("少女祈祷中..."))
+			for _, url := range ctx.State["image_url"].([]string) {
+				name := ""
+				r, err := saucenao.SauceNAO(url)
+				if err != nil {
+					name = "未知图片"
+				} else {
+					name = r.Title
+				}
+				t, err := danbooru.TagURL(name, url)
+				if err != nil {
+					ctx.SendChain(message.Text("ERROR:", err))
+					return
+				}
+				digest := md5.Sum(helper.StringToBytes(url))
+				f := cachefile + hex.EncodeToString(digest[:])
+				if file.IsNotExist(f) {
+					_ = t.Canvas.SavePNG(f)
+				}
+				ctx.SendChain(message.Image("file:///" + file.BOTPATH + "/" + f))
+			}
+		})
+}

plugin_diana/bing.go

@@ -8,21 +8,22 @@ import (
 	zero "github.com/wdvxdr1123/ZeroBot"
 	"github.com/wdvxdr1123/ZeroBot/message"
 
-	"github.com/FloatTech/ZeroBot-Plugin/control"
+	control "github.com/FloatTech/zbputils/control"
+
+	"github.com/FloatTech/ZeroBot-Plugin/order"
 	"github.com/FloatTech/ZeroBot-Plugin/plugin_diana/data"
 )
 
-var engine *zero.Engine
+var engine = control.Register("diana", order.PrioDiana, &control.Options{
+	DisableOnDefault: false,
+	Help: "嘉然\n" +
+		"- 小作文\n" +
+		"- 发大病\n" +
+		"- 教你一篇小作文[作文]\n" +
+		"- [回复]查重",
+})
 
 func init() {
-	engine = control.Register("diana", &control.Options{
-		DisableOnDefault: false,
-		Help: "嘉然\n" +
-			"- 小作文\n" +
-			"- 发大病\n" +
-			"- 教你一篇小作文[作文]\n" +
-			"- [回复]查重",
-	})
 	// 随机发送一篇上面的小作文
 	engine.OnFullMatch("小作文").SetBlock(true).
 		Handle(func(ctx *zero.Ctx) {

plugin_diana/data/text.go

@@ -9,9 +9,9 @@ import (
 	log "github.com/sirupsen/logrus"
 	"github.com/wdvxdr1123/ZeroBot/utils/helper"
 
-	"github.com/FloatTech/ZeroBot-Plugin/utils/file"
-	"github.com/FloatTech/ZeroBot-Plugin/utils/process"
-	"github.com/FloatTech/ZeroBot-Plugin/utils/sql"
+	"github.com/FloatTech/zbputils/file"
+	"github.com/FloatTech/zbputils/process"
+	"github.com/FloatTech/zbputils/sql"
 )
 
 const (
@@ -21,8 +21,8 @@ const (
 
 var db = sql.Sqlite{DBPath: dbfile}
 
-type Text struct {
-	Id   int64  `db:"id"`
+type text struct {
+	ID   int64  `db:"id"`
 	Data string `db:"data"`
 }
 
@@ -35,7 +35,7 @@ func init() {
 		}
 		err = LoadText()
 		if err == nil {
-			err = db.Create("text", &Text{})
+			err = db.Create("text", &text{})
 			if err != nil {
 				panic(err)
 			}
@@ -57,12 +57,12 @@ func LoadText() error {
 func AddText(txt string) error {
 	s := md5.Sum(helper.StringToBytes(txt))
 	i := binary.LittleEndian.Uint64(s[:8])
-	return db.Insert("text", &Text{Id: int64(i), Data: txt})
+	return db.Insert("text", &text{ID: int64(i), Data: txt})
 }
 
 // RandText 随机小作文
 func RandText() string {
-	var t Text
+	var t text
 	err := db.Pick("text", &t)
 	if err != nil {
 		return err.Error()
@@ -72,7 +72,7 @@ func RandText() string {
 
 // HentaiText 发大病
 func HentaiText() string {
-	var t Text
+	var t text
 	err := db.Find("text", &t, "where id = -3802576048116006195")
 	if err != nil {
 		return err.Error()

plugin_diana/zhiwang.go

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

plugin_fortune/fortune.go

@@ -3,59 +3,86 @@ package fortune
 
 import (
 	"archive/zip"
-	"bytes"
-	"encoding/base64"
+	"crypto/md5"
+	"encoding/hex"
 	"encoding/json"
-	"image/jpeg"
+	"image"
 	"io"
-	"io/ioutil"
 	"math/rand"
 	"os"
 	"strconv"
-	"sync"
 	"time"
 
-	"github.com/fogleman/gg"
+	"github.com/fogleman/gg" // 注册了 jpg png gif
 	"github.com/sirupsen/logrus"
 	zero "github.com/wdvxdr1123/ZeroBot"
 	"github.com/wdvxdr1123/ZeroBot/message"
 	"github.com/wdvxdr1123/ZeroBot/utils/helper"
 
-	"github.com/FloatTech/ZeroBot-Plugin/control"
-	"github.com/FloatTech/ZeroBot-Plugin/utils/file"
-	"github.com/FloatTech/ZeroBot-Plugin/utils/math"
+	"github.com/FloatTech/AnimeAPI/imgpool"
+	control "github.com/FloatTech/zbputils/control"
+	"github.com/FloatTech/zbputils/ctxext"
+	"github.com/FloatTech/zbputils/file"
+	"github.com/FloatTech/zbputils/math"
+	"github.com/FloatTech/zbputils/txt2img"
+
+	"github.com/FloatTech/ZeroBot-Plugin/order"
+)
+
+const (
+	// 底图缓存位置
+	images = "data/Fortune/"
+	// 基础文件位置
+	omikujson = "data/Fortune/text.json"
+	// 字体文件位置
+	font = "data/Font/sakura.ttf"
+	// 生成图缓存位置
+	cache = images + "cache/"
 )
 
 var (
-	// 底图缓存位置
-	base = "data/fortune/"
-	// 素材下载网站
-	site = "https://pan.dihe.moe/fortune/"
 	// 底图类型列表：车万 DC4 爱因斯坦 星空列车 樱云之恋 富婆妹 李清歌
 	// 				公主连结 原神 明日方舟 碧蓝航线 碧蓝幻想 战双 阴阳师
-	table = [...]string{"车万", "DC4", "爱因斯坦", "星空列车", "樱云之恋", "富婆妹", "李清歌", "公主连结", "原神", "明日方舟", "碧蓝航线", "碧蓝幻想", "战双", "阴阳师"}
+	table = [...]string{"车万", "DC4", "爱因斯坦", "星空列车", "樱云之恋", "富婆妹", "李清歌", "公主连结", "原神", "明日方舟", "碧蓝航线", "碧蓝幻想", "战双", "阴阳师", "赛马娘"}
 	// 映射底图与 index
 	index = make(map[string]uint8)
-	// 下载锁
-	dlmu sync.Mutex
+	// 签文
+	omikujis []map[string]string
 )
 
 func init() {
 	for i, s := range table {
 		index[s] = uint8(i)
 	}
-	err := os.MkdirAll(base, 0755)
+	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", &control.Options{
+	en := control.Register("fortune", order.PrioFortune, &control.Options{
 		DisableOnDefault: false,
 		Help: "每日运势: \n" +
-			"- 运势|抽签\n" +
-			"- 设置底图[车万 DC4 爱因斯坦 星空列车 樱云之恋 富婆妹 李清歌 公主连结 原神 明日方舟 碧蓝航线 碧蓝幻想 战双 阴阳师]",
+			"- 运势 | 抽签\n" +
+			"- 设置底图[车万 | DC4 | 爱因斯坦 | 星空列车 | 樱云之恋 | 富婆妹 | 李清歌 | 公主连结 | 原神 | 明日方舟 | 碧蓝航线 | 碧蓝幻想 | 战双 | 阴阳师 | 赛马娘]",
 	})
-	en.OnRegex(`^设置底图(.*)`).SetBlock(true).SecondPriority().
+	en.OnRegex(`^设置底图(.*)`).SetBlock(true).
 		Handle(func(ctx *zero.Ctx) {
 			gid := ctx.Event.GroupID
 			if gid <= 0 {
@@ -66,47 +93,21 @@ func init() {
 			if ok {
 				c, ok := control.Lookup("fortune")
 				if ok {
-					c.SetData(gid, int64(i)&0xff)
+					err = c.SetData(gid, int64(i)&0xff)
+					if err != nil {
+						ctx.SendChain(message.Text("设置失败:", err))
+						return
+					}
 					ctx.SendChain(message.Text("设置成功~"))
 					return
 				}
-				ctx.SendChain(message.Text("设置失败!"))
+				ctx.SendChain(message.Text("设置失败: 找不到插件"))
 				return
 			}
 			ctx.SendChain(message.Text("没有这个底图哦～"))
 		})
-	en.OnFullMatchGroup([]string{"运势", "抽签"}).SetBlock(true).SecondPriority().
+	en.OnFullMatchGroup([]string{"运势", "抽签"}).SetBlock(true).
 		Handle(func(ctx *zero.Ctx) {
-			// 检查签文文件是否存在
-			mikuji := base + "运势签文.json"
-			if file.IsNotExist(mikuji) {
-				dlmu.Lock()
-				if file.IsNotExist(mikuji) {
-					ctx.SendChain(message.Text("正在下载签文文件，请稍后..."))
-					err := file.DownloadTo(site+"运势签文.json", mikuji, false)
-					if err != nil {
-						ctx.SendChain(message.Text("ERROR: ", err))
-						return
-					}
-					ctx.SendChain(message.Text("下载签文文件完毕"))
-				}
-				dlmu.Unlock()
-			}
-			// 检查字体文件是否存在
-			ttf := base + "sakura.ttf"
-			if file.IsNotExist(ttf) {
-				dlmu.Lock()
-				if file.IsNotExist(ttf) {
-					ctx.SendChain(message.Text("正在下载字体文件，请稍后..."))
-					err := file.DownloadTo(site+"sakura.ttf", ttf, false)
-					if err != nil {
-						ctx.SendChain(message.Text("ERROR: ", err))
-						return
-					}
-					ctx.SendChain(message.Text("下载字体文件完毕"))
-				}
-				dlmu.Unlock()
-			}
 			// 获取该群背景类型，默认车万
 			kind := "车万"
 			gid := ctx.Event.GroupID
@@ -123,125 +124,92 @@ func init() {
 				}
 			}
 			// 检查背景图片是否存在
-			folder := base + kind
-			if file.IsNotExist(folder) {
-				dlmu.Lock()
-				if file.IsNotExist(folder) {
-					ctx.SendChain(message.Text("正在下载背景图片，请稍后..."))
-					zipfile := kind + ".zip"
-					zipcache := base + zipfile
-					err := file.DownloadTo(site+zipfile, zipcache, false)
-					if err != nil {
-						ctx.SendChain(message.Text("ERROR: ", err))
-						return
-					}
-					ctx.SendChain(message.Text("下载背景图片完毕"))
-					err = unpack(zipcache, folder+"/")
-					if err != nil {
-						ctx.SendChain(message.Text("ERROR: ", err))
-						return
-					}
-					ctx.SendChain(message.Text("解压背景图片完毕"))
-					// 释放空间
-					os.Remove(zipcache)
-				}
-				dlmu.Unlock()
+			zipfile := images + kind + ".zip"
+			_, err = file.GetLazyData(zipfile, false, false)
+			if err != nil {
+				ctx.SendChain(message.Text("ERROR: ", err))
+				return
 			}
+
 			// 生成种子
 			t, _ := strconv.ParseInt(time.Now().Format("20060102"), 10, 64)
 			seed := ctx.Event.UserID + t
+
 			// 随机获取背景
-			background, err := randimage(folder+"/", seed)
+			background, index, err := randimage(zipfile, seed)
 			if err != nil {
 				ctx.SendChain(message.Text("ERROR: ", err))
 				return
 			}
+
 			// 随机获取签文
-			title, text, err := randtext(mikuji, seed)
+			title, text := randtext(seed)
+			digest := md5.Sum(helper.StringToBytes(zipfile + strconv.Itoa(index) + title + text))
+			cachefile := cache + hex.EncodeToString(digest[:])
+
+			m, err := imgpool.GetImage(cachefile)
 			if err != nil {
-				ctx.SendChain(message.Text("ERROR: ", err))
-				return
-			}
-			// 绘制背景
-			d, err := draw(background, title, text)
-			if err != nil {
-				ctx.SendChain(message.Text("ERROR: ", err))
-				return
+				logrus.Debugln("[fortune]", err)
+				if file.IsNotExist(cachefile) {
+					f, err := os.Create(cachefile)
+					if err != nil {
+						ctx.SendChain(message.Text("ERROR: ", err))
+						return
+					}
+					_, err = draw(background, title, text, f)
+					_ = f.Close()
+					if err != nil {
+						ctx.SendChain(message.Text("ERROR: ", err))
+						return
+					}
+				}
+				m.SetFile(file.BOTPATH + "/" + cachefile)
+				hassent, err := m.Push(ctxext.Send(ctx), ctxext.GetMessage(ctx))
+				if err != nil {
+					ctx.SendChain(message.Text("ERROR: ", err))
+					return
+				}
+				if hassent {
+					return
+				}
 			}
 			// 发送图片
-			ctx.SendChain(message.Image("base64://" + helper.BytesToString(d)))
+			ctx.SendChain(message.Image(m.String()))
 		})
 }
 
-// @function unpack 解压资源包
-// @param tgt 压缩文件位置
-// @param dest 解压位置
-// @return 错误信息
-func unpack(tgt, dest string) error {
-	// 路径目录不存在则创建目录
-	if file.IsNotExist(dest) {
-		if err := os.MkdirAll(dest, 0755); err != nil {
-			panic(err)
-		}
-	}
-	reader, err := zip.OpenReader(tgt)
-	if err != nil {
-		return err
-	}
-	defer reader.Close()
-	// 遍历解压到文件
-	for _, file := range reader.File {
-		// 打开解压文件
-		rc, err := file.Open()
-		if err != nil {
-			return err
-		}
-		// 打开目标文件
-		w, err := os.OpenFile(dest+file.Name, os.O_WRONLY|os.O_TRUNC|os.O_CREATE, 0644)
-		if err != nil {
-			rc.Close()
-			return err
-		}
-		// 复制到文件
-		_, err = io.Copy(w, rc)
-		rc.Close()
-		w.Close()
-		if err != nil {
-			return err
-		}
-	}
-	return nil
-}
-
-// @function randimage 随机选取文件夹下的文件
-// @param path 文件夹路径
+// @function randimage 随机选取zip内的文件
+// @param path zip路径
 // @param seed 随机数种子
 // @return 文件路径 & 错误信息
-func randimage(path string, seed int64) (string, error) {
-	rd, err := ioutil.ReadDir(path)
+func randimage(path string, seed int64) (im image.Image, index int, err error) {
+	reader, err := zip.OpenReader(path)
 	if err != nil {
-		return "", err
+		return
 	}
+	defer reader.Close()
+
 	rand.Seed(seed)
-	return path + rd[rand.Intn(len(rd))].Name(), nil
+	index = rand.Intn(len(reader.File))
+	file := reader.File[index]
+	f, err := file.Open()
+	if err != nil {
+		return
+	}
+	defer f.Close()
+
+	im, _, err = image.Decode(f)
+	return
 }
 
 // @function randtext 随机选取签文
 // @param file 文件路径
 // @param seed 随机数种子
 // @return 签名 & 签文 & 错误信息
-func randtext(file string, seed int64) (string, string, error) {
-	data, err := ioutil.ReadFile(file)
-	if err != nil {
-		return "", "", err
-	}
-	temp := []map[string]string{}
-	if err := json.Unmarshal(data, &temp); err != nil {
-		return "", "", err
-	}
+func randtext(seed int64) (string, string) {
 	rand.Seed(seed)
-	r := rand.Intn(len(temp))
-	return temp[r]["title"], temp[r]["content"], nil
+	r := rand.Intn(len(omikujis))
+	return omikujis[r]["title"], omikujis[r]["content"]
 }
 
 // @function draw 绘制运势图
@@ -250,25 +218,20 @@ func randtext(file string, seed int64) (string, string, error) {
 // @param title 签名
 // @param text 签文
 // @return 错误信息
-func draw(background, title, text string) ([]byte, error) {
-	// 加载背景
-	back, err := gg.LoadImage(background)
-	if err != nil {
-		return nil, err
-	}
+func draw(back image.Image, title, text string, f io.Writer) (int64, error) {
 	canvas := gg.NewContext(back.Bounds().Size().Y, back.Bounds().Size().X)
 	canvas.DrawImage(back, 0, 0)
 	// 写标题
 	canvas.SetRGB(1, 1, 1)
-	if err := canvas.LoadFontFace(base+"sakura.ttf", 45); err != nil {
-		return nil, err
+	if err := canvas.LoadFontFace(font, 45); err != nil {
+		return -1, err
 	}
 	sw, _ := canvas.MeasureString(title)
 	canvas.DrawString(title, 140-sw/2, 112)
 	// 写正文
 	canvas.SetRGB(0, 0, 0)
-	if err := canvas.LoadFontFace(base+"sakura.ttf", 23); err != nil {
-		return nil, err
+	if err := canvas.LoadFontFace(font, 23); err != nil {
+		return -1, err
 	}
 	tw, th := canvas.MeasureString("测")
 	tw, th = tw+10, th+10
@@ -296,17 +259,7 @@ func draw(background, title, text string) ([]byte, error) {
 			}
 		}
 	}
-	// 转成 base64
-	buffer := new(bytes.Buffer)
-	encoder := base64.NewEncoder(base64.StdEncoding, buffer)
-	var opt jpeg.Options
-	opt.Quality = 70
-	err = jpeg.Encode(encoder, canvas.Image(), &opt)
-	if err != nil {
-		return nil, err
-	}
-	encoder.Close()
-	return buffer.Bytes(), nil
+	return txt2img.TxtCanvas{Canvas: canvas}.WriteTo(f)
 }
 
 func offest(total, now int, distance float64) float64 {

plugin_funny/data.go

@@ -5,8 +5,8 @@ import (
 
 	"github.com/sirupsen/logrus"
 
-	"github.com/FloatTech/ZeroBot-Plugin/utils/file"
-	"github.com/FloatTech/ZeroBot-Plugin/utils/process"
+	"github.com/FloatTech/zbputils/file"
+	"github.com/FloatTech/zbputils/process"
 )
 
 type joke struct {

plugin_funny/data_test.go

@@ -7,7 +7,7 @@ import (
 	"strings"
 	"testing"
 
-	"github.com/FloatTech/ZeroBot-Plugin/utils/sql"
+	"github.com/FloatTech/zbputils/sql"
 	"github.com/wdvxdr1123/ZeroBot/utils/helper"
 )
 

plugin_funny/laugh.go

@@ -1,7 +1,7 @@
+// Package funny 冷笑话
 package funny
 
 import (
-	"strconv"
 	"strings"
 	"time"
 
@@ -9,33 +9,30 @@ import (
 	"github.com/wdvxdr1123/ZeroBot/extension/rate"
 	"github.com/wdvxdr1123/ZeroBot/message"
 
-	"github.com/FloatTech/ZeroBot-Plugin/control"
-	"github.com/FloatTech/ZeroBot-Plugin/utils/sql"
+	control "github.com/FloatTech/zbputils/control"
+	"github.com/FloatTech/zbputils/ctxext"
+	"github.com/FloatTech/zbputils/sql"
+
+	"github.com/FloatTech/ZeroBot-Plugin/order"
 )
 
 var (
-	engine = control.Register("curse", &control.Options{
+	engine = control.Register("funny", order.PrioFunny, &control.Options{
 		DisableOnDefault: false,
 		Help: "讲个笑话\n" +
-			"- 讲个笑话[@xxx]|讲个笑话[qq号]\n",
+			"- 讲个笑话[@xxx] | 讲个笑话[qq号]",
 	})
 	limit = rate.NewManager(time.Minute, 20)
 	db    = &sql.Sqlite{DBPath: dbfile}
 )
 
 func init() {
-	engine.OnPrefix("讲个笑话").SetBlock(true).FirstPriority().Handle(func(ctx *zero.Ctx) {
+	engine.OnPrefix("讲个笑话").SetBlock(true).Handle(func(ctx *zero.Ctx) {
 		if !limit.Load(ctx.Event.GroupID).Acquire() {
 			return
 		}
 		// 获取名字
-		name := ctx.State["args"].(string)
-		if len(ctx.Event.Message) > 1 && ctx.Event.Message[1].Type == "at" {
-			qq, _ := strconv.ParseInt(ctx.Event.Message[1].Data["qq"], 10, 64)
-			name = ctx.GetGroupMemberInfo(ctx.Event.GroupID, qq, false).Get("nickname").Str
-		} else if name == "" {
-			name = ctx.Event.Sender.NickName
-		}
+		name := ctxext.NickName(ctx)
 		var j joke
 		err := db.Pick("jokes", &j)
 		if err != nil {

plugin_gif/README.md

@@ -0,0 +1,31 @@
+# ZeroBot-Plugin-Gif
+[ZeroBot QQ机器人](https://github.com/wdvxdr1123/ZeroBot)插件，可以制作各种沙雕gif图
+> 素材包地址: https://codechina.csdn.net/u011570312/imagematerials
+
+## 触发方式
+1. [指令词]+[qq号] 如：爬123456
+2. [指令词]+[图片] 如：爬[图片]
+3. [指令词]+[艾特] 如：爬@小H
+
+## 指令列表
+- [x] 爬
+- [x] 冲
+- [x] 摸
+- [x] 搓
+- [x] 拍
+- [x] 丢
+- [x] 敲
+- [x] 吃
+- [x] 啃
+- [x] 撕
+- [x] 蹭
+- [x] 灰度
+- [x] 上翻
+- [x] 下翻
+- [x] 左翻
+- [x] 右翻
+- [x] 反色
+- [x] 倒放
+- [x] 浮雕
+- [x] 打码
+- [x] 负片

plugin_gif/context.go

@@ -0,0 +1,57 @@
+package gif
+
+import (
+	"os"
+	"strconv"
+
+	"github.com/FloatTech/zbputils/file"
+	"github.com/sirupsen/logrus"
+)
+
+type context struct {
+	usrdir      string
+	headimgsdir []string
+}
+
+func dlchan(name string, c *chan *string) {
+	target := datapath + `materials/` + name
+	if file.IsNotExist(target) {
+		_ = file.DownloadTo(`https://codechina.csdn.net/u011570312/imagematerials/-/raw/main/`+name, target, true)
+	} else {
+		logrus.Debugln("[gif] dl", name, "exists")
+	}
+	*c <- &target
+}
+
+func dlblock(name string) string {
+	target := datapath + `materials/` + name
+	if file.IsNotExist(target) {
+		_ = file.DownloadTo(`https://codechina.csdn.net/u011570312/imagematerials/-/raw/main/`+name, target, true)
+	} else {
+		logrus.Debugln("[gif] dl", name, "exists")
+	}
+	return target
+}
+
+func dlrange(prefix string, end int) *[]chan *string {
+	if file.IsNotExist(datapath + `materials/` + prefix) {
+		_ = os.MkdirAll(datapath+`materials/`+prefix, 0755)
+	}
+	c := make([]chan *string, end)
+	for i := range c {
+		c[i] = make(chan *string)
+		go dlchan(prefix+"/"+strconv.Itoa(i)+".png", &c[i])
+	}
+	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
+}

plugin_gif/gif.go

@@ -0,0 +1,160 @@
+package gif
+
+import (
+	"image"
+
+	"github.com/FloatTech/zbputils/img"
+)
+
+// 摸
+func (cc *context) mo() string {
+	name := cc.usrdir + "摸.gif"
+	c := dlrange("mo", 5)
+	tou := img.LoadFirstFrame(cc.headimgsdir[0], 0, 0).Circle(0).Im
+	mo := []*image.NRGBA{
+		img.LoadFirstFrame(*<-(*c)[0], 0, 0).InsertBottom(tou, 80, 80, 32, 32).Im,
+		img.LoadFirstFrame(*<-(*c)[1], 0, 0).InsertBottom(tou, 70, 90, 42, 22).Im,
+		img.LoadFirstFrame(*<-(*c)[2], 0, 0).InsertBottom(tou, 75, 85, 37, 27).Im,
+		img.LoadFirstFrame(*<-(*c)[3], 0, 0).InsertBottom(tou, 85, 75, 27, 37).Im,
+		img.LoadFirstFrame(*<-(*c)[4], 0, 0).InsertBottom(tou, 90, 70, 22, 42).Im,
+	}
+	_ = img.SaveGif(img.MergeGif(1, mo), name)
+	return "file:///" + name
+}
+
+// 搓
+func (cc *context) cuo() string {
+	name := cc.usrdir + "搓.gif"
+	c := dlrange("cuo", 5)
+	tou := img.LoadFirstFrame(cc.headimgsdir[0], 110, 110).Circle(0).Im
+	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)
+	cuo := []*image.NRGBA{
+		img.LoadFirstFrame(*<-(*c)[0], 0, 0).InsertBottomC(tou, 0, 0, 75, 130).Im,
+		img.LoadFirstFrame(*<-(*c)[1], 0, 0).InsertBottomC(m1.Im, 0, 0, 75, 130).Im,
+		img.LoadFirstFrame(*<-(*c)[2], 0, 0).InsertBottomC(m2.Im, 0, 0, 75, 130).Im,
+		img.LoadFirstFrame(*<-(*c)[3], 0, 0).InsertBottomC(m3.Im, 0, 0, 75, 130).Im,
+		img.LoadFirstFrame(*<-(*c)[4], 0, 0).InsertBottomC(m4.Im, 0, 0, 75, 130).Im,
+	}
+	_ = img.SaveGif(img.MergeGif(5, cuo), name)
+	return "file:///" + name
+}
+
+// 敲
+func (cc *context) qiao() string {
+	name := cc.usrdir + "敲.gif"
+	c := dlrange("qiao", 2)
+	tou := img.LoadFirstFrame(cc.headimgsdir[0], 40, 40).Circle(0).Im
+	qiao := []*image.NRGBA{
+		img.LoadFirstFrame(*<-(*c)[0], 0, 0).InsertUp(tou, 40, 33, 57, 52).Im,
+		img.LoadFirstFrame(*<-(*c)[1], 0, 0).InsertUp(tou, 38, 36, 58, 50).Im,
+	}
+	_ = img.SaveGif(img.MergeGif(1, qiao), name)
+	return "file:///" + name
+}
+
+// 吃
+func (cc *context) chi() string {
+	name := cc.usrdir + "吃.gif"
+	c := dlrange("chi", 3)
+	tou := img.LoadFirstFrame(cc.headimgsdir[0], 32, 32).Im
+	chi := []*image.NRGBA{
+		img.LoadFirstFrame(*<-(*c)[0], 0, 0).InsertBottom(tou, 0, 0, 1, 38).Im,
+		img.LoadFirstFrame(*<-(*c)[1], 0, 0).InsertBottom(tou, 0, 0, 1, 38).Im,
+		img.LoadFirstFrame(*<-(*c)[2], 0, 0).InsertBottom(tou, 0, 0, 1, 38).Im,
+	}
+	_ = img.SaveGif(img.MergeGif(1, chi), name)
+	return "file:///" + name
+}
+
+// 蹭
+func (cc *context) ceng() string {
+	name := cc.usrdir + "蹭.gif"
+	c := dlrange("ceng", 6)
+	tou := img.LoadFirstFrame(cc.headimgsdir[0], 100, 100).Circle(0).Im
+	tou2 := img.LoadFirstFrame(cc.headimgsdir[1], 100, 100).Circle(0).Im
+	ceng := []*image.NRGBA{
+		img.LoadFirstFrame(*<-(*c)[0], 0, 0).InsertUp(tou, 75, 77, 40, 88).InsertUp(tou2, 77, 103, 102, 81).Im,
+		img.LoadFirstFrame(*<-(*c)[1], 0, 0).InsertUp(tou, 75, 77, 46, 100).InsertUp(img.Rotate(tou2, 10, 62, 127).Im, 0, 0, 92, 40).Im,
+		img.LoadFirstFrame(*<-(*c)[2], 0, 0).InsertUp(tou, 75, 77, 67, 99).InsertUp(tou2, 76, 117, 90, 8).Im,
+		img.LoadFirstFrame(*<-(*c)[3], 0, 0).InsertUp(tou, 75, 77, 52, 83).InsertUp(img.Rotate(tou2, -40, 94, 94).Im, 0, 0, 53, -20).Im,
+		img.LoadFirstFrame(*<-(*c)[4], 0, 0).InsertUp(tou, 75, 77, 56, 110).InsertUp(img.Rotate(tou2, -66, 132, 80).Im, 0, 0, 78, 40).Im,
+		img.LoadFirstFrame(*<-(*c)[5], 0, 0).InsertUp(tou, 75, 77, 62, 102).InsertUp(tou2, 71, 100, 110, 94).Im,
+	}
+	_ = img.SaveGif(img.MergeGif(8, ceng), name)
+	return "file:///" + name
+}
+
+// 啃
+func (cc *context) ken() string {
+	name := cc.usrdir + "啃.gif"
+	c := dlrange("ken", 16)
+	tou := img.LoadFirstFrame(cc.headimgsdir[0], 100, 100).Im
+	ken := []*image.NRGBA{
+		img.LoadFirstFrame(*<-(*c)[0], 0, 0).InsertBottom(tou, 90, 90, 105, 150).Im,
+		img.LoadFirstFrame(*<-(*c)[1], 0, 0).InsertBottom(tou, 90, 83, 96, 172).Im,
+		img.LoadFirstFrame(*<-(*c)[2], 0, 0).InsertBottom(tou, 90, 90, 106, 148).Im,
+		img.LoadFirstFrame(*<-(*c)[3], 0, 0).InsertBottom(tou, 88, 88, 97, 167).Im,
+		img.LoadFirstFrame(*<-(*c)[4], 0, 0).InsertBottom(tou, 90, 85, 89, 179).Im,
+		img.LoadFirstFrame(*<-(*c)[5], 0, 0).InsertBottom(tou, 90, 90, 106, 151).Im,
+		img.LoadFirstFrame(*<-(*c)[6], 0, 0).Im,
+		img.LoadFirstFrame(*<-(*c)[7], 0, 0).Im,
+		img.LoadFirstFrame(*<-(*c)[8], 0, 0).Im,
+		img.LoadFirstFrame(*<-(*c)[9], 0, 0).Im,
+		img.LoadFirstFrame(*<-(*c)[10], 0, 0).Im,
+		img.LoadFirstFrame(*<-(*c)[11], 0, 0).Im,
+		img.LoadFirstFrame(*<-(*c)[12], 0, 0).Im,
+		img.LoadFirstFrame(*<-(*c)[13], 0, 0).Im,
+		img.LoadFirstFrame(*<-(*c)[14], 0, 0).Im,
+		img.LoadFirstFrame(*<-(*c)[15], 0, 0).Im,
+	}
+	_ = img.SaveGif(img.MergeGif(7, ken), name)
+	return "file:///" + name
+}
+
+// 拍
+func (cc *context) pai() string {
+	name := cc.usrdir + "拍.gif"
+	c := dlrange("pai", 2)
+	tou := img.LoadFirstFrame(cc.headimgsdir[0], 30, 30).Circle(0).Im
+	pai := []*image.NRGBA{
+		img.LoadFirstFrame(*<-(*c)[0], 0, 0).InsertUp(tou, 0, 0, 1, 47).Im,
+		img.LoadFirstFrame(*<-(*c)[1], 0, 0).InsertUp(tou, 0, 0, 1, 67).Im,
+	}
+	_ = img.SaveGif(img.MergeGif(1, pai), name)
+	return "file:///" + name
+}
+
+// 冲
+func (cc *context) chong() string {
+	name := cc.usrdir + "冲.gif"
+	c := dlrange("xqe", 2)
+	tou := img.LoadFirstFrame(cc.headimgsdir[0], 0, 0).Circle(0).Im
+	chong := []*image.NRGBA{
+		img.LoadFirstFrame(*<-(*c)[0], 0, 0).InsertUp(tou, 30, 30, 15, 53).Im,
+		img.LoadFirstFrame(*<-(*c)[1], 0, 0).InsertUp(tou, 30, 30, 40, 53).Im,
+	}
+	_ = img.SaveGif(img.MergeGif(1, chong), name)
+	return "file:///" + name
+}
+
+// 丢
+func (cc *context) diu() string {
+	name := cc.usrdir + "丢.gif"
+	c := dlrange("diu", 8)
+	tou := img.LoadFirstFrame(cc.headimgsdir[0], 0, 0).Circle(0).Im
+	diu := []*image.NRGBA{
+		img.LoadFirstFrame(*<-(*c)[0], 0, 0).InsertUp(tou, 32, 32, 108, 36).Im,
+		img.LoadFirstFrame(*<-(*c)[1], 0, 0).InsertUp(tou, 32, 32, 122, 36).Im,
+		img.LoadFirstFrame(*<-(*c)[2], 0, 0).Im,
+		img.LoadFirstFrame(*<-(*c)[3], 0, 0).InsertUp(tou, 123, 123, 19, 129).Im,
+		img.LoadFirstFrame(*<-(*c)[4], 0, 0).InsertUp(tou, 185, 185, -50, 200).InsertUp(tou, 33, 33, 289, 70).Im,
+		img.LoadFirstFrame(*<-(*c)[5], 0, 0).InsertUp(tou, 32, 32, 280, 73).Im,
+		img.LoadFirstFrame(*<-(*c)[6], 0, 0).InsertUp(tou, 35, 35, 259, 31).Im,
+		img.LoadFirstFrame(*<-(*c)[7], 0, 0).InsertUp(tou, 175, 175, -50, 220).Im,
+	}
+	_ = img.SaveGif(img.MergeGif(7, diu), name)
+	return "file:///" + name
+}

plugin_gif/logo.go

@@ -0,0 +1,19 @@
+package gif
+
+import (
+	"strconv"
+	"strings"
+
+	"github.com/FloatTech/zbputils/file"
+)
+
+func (cc *context) prepareLogos(s ...string) {
+	for i, v := range s {
+		_, err := strconv.Atoi(v)
+		if err != nil {
+			_ = file.DownloadTo("https://gchat.qpic.cn/gchatpic_new//--"+strings.ToUpper(v)+"/0", cc.usrdir+strconv.Itoa(i)+".gif", true)
+		} else {
+			_ = file.DownloadTo("http://q4.qlogo.cn/g?b=qq&nk="+v+"&s=640", cc.usrdir+strconv.Itoa(i)+".gif", true)
+		}
+	}
+}

plugin_gif/png.go

@@ -0,0 +1,69 @@
+package gif
+
+import (
+	"image"
+	"math/rand"
+	"strconv"
+
+	"github.com/FloatTech/zbputils/img"
+)
+
+// 爬
+func (cc *context) pa() string {
+	name := cc.usrdir + `爬.png`
+	tou := img.LoadFirstFrame(cc.headimgsdir[0], 0, 0).Circle(0).Im
+	// 随机爬图序号
+	rand := rand.Intn(60) + 1
+	dc := img.LoadFirstFrame(dlblock(`pa/`+strconv.Itoa(rand)+`.png`), 0, 0).
+		InsertBottom(tou, 100, 100, 0, 400).Im
+	_ = img.SavePng(dc, name)
+	return "file:///" + name
+}
+
+// 撕
+func (cc *context) si() string {
+	name := cc.usrdir + `撕.png`
+	tou := img.LoadFirstFrame(cc.headimgsdir[0], 0, 0).Im
+	im1 := img.Rotate(tou, 20, 380, 380)
+	im2 := img.Rotate(tou, -12, 380, 380)
+	dc := img.LoadFirstFrame(dlblock(`si/0.png`), 0, 0).
+		InsertBottom(im1.Im, im1.W, im1.H, -3, 370).
+		InsertBottom(im2.Im, im2.W, im2.H, 653, 310).Im
+	_ = img.SavePng(dc, name)
+	return "file:///" + name
+}
+
+// 简单
+func (cc *context) other(value ...string) string {
+	name := cc.usrdir + value[0] + `.png`
+	// 加载图片
+	im := img.LoadFirstFrame(cc.headimgsdir[0], 0, 0)
+	var a *image.NRGBA
+
+	switch value[0] {
+	case "上翻", "下翻":
+		a = im.FlipV().Im
+	case "左翻", "右翻":
+		a = im.FlipH().Im
+	case "反色":
+		a = im.Invert().Im
+	case "灰度":
+		a = im.Grayscale().Im
+	case "负片":
+		a = im.Invert().Grayscale().Im
+	case "浮雕":
+		a = im.Convolve3x3().Im
+	case "打码":
+		a = im.Blur(10).Im
+	case "旋转":
+		r, _ := strconv.ParseFloat(value[1], 64)
+		a = img.Rotate(im.Im, r, 0, 0).Im
+	case "变形":
+		w, _ := strconv.Atoi(value[1])
+		h, _ := strconv.Atoi(value[2])
+		a = img.Size(im.Im, w, h).Im
+	}
+
+	_ = img.SavePng(a, name)
+	return "file:///" + name
+}

plugin_gif/run.go

@@ -0,0 +1,69 @@
+// Package gif 制图
+package gif
+
+import (
+	"math/rand"
+	"os"
+	"strconv"
+	"strings"
+	"time"
+
+	control "github.com/FloatTech/zbputils/control"
+	zero "github.com/wdvxdr1123/ZeroBot"
+	"github.com/wdvxdr1123/ZeroBot/message"
+
+	"github.com/FloatTech/ZeroBot-Plugin/order"
+)
+
+var (
+	cmds = []string{"搓", "冲", "摸", "拍", "丢", "吃", "敲", "啃", "蹭", "爬", "撕",
+		"灰度", "上翻", "下翻", "左翻", "右翻", "反色", "浮雕", "打码", "负片"}
+	botpath, _ = os.Getwd()
+	datapath   = botpath + "/data/gif/"
+)
+
+func init() { // 插件主体
+	_ = os.RemoveAll(datapath) // 清除缓存图片
+	err := os.MkdirAll(datapath, 0755)
+	if err != nil {
+		panic(err)
+	}
+	rand.Seed(time.Now().UnixNano()) // 设置种子
+	control.Register("gif", order.PrioGIF, &control.Options{
+		DisableOnDefault: false,
+		Help:             "制图\n- " + strings.Join(cmds, "\n- "),
+	}).OnRegex(`^(` + strings.Join(cmds, "|") + `)\D*?(\[CQ:(image\,file=([0-9a-zA-Z]{32}).*|at.+?(\d{5,11}))\].*|(\d+))$`).
+		SetBlock(true).Handle(func(ctx *zero.Ctx) {
+		c := newContext(ctx.Event.UserID)
+		list := ctx.State["regex_matched"].([]string)
+		c.prepareLogos(list[4]+list[5]+list[6], strconv.FormatInt(ctx.Event.UserID, 10))
+		var picurl string
+		switch list[1] {
+		case "爬":
+			picurl = c.pa()
+		case "摸":
+			picurl = c.mo()
+		case "吃":
+			picurl = c.chi()
+		case "啃":
+			picurl = c.ken()
+		case "蹭":
+			picurl = c.ceng()
+		case "敲":
+			picurl = c.qiao()
+		case "搓":
+			picurl = c.cuo()
+		case "拍":
+			picurl = c.pai()
+		case "丢":
+			picurl = c.diu()
+		case "撕":
+			picurl = c.si()
+		case "冲":
+			picurl = c.chong()
+		default:
+			picurl = c.other(list[1]) // "灰度", "上翻", "下翻", "左翻", "右翻", "反色", "倒放", "浮雕", "打码", "负片"
+		}
+		ctx.SendChain(message.Image(picurl))
+	})
+}

plugin_github/repo_searcher.go

@@ -9,21 +9,22 @@ import (
 	"net/url"
 	"strings"
 
+	control "github.com/FloatTech/zbputils/control"
 	zero "github.com/wdvxdr1123/ZeroBot"
 	"github.com/wdvxdr1123/ZeroBot/message"
 
-	"github.com/FloatTech/ZeroBot-Plugin/control"
+	"github.com/FloatTech/ZeroBot-Plugin/order"
 
 	"github.com/tidwall/gjson"
 )
 
 func init() { // 插件主体
-	control.Register("github", &control.Options{
+	control.Register("github", order.PrioGithub, &control.Options{
 		DisableOnDefault: false,
 		Help: "GitHub仓库搜索\n" +
 			"- >github [xxx]\n" +
 			"- >github -p [xxx]",
-	}).OnRegex(`^>github\s(-.{1,10}? )?(.*)$`).SetBlock(true).FirstPriority().
+	}).OnRegex(`^>github\s(-.{1,10}? )?(.*)$`).SetBlock(true).
 		Handle(func(ctx *zero.Ctx) {
 			// 发送请求
 			header := http.Header{
@@ -96,6 +97,7 @@ func init() { // 插件主体
 }
 
 // notnull 如果传入文本为空，则返回默认值
+//nolint: unparam
 func notnull(text, defstr string) string {
 	if text == "" {
 		return defstr

plugin_hs/run.go

@@ -12,9 +12,11 @@ import (
 	"github.com/wdvxdr1123/ZeroBot/message"
 	"github.com/wdvxdr1123/ZeroBot/utils/helper"
 
-	"github.com/FloatTech/ZeroBot-Plugin/control"
-	"github.com/FloatTech/ZeroBot-Plugin/utils/file"
-	"github.com/FloatTech/ZeroBot-Plugin/utils/web"
+	control "github.com/FloatTech/zbputils/control"
+	"github.com/FloatTech/zbputils/file"
+	"github.com/FloatTech/zbputils/web"
+
+	"github.com/FloatTech/ZeroBot-Plugin/order"
 )
 
 var (
@@ -49,7 +51,7 @@ func init() {
 		panic(err)
 	}
 
-	engine := control.Register("hs", &control.Options{
+	engine := control.Register("hs", order.PrioHS, &control.Options{
 		DisableOnDefault: false,
 		Help: "炉石\n" +
 			"- 搜卡[xxxx]\n" +
@@ -57,7 +59,7 @@ func init() {
 			"- 更多搜卡指令参数：https://hs.fbigame.com/misc/searchhelp",
 	})
 	engine.OnRegex(`^搜卡(.+)$`).
-		SetBlock(true).SetPriority(20).Handle(func(ctx *zero.Ctx) {
+		SetBlock(true).Handle(func(ctx *zero.Ctx) {
 		List := ctx.State["regex_matched"].([]string)[1]
 		g := sh(List)
 		t := int(gjson.Get(g, `list.#`).Int())
@@ -100,7 +102,7 @@ func init() {
 	})
 	// 卡组
 	engine.OnRegex(`^[\s\S]*?(AAE[a-zA-Z0-9/\+=]{70,})[\s\S]*$`).
-		SetBlock(true).SetPriority(20).Handle(func(ctx *zero.Ctx) {
+		SetBlock(true).Handle(func(ctx *zero.Ctx) {
 		fmt.Print("成功")
 		List := ctx.State["regex_matched"].([]string)[1]
 		ctx.SendChain(

plugin_image_finder/keyword.go

@@ -6,12 +6,16 @@ import (
 	"fmt"
 	"math/rand"
 	"net/http"
+	"strings"
 	"time"
 
+	"github.com/FloatTech/AnimeAPI/imgpool"
+	control "github.com/FloatTech/zbputils/control"
+	"github.com/FloatTech/zbputils/ctxext"
 	zero "github.com/wdvxdr1123/ZeroBot"
 	"github.com/wdvxdr1123/ZeroBot/message"
 
-	"github.com/FloatTech/ZeroBot-Plugin/control"
+	"github.com/FloatTech/ZeroBot-Plugin/order"
 )
 
 type resultjson struct {
@@ -61,7 +65,7 @@ type resultjson struct {
 }
 
 func init() {
-	control.Register("imgfinder", &control.Options{
+	control.Register("imgfinder", order.PrioImageFinder, &control.Options{
 		DisableOnDefault: false,
 		Help: "关键字搜图\n" +
 			"- 来张 [xxx]",
@@ -70,9 +74,13 @@ func init() {
 			keyword := ctx.State["regex_matched"].([]string)[1]
 			soutujson := soutuapi(keyword)
 			pom1 := "https://i.pixiv.re"
-			rannum := rintn(len(soutujson.Illusts))
+			rannum := randintn(len(soutujson.Illusts))
 			pom2 := soutujson.Illusts[rannum].ImageUrls.Medium[19:]
-			ctx.SendChain(message.Image(pom1 + pom2))
+			u := pom1 + pom2
+			m, hassent, err := imgpool.NewImage(ctxext.Send(ctx), ctxext.GetMessage(ctx), u[strings.LastIndex(u, "/")+1:], u)
+			if err == nil && !hassent {
+				ctx.SendChain(message.Image(m.String()))
+			}
 		})
 }
 
@@ -102,8 +110,8 @@ func soutuapi(keyword string) *resultjson {
 	return result
 }
 
-// rintn 从json里的30条数据中随机获取一条返回
-func rintn(len int) int {
+// randintn 从json里的30条数据中随机获取一条返回
+func randintn(n int) int {
 	rand.Seed(time.Now().UnixNano())
-	return rand.Intn(len)
+	return rand.Intn(n)
 }

plugin_juejuezi/juejuezi.go

@@ -0,0 +1,79 @@
+// Package juejuezi 绝绝子
+package juejuezi
+
+import (
+	"fmt"
+	"io"
+	"net/http"
+	"strings"
+	"time"
+
+	control "github.com/FloatTech/zbputils/control"
+	log "github.com/sirupsen/logrus"
+	"github.com/tidwall/gjson"
+	zero "github.com/wdvxdr1123/ZeroBot"
+	"github.com/wdvxdr1123/ZeroBot/extension/rate"
+	"github.com/wdvxdr1123/ZeroBot/message"
+	"github.com/wdvxdr1123/ZeroBot/utils/helper"
+
+	"github.com/FloatTech/ZeroBot-Plugin/order"
+)
+
+const (
+	juejueziURL = "https://www.offjuan.com/api/juejuezi/text"
+	referer     = "https://juejuezi.offjuan.com/"
+	ua          = "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/96.0.4664.110 Safari/537.36"
+)
+
+var (
+	limit = rate.NewManager(time.Minute, 20)
+)
+
+func init() {
+	control.Register("juejuezi", order.PrioJueJueZi, &control.Options{
+		DisableOnDefault: false,
+		Help: "绝绝子生成器\n" +
+			"- 喝奶茶绝绝子 | 绝绝子吃饭",
+	}).OnRegex("[\u4E00-\u9FA5]{0,10}绝绝子[\u4E00-\u9FA5]{0,10}").SetBlock(true).Handle(func(ctx *zero.Ctx) {
+		if !limit.Load(ctx.Event.GroupID).Acquire() {
+			return
+		}
+		toDealStr := []rune(strings.ReplaceAll(ctx.ExtractPlainText(), "绝绝子", ""))
+		switch len(toDealStr) {
+		case 0, 1:
+			ctx.SendChain(message.Reply(ctx.Event.MessageID), message.Text("不要只输入绝绝子"))
+		case 2:
+			data, err := juejuezi(string(toDealStr[0]), string(toDealStr[1]))
+			if err != nil {
+				ctx.SendChain(message.Text(err))
+			}
+			ctx.SendChain(message.Text(gjson.Get(helper.BytesToString(data), "text").String()))
+		default:
+			params := ctx.GetWordSlices(string(toDealStr)).Get("slices").Array()
+			data, err := juejuezi(params[0].String(), params[1].String())
+			if err != nil {
+				ctx.SendChain(message.Text(err))
+			}
+			ctx.SendChain(message.Text(gjson.Get(helper.BytesToString(data), "text").String()))
+		}
+	})
+}
+
+func juejuezi(verb, noun string) (data []byte, err error) {
+	juejueziStr := fmt.Sprintf("{\"verb\":\"%s\",\"noun\":\"%s\"}", verb, noun)
+	client := &http.Client{}
+	// 提交请求
+	request, err := http.NewRequest("POST", juejueziURL, strings.NewReader(juejueziStr))
+	if err != nil {
+		log.Errorln("[juejuezi]:", err)
+	}
+	request.Header.Add("Referer", referer)
+	request.Header.Add("User-Agent", ua)
+	response, err := client.Do(request)
+	if err != nil {
+		log.Errorln("[juejuezi]:", err)
+	}
+	data, err = io.ReadAll(response.Body)
+	response.Body.Close()
+	return
+}

plugin_lolicon/lolicon.go

@@ -11,8 +11,13 @@ import (
 	zero "github.com/wdvxdr1123/ZeroBot"
 	"github.com/wdvxdr1123/ZeroBot/message"
 
-	"github.com/FloatTech/ZeroBot-Plugin/control"
-	"github.com/FloatTech/ZeroBot-Plugin/utils/math"
+	"github.com/FloatTech/AnimeAPI/imgpool"
+	control "github.com/FloatTech/zbputils/control"
+	"github.com/FloatTech/zbputils/ctxext"
+	"github.com/FloatTech/zbputils/math"
+	"github.com/FloatTech/zbputils/process"
+
+	"github.com/FloatTech/ZeroBot-Plugin/order"
 )
 
 const (
@@ -25,7 +30,7 @@ var (
 )
 
 func init() {
-	control.Register("lolicon", &control.Options{
+	control.Register("lolicon", order.PrioLolicon, &control.Options{
 		DisableOnDefault: false,
 		Help: "lolicon\n" +
 			"- 来份萝莉",
@@ -50,12 +55,23 @@ func init() {
 						continue
 					}
 					url := json.Get("data.0.urls.original").Str
-					ctx.SendGroupMessage(0, message.Image(strings.ReplaceAll(url, "i.pixiv.cat", "i.pixiv.re")))
-					queue <- url
+					url = strings.ReplaceAll(url, "i.pixiv.cat", "i.pixiv.re")
+					name := url[strings.LastIndex(url, "/")+1 : len(url)-4]
+					m, err := imgpool.GetImage(name)
+					if err != nil {
+						m.SetFile(url)
+						_, err = m.Push(ctxext.SendToSelf(ctx), ctxext.GetMessage(ctx))
+						process.SleepAbout1sTo2s()
+					}
+					if err == nil {
+						queue <- m.String()
+					} else {
+						queue <- url
+					}
 				}
 			}()
 			select {
-			case <-time.After(time.Second * 10):
+			case <-time.After(time.Minute):
 				ctx.SendChain(message.Text("ERROR: 等待填充，请稍后再试......"))
 			case url := <-queue:
 				ctx.SendChain(message.Image(url))

plugin_manager/gist.go

@@ -10,8 +10,8 @@ import (
 	"github.com/sirupsen/logrus"
 	"github.com/wdvxdr1123/ZeroBot/utils/helper"
 
-	"github.com/FloatTech/ZeroBot-Plugin/utils/math"
-	"github.com/FloatTech/ZeroBot-Plugin/utils/web"
+	"github.com/FloatTech/zbputils/math"
+	"github.com/FloatTech/zbputils/web"
 )
 
 // user hash file

plugin_manager/manager.go

@@ -15,11 +15,14 @@ import (
 	"github.com/wdvxdr1123/ZeroBot/extension/rate"
 	"github.com/wdvxdr1123/ZeroBot/message"
 
-	"github.com/FloatTech/ZeroBot-Plugin/control"
+	control "github.com/FloatTech/zbputils/control"
+	"github.com/FloatTech/zbputils/ctxext"
+	"github.com/FloatTech/zbputils/math"
+	"github.com/FloatTech/zbputils/process"
+	"github.com/FloatTech/zbputils/sql"
+
+	"github.com/FloatTech/ZeroBot-Plugin/order"
 	"github.com/FloatTech/ZeroBot-Plugin/plugin_manager/timer"
-	"github.com/FloatTech/ZeroBot-Plugin/utils/math"
-	"github.com/FloatTech/ZeroBot-Plugin/utils/process"
-	"github.com/FloatTech/ZeroBot-Plugin/utils/sql"
 )
 
 const (
@@ -41,15 +44,15 @@ const (
 		"- 群聊转发 1234 XXX\n" +
 		"- 私聊转发 0000 XXX\n" +
 		"- 在MM月dd日的hh点mm分时(用http://url)提醒大家XXX\n" +
-		"- 在MM月[每周|周几]的hh点mm分时(用http://url)提醒大家XXX\n" +
+		"- 在MM月[每周 | 周几]的hh点mm分时(用http://url)提醒大家XXX\n" +
 		"- 取消在MM月dd日的hh点mm分的提醒\n" +
-		"- 取消在MM月[每周|周几]的hh点mm分的提醒\n" +
+		"- 取消在MM月[每周 | 周几]的hh点mm分的提醒\n" +
 		"- 在\"cron\"时(用[url])提醒大家[xxx]\n" +
 		"- 取消在\"cron\"的提醒\n" +
 		"- 列出所有提醒\n" +
 		"- 翻牌\n" +
 		"- 设置欢迎语XXX\n" +
-		"- [开启|关闭]入群验证"
+		"- [开启 | 关闭]入群验证"
 )
 
 var (
@@ -58,7 +61,7 @@ var (
 	clock timer.Clock
 )
 
-var engine = control.Register("manager", &control.Options{
+var engine = control.Register("manager", order.PrioManager, &control.Options{
 	DisableOnDefault: false,
 	Help:             hint,
 })
@@ -78,7 +81,7 @@ func init() { // 插件主体
 		}
 	}()
 	// 升为管理
-	engine.OnRegex(`^升为管理.*?(\d+)`, zero.OnlyGroup, zero.SuperUserPermission).SetBlock(true).SetPriority(40).
+	engine.OnRegex(`^升为管理.*?(\d+)`, zero.OnlyGroup, zero.SuperUserPermission).SetBlock(true).
 		Handle(func(ctx *zero.Ctx) {
 			ctx.SetGroupAdmin(
 				ctx.Event.GroupID,
@@ -93,7 +96,7 @@ func init() { // 插件主体
 			ctx.SendChain(message.Text(nickname + " 升为了管理~"))
 		})
 	// 取消管理
-	engine.OnRegex(`^取消管理.*?(\d+)`, zero.OnlyGroup, zero.SuperUserPermission).SetBlock(true).SetPriority(40).
+	engine.OnRegex(`^取消管理.*?(\d+)`, zero.OnlyGroup, zero.SuperUserPermission).SetBlock(true).
 		Handle(func(ctx *zero.Ctx) {
 			ctx.SetGroupAdmin(
 				ctx.Event.GroupID,
@@ -108,7 +111,7 @@ func init() { // 插件主体
 			ctx.SendChain(message.Text("残念~ " + nickname + " 暂时失去了管理员的资格"))
 		})
 	// 踢出群聊
-	engine.OnRegex(`^踢出群聊.*?(\d+)`, zero.OnlyGroup, zero.AdminPermission).SetBlock(true).SetPriority(40).
+	engine.OnRegex(`^踢出群聊.*?(\d+)`, zero.OnlyGroup, zero.AdminPermission).SetBlock(true).
 		Handle(func(ctx *zero.Ctx) {
 			ctx.SetGroupKick(
 				ctx.Event.GroupID,
@@ -123,7 +126,7 @@ func init() { // 插件主体
 			ctx.SendChain(message.Text("残念~ " + nickname + " 被放逐"))
 		})
 	// 退出群聊
-	engine.OnRegex(`^退出群聊.*?(\d+)`, zero.OnlyToMe, zero.SuperUserPermission).SetBlock(true).SetPriority(40).
+	engine.OnRegex(`^退出群聊.*?(\d+)`, zero.OnlyToMe, zero.SuperUserPermission).SetBlock(true).
 		Handle(func(ctx *zero.Ctx) {
 			ctx.SetGroupLeave(
 				math.Str2Int64(ctx.State["regex_matched"].([]string)[1]), // 要退出的群的群号
@@ -131,7 +134,7 @@ func init() { // 插件主体
 			)
 		})
 	// 开启全体禁言
-	engine.OnRegex(`^开启全员禁言$`, zero.OnlyGroup, zero.AdminPermission).SetBlock(true).SetPriority(40).
+	engine.OnRegex(`^开启全员禁言$`, zero.OnlyGroup, zero.AdminPermission).SetBlock(true).
 		Handle(func(ctx *zero.Ctx) {
 			ctx.SetGroupWholeBan(
 				ctx.Event.GroupID,
@@ -140,7 +143,7 @@ func init() { // 插件主体
 			ctx.SendChain(message.Text("全员自闭开始~"))
 		})
 	// 解除全员禁言
-	engine.OnRegex(`^解除全员禁言$`, zero.OnlyGroup, zero.AdminPermission).SetBlock(true).SetPriority(40).
+	engine.OnRegex(`^解除全员禁言$`, zero.OnlyGroup, zero.AdminPermission).SetBlock(true).
 		Handle(func(ctx *zero.Ctx) {
 			ctx.SetGroupWholeBan(
 				ctx.Event.GroupID,
@@ -149,7 +152,7 @@ func init() { // 插件主体
 			ctx.SendChain(message.Text("全员自闭结束~"))
 		})
 	// 禁言
-	engine.OnRegex(`^禁言.*?(\d+).*?\s(\d+)(.*)`, zero.OnlyGroup, zero.AdminPermission).SetBlock(true).SetPriority(40).
+	engine.OnRegex(`^禁言.*?(\d+).*?\s(\d+)(.*)`, zero.OnlyGroup, zero.AdminPermission).SetBlock(true).
 		Handle(func(ctx *zero.Ctx) {
 			duration := math.Str2Int64(ctx.State["regex_matched"].([]string)[2])
 			switch ctx.State["regex_matched"].([]string)[3] {
@@ -173,7 +176,7 @@ func init() { // 插件主体
 			ctx.SendChain(message.Text("小黑屋收留成功~"))
 		})
 	// 解除禁言
-	engine.OnRegex(`^解除禁言.*?(\d+)`, zero.OnlyGroup, zero.AdminPermission).SetBlock(true).SetPriority(40).
+	engine.OnRegex(`^解除禁言.*?(\d+)`, zero.OnlyGroup, zero.AdminPermission).SetBlock(true).
 		Handle(func(ctx *zero.Ctx) {
 			ctx.SetGroupBan(
 				ctx.Event.GroupID,
@@ -183,7 +186,7 @@ func init() { // 插件主体
 			ctx.SendChain(message.Text("小黑屋释放成功~"))
 		})
 	// 自闭禁言
-	engine.OnRegex(`^(我要自闭|禅定).*?(\d+)(.*)`, zero.OnlyGroup).SetBlock(true).SetPriority(40).
+	engine.OnRegex(`^(我要自闭|禅定).*?(\d+)(.*)`, zero.OnlyGroup).SetBlock(true).
 		Handle(func(ctx *zero.Ctx) {
 			duration := math.Str2Int64(ctx.State["regex_matched"].([]string)[2])
 			switch ctx.State["regex_matched"].([]string)[3] {
@@ -207,7 +210,7 @@ func init() { // 插件主体
 			ctx.SendChain(message.Text("那我就不手下留情了~"))
 		})
 	// 修改名片
-	engine.OnRegex(`^修改名片.*?(\d+).*?\s(.*)`, zero.OnlyGroup, zero.AdminPermission).SetBlock(true).SetPriority(40).
+	engine.OnRegex(`^修改名片.*?(\d+).*?\s(.*)`, zero.OnlyGroup, zero.AdminPermission).SetBlock(true).
 		Handle(func(ctx *zero.Ctx) {
 			ctx.SetGroupCard(
 				ctx.Event.GroupID,
@@ -217,7 +220,7 @@ func init() { // 插件主体
 			ctx.SendChain(message.Text("嗯！已经修改了"))
 		})
 	// 修改头衔
-	engine.OnRegex(`^修改头衔.*?(\d+).*?\s(.*)`, zero.OnlyGroup, zero.AdminPermission).SetBlock(true).SetPriority(40).
+	engine.OnRegex(`^修改头衔.*?(\d+).*?\s(.*)`, zero.OnlyGroup, zero.AdminPermission).SetBlock(true).
 		Handle(func(ctx *zero.Ctx) {
 			ctx.SetGroupSpecialTitle(
 				ctx.Event.GroupID,
@@ -227,7 +230,7 @@ func init() { // 插件主体
 			ctx.SendChain(message.Text("嗯！已经修改了"))
 		})
 	// 申请头衔
-	engine.OnRegex(`^申请头衔(.*)`, zero.OnlyGroup).SetBlock(true).SetPriority(40).
+	engine.OnRegex(`^申请头衔(.*)`, zero.OnlyGroup).SetBlock(true).
 		Handle(func(ctx *zero.Ctx) {
 			ctx.SetGroupSpecialTitle(
 				ctx.Event.GroupID,
@@ -237,7 +240,7 @@ func init() { // 插件主体
 			ctx.SendChain(message.Text("嗯！不错的头衔呢~"))
 		})
 	// 群聊转发
-	engine.OnRegex(`^群聊转发.*?(\d+)\s(.*)`, zero.SuperUserPermission).SetBlock(true).SetPriority(40).
+	engine.OnRegex(`^群聊转发.*?(\d+)\s(.*)`, zero.SuperUserPermission).SetBlock(true).
 		Handle(func(ctx *zero.Ctx) {
 			// 对CQ码进行反转义
 			content := ctx.State["regex_matched"].([]string)[2]
@@ -250,7 +253,7 @@ func init() { // 插件主体
 			ctx.SendChain(message.Text("📧 --> " + ctx.State["regex_matched"].([]string)[1]))
 		})
 	// 私聊转发
-	engine.OnRegex(`^私聊转发.*?(\d+)\s(.*)`, zero.SuperUserPermission).SetBlock(true).SetPriority(40).
+	engine.OnRegex(`^私聊转发.*?(\d+)\s(.*)`, zero.SuperUserPermission).SetBlock(true).
 		Handle(func(ctx *zero.Ctx) {
 			// 对CQ码进行反转义
 			content := ctx.State["regex_matched"].([]string)[2]
@@ -263,7 +266,7 @@ func init() { // 插件主体
 			ctx.SendChain(message.Text("📧 --> " + ctx.State["regex_matched"].([]string)[1]))
 		})
 	// 定时提醒
-	engine.OnRegex(`^在(.{1,2})月(.{1,3}日|每?周.?)的(.{1,3})点(.{1,3})分时(用.+)?提醒大家(.*)`, zero.AdminPermission, zero.OnlyGroup).SetBlock(true).SetPriority(40).
+	engine.OnRegex(`^在(.{1,2})月(.{1,3}日|每?周.?)的(.{1,3})点(.{1,3})分时(用.+)?提醒大家(.*)`, zero.AdminPermission, zero.OnlyGroup).SetBlock(true).
 		Handle(func(ctx *zero.Ctx) {
 			dateStrs := ctx.State["regex_matched"].([]string)
 			ts := timer.GetFilledTimer(dateStrs, ctx.Event.SelfID, ctx.Event.GroupID, false)
@@ -275,7 +278,7 @@ func init() { // 插件主体
 			}
 		})
 	// 定时 cron 提醒
-	engine.OnRegex(`^在"(.*)"时(用.+)?提醒大家(.*)`, zero.AdminPermission, zero.OnlyGroup).SetBlock(true).SetPriority(40).
+	engine.OnRegex(`^在"(.*)"时(用.+)?提醒大家(.*)`, zero.AdminPermission, zero.OnlyGroup).SetBlock(true).
 		Handle(func(ctx *zero.Ctx) {
 			dateStrs := ctx.State["regex_matched"].([]string)
 			var url, alert string
@@ -298,7 +301,7 @@ func init() { // 插件主体
 			}
 		})
 	// 取消定时
-	engine.OnRegex(`^取消在(.{1,2})月(.{1,3}日|每?周.?)的(.{1,3})点(.{1,3})分的提醒`, zero.AdminPermission, zero.OnlyGroup).SetBlock(true).SetPriority(40).
+	engine.OnRegex(`^取消在(.{1,2})月(.{1,3}日|每?周.?)的(.{1,3})点(.{1,3})分的提醒`, zero.AdminPermission, zero.OnlyGroup).SetBlock(true).
 		Handle(func(ctx *zero.Ctx) {
 			dateStrs := ctx.State["regex_matched"].([]string)
 			ts := timer.GetFilledTimer(dateStrs, ctx.Event.SelfID, ctx.Event.GroupID, true)
@@ -311,10 +314,10 @@ func init() { // 插件主体
 			}
 		})
 	// 取消 cron 定时
-	engine.OnRegex(`^取消在"(.*)"的提醒`, zero.AdminPermission, zero.OnlyGroup).SetBlock(true).SetPriority(40).
+	engine.OnRegex(`^取消在"(.*)"的提醒`, zero.AdminPermission, zero.OnlyGroup).SetBlock(true).
 		Handle(func(ctx *zero.Ctx) {
 			dateStrs := ctx.State["regex_matched"].([]string)
-			ts := timer.Timer{Cron: dateStrs[1], GrpId: ctx.Event.GroupID}
+			ts := timer.Timer{Cron: dateStrs[1], GrpID: ctx.Event.GroupID}
 			ti := ts.GetTimerID()
 			ok := clock.CancelTimer(ti)
 			if ok {
@@ -324,12 +327,12 @@ func init() { // 插件主体
 			}
 		})
 	// 列出本群所有定时
-	engine.OnFullMatch("列出所有提醒", zero.AdminPermission, zero.OnlyGroup).SetBlock(true).SetPriority(40).
+	engine.OnFullMatch("列出所有提醒", zero.AdminPermission, zero.OnlyGroup).SetBlock(true).
 		Handle(func(ctx *zero.Ctx) {
 			ctx.SendChain(message.Text(clock.ListTimers(ctx.Event.GroupID)))
 		})
 	// 随机点名
-	engine.OnFullMatchGroup([]string{"翻牌"}, zero.OnlyGroup).SetBlock(true).SetPriority(40).
+	engine.OnFullMatchGroup([]string{"翻牌"}, zero.OnlyGroup).SetBlock(true).
 		Handle(func(ctx *zero.Ctx) {
 			if !limit.Load(ctx.Event.UserID).Acquire() {
 				ctx.SendChain(message.Text("少女祈祷中......"))
@@ -367,7 +370,7 @@ func init() { // 插件主体
 			)
 		})
 	// 入群欢迎
-	engine.OnNotice().SetBlock(false).FirstPriority().
+	engine.OnNotice().SetBlock(false).
 		Handle(func(ctx *zero.Ctx) {
 			if ctx.Event.NoticeType == "group_increase" && ctx.Event.SelfID != ctx.Event.UserID {
 				var w welcome
@@ -419,16 +422,15 @@ func init() { // 插件主体
 			}
 		})
 	// 退群提醒
-	engine.OnNotice().SetBlock(false).SetPriority(40).
+	engine.OnNotice().SetBlock(false).
 		Handle(func(ctx *zero.Ctx) {
 			if ctx.Event.NoticeType == "group_decrease" {
 				userid := ctx.Event.UserID
-				nickname := ctx.GetStrangerInfo(userid, false).Get("nickname").String()
-				ctx.SendChain(message.Text(nickname, "(", userid, ")", "离开了我们..."))
+				ctx.SendChain(message.Text(ctxext.CardOrNickName(ctx, userid), "(", userid, ")", "离开了我们..."))
 			}
 		})
 	// 设置欢迎语
-	engine.OnRegex(`^设置欢迎语([\s\S]*)$`, zero.OnlyGroup, zero.AdminPermission).SetBlock(true).SetPriority(40).
+	engine.OnRegex(`^设置欢迎语([\s\S]*)$`, zero.OnlyGroup, zero.AdminPermission).SetBlock(true).
 		Handle(func(ctx *zero.Ctx) {
 			w := &welcome{
 				GrpID: ctx.Event.GroupID,
@@ -442,7 +444,7 @@ func init() { // 插件主体
 			}
 		})
 	// 入群后验证开关
-	engine.OnRegex(`^(.*)入群验证$`, zero.OnlyGroup, zero.AdminPermission).SetBlock(true).SetPriority(40).
+	engine.OnRegex(`^(.*)入群验证$`, zero.OnlyGroup, zero.AdminPermission).SetBlock(true).
 		Handle(func(ctx *zero.Ctx) {
 			option := ctx.State["regex_matched"].([]string)[1]
 			c, ok := control.Lookup("manager")
@@ -467,7 +469,7 @@ func init() { // 插件主体
 			ctx.SendChain(message.Text("找不到服务!"))
 		})
 	// 加群 gist 验证开关
-	engine.OnRegex(`^(.*)gist加群自动审批$`, zero.OnlyGroup, zero.AdminPermission).SetBlock(true).SetPriority(40).
+	engine.OnRegex(`^(.*)gist加群自动审批$`, zero.OnlyGroup, zero.AdminPermission).SetBlock(true).
 		Handle(func(ctx *zero.Ctx) {
 			option := ctx.State["regex_matched"].([]string)[1]
 			c, ok := control.Lookup("manager")
@@ -492,7 +494,7 @@ func init() { // 插件主体
 			ctx.SendChain(message.Text("找不到服务!"))
 		})
 	// 运行 CQ 码
-	engine.OnRegex(`^run(.*)$`, zero.SuperUserPermission).SetBlock(true).SetPriority(0).
+	engine.OnRegex(`^run(.*)$`, zero.SuperUserPermission).SetBlock(true).
 		Handle(func(ctx *zero.Ctx) {
 			var cmd = ctx.State["regex_matched"].([]string)[1]
 			cmd = strings.ReplaceAll(cmd, "[", "[")
@@ -503,7 +505,7 @@ func init() { // 插件主体
 	// 根据 gist 自动同意加群
 	// 加群请在github新建一个gist，其文件名为本群群号的字符串的md5(小写)，内容为一行，是当前unix时间戳(10分钟内有效)。
 	// 然后请将您的用户名和gist哈希(小写)按照username/gisthash的格式填写到回答即可。
-	engine.OnRequest().SetBlock(false).FirstPriority().Handle(func(ctx *zero.Ctx) {
+	engine.OnRequest().SetBlock(false).Handle(func(ctx *zero.Ctx) {
 		/*if ctx.Event.RequestType == "friend" {
 			ctx.SetFriendAddRequest(ctx.Event.Flag, true, "")
 		}*/

plugin_manager/timer/msg.go

@@ -5,12 +5,12 @@ import (
 	"github.com/wdvxdr1123/ZeroBot/message"
 )
 
-func (ts *Timer) sendmsg(grp int64, ctx *zero.Ctx) {
+func (t *Timer) sendmsg(grp int64, ctx *zero.Ctx) {
 	ctx.Event = new(zero.Event)
 	ctx.Event.GroupID = grp
-	if ts.Url == "" {
-		ctx.SendChain(atall, message.Text(ts.Alert))
+	if t.URL == "" {
+		ctx.SendChain(atall, message.Text(t.Alert))
 	} else {
-		ctx.SendChain(atall, message.Text(ts.Alert), message.Image(ts.Url).Add("cache", "0"))
+		ctx.SendChain(atall, message.Text(t.Alert), message.Image(t.URL).Add("cache", "0"))
 	}
 }

plugin_manager/timer/parse.go

@@ -14,29 +14,29 @@ import (
 )
 
 // GetTimerInfo 获得标准化定时字符串
-func (ts *Timer) GetTimerInfo() string {
-	if ts.Cron != "" {
-		return fmt.Sprintf("[%d]%s", ts.GrpId, ts.Cron)
+func (t *Timer) GetTimerInfo() string {
+	if t.Cron != "" {
+		return fmt.Sprintf("[%d]%s", t.GrpID, t.Cron)
 	}
-	return fmt.Sprintf("[%d]%d月%d日%d周%d:%d", ts.GrpId, ts.Month(), ts.Day(), ts.Week(), ts.Hour(), ts.Minute())
+	return fmt.Sprintf("[%d]%d月%d日%d周%d:%d", t.GrpID, t.Month(), t.Day(), t.Week(), t.Hour(), t.Minute())
 }
 
-// GetTimerInfo 获得标准化 ID
-func (ts *Timer) GetTimerID() uint32 {
-	key := ts.GetTimerInfo()
+// GetTimerID 获得标准化 ID
+func (t *Timer) GetTimerID() uint32 {
+	key := t.GetTimerInfo()
 	m := md5.Sum(helper.StringToBytes(key))
 	return binary.LittleEndian.Uint32(m[:4])
 }
 
 // GetFilledCronTimer 获得以cron填充好的ts
 func GetFilledCronTimer(croncmd string, alert string, img string, botqq, gid int64) *Timer {
-	var ts Timer
-	ts.Alert = alert
-	ts.Cron = croncmd
-	ts.Url = img
-	ts.Selfid = botqq
-	ts.GrpId = gid
-	return &ts
+	var t Timer
+	t.Alert = alert
+	t.Cron = croncmd
+	t.URL = img
+	t.SelfID = botqq
+	t.GrpID = gid
+	return &t
 }
 
 // GetFilledTimer 获得填充好的ts
@@ -46,79 +46,79 @@ func GetFilledTimer(dateStrs []string, botqq, grp int64, matchDateOnly bool) *Ti
 	hourStr := []rune(dateStrs[3])
 	minuteStr := []rune(dateStrs[4])
 
-	var ts Timer
+	var t Timer
 	mon := time.Month(chineseNum2Int(monthStr))
 	if (mon != -1 && mon <= 0) || mon > 12 { // 月份非法
-		ts.Alert = "月份非法！"
-		return &ts
+		t.Alert = "月份非法！"
+		return &t
 	}
-	ts.SetMonth(mon)
+	t.SetMonth(mon)
 	lenOfDW := len(dayWeekStr)
 	switch {
 	case lenOfDW == 4: // 包括末尾的"日"
 		dayWeekStr = []rune{dayWeekStr[0], dayWeekStr[2]} // 去除中间的十
 		d := chineseNum2Int(dayWeekStr)
 		if (d != -1 && d <= 0) || d > 31 { // 日期非法
-			ts.Alert = "日期非法1！"
-			return &ts
+			t.Alert = "日期非法1！"
+			return &t
 		}
-		ts.SetDay(d)
+		t.SetDay(d)
 	case dayWeekStr[lenOfDW-1] == rune('日'): // xx日
 		dayWeekStr = dayWeekStr[:lenOfDW-1]
 		d := chineseNum2Int(dayWeekStr)
 		if (d != -1 && d <= 0) || d > 31 { // 日期非法
-			ts.Alert = "日期非法2！"
-			return &ts
+			t.Alert = "日期非法2！"
+			return &t
 		}
-		ts.SetDay(d)
+		t.SetDay(d)
 	case dayWeekStr[0] == rune('每'): // 每周
-		ts.SetWeek(-1)
+		t.SetWeek(-1)
 	default: // 周x
 		w := chineseNum2Int(dayWeekStr[1:])
 		if w == 7 { // 周天是0
 			w = 0
 		}
 		if w < 0 || w > 6 { // 星期非法
-			ts.Alert = "星期非法！"
-			return &ts
+			t.Alert = "星期非法！"
+			return &t
 		}
-		ts.SetWeek(time.Weekday(w))
+		t.SetWeek(time.Weekday(w))
 	}
 	if len(hourStr) == 3 {
 		hourStr = []rune{hourStr[0], hourStr[2]} // 去除中间的十
 	}
 	h := chineseNum2Int(hourStr)
 	if h < -1 || h > 23 { // 小时非法
-		ts.Alert = "小时非法！"
-		return &ts
+		t.Alert = "小时非法！"
+		return &t
 	}
-	ts.SetHour(h)
+	t.SetHour(h)
 	if len(minuteStr) == 3 {
 		minuteStr = []rune{minuteStr[0], minuteStr[2]} // 去除中间的十
 	}
 	min := chineseNum2Int(minuteStr)
 	if min < -1 || min > 59 { // 分钟非法
-		ts.Alert = "分钟非法！"
-		return &ts
+		t.Alert = "分钟非法！"
+		return &t
 	}
-	ts.SetMinute(min)
+	t.SetMinute(min)
 	if !matchDateOnly {
 		urlStr := dateStrs[5]
 		if urlStr != "" { // 是图片url
-			ts.Url = urlStr[3:] // utf-8下用为3字节
-			logrus.Println("[群管]" + ts.Url)
-			if !strings.HasPrefix(ts.Url, "http") {
-				ts.Url = "illegal"
+			t.URL = urlStr[3:] // utf-8下用为3字节
+			logrus.Println("[群管]" + t.URL)
+			if !strings.HasPrefix(t.URL, "http") {
+				t.URL = "illegal"
 				logrus.Println("[群管]url非法！")
-				return &ts
+				return &t
 			}
 		}
-		ts.Alert = dateStrs[6]
-		ts.SetEn(true)
+		t.Alert = dateStrs[6]
+		t.SetEn(true)
 	}
-	ts.Selfid = botqq
-	ts.GrpId = grp
-	return &ts
+	t.SelfID = botqq
+	t.GrpID = grp
+	return &t
 }
 
 // chineseNum2Int 汉字数字转int，仅支持-10～99，最多两位数，其中"每"解释为-1，"每二"为-2，以此类推
@@ -155,13 +155,12 @@ func chineseNum2Int(rs []rune) int {
 func chineseChar2Int(c rune) int {
 	if c == rune('日') || c == rune('天') { // 周日/周天
 		return 7
-	} else {
-		match := []rune("零一二三四五六七八九十")
-		for i, m := range match {
-			if c == m {
-				return i
-			}
-		}
-		return 0
 	}
+	match := []rune("零一二三四五六七八九十")
+	for i, m := range match {
+		if c == m {
+			return i
+		}
+	}
+	return 0
 }

plugin_manager/timer/sleep.go

@@ -15,13 +15,13 @@ func firstWeek(date *time.Time, week time.Weekday) (d time.Time) {
 	return
 }
 
-func (ts *Timer) nextWakeTime() (date time.Time) {
+func (t *Timer) nextWakeTime() (date time.Time) {
 	date = time.Now()
-	m := ts.Month()
-	d := ts.Day()
-	h := ts.Hour()
-	mn := ts.Minute()
-	w := ts.Week()
+	m := t.Month()
+	d := t.Day()
+	h := t.Hour()
+	mn := t.Minute()
+	w := t.Week()
 	var unit time.Duration
 	logrus.Debugln("[timer] unit init:", unit)
 	if mn >= 0 {
@@ -74,35 +74,35 @@ func (ts *Timer) nextWakeTime() (date time.Time) {
 	}
 	switch stable {
 	case 0b0101:
-		if ts.Day() != time.Now().Day() || ts.Month() != time.Now().Month() {
+		if t.Day() != time.Now().Day() || t.Month() != time.Now().Month() {
 			h = 0
 		}
 	case 0b1001:
-		if ts.Month() != time.Now().Month() {
+		if t.Month() != time.Now().Month() {
 			d = 0
 		}
 	case 0b0001:
-		if ts.Month() != time.Now().Month() {
+		if t.Month() != time.Now().Month() {
 			d = 0
 			h = 0
 		}
 	}
 	logrus.Debugln("[timer] stable:", stable)
 	logrus.Debugln("[timer] m:", m, "d:", d, "h:", h, "mn:", mn, "w:", w)
-	date = time.Date(date.Year(), time.Month(m), int(d), int(h), int(mn), date.Second(), date.Nanosecond(), date.Location())
+	date = time.Date(date.Year(), m, d, h, mn, date.Second(), date.Nanosecond(), date.Location())
 	logrus.Debugln("[timer] date original:", date)
 	if unit > 0 {
 		date = date.Add(unit)
 	}
 	logrus.Debugln("[timer] date after add:", date)
 	if time.Until(date) <= 0 {
-		if ts.Month() < 0 {
-			if ts.Day() > 0 || (ts.Day() == 0 && ts.Week() >= 0) {
+		if t.Month() < 0 {
+			if t.Day() > 0 || (t.Day() == 0 && t.Week() >= 0) {
 				date = date.AddDate(0, 1, 0)
-			} else if ts.Day() < 0 || ts.Week() < 0 {
-				if ts.Hour() > 0 {
+			} else if t.Day() < 0 || t.Week() < 0 {
+				if t.Hour() > 0 {
 					date = date.AddDate(0, 0, 1)
-				} else if ts.Minute() > 0 {
+				} else if t.Minute() > 0 {
 					date = date.Add(time.Hour)
 				}
 			}
@@ -111,7 +111,7 @@ func (ts *Timer) nextWakeTime() (date time.Time) {
 		}
 	}
 	logrus.Debugln("[timer] date after fix:", date)
-	if stable&0x8 != 0 && date.Hour() != int(h) {
+	if stable&0x8 != 0 && date.Hour() != h {
 		switch {
 		case stable&0x4 == 0:
 			date = date.AddDate(0, 0, 1).Add(-time.Hour)
@@ -124,7 +124,7 @@ func (ts *Timer) nextWakeTime() (date time.Time) {
 		}
 	}
 	logrus.Debugln("[timer] date after s8:", date)
-	if stable&0x4 != 0 && date.Day() != int(d) {
+	if stable&0x4 != 0 && date.Day() != d {
 		switch {
 		case stable*0x1 == 0:
 			date = date.AddDate(0, 1, -1)
@@ -140,7 +140,7 @@ func (ts *Timer) nextWakeTime() (date time.Time) {
 		default:
 			date = date.AddDate(1, 0, 0)
 		}
-		date = firstWeek(&date, time.Weekday(w))
+		date = firstWeek(&date, w)
 	}
 	logrus.Debugln("[timer] date after s2:", date)
 	if time.Until(date) <= 0 {
@@ -149,14 +149,14 @@ func (ts *Timer) nextWakeTime() (date time.Time) {
 	return date
 }
 
-func (ts *Timer) judgeHM() {
-	if ts.Hour() < 0 || ts.Hour() == time.Now().Hour() {
-		if ts.Minute() < 0 || ts.Minute() == time.Now().Minute() {
-			if ts.Selfid != 0 {
-				ts.sendmsg(ts.GrpId, zero.GetBot(ts.Selfid))
+func (t *Timer) judgeHM() {
+	if t.Hour() < 0 || t.Hour() == time.Now().Hour() {
+		if t.Minute() < 0 || t.Minute() == time.Now().Minute() {
+			if t.SelfID != 0 {
+				t.sendmsg(t.GrpID, zero.GetBot(t.SelfID))
 			} else {
 				zero.RangeBot(func(id int64, ctx *zero.Ctx) (_ bool) {
-					ts.sendmsg(ts.GrpId, ctx)
+					t.sendmsg(t.GrpID, ctx)
 					return
 				})
 			}

plugin_manager/timer/timer.db.go

@@ -1,26 +1,28 @@
 package timer
 
 import (
-	"strconv"
-
-	"github.com/FloatTech/ZeroBot-Plugin/utils/sql"
+	"github.com/FloatTech/zbputils/sql"
 )
 
+// Timer 计时器
 type Timer struct {
-	Id                          uint32 `db:"id"`
+	ID                          uint32 `db:"id"`
 	En1Month4Day5Week3Hour5Min6 int32  `db:"emdwhm"`
-	Selfid                      int64  `db:"sid"`
-	GrpId                       int64  `db:"gid"`
+	SelfID                      int64  `db:"sid"`
+	GrpID                       int64  `db:"gid"`
 	Alert                       string `db:"alert"`
 	Cron                        string `db:"cron"`
-	Url                         string `db:"url"`
+	URL                         string `db:"url"`
 }
 
+// InsertInto 插入自身
 func (t *Timer) InsertInto(db *sql.Sqlite) error {
 	return db.Insert("timer", t)
 }
 
+/*
 func getTimerFrom(db *sql.Sqlite, id uint32) (t Timer, err error) {
 	err = db.Find("timer", &t, "where id = "+strconv.Itoa(int(id)))
 	return
 }
+*/

plugin_manager/timer/timer.go

@@ -12,10 +12,10 @@ import (
 	zero "github.com/wdvxdr1123/ZeroBot"
 	"github.com/wdvxdr1123/ZeroBot/message"
 
-	"github.com/FloatTech/ZeroBot-Plugin/utils/file"
-	"github.com/FloatTech/ZeroBot-Plugin/utils/sql"
+	"github.com/FloatTech/zbputils/sql"
 )
 
+// Clock 时钟
 type Clock struct {
 	db       *sql.Sqlite
 	timers   *(map[uint32]*Timer)
@@ -37,10 +37,12 @@ var (
 	}
 )
 
+// NewClock 添加一个新时钟
 func NewClock(db *sql.Sqlite) (c Clock) {
-	c.loadTimers(db)
 	c.cron = cron.New()
 	c.entries = make(map[uint32]cron.EntryID)
+	c.timers = &map[uint32]*Timer{}
+	c.loadTimers(db)
 	c.cron.Start()
 	return
 }
@@ -50,9 +52,9 @@ func (c *Clock) RegisterTimer(ts *Timer, save bool) bool {
 	var key uint32
 	if save {
 		key = ts.GetTimerID()
-		ts.Id = key
+		ts.ID = key
 	} else {
-		key = ts.Id
+		key = ts.ID
 	}
 	t, ok := c.GetTimer(key)
 	if t != ts && ok { // 避免重复注册定时器
@@ -61,30 +63,34 @@ func (c *Clock) RegisterTimer(ts *Timer, save bool) bool {
 	logrus.Println("[群管]注册计时器", key)
 	if ts.Cron != "" {
 		var ctx *zero.Ctx
-		if ts.Selfid != 0 {
-			ctx = zero.GetBot(ts.Selfid)
+		if ts.SelfID != 0 {
+			ctx = zero.GetBot(ts.SelfID)
 		} else {
 			zero.RangeBot(func(id int64, c *zero.Ctx) bool {
 				ctx = c
-				ts.Selfid = id
+				ts.SelfID = id
 				return false
 			})
 		}
-		eid, err := c.cron.AddFunc(ts.Cron, func() { ts.sendmsg(ts.GrpId, ctx) })
+		eid, err := c.cron.AddFunc(ts.Cron, func() { ts.sendmsg(ts.GrpID, ctx) })
 		if err == nil {
 			c.entmu.Lock()
 			c.entries[key] = eid
 			c.entmu.Unlock()
 			if save {
-				err = c.AddTimer(ts)
+				err = c.AddTimerIntoDB(ts)
+			}
+			if err == nil {
+				err = c.AddTimerIntoMap(ts)
 			}
 			return err == nil
 		}
 		ts.Alert = err.Error()
 	} else {
 		if save {
-			_ = c.AddTimer(ts)
+			_ = c.AddTimerIntoDB(ts)
 		}
+		_ = c.AddTimerIntoMap(ts)
 		for ts.En() {
 			nextdate := ts.nextWakeTime()
 			sleepsec := time.Until(nextdate)
@@ -135,7 +141,7 @@ func (c *Clock) ListTimers(grpID int64) []string {
 		c.timersmu.RLock()
 		keys := make([]string, 0, len(*c.timers))
 		for _, v := range *c.timers {
-			if v.GrpId == grpID {
+			if v.GrpID == grpID {
 				k := v.GetTimerInfo()
 				start := strings.Index(k, "]")
 				msg := strings.ReplaceAll(k[start+1:]+"\n", "-1", "每")
@@ -147,11 +153,11 @@ func (c *Clock) ListTimers(grpID int64) []string {
 		}
 		c.timersmu.RUnlock()
 		return keys
-	} else {
-		return nil
 	}
+	return nil
 }
 
+// GetTimer 获得定时器
 func (c *Clock) GetTimer(key uint32) (t *Timer, ok bool) {
 	c.timersmu.RLock()
 	t, ok = (*c.timers)[key]
@@ -159,25 +165,31 @@ func (c *Clock) GetTimer(key uint32) (t *Timer, ok bool) {
 	return
 }
 
-func (c *Clock) AddTimer(t *Timer) (err error) {
+// AddTimerIntoDB 添加定时器
+func (c *Clock) AddTimerIntoDB(t *Timer) (err error) {
 	c.timersmu.Lock()
-	(*c.timers)[t.Id] = t
 	err = c.db.Insert("timer", t)
 	c.timersmu.Unlock()
 	return
 }
 
+// AddTimerIntoMap 添加定时器到缓存
+func (c *Clock) AddTimerIntoMap(t *Timer) (err error) {
+	c.timersmu.Lock()
+	(*c.timers)[t.ID] = t
+	c.timersmu.Unlock()
+	return
+}
+
 func (c *Clock) loadTimers(db *sql.Sqlite) {
-	if file.IsExist(db.DBPath) {
-		c.db = db
-		err := c.db.Create("timer", &Timer{})
-		if err == nil {
-			var t Timer
-			c.db.FindFor("timer", &t, "", func() error {
-				tescape := t
-				go c.RegisterTimer(&tescape, false)
-				return nil
-			})
-		}
+	c.db = db
+	err := c.db.Create("timer", &Timer{})
+	if err == nil {
+		var t Timer
+		_ = c.db.FindFor("timer", &t, "", func() error {
+			tescape := t
+			go c.RegisterTimer(&tescape, false)
+			return nil
+		})
 	}
 }

plugin_manager/timer/timer_test.go

@@ -4,6 +4,7 @@ import (
 	"testing"
 	"time"
 
+	"github.com/FloatTech/zbputils/sql"
 	"github.com/sirupsen/logrus"
 )
 
@@ -22,3 +23,11 @@ func TestNextWakeTime(t *testing.T) {
 	t.Log(t1)
 	t.Fail()
 }
+
+func TestClock(t *testing.T) {
+	db := &sql.Sqlite{DBPath: "test.db"}
+	c := NewClock(db)
+	c.AddTimerIntoDB(GetFilledTimer([]string{"", "12", "-1", "12", "0", "", "test"}, 0, 0, false))
+	t.Log(c.ListTimers(0))
+	t.Fail()
+}

plugin_manager/timer/wrap.go

@@ -3,13 +3,13 @@ package timer
 import "time"
 
 // En isEnabled 1bit
-func (m *Timer) En() (en bool) {
-	return m.En1Month4Day5Week3Hour5Min6&0x800000 != 0
+func (t *Timer) En() (en bool) {
+	return t.En1Month4Day5Week3Hour5Min6&0x800000 != 0
 }
 
 // Month 4bits
-func (m *Timer) Month() (mon time.Month) {
-	mon = time.Month((m.En1Month4Day5Week3Hour5Min6 & 0x780000) >> 19)
+func (t *Timer) Month() (mon time.Month) {
+	mon = time.Month((t.En1Month4Day5Week3Hour5Min6 & 0x780000) >> 19)
 	if mon == 0b1111 {
 		mon = -1
 	}
@@ -17,8 +17,8 @@ func (m *Timer) Month() (mon time.Month) {
 }
 
 // Day 5bits
-func (m *Timer) Day() (d int) {
-	d = int((m.En1Month4Day5Week3Hour5Min6 & 0x07c000) >> 14)
+func (t *Timer) Day() (d int) {
+	d = int((t.En1Month4Day5Week3Hour5Min6 & 0x07c000) >> 14)
 	if d == 0b11111 {
 		d = -1
 	}
@@ -26,8 +26,8 @@ func (m *Timer) Day() (d int) {
 }
 
 // Week 3bits
-func (m *Timer) Week() (w time.Weekday) {
-	w = time.Weekday((m.En1Month4Day5Week3Hour5Min6 & 0x003800) >> 11)
+func (t *Timer) Week() (w time.Weekday) {
+	w = time.Weekday((t.En1Month4Day5Week3Hour5Min6 & 0x003800) >> 11)
 	if w == 0b111 {
 		w = -1
 	}
@@ -35,8 +35,8 @@ func (m *Timer) Week() (w time.Weekday) {
 }
 
 // Hour 5bits
-func (m *Timer) Hour() (h int) {
-	h = int((m.En1Month4Day5Week3Hour5Min6 & 0x0007c0) >> 6)
+func (t *Timer) Hour() (h int) {
+	h = int((t.En1Month4Day5Week3Hour5Min6 & 0x0007c0) >> 6)
 	if h == 0b11111 {
 		h = -1
 	}
@@ -44,8 +44,8 @@ func (m *Timer) Hour() (h int) {
 }
 
 // Minute 6bits
-func (m *Timer) Minute() (min int) {
-	min = int(m.En1Month4Day5Week3Hour5Min6 & 0x00003f)
+func (t *Timer) Minute() (min int) {
+	min = int(t.En1Month4Day5Week3Hour5Min6 & 0x00003f)
 	if min == 0b111111 {
 		min = -1
 	}
@@ -53,35 +53,35 @@ func (m *Timer) Minute() (min int) {
 }
 
 // SetEn ...
-func (m *Timer) SetEn(en bool) {
+func (t *Timer) SetEn(en bool) {
 	if en {
-		m.En1Month4Day5Week3Hour5Min6 |= 0x800000
+		t.En1Month4Day5Week3Hour5Min6 |= 0x800000
 	} else {
-		m.En1Month4Day5Week3Hour5Min6 &= 0x7fffff
+		t.En1Month4Day5Week3Hour5Min6 &= 0x7fffff
 	}
 }
 
 // SetMonth ...
-func (m *Timer) SetMonth(mon time.Month) {
-	m.En1Month4Day5Week3Hour5Min6 = ((int32(mon) << 19) & 0x780000) | (m.En1Month4Day5Week3Hour5Min6 & 0x87ffff)
+func (t *Timer) SetMonth(mon time.Month) {
+	t.En1Month4Day5Week3Hour5Min6 = ((int32(mon) << 19) & 0x780000) | (t.En1Month4Day5Week3Hour5Min6 & 0x87ffff)
 }
 
 // SetDay ...
-func (m *Timer) SetDay(d int) {
-	m.En1Month4Day5Week3Hour5Min6 = ((int32(d) << 14) & 0x07c000) | (m.En1Month4Day5Week3Hour5Min6 & 0xf83fff)
+func (t *Timer) SetDay(d int) {
+	t.En1Month4Day5Week3Hour5Min6 = ((int32(d) << 14) & 0x07c000) | (t.En1Month4Day5Week3Hour5Min6 & 0xf83fff)
 }
 
 // SetWeek ...
-func (m *Timer) SetWeek(w time.Weekday) {
-	m.En1Month4Day5Week3Hour5Min6 = ((int32(w) << 11) & 0x003800) | (m.En1Month4Day5Week3Hour5Min6 & 0xffc7ff)
+func (t *Timer) SetWeek(w time.Weekday) {
+	t.En1Month4Day5Week3Hour5Min6 = ((int32(w) << 11) & 0x003800) | (t.En1Month4Day5Week3Hour5Min6 & 0xffc7ff)
 }
 
 // SetHour ...
-func (m *Timer) SetHour(h int) {
-	m.En1Month4Day5Week3Hour5Min6 = ((int32(h) << 6) & 0x0007c0) | (m.En1Month4Day5Week3Hour5Min6 & 0xfff83f)
+func (t *Timer) SetHour(h int) {
+	t.En1Month4Day5Week3Hour5Min6 = ((int32(h) << 6) & 0x0007c0) | (t.En1Month4Day5Week3Hour5Min6 & 0xfff83f)
 }
 
 // SetMinute ...
-func (m *Timer) SetMinute(min int) {
-	m.En1Month4Day5Week3Hour5Min6 = (int32(min) & 0x00003f) | (m.En1Month4Day5Week3Hour5Min6 & 0xffffc0)
+func (t *Timer) SetMinute(min int) {
+	t.En1Month4Day5Week3Hour5Min6 = (int32(min) & 0x00003f) | (t.En1Month4Day5Week3Hour5Min6 & 0xffffc0)
 }

plugin_minecraft/manager.go

@@ -6,11 +6,12 @@ import (
 	"io/ioutil"
 	"net/http"
 
+	control "github.com/FloatTech/zbputils/control"
 	zero "github.com/wdvxdr1123/ZeroBot"
 	"github.com/wdvxdr1123/ZeroBot/extension"
 	"github.com/wdvxdr1123/ZeroBot/message"
 
-	"github.com/FloatTech/ZeroBot-Plugin/control"
+	"github.com/FloatTech/ZeroBot-Plugin/order"
 )
 
 // 此功能实现依赖MCSManager项目对服务器的管理api，mc服务器如果没有在该管理平台部署此功能无效
@@ -19,7 +20,7 @@ import (
 
 const api = "http://your.addr:23333/api/start_server/%s/?apikey=apikey"
 
-var engine = control.Register("minecraft", &control.Options{
+var engine = control.Register("minecraft", order.PrioMinecraft, &control.Options{
 	DisableOnDefault: false,
 	Help: "minecraft\n" +
 		"- /mcstart xxx\n" +

plugin_moyu/holiday_test.go

@@ -8,7 +8,7 @@ import (
 	reg "github.com/fumiama/go-registry"
 )
 
-var sr = reg.NewRegedit("reilia.eastasia.azurecontainer.io:32664", "fumiama", "--")
+var sr = reg.NewRegedit("reilia.fumiama.top:32664", "fumiama", "--")
 
 func TestGetHoliday(t *testing.T) {
 	registry.Connect()
@@ -24,7 +24,7 @@ func TestSetHoliday(t *testing.T) {
 		t.Fatal(err)
 	}
 
-	err = SetHoliday("元旦", 1, 2022, 1, 1)
+	err = SetHoliday("元旦", 1, 2023, 1, 1)
 	if err != nil {
 		t.Fatal(err)
 	}