🐛 疫情查询、网易点歌、qq点歌问题 (#220)

* 🐛 修复网易点歌，qq点歌问题

* 🚨 错误输出

* 🚨 错误输出

plugin/epidemic/epidemic.go

@@ -34,8 +34,8 @@ type epidemic struct {
 type area struct {
 	Name  string `json:"name"`
 	Today struct {
-		Confirm int `json:"confirm"`
+		Confirm int         `json:"confirm"`
-		Wzzadd  int `json:"wzz_add"`
+		Wzzadd  interface{} `json:"wzz_add"`
 	} `json:"today"`
 	Total struct {
 		NowConfirm int    `json:"nowConfirm"`

plugin/music/selecter.go

@@ -5,6 +5,7 @@ import (
 	"crypto/md5"
 	"encoding/hex"
 	"fmt"
+	"github.com/FloatTech/zbputils/web"
 	"io"
 	"net/http"
 	"net/url"
@@ -134,72 +135,28 @@ func kugou(keyword string) message.MessageSegment {
 }
 
 // cloud163 返回网易云音乐卡片
-func cloud163(keyword string) message.MessageSegment {
+func cloud163(keyword string) (msg message.MessageSegment) {
-	headers := http.Header{
+	requestURL := "https://autumnfish.cn/search?keywords=" + url.QueryEscape(keyword)
-		"Content-Type": []string{"application/x-www-form-urlencoded"},
+	data, err := web.GetData(requestURL)
-		"User-Agent":   []string{"Mozilla/5.0 (Windows NT 6.1; Win64; x64; rv:84.0) Gecko/20100101 Firefox/84.0"},
+	if err != nil {
+		msg = message.Text("ERROR:", err)
+		return
 	}
-	data := url.Values{
+	msg = message.Music("163", gjson.ParseBytes(data).Get("result.songs.0.id").Int())
-		"keywords": []string{keyword},
+	return
-	}
-	// 通过API 搜索音乐信息 第一首
-	// 返回音乐卡片
-	return message.Music("163", gjson.ParseBytes(netPost("https://nemapi.windis.xyz/search", data, headers)).Get("result.songs.0.id").Int())
 }
 
 // qqmusic 返回QQ音乐卡片
-func qqmusic(keyword string) message.MessageSegment {
+func qqmusic(keyword string) (msg message.MessageSegment) {
-	// 搜索音乐信息 第一首歌
+	requestURL := "https://c.y.qq.com/soso/fcgi-bin/client_search_cp?w=" + url.QueryEscape(keyword)
-	h1 := http.Header{
+	data, err := web.RequestDataWith(web.NewDefaultClient(), requestURL, "GET", "", web.RandUA())
-		"User-Agent": []string{"Mozilla/5.0 (Windows NT 6.1; Win64; x64; rv:84.0) Gecko/20100101 Firefox/84.0"},
+	if err != nil {
+		msg = message.Text("ERROR:", err)
+		return
 	}
-	search, _ := url.Parse("https://c.y.qq.com/soso/fcgi-bin/client_search_cp")
+	info := gjson.ParseBytes(data[9 : len(data)-1]).Get("data.song.list.0")
-	search.RawQuery = url.Values{
+	msg = message.Music("qq", info.Get("songid").Int())
-		"w": []string{keyword},
+	return
-	}.Encode()
-	res := netGet(search.String(), h1)
-	info := gjson.ParseBytes(res[9 : len(res)-1]).Get("data.song.list.0")
-	// 获得音乐直链
-	h2 := http.Header{
-		"User-Agent": []string{"Mozilla/5.0 (iPhone; CPU iPhone OS 9_1 like Mac OS X) AppleWebKit/601.1.46 (KHTML, like Gecko) Version/9.0 Mobile/13B143 Safari/601.1"},
-		"referer":    []string{"http://y.qq.com"},
-	}
-	music, _ := url.Parse("https://u.y.qq.com/cgi-bin/musicu.fcg")
-	music.RawQuery = url.Values{
-		"data": []string{`{"req": {"module": "CDN.SrfCdnDispatchServer", "method": "GetCdnDispatch", "param": {"guid": "3982823384", "calltype": 0, "userip": ""}}, "req_0": {"module": "vkey.GetVkeyServer", "method": "CgiGetVkey", "param": {"guid": "3982823384", "songmid": ["` + info.Get("songmid").Str + `"], "songtype": [0], "uin": "0", "loginflag": 1, "platform": "20"}}, "comm": {"uin": 0, "format": "json", "ct": 24, "cv": 0}}`},
-	}.Encode()
-	audio := gjson.ParseBytes(netGet(music.String(), h2))
-	// 获得音乐封面
-	image := "https://y.gtimg.cn/music/photo_new/" +
-		find(
-			`photo_new\u002F`,
-			"?max_age",
-			string(
-				netGet("https://y.qq.com/n/yqq/song/"+info.Get("songmid").Str+".html", nil),
-			),
-		)
-	// 返回音乐卡片
-	return message.CustomMusic(
-		"https://y.qq.com/n/yqq/song/"+info.Get("songmid").Str+".html",
-		"https://isure.stream.qqmusic.qq.com/"+audio.Get("req_0.data.midurlinfo.0.purl").Str,
-		info.Get("songname").Str,
-	).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)
-	if n == -1 {
-		n = 0
-	} else {
-		n += len(pre)
-	}
-	str = str[n:]
-	m := strings.Index(str, suf)
-	if m == -1 {
-		m = len(str)
-	}
-	return str[:m]
 }
 
 // md5str 返回字符串 MD5
@@ -223,17 +180,3 @@ func netGet(url string, header http.Header) []byte {
 	result, _ := io.ReadAll(res.Body)
 	return result
 }
-
-// netPost 返回请求数据
-func netPost(url string, data url.Values, header http.Header) []byte {
-	client := &http.Client{}
-	request, _ := http.NewRequest("POST", url, strings.NewReader(data.Encode()))
-	request.Header = header
-	res, err := client.Do(request)
-	if err != nil {
-		return nil
-	}
-	defer res.Body.Close()
-	result, _ := io.ReadAll(res.Body)
-	return result
-}

plugin/shadiao/caihongpi.go

@@ -1,21 +0,0 @@
-package shadiao
-
-import (
-	zero "github.com/wdvxdr1123/ZeroBot"
-	"github.com/wdvxdr1123/ZeroBot/message"
-	"github.com/wdvxdr1123/ZeroBot/utils/helper"
-
-	"github.com/FloatTech/zbputils/ctxext"
-	"github.com/FloatTech/zbputils/web"
-)
-
-func init() {
-	engine.OnFullMatch("哄我").SetBlock(true).Limit(ctxext.LimitByUser).Handle(func(ctx *zero.Ctx) {
-		data, err := web.RequestDataWith(web.NewDefaultClient(), chpURL, "GET", chpReferer, ua)
-		if err != nil {
-			ctx.SendChain(message.Text("ERROR:", err))
-			return
-		}
-		ctx.SendChain(message.Reply(ctx.Event.MessageID), message.Text(helper.BytesToString(data)))
-	})
-}

plugin/shadiao/dujitang.go

@@ -1,21 +0,0 @@
-package shadiao
-
-import (
-	zero "github.com/wdvxdr1123/ZeroBot"
-	"github.com/wdvxdr1123/ZeroBot/message"
-	"github.com/wdvxdr1123/ZeroBot/utils/helper"
-
-	"github.com/FloatTech/zbputils/ctxext"
-	"github.com/FloatTech/zbputils/web"
-)
-
-func init() {
-	engine.OnFullMatch("来碗毒鸡汤").SetBlock(true).Limit(ctxext.LimitByUser).Handle(func(ctx *zero.Ctx) {
-		data, err := web.RequestDataWith(web.NewDefaultClient(), duURL, "GET", duReferer, ua)
-		if err != nil {
-			ctx.SendChain(message.Text("ERROR:", err))
-			return
-		}
-		ctx.SendChain(message.Reply(ctx.Event.MessageID), message.Text(helper.BytesToString(data)))
-	})
-}

plugin/shadiao/pengyouquan.go

@@ -1,21 +0,0 @@
-package shadiao
-
-import (
-	zero "github.com/wdvxdr1123/ZeroBot"
-	"github.com/wdvxdr1123/ZeroBot/message"
-	"github.com/wdvxdr1123/ZeroBot/utils/helper"
-
-	"github.com/FloatTech/zbputils/ctxext"
-	"github.com/FloatTech/zbputils/web"
-)
-
-func init() {
-	engine.OnFullMatch("发个朋友圈").SetBlock(true).Limit(ctxext.LimitByUser).Handle(func(ctx *zero.Ctx) {
-		data, err := web.RequestDataWith(web.NewDefaultClient(), pyqURL, "GET", pyqReferer, ua)
-		if err != nil {
-			ctx.SendChain(message.Text("ERROR:", err))
-			return
-		}
-		ctx.SendChain(message.Reply(ctx.Event.MessageID), message.Text(helper.BytesToString(data)))
-	})
-}

plugin/shadiao/shadiao.go

@@ -3,19 +3,22 @@ package shadiao
 
 import (
 	control "github.com/FloatTech/zbputils/control"
+	"github.com/FloatTech/zbputils/ctxext"
+	"github.com/FloatTech/zbputils/web"
+	"github.com/tidwall/gjson"
+	zero "github.com/wdvxdr1123/ZeroBot"
+	"github.com/wdvxdr1123/ZeroBot/message"
 )
 
 const (
-	chpURL          = "https://chp.shadiao.app/chp"
+	chpURL          = "https://api.shadiao.app/chp"
 	duURL           = "https://api.shadiao.app/du"
 	pyqURL          = "https://api.shadiao.app/pyq"
 	yduanziURL      = "http://www.yduanzi.com/duanzi/getduanzi"
 	chayiURL        = "https://api.lovelive.tools/api/SweetNothings/Web/0"
 	ganhaiURL       = "https://api.lovelive.tools/api/SweetNothings/Web/1"
 	ua              = "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/96.0.4664.110 Safari/537.36"
-	chpReferer      = "https://chp.shadiao.app/"
+	sdReferer       = "https://api.shadiao.app/"
-	duReferer       = "https://du.shadiao.app/"
-	pyqReferer      = "https://pyq.shadiao.app/"
 	yduanziReferer  = "http://www.yduanzi.com/?utm_source=shadiao.app"
 	loveliveReferer = "https://lovelive.tools/"
 )
@@ -26,4 +29,18 @@ var (
 		Help: "沙雕app\n" +
 			"- 哄我\n- 渣我\n- 来碗绿茶\n- 发个朋友圈\n- 来碗毒鸡汤\n- 讲个段子",
 	})
+	sdMap = map[string]string{"哄我": chpURL, "来碗毒鸡汤": duURL, "发个朋友圈": pyqURL}
 )
+
+func init() {
+	engine.OnFullMatchGroup([]string{"哄我", "来碗毒鸡汤", "发个朋友圈"}).SetBlock(true).Limit(ctxext.LimitByUser).Handle(func(ctx *zero.Ctx) {
+		requestURL := sdMap[ctx.State["matched"].(string)]
+		data, err := web.RequestDataWith(web.NewDefaultClient(), requestURL, "GET", sdReferer, ua)
+		if err != nil {
+			ctx.SendChain(message.Text("ERROR:", err))
+			return
+		}
+		ctx.SendChain(message.Reply(ctx.Event.MessageID), message.Text(gjson.GetBytes(data, "data.text").String()))
+
+	})
+}