🐛 job 指令触发可能失败

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

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

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

* - 删去了遗漏的Trim

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

* 小调整

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

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

* fix:修复了枝网查重无法使用的问题

* readme适配上次的欢迎语修改

* 删去调试语句

* Update setu_geter.go

* Update zhiwang.go

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

README.md

@@ -5,7 +5,6 @@
 
   <img src="http://sayuri.fumiama.top/cmoe?name=ZeroBot-Plugin&theme=r34" />
 
-[![YAYA](https://img.shields.io/badge/OneBot-YaYa-green.svg?style=social&logo=appveyor)](https://github.com/Yiwen-Chan/OneBot-YaYa)
 [![GOCQ](https://img.shields.io/badge/OneBot-MiraiGo-green.svg?style=social&logo=appveyor)](https://github.com/Mrs4s/go-cqhttp)
 [![OICQ](https://img.shields.io/badge/OneBot-OICQ-green.svg?style=social&logo=appveyor)](https://github.com/takayama-lily/node-onebot)
 [![MIRAI](https://img.shields.io/badge/OneBot-Mirai-green.svg?style=social&logo=appveyor)](https://github.com/yyuueexxiinngg/onebot-kotlin)
@@ -148,7 +147,7 @@ print("run[CQ:image,file="+j["img"]+"]")
     - [x] 退出群聊[群号]@Bot
     - [x] *入群欢迎
     - [x] *退群通知
-    - [x] 设置欢迎语[欢迎~]  可选添加 [{at}] [{nickname}] [{avatar}]
+    - [x] 设置欢迎语[欢迎~]  可选添加 [{at}] [{nickname}] [{avatar}] [{id}]
     - [x] 在[MM]月[dd]日的[hh]点[mm]分时(用[url])提醒大家[xxx]
     - [x] 在[MM]月[每周 | 周几]的[hh]点[mm]分时(用[url])提醒大家[xxx]
     - [x] 取消在[MM]月[dd]日的[hh]点[mm]分的提醒
@@ -249,7 +248,7 @@ print("run[CQ:image,file="+j["img"]+"]")
     - [x] 放大图片[图片]
 - **每日运势** `import _ github.com/FloatTech/ZeroBot-Plugin/plugin/fortune`
     - [x] 运势 | 抽签
-    - [x] 设置底图[车万 DC4 爱因斯坦 星空列车 樱云之恋 富婆妹 李清歌 公主连结 原神 明日方舟 碧蓝航线 碧蓝幻想 战双 阴阳师 赛马娘 东方归言录]
+    - [x] 设置底图[车万 DC4 爱因斯坦 星空列车 樱云之恋 富婆妹 李清歌 公主连结 原神 明日方舟 碧蓝航线 碧蓝幻想 战双 阴阳师 赛马娘 东方归言录 奇异恩典]
 - **原神抽卡** `import _ github.com/FloatTech/ZeroBot-Plugin/plugin/genshin`
     - [x] 切换原神卡池
     - [x] 原神十连

go.mod

@@ -3,9 +3,9 @@ module github.com/FloatTech/ZeroBot-Plugin
 go 1.18
 
 require (
-	github.com/FloatTech/AnimeAPI v1.3.2-0.20220330051608-0599bc2286fc
+	github.com/FloatTech/AnimeAPI v1.3.3-0.20220404043354-914e2358e584
 	github.com/FloatTech/sqlite v0.2.1
-	github.com/FloatTech/zbputils v1.3.2-0.20220330051507-f26fec6ab9d8
+	github.com/FloatTech/zbputils v1.3.3-0.20220404050136-180c64cdee96
 	github.com/antchfx/htmlquery v1.2.4
 	github.com/corona10/goimagehash v1.0.3
 	github.com/fogleman/gg v1.3.0

go.sum

@@ -1,9 +1,9 @@
-github.com/FloatTech/AnimeAPI v1.3.2-0.20220330051608-0599bc2286fc h1:kTdQ6MvYGhVFpXlnAYdWeXAy8pdcpCUEcInT6zVOq+g=
-github.com/FloatTech/AnimeAPI v1.3.2-0.20220330051608-0599bc2286fc/go.mod h1:lZmZecNyucV88/1GllxoAh4F41Gy1nLannviQ4ahVWg=
+github.com/FloatTech/AnimeAPI v1.3.3-0.20220404043354-914e2358e584 h1:sBTSbodmIO4gmeKtU1BCiaDGYCsKNO7+ldg9oebyyVI=
+github.com/FloatTech/AnimeAPI v1.3.3-0.20220404043354-914e2358e584/go.mod h1:IKFBpKHgFAzo6cU4wOaRdb1ywa5mQ4NFc0mJk/wzgyY=
 github.com/FloatTech/sqlite v0.2.1 h1:9t6Me48XJJCIoPy4nLRvcdhcVKfT0c2lilp7SEKROG8=
 github.com/FloatTech/sqlite v0.2.1/go.mod h1:6NfHRzqOo9RWeMJEoAQVuo51Omd5LFNxCNQhMF02/9U=
-github.com/FloatTech/zbputils v1.3.2-0.20220330051507-f26fec6ab9d8 h1:qFMThl7qav2WwRGxNNcD1qviIZhfANW8Y0aXRpnhwMM=
-github.com/FloatTech/zbputils v1.3.2-0.20220330051507-f26fec6ab9d8/go.mod h1:V2Y8jkxjwACWuJsDCyNVKc+qABfMAUh/mgBYdWBxOPo=
+github.com/FloatTech/zbputils v1.3.3-0.20220404050136-180c64cdee96 h1:nS5auZd5HfJ/Qj0BTwhD+CmKlxtWa5/Uogzu1Y/RnUc=
+github.com/FloatTech/zbputils v1.3.3-0.20220404050136-180c64cdee96/go.mod h1:V2Y8jkxjwACWuJsDCyNVKc+qABfMAUh/mgBYdWBxOPo=
 github.com/PuerkitoBio/goquery v1.5.1/go.mod h1:GsLWisAFVj4WgDibEWF4pvYnkVQBpKBKeU+7zCJoLcc=
 github.com/RomiChan/websocket v1.4.3-0.20220123145318-307a86b127bc h1:AAx50/fb/xS4lvsdQg+bFbGvqSDhyV1MF+p2PLCamZ0=
 github.com/RomiChan/websocket v1.4.3-0.20220123145318-307a86b127bc/go.mod h1:OMmITAib6POA37xCichWM0aRnoVpSMZO1rB/G01wrr0=

kanban/banner.go

@@ -10,7 +10,7 @@ import (
 var (
 	info = [...]string{
 		"* OneBot + ZeroBot + Golang",
-		"* Version 1.3.2 - 2022-03-13 13:21:15 +0800 CST",
+		"* Version 1.3.3-beta1 - 2022-04-03 18:52:12 +0800 CST",
 		"* Copyright © 2020 - 2022 FloatTech. All Rights Reserved.",
 		"* Project: https://github.com/FloatTech/ZeroBot-Plugin",
 	}

plugin/acgimage/classify.go

@@ -11,7 +11,6 @@ import (
 	"github.com/FloatTech/AnimeAPI/classify"
 
 	"github.com/FloatTech/zbputils/control"
-	"github.com/FloatTech/zbputils/control/order"
 	"github.com/FloatTech/zbputils/ctxext"
 	"github.com/FloatTech/zbputils/img/pool"
 	"github.com/FloatTech/zbputils/web"
@@ -31,7 +30,7 @@ var (
 )
 
 func init() { // 插件主体
-	engine := control.Register("acgimage", order.AcquirePrio(), &control.Options{
+	engine := control.Register("acgimage", &control.Options{
 		DisableOnDefault: false,
 		Help: "随机图片与AI点评\n" +
 			"- 随机图片(评级大于6的图将私发)\n" +

plugin/ai_false/ai_false.go

@@ -12,14 +12,12 @@ import (
 	"github.com/shirou/gopsutil/v3/disk"
 	"github.com/shirou/gopsutil/v3/mem"
 
-	"github.com/FloatTech/zbputils/control/order"
-
 	zero "github.com/wdvxdr1123/ZeroBot"
 	"github.com/wdvxdr1123/ZeroBot/message"
 )
 
 func init() { // 插件主体
-	engine := control.Register("aifalse", order.AcquirePrio(), &control.Options{
+	engine := control.Register("aifalse", &control.Options{
 		DisableOnDefault: false,
 		Help: "AIfalse\n" +
 			"- 查询计算机当前活跃度: [检查身体 | 自检 | 启动自检 | 系统状态]",

plugin/ai_reply/ai_tts.go

@@ -17,8 +17,6 @@ import (
 	"github.com/FloatTech/AnimeAPI/tts/mockingbird"
 	"github.com/FloatTech/zbputils/control"
 	"github.com/FloatTech/zbputils/ctxext"
-
-	"github.com/FloatTech/zbputils/control/order"
 )
 
 const ttsServiceName = "tts"
@@ -51,7 +49,7 @@ func init() {
 		},
 		l: []string{"拟声鸟阿梓", "拟声鸟药水哥", "百度女声", "百度男声", "百度度逍遥", "百度度丫丫"},
 	}
-	engine := control.Register(ttsServiceName, order.AcquirePrio(), &control.Options{
+	engine := control.Register(ttsServiceName, &control.Options{
 		DisableOnDefault: true,
 		Help: "语音回复(包括拟声鸟和百度)\n" +
 			"- @Bot 任意文本(任意一句话回复)\n" +

plugin/ai_reply/main.go

@@ -10,8 +10,6 @@ import (
 	"github.com/FloatTech/zbputils/ctxext"
 	zero "github.com/wdvxdr1123/ZeroBot"
 	"github.com/wdvxdr1123/ZeroBot/message"
-
-	"github.com/FloatTech/zbputils/control/order"
 )
 
 const (
@@ -21,7 +19,7 @@ const (
 var replyModes = [...]string{"青云客", "小爱"}
 
 func init() { // 插件主体
-	engine := control.Register(replyServiceName, order.AcquirePrio(), &control.Options{
+	engine := control.Register(replyServiceName, &control.Options{
 		DisableOnDefault: false,
 		Help: "人工智能回复\n" +
 			"- @Bot 任意文本(任意一句话回复)\n- 设置回复模式[青云客  |  小爱]\n- ",

plugin/aiwife/non-existent.go

@@ -9,8 +9,6 @@ import (
 	"github.com/FloatTech/zbputils/ctxext"
 	zero "github.com/wdvxdr1123/ZeroBot"
 	"github.com/wdvxdr1123/ZeroBot/message"
-
-	"github.com/FloatTech/zbputils/control/order"
 )
 
 const (
@@ -18,7 +16,7 @@ const (
 )
 
 func init() { // 插件主体
-	control.Register("aiwife", order.AcquirePrio(), &control.Options{
+	control.Register("aiwife", &control.Options{
 		DisableOnDefault: false,
 		Help: "AIWife\n" +
 			"- waifu | 随机waifu",

plugin/atri/atri.go

@@ -14,8 +14,6 @@ import (
 
 	control "github.com/FloatTech/zbputils/control"
 	"github.com/FloatTech/zbputils/process"
-
-	"github.com/FloatTech/zbputils/control/order"
 )
 
 const (
@@ -26,7 +24,7 @@ const (
 )
 
 func init() { // 插件主体
-	engine := control.Register(servicename, order.AcquirePrio(), &control.Options{
+	engine := control.Register(servicename, &control.Options{
 		DisableOnDefault: false,
 		Help: "本插件基于 ATRI ，为 Golang 移植版\n" +
 			"- ATRI醒醒\n- ATRI睡吧\n- 萝卜子\n- 喜欢 | 爱你 | 爱 | suki | daisuki | すき | 好き | 贴贴 | 老婆 | 亲一个 | mua\n" +
@@ -34,26 +32,16 @@ func init() { // 插件主体
 			"- 中午好 | 午安 | 午好\n- 晚安 | oyasuminasai | おやすみなさい | 晚好 | 晚上好\n- 高性能 | 太棒了 | すごい | sugoi | 斯国一 | よかった\n" +
 			"- 没事 | 没关系 | 大丈夫 | 还好 | 不要紧 | 没出大问题 | 没伤到哪\n- 好吗 | 是吗 | 行不行 | 能不能 | 可不可以\n- 啊这\n- 我好了\n- ？ | ? | ¿\n" +
 			"- 离谱\n- 答应我",
+		OnEnable: func(ctx *zero.Ctx) {
+			process.SleepAbout1sTo2s()
+			ctx.SendChain(message.Text("嗯呜呜……夏生先生……？"))
+		},
+		OnDisable: func(ctx *zero.Ctx) {
+			process.SleepAbout1sTo2s()
+			ctx.SendChain(message.Text("Zzz……Zzz……"))
+		},
 	})
-	zero.OnFullMatch("ATRI醒醒", zero.AdminPermission).SetBlock(true).
-		Handle(func(ctx *zero.Ctx) {
-			c, ok := control.Lookup(servicename)
-			if ok && !c.IsEnabledIn(ctx.Event.GroupID) {
-				c.Enable(ctx.Event.GroupID)
-				process.SleepAbout1sTo2s()
-				ctx.SendChain(message.Text("嗯呜呜……夏生先生……？"))
-			}
-		})
-	engine.OnFullMatch("ATRI睡吧", zero.AdminPermission).SetBlock(true).
-		Handle(func(ctx *zero.Ctx) {
-			c, ok := control.Lookup(servicename)
-			if ok && c.IsEnabledIn(ctx.Event.GroupID) {
-				c.Disable(ctx.Event.GroupID)
-				process.SleepAbout1sTo2s()
-				ctx.SendChain(message.Text("Zzz……Zzz……"))
-			}
-		})
-	engine.OnFullMatch("萝卜子", atriSleep).SetBlock(true).
+	engine.OnFullMatch("萝卜子", isAtriSleeping).SetBlock(true).
 		Handle(func(ctx *zero.Ctx) {
 			process.SleepAbout1sTo2s()
 			switch rand.Intn(2) {
@@ -63,12 +51,12 @@ func init() { // 插件主体
 				ctx.SendChain(randRecord("RocketPunch.amr"))
 			}
 		})
-	engine.OnFullMatchGroup([]string{"喜欢", "爱你", "爱", "suki", "daisuki", "すき", "好き", "贴贴", "老婆", "亲一个", "mua"}, atriSleep, zero.OnlyToMe).SetBlock(true).
+	engine.OnFullMatchGroup([]string{"喜欢", "爱你", "爱", "suki", "daisuki", "すき", "好き", "贴贴", "老婆", "亲一个", "mua"}, isAtriSleeping, 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).
+	engine.OnKeywordGroup([]string{"草你妈", "操你妈", "脑瘫", "废柴", "fw", "five", "废物", "战斗", "爬", "爪巴", "sb", "SB", "傻B"}, isAtriSleeping, zero.OnlyToMe).SetBlock(true).
 		Handle(func(ctx *zero.Ctx) {
 			process.SleepAbout1sTo2s()
 			ctx.SendChain(randImage("FN.jpg", "WQ.jpg", "WQ1.jpg"))
@@ -169,7 +157,7 @@ func init() { // 插件主体
 				))
 			}
 		})
-	engine.OnKeywordGroup([]string{"高性能", "太棒了", "すごい", "sugoi", "斯国一", "よかった"}, atriSleep, zero.OnlyToMe).SetBlock(true).
+	engine.OnKeywordGroup([]string{"高性能", "太棒了", "すごい", "sugoi", "斯国一", "よかった"}, isAtriSleeping, zero.OnlyToMe).SetBlock(true).
 		Handle(func(ctx *zero.Ctx) {
 			process.SleepAbout1sTo2s()
 			ctx.SendChain(randText(
@@ -190,7 +178,7 @@ func init() { // 插件主体
 				"呣......我的高性能，毫无遗憾地施展出来了......",
 			))
 		})
-	engine.OnKeywordGroup([]string{"没事", "没关系", "大丈夫", "还好", "不要紧", "没出大问题", "没伤到哪"}, atriSleep, zero.OnlyToMe).SetBlock(true).
+	engine.OnKeywordGroup([]string{"没事", "没关系", "大丈夫", "还好", "不要紧", "没出大问题", "没伤到哪"}, isAtriSleeping, zero.OnlyToMe).SetBlock(true).
 		Handle(func(ctx *zero.Ctx) {
 			process.SleepAbout1sTo2s()
 			ctx.SendChain(randText(
@@ -205,26 +193,26 @@ func init() { // 插件主体
 			))
 		})
 
-	engine.OnKeywordGroup([]string{"好吗", "是吗", "行不行", "能不能", "可不可以"}, atriSleep).SetBlock(true).
+	engine.OnKeywordGroup([]string{"好吗", "是吗", "行不行", "能不能", "可不可以"}, isAtriSleeping).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).
+	engine.OnKeywordGroup([]string{"啊这"}, isAtriSleeping).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).
+	engine.OnKeywordGroup([]string{"我好了"}, isAtriSleeping).SetBlock(true).
 		Handle(func(ctx *zero.Ctx) {
 			process.SleepAbout1sTo2s()
 			ctx.SendChain(message.Reply(ctx.Event.MessageID), randText("不许好！", "憋回去！"))
 		})
-	engine.OnFullMatchGroup([]string{"？", "?", "¿"}, atriSleep).SetBlock(true).
+	engine.OnFullMatchGroup([]string{"？", "?", "¿"}, isAtriSleeping).SetBlock(true).
 		Handle(func(ctx *zero.Ctx) {
 			process.SleepAbout1sTo2s()
 			switch rand.Intn(5) {
@@ -234,7 +222,7 @@ func init() { // 插件主体
 				ctx.SendChain(randImage("WH.jpg", "WH1.jpg", "WH2.jpg", "WH3.jpg"))
 			}
 		})
-	engine.OnKeyword("离谱", atriSleep).SetBlock(true).
+	engine.OnKeyword("离谱", isAtriSleeping).SetBlock(true).
 		Handle(func(ctx *zero.Ctx) {
 			switch rand.Intn(5) {
 			case 0:
@@ -243,7 +231,7 @@ func init() { // 插件主体
 				ctx.SendChain(randImage("WH.jpg"))
 			}
 		})
-	engine.OnKeyword("答应我", atriSleep, zero.OnlyToMe).SetBlock(true).
+	engine.OnKeyword("答应我", isAtriSleeping, zero.OnlyToMe).SetBlock(true).
 		Handle(func(ctx *zero.Ctx) {
 			process.SleepAbout1sTo2s()
 			ctx.SendChain(randText("我无法回应你的请求"))
@@ -262,8 +250,8 @@ func randRecord(file ...string) message.MessageSegment {
 	return message.Record(res + file[rand.Intn(len(file))])
 }
 
-// atriSleep 凌晨0点到6点，ATRI 在睡觉，不回应任何请求
-func atriSleep(ctx *zero.Ctx) bool {
+// isAtriSleeping 凌晨0点到6点，ATRI 在睡觉，不回应任何请求
+func isAtriSleeping(ctx *zero.Ctx) bool {
 	if now := time.Now().Hour(); now >= 1 && now < 6 {
 		return false
 	}

plugin/b14/main.go

@@ -10,12 +10,10 @@ import (
 	zero "github.com/wdvxdr1123/ZeroBot"
 	"github.com/wdvxdr1123/ZeroBot/message"
 	"github.com/wdvxdr1123/ZeroBot/utils/helper"
-
-	"github.com/FloatTech/zbputils/control/order"
 )
 
 func init() {
-	en := control.Register("base16384", order.AcquirePrio(), &control.Options{
+	en := control.Register("base16384", &control.Options{
 		DisableOnDefault: false,
 		Help: "base16384加解密\n" +
 			"- 加密xxx\n- 解密xxx\n- 用yyy加密xxx\n- 用yyy解密xxx",

plugin/baidu/search.go

@@ -8,12 +8,11 @@ import (
 	"github.com/wdvxdr1123/ZeroBot/message"
 
 	"github.com/FloatTech/zbputils/control"
-	"github.com/FloatTech/zbputils/control/order"
 	"github.com/FloatTech/zbputils/ctxext"
 )
 
 func init() {
-	control.Register("baidu", order.AcquirePrio(), &control.Options{
+	control.Register("baidu", &control.Options{
 		DisableOnDefault: false,
 		Help: "baidu\n" +
 			"- 百度下[xxx]",

plugin/bilibili/info.go

@@ -11,7 +11,6 @@ import (
 	"time"
 
 	control "github.com/FloatTech/zbputils/control"
-	"github.com/FloatTech/zbputils/control/order"
 	"github.com/FloatTech/zbputils/file"
 	"github.com/FloatTech/zbputils/img"
 	"github.com/FloatTech/zbputils/img/text"
@@ -23,7 +22,7 @@ import (
 	"github.com/wdvxdr1123/ZeroBot/message"
 )
 
-var engine = control.Register("bilibili", order.AcquirePrio(), &control.Options{
+var engine = control.Register("bilibili", &control.Options{
 	DisableOnDefault: false,
 	Help: "bilibili\n" +
 		"- >vup info [xxx]\n" +

plugin/bilibili_parse/bilibili_parse.go

@@ -11,8 +11,6 @@ import (
 	log "github.com/sirupsen/logrus"
 	zero "github.com/wdvxdr1123/ZeroBot"
 	"github.com/wdvxdr1123/ZeroBot/message"
-
-	"github.com/FloatTech/zbputils/control/order"
 )
 
 const (
@@ -21,7 +19,7 @@ const (
 )
 
 func init() {
-	engine := control.Register("bilibiliparse", order.AcquirePrio(), &control.Options{
+	engine := control.Register("bilibiliparse", &control.Options{
 		DisableOnDefault: false,
 		Help: "b站视频链接解析\n" +
 			"- https://www.bilibili.com/video/BV1xx411c7BF | https://www.bilibili.com/video/av1605 | https://b23.tv/I8uzWCA | https://www.bilibili.com/video/bv1xx411c7BF",

plugin/bilibili_push/bilibili_push.go

@@ -15,7 +15,6 @@ import (
 
 	"github.com/FloatTech/zbputils/binary"
 	"github.com/FloatTech/zbputils/control"
-	"github.com/FloatTech/zbputils/control/order"
 	"github.com/FloatTech/zbputils/img/text"
 	"github.com/FloatTech/zbputils/web"
 )
@@ -57,7 +56,7 @@ var (
 
 func init() {
 	go bilibiliPushDaily()
-	en := control.Register(serviceName, order.AcquirePrio(), &control.Options{
+	en := control.Register(serviceName, &control.Options{
 		DisableOnDefault: false,
 		Help: "bilibilipush\n" +
 			"- 添加订阅[uid]\n" +

plugin/book_review/book_review.go

@@ -8,13 +8,12 @@ import (
 
 	"github.com/FloatTech/zbputils/binary"
 	"github.com/FloatTech/zbputils/control"
-	"github.com/FloatTech/zbputils/control/order"
 	"github.com/FloatTech/zbputils/file"
 	"github.com/FloatTech/zbputils/img/text"
 )
 
 func init() {
-	engine := control.Register("bookreview", order.AcquirePrio(), &control.Options{
+	engine := control.Register("bookreview", &control.Options{
 		DisableOnDefault: false,
 		Help:             "哀伤雪刃推书记录\n- 书评[xxx]\n- 随机书评",
 		PublicDataFolder: "BookReview",

plugin/cangtoushi/cangtoushi.go

@@ -15,8 +15,6 @@ import (
 	zero "github.com/wdvxdr1123/ZeroBot"
 	"github.com/wdvxdr1123/ZeroBot/message"
 	"github.com/wdvxdr1123/ZeroBot/utils/helper"
-
-	"github.com/FloatTech/zbputils/control/order"
 )
 
 const (
@@ -32,7 +30,7 @@ var (
 )
 
 func init() {
-	engine := control.Register("cangtoushi", order.AcquirePrio(), &control.Options{
+	engine := control.Register("cangtoushi", &control.Options{
 		DisableOnDefault: false,
 		Help: "藏头诗\n" +
 			"- 藏头诗[xxx]\n- 藏尾诗[xxx]",

plugin/chat/chat.go

@@ -10,13 +10,11 @@ import (
 	zero "github.com/wdvxdr1123/ZeroBot"
 	"github.com/wdvxdr1123/ZeroBot/extension/rate"
 	"github.com/wdvxdr1123/ZeroBot/message"
-
-	"github.com/FloatTech/zbputils/control/order"
 )
 
 var (
 	poke   = rate.NewManager(time.Minute*5, 8) // 戳一戳
-	engine = control.Register("chat", order.AcquirePrio(), &control.Options{
+	engine = control.Register("chat", &control.Options{
 		DisableOnDefault: false,
 		Help:             "chat\n- [BOT名字]\n- [戳一戳BOT]\n- 空调开\n- 空调关\n- 群温度\n- 设置温度[正整数]",
 	})

plugin/choose/choose.go

@@ -9,12 +9,10 @@ import (
 	control "github.com/FloatTech/zbputils/control"
 	zero "github.com/wdvxdr1123/ZeroBot"
 	"github.com/wdvxdr1123/ZeroBot/message"
-
-	"github.com/FloatTech/zbputils/control/order"
 )
 
 func init() {
-	engine := control.Register("choose", order.AcquirePrio(), &control.Options{
+	engine := control.Register("choose", &control.Options{
 		DisableOnDefault: false,
 		Help: "choose\n" +
 			"- 选择可口可乐还是百事可乐\n" +

plugin/chouxianghua/chouxianghua.go

@@ -7,12 +7,11 @@ import (
 	"github.com/wdvxdr1123/ZeroBot/message"
 
 	"github.com/FloatTech/zbputils/control"
-	"github.com/FloatTech/zbputils/control/order"
 	"github.com/FloatTech/zbputils/file"
 )
 
 func init() {
-	en := control.Register("chouxianghua", order.AcquirePrio(), &control.Options{
+	en := control.Register("chouxianghua", &control.Options{
 		DisableOnDefault: false,
 		Help:             "抽象话\n- 抽象翻译xxx",
 		PublicDataFolder: "ChouXiangHua",

plugin/coser/coser.go

@@ -14,8 +14,6 @@ import (
 	control "github.com/FloatTech/zbputils/control"
 	"github.com/FloatTech/zbputils/ctxext"
 	"github.com/FloatTech/zbputils/web"
-
-	"github.com/FloatTech/zbputils/control/order"
 )
 
 var (
@@ -25,7 +23,7 @@ var (
 )
 
 func init() {
-	control.Register("coser", order.AcquirePrio(), &control.Options{
+	control.Register("coser", &control.Options{
 		DisableOnDefault: false,
 		Help:             "三次元小姐姐\n- coser",
 	}).ApplySingle(ctxext.DefaultSingle).OnFullMatch("coser", zero.OnlyGroup).SetBlock(true).Limit(ctxext.LimitByGroup).

plugin/cpstory/cpstory.go

@@ -11,12 +11,10 @@ import (
 	control "github.com/FloatTech/zbputils/control"
 	"github.com/FloatTech/zbputils/file"
 	"github.com/FloatTech/zbputils/math"
-
-	"github.com/FloatTech/zbputils/control/order"
 )
 
 func init() {
-	engine := control.Register("cpstory", order.AcquirePrio(), &control.Options{
+	engine := control.Register("cpstory", &control.Options{
 		DisableOnDefault: false,
 		Help:             "cp短打\n- 组cp[@xxx][@xxx]\n- 磕cp大老师 雪乃",
 		PublicDataFolder: "CpStory",

plugin/curse/curse.go

@@ -10,8 +10,6 @@ import (
 	"github.com/FloatTech/zbputils/ctxext"
 	"github.com/FloatTech/zbputils/file"
 	"github.com/FloatTech/zbputils/process"
-
-	"github.com/FloatTech/zbputils/control/order"
 )
 
 const (
@@ -20,7 +18,7 @@ const (
 )
 
 func init() {
-	engine := control.Register("curse", order.AcquirePrio(), &control.Options{
+	engine := control.Register("curse", &control.Options{
 		DisableOnDefault: true,
 		Help:             "骂人(求骂,自卫)\n- 骂我\n- 大力骂我",
 		PublicDataFolder: "Curse",

plugin/danbooru/main.go

@@ -13,12 +13,10 @@ import (
 	zero "github.com/wdvxdr1123/ZeroBot"
 	"github.com/wdvxdr1123/ZeroBot/message"
 	"github.com/wdvxdr1123/ZeroBot/utils/helper"
-
-	"github.com/FloatTech/zbputils/control/order"
 )
 
 func init() { // 插件主体
-	engine := control.Register("danbooru", order.AcquirePrio(), &control.Options{
+	engine := control.Register("danbooru", &control.Options{
 		DisableOnDefault: false,
 		Help: "二次元图片标签识别\n" +
 			"- 鉴赏图片[图片]",

plugin/diana/bing.go

@@ -7,12 +7,10 @@ import (
 
 	control "github.com/FloatTech/zbputils/control"
 
-	"github.com/FloatTech/zbputils/control/order"
-
 	"github.com/FloatTech/ZeroBot-Plugin/plugin/diana/data"
 )
 
-var engine = control.Register("diana", order.AcquirePrio(), &control.Options{
+var engine = control.Register("diana", &control.Options{
 	DisableOnDefault: false,
 	Help: "嘉然\n" +
 		"- 小作文\n" +

plugin/diana/zhiwang.go

@@ -3,106 +3,87 @@ package diana
 
 import (
 	"bytes"
-	"encoding/json"
 	"math"
+	"strings"
 	"time"
 
+	"github.com/FloatTech/zbputils/binary"
+	"github.com/FloatTech/zbputils/ctxext"
+	"github.com/FloatTech/zbputils/web"
+	"github.com/tidwall/gjson"
 	"github.com/wdvxdr1123/ZeroBot/message"
 
-	"net/http"
-	"strings"
-
 	zero "github.com/wdvxdr1123/ZeroBot"
 )
 
-type zhiwang struct {
-	Code int `json:"code"`
-	Data struct {
-		EndTime   int             `json:"end_time"`
-		Rate      float64         `json:"rate"`
-		Related   [][]interface{} `json:"related"`
-		StartTime int             `json:"start_time"`
-	} `json:"data"`
-	Message string `json:"message"`
-}
-
 // 小作文查重: 回复要查的消息 查重
 func init() {
-	engine.OnMessage(fullmatch("查重")).SetBlock(true).
-		Handle(func(ctx *zero.Ctx) {
-			msg := ctx.Event.Message
-			if msg[0].Type == "reply" {
-				msg := ctx.GetMessage(message.NewMessageID(msg[0].Data["id"])).Elements[0].Data["text"]
-				zhiwangjson := zhiwangapi(msg)
-
-				if zhiwangjson == nil || zhiwangjson.Code != 0 {
-					ctx.SendChain(message.Text("api返回错误"))
-					return
-				}
-
-				if len(zhiwangjson.Data.Related) == 0 {
-					ctx.SendChain(message.Text("枝网没搜到，查重率为0%，我的评价是：一眼真"))
-					return
-				}
-
-				related := zhiwangjson.Data.Related[0][1].(map[string]interface{})
-				ctx.SendChain(message.Text(
-					"枝网文本复制检测报告(简洁)", "\n",
-					"查重时间: ", time.Now().Format("2006-01-02 15:04:05"), "\n",
-					"总文字复制比: ", math.Floor(zhiwangjson.Data.Rate*100), "%", "\n",
-					"相似小作文:", "\n",
-					related["content"].(string)[:102]+".....", "\n",
-					"获赞数", related["like_num"], "\n",
-					zhiwangjson.Data.Related[0][2].(string), "\n",
-					"作者: ", related["m_name"], "\n",
-					"发表时间: ", time.Unix(int64(related["ctime"].(float64)), 0).Format("2006-01-02 15:04:05"), "\n",
-					"查重结果仅作参考，请注意辨别是否为原创", "\n",
-					"数据来源: https://asoulcnki.asia/",
-				))
-			}
-		})
-}
-
-// 发起api请求并把返回body交由json库解析
-func zhiwangapi(text string) *zhiwang {
-	url := "https://asoulcnki.asia/v1/api/check"
-	post := "{\n\"text\":\"" + text + "\"\n}"
-	var jsonStr = []byte(post)
-
-	req, _ := http.NewRequest("POST", url, bytes.NewBuffer(jsonStr))
-	req.Header.Set("Content-Type", "application/json")
-	client := &http.Client{}
-
-	resp, err := client.Do(req)
-
-	if err != nil {
-		return nil
-	}
-	defer resp.Body.Close()
-
-	result := &zhiwang{}
-	if err1 := json.NewDecoder(resp.Body).Decode(result); err1 != nil {
-		return nil
-	}
-	return result
-}
-
-func fullmatch(src ...string) zero.Rule {
-	return func(ctx *zero.Ctx) bool {
+	engine.OnMessage(func(ctx *zero.Ctx) bool {
 		msg := ctx.Event.Message
+		if msg[0].Type != "reply" {
+			return false
+		}
 		for _, elem := range msg {
 			if elem.Type == "text" {
 				text := elem.Data["text"]
 				text = strings.ReplaceAll(text, " ", "")
 				text = strings.ReplaceAll(text, "\r", "")
 				text = strings.ReplaceAll(text, "\n", "")
-				for _, s := range src {
-					if text == s {
-						return true
-					}
+				if text == "查重" {
+					return true
 				}
 			}
 		}
 		return false
-	}
+	}).SetBlock(true).Limit(ctxext.LimitByUser).Handle(func(ctx *zero.Ctx) {
+		msg := ctx.GetMessage(message.NewMessageID(ctx.Event.Message[0].Data["id"])).Elements[0].Data["text"]
+		result, err := zhiwangapi(msg)
+		if err != nil {
+			ctx.SendChain(message.Text("ERROR:", err))
+			return
+		}
+		if result.Get("code").Int() != 0 {
+			ctx.SendChain(message.Text("api返回错误:", result.Get("code").Int()))
+			return
+		}
+		if result.Get("data.related.#").Int() == 0 {
+			ctx.Send(message.ReplyWithMessage(ctx.Event.MessageID, message.Text("枝网没搜到，查重率为0%，鉴定为原创")))
+			return
+		}
+		related := result.Get("data.related.0.reply").Map()
+		rate := result.Get("data.related.0.rate").Float()
+		relatedcontent := related["content"].String()
+		if len(relatedcontent) > 102 {
+			relatedcontent = relatedcontent[:102] + "....."
+		}
+		ctx.Send(message.ReplyWithMessage(ctx.Event.MessageID, message.Text(
+			"枝网文本复制检测报告(简洁)", "\n",
+			"查重时间: ", time.Now().Format("2006-01-02 15:04:05"), "\n",
+			"总文字复制比: ", math.Floor(rate*100), "%", "\n",
+			"相似小作文：", "\n", relatedcontent, "\n",
+			"获赞数：", related["like_num"].String(), "\n",
+			result.Get("data.related.0.reply_url").String(), "\n",
+			"作者: ", related["m_name"].String(), "\n",
+			"发表时间: ", time.Unix(int64(related["ctime"].Float()), 0).Format("2006-01-02 15:04:05"), "\n",
+			"查重结果仅作参考，请注意辨别是否为原创", "\n",
+			"数据来源: https://asoulcnki.asia/",
+		)))
+	})
+}
+
+func zhiwangapi(text string) (*gjson.Result, error) {
+	b, cl := binary.OpenWriterF(func(w *binary.Writer) {
+		w.WriteString("{\n\"text\":\"")
+		w.WriteString(text)
+		w.WriteString("\"\n}")
+	})
+
+	data, err := web.PostData("https://asoulcnki.asia/v1/api/check", "application/json", bytes.NewReader(b))
+	cl()
+	if err != nil {
+		return nil, err
+	}
+
+	result := gjson.ParseBytes(data)
+	return &result, nil
 }

plugin/drift_bottle/main.go

@@ -7,14 +7,13 @@ import (
 	"sync"
 
 	"github.com/FloatTech/zbputils/control"
-	"github.com/FloatTech/zbputils/control/order"
 	"github.com/sirupsen/logrus"
 	zero "github.com/wdvxdr1123/ZeroBot"
 	"github.com/wdvxdr1123/ZeroBot/message"
 )
 
 func init() {
-	en := control.Register("driftbottle", order.AcquirePrio(), &control.Options{
+	en := control.Register("driftbottle", &control.Options{
 		DisableOnDefault:  false,
 		Help:              "漂流瓶\n- (在群xxx)丢漂流瓶(到频道xxx) [消息]\n- (从频道xxx)捡漂流瓶\n- @BOT 创建频道 xxx\n- 跳入(频道)海中\n- 注：不显式限制时，私聊发送可在所有群抽到，群聊发送仅可在本群抽到，默认频道为 global",
 		PrivateDataFolder: "driftbottle",

plugin/emojimix/mix.go

@@ -7,7 +7,6 @@ import (
 	"strconv"
 
 	"github.com/FloatTech/zbputils/control"
-	"github.com/FloatTech/zbputils/control/order"
 	"github.com/FloatTech/zbputils/ctxext"
 	"github.com/sirupsen/logrus"
 	zero "github.com/wdvxdr1123/ZeroBot"
@@ -17,7 +16,7 @@ import (
 const bed = "https://www.gstatic.com/android/keyboard/emojikitchen/%d/u%x/u%x_u%x.png"
 
 func init() {
-	control.Register("emojimix", order.AcquirePrio(), &control.Options{
+	control.Register("emojimix", &control.Options{
 		DisableOnDefault: false,
 		Help: "合成emoji\n" +
 			"- [emoji][emoji]",

plugin/epidemic/epidemic.go

@@ -9,7 +9,6 @@ import (
 
 	"github.com/FloatTech/zbputils/binary"
 	"github.com/FloatTech/zbputils/control"
-	"github.com/FloatTech/zbputils/control/order"
 	"github.com/FloatTech/zbputils/ctxext"
 	"github.com/FloatTech/zbputils/web"
 )
@@ -49,7 +48,7 @@ type area struct {
 }
 
 func init() {
-	engine := control.Register(servicename, order.AcquirePrio(), &control.Options{
+	engine := control.Register(servicename, &control.Options{
 		DisableOnDefault: false,
 		Help: "城市疫情查询\n" +
 			"- xxx疫情\n",

plugin/font/main.go

@@ -4,7 +4,6 @@ package font
 import (
 	"github.com/FloatTech/zbputils/binary"
 	"github.com/FloatTech/zbputils/control"
-	"github.com/FloatTech/zbputils/control/order"
 	"github.com/FloatTech/zbputils/ctxext"
 	"github.com/FloatTech/zbputils/img/text"
 	zero "github.com/wdvxdr1123/ZeroBot"
@@ -12,7 +11,7 @@ import (
 )
 
 func init() {
-	control.Register("font", order.AcquirePrio(), &control.Options{
+	control.Register("font", &control.Options{
 		DisableOnDefault: false,
 		Help:             "渲染任意文字到图片\n- (用[终末体|终末变体|紫罗兰体|樱酥体|Consolas体|苹方体])渲染文字xxx",
 	}).OnRegex(`^(用.+)?渲染文字([\s\S]+)$`).SetBlock(true).Limit(ctxext.LimitByUser).Handle(func(ctx *zero.Ctx) {

plugin/fortune/fortune.go

@@ -25,8 +25,6 @@ import (
 	"github.com/FloatTech/zbputils/img/pool"
 	"github.com/FloatTech/zbputils/img/writer"
 	"github.com/FloatTech/zbputils/math"
-
-	"github.com/FloatTech/zbputils/control/order"
 )
 
 const (
@@ -42,7 +40,7 @@ const (
 
 var (
 	// 底图类型列表
-	table = [...]string{"车万", "DC4", "爱因斯坦", "星空列车", "樱云之恋", "富婆妹", "李清歌", "公主连结", "原神", "明日方舟", "碧蓝航线", "碧蓝幻想", "战双", "阴阳师", "赛马娘", "东方归言录"}
+	table = [...]string{"车万", "DC4", "爱因斯坦", "星空列车", "樱云之恋", "富婆妹", "李清歌", "公主连结", "原神", "明日方舟", "碧蓝航线", "碧蓝幻想", "战双", "阴阳师", "赛马娘", "东方归言录", "奇异恩典"}
 	// 映射底图与 index
 	index = make(map[string]uint8)
 	// 签文
@@ -51,11 +49,11 @@ var (
 
 func init() {
 	// 插件主体
-	en := control.Register("fortune", order.AcquirePrio(), &control.Options{
+	en := control.Register("fortune", &control.Options{
 		DisableOnDefault: false,
 		Help: "每日运势: \n" +
 			"- 运势 | 抽签\n" +
-			"- 设置底图[车万 | DC4 | 爱因斯坦 | 星空列车 | 樱云之恋 | 富婆妹 | 李清歌 | 公主连结 | 原神 | 明日方舟 | 碧蓝航线 | 碧蓝幻想 | 战双 | 阴阳师 | 赛马娘 | 东方归言录]",
+			"- 设置底图[车万 | DC4 | 爱因斯坦 | 星空列车 | 樱云之恋 | 富婆妹 | 李清歌 | 公主连结 | 原神 | 明日方舟 | 碧蓝航线 | 碧蓝幻想 | 战双 | 阴阳师 | 赛马娘 | 东方归言录 | 奇异恩典]",
 		PublicDataFolder: "Fortune",
 	})
 	_ = os.RemoveAll(cache)

plugin/funny/laugh.go

@@ -12,8 +12,6 @@ import (
 	control "github.com/FloatTech/zbputils/control"
 	"github.com/FloatTech/zbputils/ctxext"
 	"github.com/FloatTech/zbputils/file"
-
-	"github.com/FloatTech/zbputils/control/order"
 )
 
 type joke struct {
@@ -24,7 +22,7 @@ type joke struct {
 var db = &sql.Sqlite{}
 
 func init() {
-	en := control.Register("funny", order.AcquirePrio(), &control.Options{
+	en := control.Register("funny", &control.Options{
 		DisableOnDefault: false,
 		Help: "讲个笑话\n" +
 			"- 讲个笑话[@xxx] | 讲个笑话[qq号]",

plugin/genshin/ys.go

@@ -13,7 +13,6 @@ import (
 	"sync/atomic"
 
 	"github.com/FloatTech/zbputils/control"
-	"github.com/FloatTech/zbputils/control/order"
 	"github.com/FloatTech/zbputils/ctxext"
 	"github.com/FloatTech/zbputils/file"
 	"github.com/FloatTech/zbputils/img/writer"
@@ -33,7 +32,7 @@ var (
 )
 
 func init() {
-	engine := control.Register("genshin", order.AcquirePrio(), &control.Options{
+	engine := control.Register("genshin", &control.Options{
 		DisableOnDefault: false,
 		Help:             "原神抽卡\n- 原神十连\n- 切换原神卡池",
 		PublicDataFolder: "Genshin",

plugin/gif/run.go

@@ -11,8 +11,6 @@ import (
 	"github.com/FloatTech/zbputils/file"
 	zero "github.com/wdvxdr1123/ZeroBot"
 	"github.com/wdvxdr1123/ZeroBot/message"
-
-	"github.com/FloatTech/zbputils/control/order"
 )
 
 var (
@@ -22,7 +20,7 @@ var (
 )
 
 func init() { // 插件主体
-	en := control.Register("gif", order.AcquirePrio(), &control.Options{
+	en := control.Register("gif", &control.Options{
 		DisableOnDefault:  false,
 		Help:              "制图\n- " + strings.Join(cmds, "\n- "),
 		PrivateDataFolder: "gif",

plugin/github/repo_searcher.go

@@ -13,13 +13,11 @@ import (
 	zero "github.com/wdvxdr1123/ZeroBot"
 	"github.com/wdvxdr1123/ZeroBot/message"
 
-	"github.com/FloatTech/zbputils/control/order"
-
 	"github.com/tidwall/gjson"
 )
 
 func init() { // 插件主体
-	control.Register("github", order.AcquirePrio(), &control.Options{
+	control.Register("github", &control.Options{
 		DisableOnDefault: false,
 		Help: "GitHub仓库搜索\n" +
 			"- >github [xxx]\n" +

plugin/hs/run.go

@@ -16,8 +16,6 @@ import (
 	"github.com/FloatTech/zbputils/ctxext"
 	"github.com/FloatTech/zbputils/file"
 	"github.com/FloatTech/zbputils/web"
-
-	"github.com/FloatTech/zbputils/control/order"
 )
 
 var reqconf = [...]string{"GET", "https://hs.fbigame.com",
@@ -43,7 +41,7 @@ const (
 )
 
 func init() {
-	engine := control.Register("hs", order.AcquirePrio(), &control.Options{
+	engine := control.Register("hs", &control.Options{
 		DisableOnDefault: false,
 		Help: "炉石\n" +
 			"- 搜卡[xxxx]\n" +

plugin/hyaku/main.go

@@ -11,7 +11,6 @@ import (
 
 	"github.com/FloatTech/zbputils/binary"
 	"github.com/FloatTech/zbputils/control"
-	"github.com/FloatTech/zbputils/control/order"
 	"github.com/FloatTech/zbputils/ctxext"
 	"github.com/FloatTech/zbputils/file"
 	zero "github.com/wdvxdr1123/ZeroBot"
@@ -51,7 +50,7 @@ func (l *line) String() string {
 var lines [100]*line
 
 func init() {
-	engine := control.Register("hyaku", order.AcquirePrio(), &control.Options{
+	engine := control.Register("hyaku", &control.Options{
 		DisableOnDefault: false,
 		Help: "百人一首\n" +
 			"- 百人一首(随机发一首)\n" +

plugin/image_finder/keyword.go

@@ -14,7 +14,6 @@ import (
 	"github.com/FloatTech/AnimeAPI/pixiv"
 
 	"github.com/FloatTech/zbputils/control"
-	"github.com/FloatTech/zbputils/control/order"
 	"github.com/FloatTech/zbputils/ctxext"
 	"github.com/FloatTech/zbputils/img/pool"
 	"github.com/FloatTech/zbputils/web"
@@ -35,7 +34,7 @@ type resultjson struct {
 }
 
 func init() {
-	control.Register("imgfinder", order.AcquirePrio(), &control.Options{
+	control.Register("imgfinder", &control.Options{
 		DisableOnDefault: false,
 		Help: "关键字搜图\n" +
 			"- 来张 [xxx]",

plugin/inject/main.go

@@ -3,13 +3,12 @@ package inject
 
 import (
 	"github.com/FloatTech/zbputils/control"
-	"github.com/FloatTech/zbputils/control/order"
 	zero "github.com/wdvxdr1123/ZeroBot"
 	"github.com/wdvxdr1123/ZeroBot/message"
 )
 
 func init() {
-	en := control.Register("inject", order.AcquirePrio(), &control.Options{
+	en := control.Register("inject", &control.Options{
 		DisableOnDefault: false,
 		Help: "注入指令\n" +
 			"- run[CQ码]",

plugin/jandan/jandan.go

@@ -14,8 +14,6 @@ import (
 	"github.com/sirupsen/logrus"
 	zero "github.com/wdvxdr1123/ZeroBot"
 	"github.com/wdvxdr1123/ZeroBot/message"
-
-	"github.com/FloatTech/zbputils/control/order"
 )
 
 const (
@@ -23,7 +21,7 @@ const (
 )
 
 func init() {
-	engine := control.Register("jandan", order.AcquirePrio(), &control.Options{
+	engine := control.Register("jandan", &control.Options{
 		DisableOnDefault: false,
 		Help:             "煎蛋网无聊图\n- 来份[屌|弔|吊]图\n- 更新[屌|弔|吊]图\n",
 		PublicDataFolder: "Jandan",

plugin/juejuezi/juejuezi.go

@@ -14,8 +14,6 @@ import (
 	zero "github.com/wdvxdr1123/ZeroBot"
 	"github.com/wdvxdr1123/ZeroBot/message"
 	"github.com/wdvxdr1123/ZeroBot/utils/helper"
-
-	"github.com/FloatTech/zbputils/control/order"
 )
 
 const (
@@ -25,7 +23,7 @@ const (
 )
 
 func init() {
-	control.Register("juejuezi", order.AcquirePrio(), &control.Options{
+	control.Register("juejuezi", &control.Options{
 		DisableOnDefault: false,
 		Help: "绝绝子生成器\n" +
 			"- 喝奶茶绝绝子 | 绝绝子吃饭",

plugin/lolicon/lolicon.go

@@ -15,8 +15,6 @@ import (
 	"github.com/FloatTech/zbputils/math"
 	"github.com/FloatTech/zbputils/process"
 	"github.com/FloatTech/zbputils/web"
-
-	"github.com/FloatTech/zbputils/control/order"
 )
 
 const (
@@ -29,7 +27,7 @@ var (
 )
 
 func init() {
-	control.Register("lolicon", order.AcquirePrio(), &control.Options{
+	control.Register("lolicon", &control.Options{
 		DisableOnDefault: false,
 		Help: "lolicon\n" +
 			"- 来份萝莉",

plugin/manager/manager.go

@@ -19,8 +19,6 @@ import (
 	"github.com/FloatTech/zbputils/math"
 	"github.com/FloatTech/zbputils/process"
 
-	"github.com/FloatTech/zbputils/control/order"
-
 	"github.com/FloatTech/ZeroBot-Plugin/plugin/manager/timer"
 )
 
@@ -61,7 +59,7 @@ var (
 )
 
 func init() { // 插件主体
-	engine := control.Register("manager", order.AcquirePrio(), &control.Options{
+	engine := control.Register("manager", &control.Options{
 		DisableOnDefault:  false,
 		Help:              hint,
 		PrivateDataFolder: "manager",

plugin/moyu/run.go

@@ -8,8 +8,6 @@ import (
 	control "github.com/FloatTech/zbputils/control"
 	zero "github.com/wdvxdr1123/ZeroBot"
 	"github.com/wdvxdr1123/ZeroBot/message"
-
-	"github.com/FloatTech/zbputils/control/order"
 )
 
 var (
@@ -19,7 +17,7 @@ var (
 )
 
 func init() { // 插件主体
-	control.Register("moyu", order.AcquirePrio(), &control.Options{
+	control.Register("moyu", &control.Options{
 		DisableOnDefault: true,
 		Help: "moyu\n" +
 			"- /启用 moyu\n" +

plugin/moyu_calendar/calendar.go

@@ -13,7 +13,6 @@ import (
 	"time"
 
 	control "github.com/FloatTech/zbputils/control"
-	"github.com/FloatTech/zbputils/control/order"
 	zero "github.com/wdvxdr1123/ZeroBot"
 	"github.com/wdvxdr1123/ZeroBot/message"
 
@@ -26,7 +25,7 @@ var weixin = regexp.MustCompile(`url \+= '(.+)';`)
 var client = &http.Client{}
 
 func init() {
-	control.Register("moyucalendar", order.AcquirePrio(), &control.Options{
+	control.Register("moyucalendar", &control.Options{
 		DisableOnDefault: true,
 		Help: "摸鱼人日历\n" +
 			"- /启用 moyucalendar\n" +

plugin/music/selecter.go

@@ -16,12 +16,10 @@ import (
 	"github.com/tidwall/gjson"
 	zero "github.com/wdvxdr1123/ZeroBot"
 	"github.com/wdvxdr1123/ZeroBot/message"
-
-	"github.com/FloatTech/zbputils/control/order"
 )
 
 func init() {
-	control.Register("music", order.AcquirePrio(), &control.Options{
+	control.Register("music", &control.Options{
 		DisableOnDefault: false,
 		Help: "点歌\n" +
 			"- 点歌[xxx]\n" +

plugin/nativesetu/main.go

@@ -13,8 +13,6 @@ import (
 	"github.com/FloatTech/zbputils/control"
 	"github.com/FloatTech/zbputils/ctxext"
 	"github.com/FloatTech/zbputils/file"
-
-	"github.com/FloatTech/zbputils/control/order"
 )
 
 var (
@@ -22,7 +20,7 @@ var (
 )
 
 func init() {
-	engine := control.Register("nativesetu", order.AcquirePrio(), &control.Options{
+	engine := control.Register("nativesetu", &control.Options{
 		DisableOnDefault: false,
 		Help: "本地涩图\n" +
 			"- 本地[xxx]\n" +

plugin/nativewife/main.go

@@ -16,14 +16,12 @@ import (
 	"github.com/wdvxdr1123/ZeroBot/message"
 	"github.com/wdvxdr1123/ZeroBot/utils/helper"
 
-	"github.com/FloatTech/zbputils/control/order"
-
 	control "github.com/FloatTech/zbputils/control"
 	"github.com/FloatTech/zbputils/file"
 )
 
 func init() {
-	engine := control.Register("nwife", order.AcquirePrio(), &control.Options{
+	engine := control.Register("nwife", &control.Options{
 		DisableOnDefault:  false,
 		Help:              "nativewife\n- 抽wife[@xxx]\n- 添加wife[名字][图片]\n- 删除wife[名字]\n- [让 | 不让]所有人均可添加wife",
 		PrivateDataFolder: "nwife",

plugin/nbnhhsh/nbnhhsh.go

@@ -11,12 +11,10 @@ import (
 	"github.com/tidwall/gjson"
 	zero "github.com/wdvxdr1123/ZeroBot"
 	"github.com/wdvxdr1123/ZeroBot/message"
-
-	"github.com/FloatTech/zbputils/control/order"
 )
 
 func init() {
-	control.Register("nbnhhsh", order.AcquirePrio(), &control.Options{
+	control.Register("nbnhhsh", &control.Options{
 		DisableOnDefault: false,
 		Help:             "拼音首字母释义工具\n- ?? [缩写]",
 	}).OnRegex(`^[?？]{1,2} ?([a-z0-9]+)$`).SetBlock(false).

plugin/novel/qianbi.go

@@ -20,8 +20,6 @@ import (
 	control "github.com/FloatTech/zbputils/control"
 	"github.com/FloatTech/zbputils/ctxext"
 	"github.com/FloatTech/zbputils/img/text"
-
-	"github.com/FloatTech/zbputils/control/order"
 )
 
 const (
@@ -40,7 +38,7 @@ const (
 var gCurCookieJar *cookiejar.Jar
 
 func init() {
-	control.Register("novel", order.AcquirePrio(), &control.Options{
+	control.Register("novel", &control.Options{
 		DisableOnDefault: false,
 		Help:             "铅笔小说网搜索\n- 小说[xxx]",
 	}).OnRegex("^小说([\u4E00-\u9FA5A-Za-z0-9]{1,25})$").SetBlock(true).Limit(ctxext.LimitByUser).

plugin/nsfw/main.go

@@ -8,14 +8,12 @@ import (
 	"github.com/FloatTech/zbputils/process"
 	zero "github.com/wdvxdr1123/ZeroBot"
 	"github.com/wdvxdr1123/ZeroBot/message"
-
-	"github.com/FloatTech/zbputils/control/order"
 )
 
 const hso = "https://gchat.qpic.cn/gchatpic_new//--4234EDEC5F147A4C319A41149D7E0EA9/0"
 
 func init() {
-	engine := control.Register("nsfw", order.AcquirePrio(), &control.Options{
+	engine := control.Register("nsfw", &control.Options{
 		DisableOnDefault: false,
 		Help:             "nsfw图片识别\n- nsfw打分[图片]",
 	}).ApplySingle(ctxext.DefaultSingle)
@@ -33,7 +31,7 @@ func init() {
 				ctx.Send(message.ReplyWithMessage(ctx.Event.MessageID, message.Text(judge(p[0]))))
 			}
 		})
-	control.Register("nsfwauto", order.AcquirePrio(), &control.Options{
+	control.Register("nsfwauto", &control.Options{
 		DisableOnDefault: true,
 		Help:             "nsfw图片自动识别\n- 当图片属于非 neutral 类别时自动发送评价",
 	}).OnMessage(zero.HasPicture).SetBlock(false).

plugin/omikuji/sensou.go

@@ -16,14 +16,12 @@ import (
 	"github.com/FloatTech/zbputils/ctxext"
 	"github.com/FloatTech/zbputils/file"
 	"github.com/FloatTech/zbputils/img/text"
-
-	"github.com/FloatTech/zbputils/control/order"
 )
 
 const bed = "https://gitcode.net/u011570312/senso-ji-omikuji/-/raw/main/%d_%d.jpg"
 
 func init() { // 插件主体
-	engine := control.Register("omikuji", order.AcquirePrio(), &control.Options{
+	engine := control.Register("omikuji", &control.Options{
 		DisableOnDefault: false,
 		Help: "浅草寺求签\n" +
 			"- 求签 | 占卜\n- 解签",

plugin/reborn/main.go

@@ -10,12 +10,10 @@ import (
 	"github.com/sirupsen/logrus"
 	zero "github.com/wdvxdr1123/ZeroBot"
 	"github.com/wdvxdr1123/ZeroBot/message"
-
-	"github.com/FloatTech/zbputils/control/order"
 )
 
 func init() {
-	en := control.Register("reborn", order.AcquirePrio(), &control.Options{
+	en := control.Register("reborn", &control.Options{
 		DisableOnDefault: false,
 		Help:             "投胎\n- reborn",
 		PublicDataFolder: "Reborn",

plugin/runcode/code_runner.go

@@ -14,8 +14,6 @@ import (
 	zero "github.com/wdvxdr1123/ZeroBot"
 	"github.com/wdvxdr1123/ZeroBot/message"
 
-	"github.com/FloatTech/zbputils/control/order"
-
 	"github.com/tidwall/gjson"
 )
 
@@ -93,7 +91,7 @@ var (
 )
 
 func init() {
-	control.Register("runcode", order.AcquirePrio(), &control.Options{
+	control.Register("runcode", &control.Options{
 		DisableOnDefault: false,
 		Help: "在线代码运行: \n" +
 			">runcode [language] [code block]\n" +

plugin/saucenao/searcher.go

@@ -15,14 +15,13 @@ import (
 	"github.com/FloatTech/AnimeAPI/yandex"
 
 	"github.com/FloatTech/zbputils/control"
-	"github.com/FloatTech/zbputils/control/order"
 	"github.com/FloatTech/zbputils/ctxext"
 	"github.com/FloatTech/zbputils/file"
 	"github.com/FloatTech/zbputils/img/pool"
 )
 
 func init() { // 插件主体
-	engine := control.Register("saucenao", order.AcquirePrio(), &control.Options{
+	engine := control.Register("saucenao", &control.Options{
 		DisableOnDefault: false,
 		Help: "搜图\n" +
 			"- 以图搜图 | 搜索图片 | 以图识图[图片]\n" +

plugin/scale/main.go

@@ -23,7 +23,6 @@ import (
 
 	"github.com/FloatTech/zbputils/binary"
 	"github.com/FloatTech/zbputils/control"
-	"github.com/FloatTech/zbputils/control/order"
 	"github.com/FloatTech/zbputils/ctxext"
 	"github.com/FloatTech/zbputils/file"
 	"github.com/FloatTech/zbputils/img"
@@ -32,7 +31,7 @@ import (
 )
 
 func init() {
-	engine := control.Register("scale", order.AcquirePrio(), &control.Options{
+	engine := control.Register("scale", &control.Options{
 		DisableOnDefault:  false,
 		Help:              "叔叔的AI二次元图片放大\n- 放大图片[图片]",
 		PrivateDataFolder: "scale",

plugin/score/sign_in.go

@@ -19,8 +19,6 @@ import (
 	"github.com/FloatTech/zbputils/img/text"
 	"github.com/FloatTech/zbputils/img/writer"
 	"github.com/FloatTech/zbputils/web"
-
-	"github.com/FloatTech/zbputils/control/order"
 )
 
 const (
@@ -35,7 +33,7 @@ const (
 var levelArray = [...]int{0, 1, 2, 5, 10, 20, 35, 55, 75, 100, 120}
 
 func init() {
-	engine := control.Register("score", order.AcquirePrio(), &control.Options{
+	engine := control.Register("score", &control.Options{
 		DisableOnDefault:  false,
 		Help:              "签到得分\n- 签到\n- 获得签到背景[@xxx] | 获得签到背景",
 		PrivateDataFolder: "score",

plugin/setutime/setu_geter.go

@@ -18,8 +18,6 @@ import (
 	"github.com/FloatTech/zbputils/process"
 	zero "github.com/wdvxdr1123/ZeroBot"
 	"github.com/wdvxdr1123/ZeroBot/message"
-
-	"github.com/FloatTech/zbputils/control/order"
 )
 
 // Pools 图片缓冲池
@@ -51,7 +49,7 @@ var pool = &imgpool{
 }
 
 func init() { // 插件主体
-	engine := control.Register("setutime", order.AcquirePrio(), &control.Options{
+	engine := control.Register("setutime", &control.Options{
 		DisableOnDefault: false,
 		Help: "涩图\n" +
 			"- 来份[涩图/二次元/风景/车万]\n" +
@@ -76,7 +74,7 @@ func init() { // 插件主体
 		}
 	}()
 
-	engine.OnRegex(`^来份(.*)$`, ctxext.FirstValueInList(pool)).SetBlock(true).Limit(ctxext.LimitByUser).
+	engine.OnRegex(`^来份(.+)$`, ctxext.FirstValueInList(pool)).SetBlock(true).Limit(ctxext.LimitByUser).
 		Handle(func(ctx *zero.Ctx) {
 			var imgtype = ctx.State["regex_matched"].([]string)[1]
 			// 补充池子
@@ -96,7 +94,7 @@ func init() { // 插件主体
 			}
 		})
 
-	engine.OnRegex(`^添加(.*?)(\d+)$`, zero.SuperUserPermission).SetBlock(true).
+	engine.OnRegex(`^添加(.+)\s?(\d+)$`, zero.SuperUserPermission).SetBlock(true).
 		Handle(func(ctx *zero.Ctx) {
 			var (
 				imgtype = ctx.State["regex_matched"].([]string)[1]
@@ -110,7 +108,7 @@ func init() { // 插件主体
 			ctx.SendChain(message.Text("成功向分类", imgtype, "添加图片", id))
 		})
 
-	engine.OnRegex(`^删除(.*?)(\d+)$`, ctxext.FirstValueInList(pool), zero.SuperUserPermission).SetBlock(true).
+	engine.OnRegex(`^删除(.+)\s?(\d+)$`, ctxext.FirstValueInList(pool), zero.SuperUserPermission).SetBlock(true).
 		Handle(func(ctx *zero.Ctx) {
 			var (
 				imgtype = ctx.State["regex_matched"].([]string)[1]

plugin/shadiao/shadiao.go

@@ -3,8 +3,6 @@ package shadiao
 
 import (
 	control "github.com/FloatTech/zbputils/control"
-
-	"github.com/FloatTech/zbputils/control/order"
 )
 
 const (
@@ -23,7 +21,7 @@ const (
 )
 
 var (
-	engine = control.Register("shadiao", order.AcquirePrio(), &control.Options{
+	engine = control.Register("shadiao", &control.Options{
 		DisableOnDefault: false,
 		Help: "沙雕app\n" +
 			"- 哄我\n- 渣我\n- 来碗绿茶\n- 发个朋友圈\n- 来碗毒鸡汤\n- 讲个段子",

plugin/shindan/shindan.go

@@ -8,15 +8,13 @@ import (
 	"github.com/wdvxdr1123/ZeroBot/message"
 	"github.com/wdvxdr1123/ZeroBot/utils/helper"
 
-	"github.com/FloatTech/zbputils/control/order"
-
 	control "github.com/FloatTech/zbputils/control"
 	"github.com/FloatTech/zbputils/ctxext"
 	"github.com/FloatTech/zbputils/img/text"
 )
 
 func init() {
-	engine := control.Register("shindan", order.AcquirePrio(), &control.Options{
+	engine := control.Register("shindan", &control.Options{
 		DisableOnDefault: false,
 		Help: "shindan\n" +
 			"- 今天是什么少女[@xxx]\n" +

plugin/sleep_manage/sleep_manage.go

@@ -10,12 +10,10 @@ import (
 	"github.com/wdvxdr1123/ZeroBot/message"
 
 	control "github.com/FloatTech/zbputils/control"
-
-	"github.com/FloatTech/zbputils/control/order"
 )
 
 func init() {
-	engine := control.Register("sleepmanage", order.AcquirePrio(), &control.Options{
+	engine := control.Register("sleepmanage", &control.Options{
 		DisableOnDefault:  false,
 		Help:              "sleepmanage\n- 早安\n- 晚安",
 		PrivateDataFolder: "sleep",

plugin/thesaurus/chat.go

@@ -10,14 +10,12 @@ import (
 	"github.com/sirupsen/logrus"
 	zero "github.com/wdvxdr1123/ZeroBot"
 	"github.com/wdvxdr1123/ZeroBot/message"
-
-	"github.com/FloatTech/zbputils/control/order"
 )
 
 type kimo = map[string]*[]string
 
 func init() {
-	engine := control.Register("thesaurus", order.AcquirePrio(), &control.Options{
+	engine := control.Register("thesaurus", &control.Options{
 		DisableOnDefault: false,
 		Help:             "thesaurus\n- 词典匹配回复",
 		PublicDataFolder: "Chat",

plugin/tiangou/tiangou.go

@@ -4,7 +4,6 @@ package tiangou
 import (
 	sql "github.com/FloatTech/sqlite"
 	"github.com/FloatTech/zbputils/control"
-	"github.com/FloatTech/zbputils/control/order"
 	"github.com/FloatTech/zbputils/ctxext"
 	"github.com/FloatTech/zbputils/file"
 	"github.com/sirupsen/logrus"
@@ -20,7 +19,7 @@ type tiangou struct {
 var db = &sql.Sqlite{}
 
 func init() {
-	en := control.Register("tiangou", order.AcquirePrio(), &control.Options{
+	en := control.Register("tiangou", &control.Options{
 		DisableOnDefault: false,
 		Help: "舔狗日记\n" +
 			"- 舔狗日记",

plugin/tracemoe/moe.go

@@ -8,8 +8,6 @@ import (
 	trmoe "github.com/fumiama/gotracemoe"
 	zero "github.com/wdvxdr1123/ZeroBot"
 	"github.com/wdvxdr1123/ZeroBot/message"
-
-	"github.com/FloatTech/zbputils/control/order"
 )
 
 var (
@@ -17,7 +15,7 @@ var (
 )
 
 func init() { // 插件主体
-	engine := control.Register("tracemoe", order.AcquirePrio(), &control.Options{
+	engine := control.Register("tracemoe", &control.Options{
 		DisableOnDefault: false,
 		Help:             "tracemoe\n- 搜番 | 搜索番剧[图片]",
 	})

plugin/translation/tl.go

@@ -10,12 +10,10 @@ import (
 	"github.com/FloatTech/zbputils/ctxext"
 	"github.com/FloatTech/zbputils/process"
 	"github.com/FloatTech/zbputils/web"
-
-	"github.com/FloatTech/zbputils/control/order"
 )
 
 func init() {
-	control.Register("translation", order.AcquirePrio(), &control.Options{
+	control.Register("translation", &control.Options{
 		DisableOnDefault: false,
 		Help: "翻译\n" +
 			">TL 你好",

plugin/vtb_quotation/vtb_quotation.go

@@ -23,8 +23,6 @@ import (
 	"github.com/FloatTech/zbputils/img/text"
 	"github.com/FloatTech/zbputils/web"
 
-	"github.com/FloatTech/zbputils/control/order"
-
 	"github.com/FloatTech/ZeroBot-Plugin/plugin/vtb_quotation/model"
 )
 
@@ -36,7 +34,7 @@ var (
 )
 
 func init() {
-	engine := control.Register("vtbquotation", order.AcquirePrio(), &control.Options{
+	engine := control.Register("vtbquotation", &control.Options{
 		DisableOnDefault: false,
 		Help:             "vtbkeyboard.moe\n- vtb语录\n- 随机vtb\n- 更新vtb\n",
 		PublicDataFolder: "VtbQuotation",

plugin/wangyiyun/main.go

@@ -8,8 +8,6 @@ import (
 	zero "github.com/wdvxdr1123/ZeroBot"
 	"github.com/wdvxdr1123/ZeroBot/message"
 	"github.com/wdvxdr1123/ZeroBot/utils/helper"
-
-	"github.com/FloatTech/zbputils/control/order"
 )
 
 const (
@@ -19,7 +17,7 @@ const (
 )
 
 func init() {
-	control.Register("wangyiyun", order.AcquirePrio(), &control.Options{
+	control.Register("wangyiyun", &control.Options{
 		DisableOnDefault: false,
 		Help:             "wangyiyun \n- 来份网易云热评",
 	}).OnFullMatch("来份网易云热评").SetBlock(true).Limit(ctxext.LimitByUser).

plugin/wordle/wordle.go

@@ -12,7 +12,6 @@ import (
 	"time"
 
 	"github.com/FloatTech/zbputils/control"
-	"github.com/FloatTech/zbputils/control/order"
 	"github.com/FloatTech/zbputils/ctxext"
 	"github.com/FloatTech/zbputils/file"
 	"github.com/FloatTech/zbputils/img/writer"
@@ -60,7 +59,7 @@ var (
 )
 
 func init() {
-	en := control.Register("wordle", order.AcquirePrio(), &control.Options{
+	en := control.Register("wordle", &control.Options{
 		DisableOnDefault: false,
 		Help: "猜单词\n" +
 			"- 个人猜单词" +

plugin/wtf/main.go

@@ -9,12 +9,10 @@ import (
 	"github.com/FloatTech/zbputils/ctxext"
 	zero "github.com/wdvxdr1123/ZeroBot"
 	"github.com/wdvxdr1123/ZeroBot/message"
-
-	"github.com/FloatTech/zbputils/control/order"
 )
 
 func init() {
-	en := control.Register("wtf", order.AcquirePrio(), &control.Options{
+	en := control.Register("wtf", &control.Options{
 		DisableOnDefault: false,
 		Help:             "鬼东西\n- 鬼东西列表\n- 查询鬼东西[序号][@xxx]",
 	})

plugin/ymgal/ymgal.go

@@ -5,7 +5,6 @@ import (
 	"strings"
 
 	"github.com/FloatTech/zbputils/control"
-	"github.com/FloatTech/zbputils/control/order"
 	"github.com/FloatTech/zbputils/ctxext"
 	"github.com/FloatTech/zbputils/file"
 	zero "github.com/wdvxdr1123/ZeroBot"
@@ -13,7 +12,7 @@ import (
 )
 
 func init() {
-	engine := control.Register("ymgal", order.AcquirePrio(), &control.Options{
+	engine := control.Register("ymgal", &control.Options{
 		DisableOnDefault: false,
 		Help:             "月幕galgame\n- 随机galCG\n- 随机gal表情包\n- galCG[xxx]\n- gal表情包[xxx]\n- 更新gal\n",
 		PublicDataFolder: "Ymgal",

plugin/zaobao/zaobao.go

@@ -12,8 +12,6 @@ import (
 	"github.com/FloatTech/zbputils/binary"
 	control "github.com/FloatTech/zbputils/control"
 	"github.com/FloatTech/zbputils/web"
-
-	"github.com/FloatTech/zbputils/control/order"
 )
 
 const (
@@ -29,7 +27,7 @@ var (
 )
 
 func init() { // 插件主体
-	engine := control.Register("zaobao", order.AcquirePrio(), &control.Options{
+	engine := control.Register("zaobao", &control.Options{
 		DisableOnDefault: true,
 		Help: "易即今日公众号api的今日早报\n" +
 			"api早上8点更新，推荐定时在8点30后\n" +