diff --git a/plugin_bilibili/info.go b/plugin_bilibili/info.go index 02c416cc47..a825407786 100644 --- a/plugin_bilibili/info.go +++ b/plugin_bilibili/info.go @@ -22,7 +22,7 @@ var engine = control.Register("bilibili", order.PrioBilibili, &control.Options{ // 查成分的 func init() { - engine.OnRegex(`^>user info\s(.{1,25})$`).SetBlock(true). + engine.OnRegex(`^>(?:user|vup)\s?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_parse/bilibili_parse.go b/plugin_bilibili_parse/bilibili_parse.go index 8f86f23325..761a2a9f46 100644 --- a/plugin_bilibili_parse/bilibili_parse.go +++ b/plugin_bilibili_parse/bilibili_parse.go @@ -57,7 +57,7 @@ func parseURL(bilibiliURL string) (m message.Message) { m = append(m, message.Image(image)) like := htmlquery.FindOne(doc, "//*[@id='arc_toolbar_report']/div[1]/span[@class='like']/text()").Data coin := htmlquery.FindOne(doc, "//*[@id='arc_toolbar_report']/div[1]/span[@class='coin']/text()").Data - m = append(m, message.Text("点赞:", strings.TrimSpace(like)+"投币:", strings.TrimSpace(coin)+"\n")) + m = append(m, message.Text("\n点赞:", strings.TrimSpace(like)+"投币:", strings.TrimSpace(coin)+"\n")) collect := htmlquery.FindOne(doc, "//*[@id='arc_toolbar_report']/div[1]/span[@class='collect']/text()").Data share := htmlquery.FindOne(doc, "//*[@id='arc_toolbar_report']/div[1]/span[@class='share']/text()").Data m = append(m, message.Text("收藏:", strings.TrimSpace(collect)+"分享:", strings.TrimSpace(share)+"\n")) diff --git a/plugin_image_finder/keyword.go b/plugin_image_finder/keyword.go index 5f9afb1539..89a698f5b0 100644 --- a/plugin_image_finder/keyword.go +++ b/plugin_image_finder/keyword.go @@ -69,7 +69,7 @@ func init() { DisableOnDefault: false, Help: "关键字搜图\n" + "- 来张 [xxx]", - }).OnRegex(`^来张 (.*)$`, zero.AdminPermission).SetBlock(true). + }).OnRegex(`^来张\s?(.*)$`, zero.AdminPermission).SetBlock(true). Handle(func(ctx *zero.Ctx) { keyword := ctx.State["regex_matched"].([]string)[1] soutujson := soutuapi(keyword) diff --git a/plugin_music/selecter.go b/plugin_music/selecter.go index ab0c3c298e..723bd788cb 100644 --- a/plugin_music/selecter.go +++ b/plugin_music/selecter.go @@ -30,7 +30,7 @@ func init() { "- 网易点歌[xxx]\n" + "- 酷我点歌[xxx]\n" + "- 酷狗点歌[xxx]", - }).OnRegex("^(.{0,2})点歌(.{1,25})$").SetBlock(true). + }).OnRegex(`^(.{0,2})点歌\s?(.{1,25})$`).SetBlock(true). Handle(func(ctx *zero.Ctx) { if !limit.Load(ctx.Event.UserID).Acquire() { ctx.SendChain(message.Text("请稍后重试0x0..."))