diff --git a/go.mod b/go.mod index 3753354c..dd4762ff 100644 --- a/go.mod +++ b/go.mod @@ -5,7 +5,7 @@ go 1.18 require ( github.com/FloatTech/AnimeAPI v1.3.2 github.com/FloatTech/sqlite v0.2.1 - github.com/FloatTech/zbputils v1.3.3-0.20220402143834-825f0c6b3ef2 + github.com/FloatTech/zbputils v1.3.3-0.20220402144434-73a4caf53729 github.com/antchfx/htmlquery v1.2.4 github.com/corona10/goimagehash v1.0.3 github.com/fogleman/gg v1.3.0 diff --git a/go.sum b/go.sum index 53b21ea9..440dcac1 100644 --- a/go.sum +++ b/go.sum @@ -2,8 +2,8 @@ github.com/FloatTech/AnimeAPI v1.3.2 h1:5RmNOIi8QSwFjTgB9KxIjdbDdXUCe1+MLe+7R633 github.com/FloatTech/AnimeAPI v1.3.2/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.3-0.20220402143834-825f0c6b3ef2 h1:lMoKD5dg7FGCzxDCmBXCkHcukqGph+PHLoQ0wuQO7hc= -github.com/FloatTech/zbputils v1.3.3-0.20220402143834-825f0c6b3ef2/go.mod h1:V2Y8jkxjwACWuJsDCyNVKc+qABfMAUh/mgBYdWBxOPo= +github.com/FloatTech/zbputils v1.3.3-0.20220402144434-73a4caf53729 h1:kewQofwDrOMSu6ssiq557la3JygScyY88w3XAU2mLoc= +github.com/FloatTech/zbputils v1.3.3-0.20220402144434-73a4caf53729/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= diff --git a/plugin/acgimage/classify.go b/plugin/acgimage/classify.go index 00a86095..05afb4f0 100644 --- a/plugin/acgimage/classify.go +++ b/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" + diff --git a/plugin/ai_false/ai_false.go b/plugin/ai_false/ai_false.go index 824fe463..629ce8d7 100644 --- a/plugin/ai_false/ai_false.go +++ b/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" + "- 查询计算机当前活跃度: [检查身体 | 自检 | 启动自检 | 系统状态]", diff --git a/plugin/ai_reply/ai_tts.go b/plugin/ai_reply/ai_tts.go index ddd11455..472ea4c4 100644 --- a/plugin/ai_reply/ai_tts.go +++ b/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" + diff --git a/plugin/ai_reply/main.go b/plugin/ai_reply/main.go index 8b5ca872..0b3dc898 100644 --- a/plugin/ai_reply/main.go +++ b/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- ", diff --git a/plugin/aiwife/non-existent.go b/plugin/aiwife/non-existent.go index e758a956..c5bfe0a5 100644 --- a/plugin/aiwife/non-existent.go +++ b/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", diff --git a/plugin/atri/atri.go b/plugin/atri/atri.go index ac503d29..3c9969a4 100644 --- a/plugin/atri/atri.go +++ b/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" + diff --git a/plugin/b14/main.go b/plugin/b14/main.go index 7f50bac6..6e3f9e90 100644 --- a/plugin/b14/main.go +++ b/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", diff --git a/plugin/baidu/search.go b/plugin/baidu/search.go index ed32bcdc..e4e06fb2 100644 --- a/plugin/baidu/search.go +++ b/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]", diff --git a/plugin/bilibili/info.go b/plugin/bilibili/info.go index b0157e55..3be9a914 100644 --- a/plugin/bilibili/info.go +++ b/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" + diff --git a/plugin/bilibili_parse/bilibili_parse.go b/plugin/bilibili_parse/bilibili_parse.go index b2d2e36a..31c76f9a 100644 --- a/plugin/bilibili_parse/bilibili_parse.go +++ b/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", diff --git a/plugin/bilibili_push/bilibili_push.go b/plugin/bilibili_push/bilibili_push.go index c700b45e..e7db6385 100644 --- a/plugin/bilibili_push/bilibili_push.go +++ b/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" + diff --git a/plugin/book_review/book_review.go b/plugin/book_review/book_review.go index 8b525b84..657fcbd3 100644 --- a/plugin/book_review/book_review.go +++ b/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", diff --git a/plugin/cangtoushi/cangtoushi.go b/plugin/cangtoushi/cangtoushi.go index ae973dde..15fba4e6 100644 --- a/plugin/cangtoushi/cangtoushi.go +++ b/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]", diff --git a/plugin/chat/chat.go b/plugin/chat/chat.go index 056c71ac..34308e08 100644 --- a/plugin/chat/chat.go +++ b/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- 设置温度[正整数]", }) diff --git a/plugin/choose/choose.go b/plugin/choose/choose.go index 5c7fa673..61876dc5 100644 --- a/plugin/choose/choose.go +++ b/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" + diff --git a/plugin/chouxianghua/chouxianghua.go b/plugin/chouxianghua/chouxianghua.go index c87c41b7..9974c994 100644 --- a/plugin/chouxianghua/chouxianghua.go +++ b/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", diff --git a/plugin/coser/coser.go b/plugin/coser/coser.go index cccf7a79..d19b7ba3 100644 --- a/plugin/coser/coser.go +++ b/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). diff --git a/plugin/cpstory/cpstory.go b/plugin/cpstory/cpstory.go index 40046f44..c722a968 100644 --- a/plugin/cpstory/cpstory.go +++ b/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", diff --git a/plugin/curse/curse.go b/plugin/curse/curse.go index 60e503d0..53cc1aa8 100644 --- a/plugin/curse/curse.go +++ b/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", diff --git a/plugin/danbooru/main.go b/plugin/danbooru/main.go index 8be0f2c9..bbb12278 100644 --- a/plugin/danbooru/main.go +++ b/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" + "- 鉴赏图片[图片]", diff --git a/plugin/diana/bing.go b/plugin/diana/bing.go index f06f1aa5..6714f93a 100644 --- a/plugin/diana/bing.go +++ b/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" + diff --git a/plugin/drift_bottle/main.go b/plugin/drift_bottle/main.go index 07a05633..0cdb7db8 100644 --- a/plugin/drift_bottle/main.go +++ b/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", diff --git a/plugin/emojimix/mix.go b/plugin/emojimix/mix.go index ce50222c..9a5e9d17 100644 --- a/plugin/emojimix/mix.go +++ b/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]", diff --git a/plugin/epidemic/epidemic.go b/plugin/epidemic/epidemic.go index 6f42147a..30215806 100644 --- a/plugin/epidemic/epidemic.go +++ b/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", diff --git a/plugin/font/main.go b/plugin/font/main.go index 19b25db0..be46ffc4 100644 --- a/plugin/font/main.go +++ b/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) { diff --git a/plugin/fortune/fortune.go b/plugin/fortune/fortune.go index 9ef8e379..d69065ea 100644 --- a/plugin/fortune/fortune.go +++ b/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 ( @@ -51,7 +49,7 @@ var ( func init() { // 插件主体 - en := control.Register("fortune", order.AcquirePrio(), &control.Options{ + en := control.Register("fortune", &control.Options{ DisableOnDefault: false, Help: "每日运势: \n" + "- 运势 | 抽签\n" + diff --git a/plugin/funny/laugh.go b/plugin/funny/laugh.go index 3f924944..ad5dfe56 100644 --- a/plugin/funny/laugh.go +++ b/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号]", diff --git a/plugin/genshin/ys.go b/plugin/genshin/ys.go index 17a24b19..82c6c155 100644 --- a/plugin/genshin/ys.go +++ b/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", diff --git a/plugin/gif/run.go b/plugin/gif/run.go index f65acd20..e505efd8 100644 --- a/plugin/gif/run.go +++ b/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", diff --git a/plugin/github/repo_searcher.go b/plugin/github/repo_searcher.go index a512376f..d81d4ec3 100644 --- a/plugin/github/repo_searcher.go +++ b/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" + diff --git a/plugin/hs/run.go b/plugin/hs/run.go index 126b69d3..f23af3f4 100644 --- a/plugin/hs/run.go +++ b/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" + diff --git a/plugin/hyaku/main.go b/plugin/hyaku/main.go index bae7bef3..736ffdcc 100644 --- a/plugin/hyaku/main.go +++ b/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" + diff --git a/plugin/image_finder/keyword.go b/plugin/image_finder/keyword.go index c90c6f03..d260bbf8 100644 --- a/plugin/image_finder/keyword.go +++ b/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]", diff --git a/plugin/inject/main.go b/plugin/inject/main.go index 6ea3bd26..26c11d4d 100644 --- a/plugin/inject/main.go +++ b/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码]", diff --git a/plugin/jandan/jandan.go b/plugin/jandan/jandan.go index bc1623ed..b83ab23e 100644 --- a/plugin/jandan/jandan.go +++ b/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", diff --git a/plugin/juejuezi/juejuezi.go b/plugin/juejuezi/juejuezi.go index 80fdfc1f..dc63093f 100644 --- a/plugin/juejuezi/juejuezi.go +++ b/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" + "- 喝奶茶绝绝子 | 绝绝子吃饭", diff --git a/plugin/lolicon/lolicon.go b/plugin/lolicon/lolicon.go index 9bc885c0..b1b2b9a7 100644 --- a/plugin/lolicon/lolicon.go +++ b/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" + "- 来份萝莉", diff --git a/plugin/manager/manager.go b/plugin/manager/manager.go index 04181197..b7dd8c77 100644 --- a/plugin/manager/manager.go +++ b/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", diff --git a/plugin/moyu/run.go b/plugin/moyu/run.go index a6c2fb81..83f24d80 100644 --- a/plugin/moyu/run.go +++ b/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" + diff --git a/plugin/moyu_calendar/calendar.go b/plugin/moyu_calendar/calendar.go index b0500d23..4a0014ff 100644 --- a/plugin/moyu_calendar/calendar.go +++ b/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" + diff --git a/plugin/music/selecter.go b/plugin/music/selecter.go index 0dafc083..4019dbfd 100644 --- a/plugin/music/selecter.go +++ b/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" + diff --git a/plugin/nativesetu/main.go b/plugin/nativesetu/main.go index 19cb6431..36ee2c51 100644 --- a/plugin/nativesetu/main.go +++ b/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" + diff --git a/plugin/nativewife/main.go b/plugin/nativewife/main.go index fc8e30f5..697dbef4 100644 --- a/plugin/nativewife/main.go +++ b/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", diff --git a/plugin/nbnhhsh/nbnhhsh.go b/plugin/nbnhhsh/nbnhhsh.go index e65be351..e364be2a 100644 --- a/plugin/nbnhhsh/nbnhhsh.go +++ b/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). diff --git a/plugin/novel/qianbi.go b/plugin/novel/qianbi.go index 1dbca273..b08d0547 100644 --- a/plugin/novel/qianbi.go +++ b/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). diff --git a/plugin/nsfw/main.go b/plugin/nsfw/main.go index 2e7bcae5..2ab38872 100644 --- a/plugin/nsfw/main.go +++ b/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). diff --git a/plugin/omikuji/sensou.go b/plugin/omikuji/sensou.go index d1913c2e..c006eaac 100644 --- a/plugin/omikuji/sensou.go +++ b/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- 解签", diff --git a/plugin/reborn/main.go b/plugin/reborn/main.go index 1d7b80ef..449bb7ad 100644 --- a/plugin/reborn/main.go +++ b/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", diff --git a/plugin/runcode/code_runner.go b/plugin/runcode/code_runner.go index e0515f53..58291be5 100644 --- a/plugin/runcode/code_runner.go +++ b/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" + diff --git a/plugin/saucenao/searcher.go b/plugin/saucenao/searcher.go index 23967451..6ffbb6a7 100644 --- a/plugin/saucenao/searcher.go +++ b/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" + diff --git a/plugin/scale/main.go b/plugin/scale/main.go index cbf3ea3a..ff61120b 100644 --- a/plugin/scale/main.go +++ b/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", diff --git a/plugin/score/sign_in.go b/plugin/score/sign_in.go index 8c9687dc..9adfd746 100644 --- a/plugin/score/sign_in.go +++ b/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", diff --git a/plugin/setutime/setu_geter.go b/plugin/setutime/setu_geter.go index 08252b02..acc202d7 100644 --- a/plugin/setutime/setu_geter.go +++ b/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" + diff --git a/plugin/shadiao/shadiao.go b/plugin/shadiao/shadiao.go index d3581ec9..eace2892 100644 --- a/plugin/shadiao/shadiao.go +++ b/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- 讲个段子", diff --git a/plugin/shindan/shindan.go b/plugin/shindan/shindan.go index 6f125051..90da077d 100644 --- a/plugin/shindan/shindan.go +++ b/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" + diff --git a/plugin/sleep_manage/sleep_manage.go b/plugin/sleep_manage/sleep_manage.go index 0f85542d..58449f8b 100644 --- a/plugin/sleep_manage/sleep_manage.go +++ b/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", diff --git a/plugin/thesaurus/chat.go b/plugin/thesaurus/chat.go index 7c65ad22..f673e39d 100644 --- a/plugin/thesaurus/chat.go +++ b/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", diff --git a/plugin/tiangou/tiangou.go b/plugin/tiangou/tiangou.go index 6402ed30..325a1058 100644 --- a/plugin/tiangou/tiangou.go +++ b/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" + "- 舔狗日记", diff --git a/plugin/tracemoe/moe.go b/plugin/tracemoe/moe.go index c78a1266..7b4c485f 100644 --- a/plugin/tracemoe/moe.go +++ b/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- 搜番 | 搜索番剧[图片]", }) diff --git a/plugin/translation/tl.go b/plugin/translation/tl.go index d20211f1..bcd7c883 100644 --- a/plugin/translation/tl.go +++ b/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 你好", diff --git a/plugin/vtb_quotation/vtb_quotation.go b/plugin/vtb_quotation/vtb_quotation.go index 3a838124..40d335e5 100644 --- a/plugin/vtb_quotation/vtb_quotation.go +++ b/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", diff --git a/plugin/wangyiyun/main.go b/plugin/wangyiyun/main.go index 9fef3e44..0a85b483 100644 --- a/plugin/wangyiyun/main.go +++ b/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). diff --git a/plugin/wordle/wordle.go b/plugin/wordle/wordle.go index 3fe2a751..19cacdef 100644 --- a/plugin/wordle/wordle.go +++ b/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" + "- 个人猜单词" + diff --git a/plugin/wtf/main.go b/plugin/wtf/main.go index 664fab63..2797beb1 100644 --- a/plugin/wtf/main.go +++ b/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]", }) diff --git a/plugin/ymgal/ymgal.go b/plugin/ymgal/ymgal.go index 6afe74d0..d65c8f4c 100644 --- a/plugin/ymgal/ymgal.go +++ b/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", diff --git a/plugin/zaobao/zaobao.go b/plugin/zaobao/zaobao.go index 3f3822fa..4c2f4892 100644 --- a/plugin/zaobao/zaobao.go +++ b/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" +