From 45a2808c13a0e4e8fd73239fb71fc70de370e079 Mon Sep 17 00:00:00 2001 From: Yiwen-Chan Date: Mon, 12 Apr 2021 15:41:09 +0800 Subject: [PATCH] =?UTF-8?q?=F0=9F=8E=A8=20=E6=94=B9=E8=BF=9B=E4=BB=A3?= =?UTF-8?q?=E7=A0=81=E7=BB=93=E6=9E=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- music/music_selecter.go | 33 ++++++++++++++++----------------- 1 file changed, 16 insertions(+), 17 deletions(-) diff --git a/music/music_selecter.go b/music/music_selecter.go index 870cae09..a012d0ee 100644 --- a/music/music_selecter.go +++ b/music/music_selecter.go @@ -18,28 +18,29 @@ import ( func init() { zero.OnRegex("^酷我点歌(.+?)$").SetBlock(true).FirstPriority(). Handle(func(ctx *zero.Ctx) { - ctx.Send(kuwo(ctx.State["regex_matched"].([]string)[1])) + ctx.SendChain(kuwo(ctx.State["regex_matched"].([]string)[1])) return }) - zero.OnRegex("^酷狗点歌(.+?)$").SetBlock(true).SetPriority(50).Handle(func(ctx *zero.Ctx) { - ctx.Send(kugou(ctx.State["regex_matched"].([]string)[1])) - return - }) + zero.OnRegex("^酷狗点歌(.+?)$").SetBlock(true).FirstPriority(). + Handle(func(ctx *zero.Ctx) { + ctx.SendChain(kugou(ctx.State["regex_matched"].([]string)[1])) + return + }) - zero.OnRegex("^网易点歌(.+?)$").SetBlock(true).SetPriority(50).Handle(func(ctx *zero.Ctx) { - ctx.Send(cloud163(ctx.State["regex_matched"].([]string)[1])) - return - }) + zero.OnRegex("^网易点歌(.+?)$").SetBlock(true).FirstPriority(). + Handle(func(ctx *zero.Ctx) { + ctx.SendChain(cloud163(ctx.State["regex_matched"].([]string)[1])) + return + }) - zero.OnRegex("^点歌(.+?)$").SetBlock(true).SetPriority(50).Handle(func(ctx *zero.Ctx) { - ctx.Send(qqmusic(ctx.State["regex_matched"].([]string)[1])) - return - }) + zero.OnRegex("^点歌(.+?)$").SetBlock(true).FirstPriority(). + Handle(func(ctx *zero.Ctx) { + ctx.SendChain(qqmusic(ctx.State["regex_matched"].([]string)[1])) + return + }) } -//----------------------------------------------------------------------- - // kuwo 返回酷我音乐卡片 func kuwo(keyword string) message.MessageSegment { headers := http.Header{ @@ -193,8 +194,6 @@ func qqmusic(keyword string) message.MessageSegment { ).Add("content", info.Get("singer.0.name").Str).Add("image", image) } -//----------------------------------------------------------------------- - // find 返回 pre 到 suf 之间的文本 func find(pre string, suf string, str string) string { n := strings.Index(str, pre)