From 192c2a8bd64f7077f849d582b7571f3b4e17a875 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=96=B9=E6=9F=B3=E7=85=9C?= <101934327+fangliuyu@users.noreply.github.com> Date: Wed, 6 Jul 2022 13:44:24 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E7=BD=91=E6=98=93=E4=BA=91?= =?UTF-8?q?=E7=82=B9=E6=AD=8CAPI=E5=A4=B1=E6=95=88=EF=BC=88405=EF=BC=89?= =?UTF-8?q?=E9=97=AE=E9=A2=98=20(#303)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * Update main.go * Update selecter.go * Update struct.go * Update main.go --- plugin/guessmusic/main.go | 10 +++++----- plugin/guessmusic/struct.go | 1 + plugin/music/selecter.go | 2 +- 3 files changed, 7 insertions(+), 6 deletions(-) diff --git a/plugin/guessmusic/main.go b/plugin/guessmusic/main.go index affc0a8c..d3f27fc5 100644 --- a/plugin/guessmusic/main.go +++ b/plugin/guessmusic/main.go @@ -49,9 +49,9 @@ func init() { // 插件主体 "- 设置猜歌缓存歌库路径 [绝对路径]\n" + "- 设置猜歌本地 [true/false]\n" + "- 设置猜歌Api [true/false]\n" + - "注：默认歌库为网易云热歌榜\n" + - "1.可在后面添加“-动漫”进行动漫歌猜歌\n-这个只能猜歌名和歌手\n" + - "2.可在后面添加“-动漫2”进行动漫歌猜歌\n-这个可以猜番名，但歌手经常“未知”", + "注：默认歌库为网易云热歌榜\n- 本地歌榜歌库歌曲命名规格“歌名 - 歌手”\n" + + "1.可在后面添加“-动漫”进行动漫歌猜歌\n- 这个只能猜歌名和歌手\n- 本地动漫歌库歌曲命名规格“歌名 - 歌手”\n" + + "2.可在后面添加“-动漫2”进行动漫歌猜歌\n- 这个可以猜番名，但歌手经常“未知”\n- 本地动漫2歌库歌曲命名规格“歌名 - 歌手 - 番名”", PrivateDataFolder: "guessmusic", }).ApplySingle(single.New( single.WithKeyFn(func(ctx *zero.Ctx) int64 { return ctx.Event.GroupID }), @@ -489,9 +489,9 @@ func getAnimeData(musicPath string) (musicName string, err error) { err = errors.New("无法获API取歌曲信息") return } - requestURL := "https://autumnfish.cn/search?keywords=" + url.QueryEscape(name+" "+artistName) + "&limit=1" + requestURL := "https://music.cyrilstudio.top/search?keywords=" + url.QueryEscape(name+" "+artistName) + "&limit=1" if artistName == "未知" { - requestURL = "https://autumnfish.cn/search?keywords=" + url.QueryEscape(acgName+" "+name) + "&limit=1" + requestURL = "https://music.cyrilstudio.top/search?keywords=" + url.QueryEscape(acgName+" "+name) + "&limit=1" } data, err = web.GetData(requestURL) if err != nil { diff --git a/plugin/guessmusic/struct.go b/plugin/guessmusic/struct.go index dbad4bf4..216f9f96 100644 --- a/plugin/guessmusic/struct.go +++ b/plugin/guessmusic/struct.go @@ -95,6 +95,7 @@ type autumnfishData struct { Alias []interface{} `json:"alias"` Rtype int `json:"rtype"` Ftype int `json:"ftype"` + TransNames []string `json:"transNames"` Mvid int `json:"mvid"` Fee int `json:"fee"` RURL interface{} `json:"rUrl"` diff --git a/plugin/music/selecter.go b/plugin/music/selecter.go index 4b806291..c3cc66aa 100644 --- a/plugin/music/selecter.go +++ b/plugin/music/selecter.go @@ -138,7 +138,7 @@ func kugou(keyword string) message.MessageSegment { // cloud163 返回网易云音乐卡片 func cloud163(keyword string) (msg message.MessageSegment) { - requestURL := "https://autumnfish.cn/search?keywords=" + url.QueryEscape(keyword) + requestURL := "https://music.cyrilstudio.top/search?keywords=" + url.QueryEscape(keyword) data, err := web.GetData(requestURL) if err != nil { msg = message.Text("ERROR:", err)