From bd88c6820824572b7e83301b4c18e0d53d48a224 Mon Sep 17 00:00:00 2001 From: fumiama Date: Thu, 9 Sep 2021 12:31:57 +0800 Subject: [PATCH] =?UTF-8?q?=E2=9C=8F=EF=B8=8F=20=20=E5=A2=9E=E5=8A=A0=20se?= =?UTF-8?q?tblock=20=E9=81=BF=E5=85=8D=E5=86=B2=E7=AA=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- plugin_ai_false/ai_false.go | 2 +- plugin_aiwife/non-existent.go | 2 +- plugin_bilibili/fansDaily.go | 2 +- plugin_bilibili/info.go | 2 +- plugin_bilibili/live_info.go | 2 +- plugin_diana/bing.go | 6 +++--- plugin_diana/zhiwang.go | 2 +- plugin_image_finder/keyword.go | 2 +- plugin_lolicon/lolicon.go | 2 +- plugin_minecraft/info.go | 2 +- plugin_minecraft/manager.go | 4 ++-- plugin_omikuji/sensou.go | 2 +- 12 files changed, 15 insertions(+), 15 deletions(-) diff --git a/plugin_ai_false/ai_false.go b/plugin_ai_false/ai_false.go index 809c1246..8c4aca91 100644 --- a/plugin_ai_false/ai_false.go +++ b/plugin_ai_false/ai_false.go @@ -21,7 +21,7 @@ func init() { // 插件主体 Help: "AIfalse\n" + "- 查询计算机当前活跃度[检查身体|自检|启动自检|系统状态", }) - engine.OnFullMatchGroup([]string{"检查身体", "自检", "启动自检", "系统状态"}, zero.AdminPermission). + engine.OnFullMatchGroup([]string{"检查身体", "自检", "启动自检", "系统状态"}, zero.AdminPermission).SetBlock(true). Handle(func(ctx *zero.Ctx) { ctx.SendChain(message.Text( "* CPU占用率: ", cpuPercent(), "%\n", diff --git a/plugin_aiwife/non-existent.go b/plugin_aiwife/non-existent.go index 8ba3743f..17599e95 100644 --- a/plugin_aiwife/non-existent.go +++ b/plugin_aiwife/non-existent.go @@ -24,7 +24,7 @@ func init() { // 插件主体 DisableOnDefault: false, Help: "AIWife\n" + "- waifu|随机waifu", - }).OnFullMatchGroup([]string{"waifu", "随机waifu"}).SetPriority(10). + }).OnFullMatchGroup([]string{"waifu", "随机waifu"}).SetPriority(10).SetBlock(true). Handle(func(ctx *zero.Ctx) { miku := rand.Intn(100000) + 1 ctx.SendChain(message.At(ctx.Event.UserID), message.Image(fmt.Sprintf(bed, miku))) diff --git a/plugin_bilibili/fansDaily.go b/plugin_bilibili/fansDaily.go index 5e56ad67..f4056d1d 100644 --- a/plugin_bilibili/fansDaily.go +++ b/plugin_bilibili/fansDaily.go @@ -23,7 +23,7 @@ type follower struct { // 开启日报推送 func init() { - engine.OnFullMatch("/开启粉丝日报", zero.AdminPermission). + engine.OnFullMatch("/开启粉丝日报", zero.AdminPermission).SetBlock(true). Handle(func(ctx *zero.Ctx) { fansDaily(ctx.Event.GroupID) // 群号传进去给下面发信息的函数 }) diff --git a/plugin_bilibili/info.go b/plugin_bilibili/info.go index 69201472..ba1f40ab 100644 --- a/plugin_bilibili/info.go +++ b/plugin_bilibili/info.go @@ -23,7 +23,7 @@ func init() { "- >user info [名字|uid]\n" + "- /开启粉丝日报", }) - engine.OnRegex(`^>user info\s(.{1,25})$`). + engine.OnRegex(`^>user info\s(.{1,25})$`).SetBlock(true). Handle(func(ctx *zero.Ctx) { keyword := ctx.State["regex_matched"].([]string)[1] rest, err := uid(keyword) diff --git a/plugin_bilibili/live_info.go b/plugin_bilibili/live_info.go index b9b5a48d..a8f90ae3 100644 --- a/plugin_bilibili/live_info.go +++ b/plugin_bilibili/live_info.go @@ -13,7 +13,7 @@ import ( // 查vup粉丝数据 func init() { - engine.OnRegex(`^>vup info\s?(.{1,25})$`). + engine.OnRegex(`^>vup info\s?(.{1,25})$`).SetBlock(true). Handle(func(ctx *zero.Ctx) { keyword := ctx.State["regex_matched"].([]string)[1] res, err := uid(keyword) diff --git a/plugin_diana/bing.go b/plugin_diana/bing.go index 5665e91a..46b7abd2 100644 --- a/plugin_diana/bing.go +++ b/plugin_diana/bing.go @@ -24,20 +24,20 @@ func init() { "- [回复]查重", }) // 随机发送一篇上面的小作文 - engine.OnFullMatch("小作文"). + engine.OnFullMatch("小作文").SetBlock(true). Handle(func(ctx *zero.Ctx) { rand.Seed(time.Now().UnixNano()) // 绕过第一行发病 ctx.Send((*data.Array)[rand.Intn(len(*data.Array)-1)+1]) }) // 逆天 - engine.OnFullMatch("发大病"). + engine.OnFullMatch("发大病").SetBlock(true). Handle(func(ctx *zero.Ctx) { // 第一行是发病 ctx.Send((*data.Array)[0]) }) // 增加小作文 - engine.OnRegex(`^教你一篇小作文(.*)$`, zero.AdminPermission). + engine.OnRegex(`^教你一篇小作文(.*)$`, zero.AdminPermission).SetBlock(true). Handle(func(ctx *zero.Ctx) { err := data.AddText(ctx.State["regex_matched"].([]string)[1]) if err != nil { diff --git a/plugin_diana/zhiwang.go b/plugin_diana/zhiwang.go index 6ad11dfb..2654b22c 100644 --- a/plugin_diana/zhiwang.go +++ b/plugin_diana/zhiwang.go @@ -28,7 +28,7 @@ type zhiwang struct { // 小作文查重: 回复要查的消息 查重 func init() { - engine.OnMessage(fullmatch("查重")). + engine.OnMessage(fullmatch("查重")).SetBlock(true). Handle(func(ctx *zero.Ctx) { msg := ctx.Event.Message if msg[0].Type == "reply" { diff --git a/plugin_image_finder/keyword.go b/plugin_image_finder/keyword.go index 1cf1faf7..040a2f7e 100644 --- a/plugin_image_finder/keyword.go +++ b/plugin_image_finder/keyword.go @@ -65,7 +65,7 @@ func init() { DisableOnDefault: false, Help: "关键字搜图\n" + "- 来张 [xxx]", - }).OnRegex(`^来张 (.*)$`, zero.AdminPermission). + }).OnRegex(`^来张 (.*)$`, zero.AdminPermission).SetBlock(true). Handle(func(ctx *zero.Ctx) { keyword := ctx.State["regex_matched"].([]string)[1] soutujson := soutuapi(keyword) diff --git a/plugin_lolicon/lolicon.go b/plugin_lolicon/lolicon.go index 1e063060..72fd761d 100644 --- a/plugin_lolicon/lolicon.go +++ b/plugin_lolicon/lolicon.go @@ -27,7 +27,7 @@ func init() { DisableOnDefault: false, Help: "lolicon\n" + "- 来份萝莉", - }).OnFullMatch("来份萝莉"). + }).OnFullMatch("来份萝莉").SetBlock(true). Handle(func(ctx *zero.Ctx) { go func() { for i := 0; i < min(cap(queue)-len(queue), 2); i++ { diff --git a/plugin_minecraft/info.go b/plugin_minecraft/info.go index 1efe4df3..239a9c86 100644 --- a/plugin_minecraft/info.go +++ b/plugin_minecraft/info.go @@ -46,7 +46,7 @@ func init() { servers["ftbi"] = "115.28.186.22:25710" servers["ges"] = "115.28.186.22:25701" - engine.OnCommand("mclist"). + engine.OnCommand("mclist").SetBlock(true). Handle(func(ctx *zero.Ctx) { model := extension.CommandModel{} _ = ctx.Parse(&model) diff --git a/plugin_minecraft/manager.go b/plugin_minecraft/manager.go index b96acabd..8493ccec 100644 --- a/plugin_minecraft/manager.go +++ b/plugin_minecraft/manager.go @@ -30,7 +30,7 @@ func init() { "- /mclist servername\n" + "- https://github.com/Suwings/MCSManager", }) - engine.OnCommand("mcstart"). + engine.OnCommand("mcstart").SetBlock(true). Handle(func(ctx *zero.Ctx) { model := extension.CommandModel{} _ = ctx.Parse(&model) @@ -38,7 +38,7 @@ func init() { result := start(model.Args) ctx.Send(result) }) - engine.OnCommand("mcstop"). + engine.OnCommand("mcstop").SetBlock(true). Handle(func(ctx *zero.Ctx) { model := extension.CommandModel{} _ = ctx.Parse(&model) diff --git a/plugin_omikuji/sensou.go b/plugin_omikuji/sensou.go index 7b7001d2..12a2686e 100644 --- a/plugin_omikuji/sensou.go +++ b/plugin_omikuji/sensou.go @@ -24,7 +24,7 @@ func init() { // 插件主体 DisableOnDefault: false, Help: "浅草寺求签\n" + "- 求签|运势|占卜", - }).OnFullMatchGroup([]string{"求签", "运势", "占卜"}).SetPriority(10). + }).OnFullMatchGroup([]string{"求签", "运势", "占卜"}).SetPriority(10).SetBlock(true). Handle(func(ctx *zero.Ctx) { miku := rand.Intn(100) + 1 ctx.SendChain(