From 5e80809b82bc79fde242f424a02d0920b1cf1964 Mon Sep 17 00:00:00 2001 From: ltxhhz Date: Wed, 24 Aug 2022 22:17:54 +0800 Subject: [PATCH 1/3] =?UTF-8?q?8.24=20=E5=AF=BC=E5=87=BA=E7=94=9F=E6=88=90?= =?UTF-8?q?=E6=B6=88=E6=81=AFid=E7=9A=84=E5=87=BD=E6=95=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lib/index.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/index.ts b/lib/index.ts index 1f49f7e0..078782fb 100644 --- a/lib/index.ts +++ b/lib/index.ts @@ -10,7 +10,7 @@ export { Message, PrivateMessage, GroupMessage, DiscussMessage, ForwardMessage, MusicPlatform, Sendable, Anonymous, MessageElem, FileElem, ReplyElem, TextElem, AtElem, FaceElem, BfaceElem, MfaceElem, ImageElem, MiraiElem, FlashElem, PttElem, VideoElem, XmlElem, JsonElem, ShareElem, LocationElem, PokeElem, - parseDmMessageId, parseGroupMessageId, parseImageFileParam, getGroupImageUrl, segment } from "./message" + parseDmMessageId, parseGroupMessageId, parseImageFileParam, getGroupImageUrl, segment, genGroupMessageId, genDmMessageId } from "./message" export { PrivateMessageEvent, GroupMessageEvent, DiscussMessageEvent, MessageRet, MessageEvent, RequestEvent, FriendNoticeEvent, GroupNoticeEvent, FriendRequestEvent, GroupRequestEvent, GroupInviteEvent, EventMap, From fdd5ba341362affb6917c69ce7fc0f552afa1a0c Mon Sep 17 00:00:00 2001 From: ltxhhz Date: Wed, 24 Aug 2022 22:24:58 +0800 Subject: [PATCH 2/3] =?UTF-8?q?8.24=20=E6=B7=BB=E5=8A=A0=E6=96=B0=E8=A1=A8?= =?UTF-8?q?=E6=83=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lib/message/face.ts | 1 + 1 file changed, 1 insertion(+) diff --git a/lib/message/face.ts b/lib/message/face.ts index 8e754db4..82fe9fc9 100644 --- a/lib/message/face.ts +++ b/lib/message/face.ts @@ -265,6 +265,7 @@ export const facemap: {[k: number]: string} = { 337: "/花朵脸", 338: "/我想开了", 339: "/舔屏", + 340: "/热化了", } export const pokemap: {[k: number]: string} = { From fea7e72566d9b8ae217632a65859c6cf38cf208b Mon Sep 17 00:00:00 2001 From: ltxhhz Date: Thu, 25 Aug 2022 11:41:03 +0800 Subject: [PATCH 3/3] =?UTF-8?q?8.25=20=E4=BF=AE=E5=A4=8D=20=E9=9F=B3?= =?UTF-8?q?=E4=B9=90=E5=88=86=E4=BA=AB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitignore | 1 + lib/message/music.ts | 7 ++++--- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 6563b606..4e89e510 100644 --- a/.gitignore +++ b/.gitignore @@ -5,3 +5,4 @@ lib/**/*.d.ts lib/**/*.js !lib/**/protobuf.min.d.ts !lib/**/protobuf.min.js +package-lock.json diff --git a/lib/message/music.ts b/lib/message/music.ts index ebc49476..3d040d6e 100644 --- a/lib/message/music.ts +++ b/lib/message/music.ts @@ -35,7 +35,7 @@ async function getMiGuSong(id: string) { let a: any = await axios.get(`https://music.migu.cn/v3/api/music/audioPlayer/getSongPic?songId=${rsp.songId}`, { responseType: "json", headers: { referer: "https://music.migu.cn/v3/music/player/audio" } }) preview = a.data.smallPic || "" } catch { } - let url: any = await axios.get(`https://app.c.nf.migu.cn/MIGUM2.0/v1.0/content/shareInfo.do?contentId=${rsp.contentId}&contentName=${rsp.songName}&resourceType=2&targetUserName=${rsp.singer}`, { responseType: "json" }) + let url: any = await axios.get(`https://app.c.nf.migu.cn/MIGUM2.0/v1.0/content/shareInfo.do?contentId=${rsp.contentId}&contentName=${encodeURIComponent(rsp.songName)}&resourceType=2&targetUserName=${encodeURIComponent(rsp.singer)}`, { responseType: "json" }) let jumpUrl = url.data.url || "http://c.migu.cn/" return { title: rsp.songName, @@ -65,12 +65,13 @@ async function getKuGouSong(id: string) { async function getKuwoSong(id: string) { let rsp: any = await axios.get(`http://yinyue.kuwo.cn/api/www/music/musicInfo?mid=${id}&httpsStatus=1`, { responseType: "json", headers: { csrf: id, cookie: " kw_token=" + id } }) rsp = rsp.data.data - let url: any = await axios.get(`http://yinyue.kuwo.cn/url?format=mp3&rid=${id}&response=url&type=convert_url3&from=web&t=${+new Date()}`, { responseType: "json" }) + // let url: any = await axios.get(`http://yinyue.kuwo.cn/url?format=mp3&rid=${id}&response=url&type=convert_url3&from=web&t=${+new Date()}`, { responseType: "json" }) + let url: any = await axios.get(`http://www.kuwo.cn/api/v1/www/music/playUrl?mid=${id}&type=music&httpsStatus=1`) return { title: rsp.name, singer: rsp.artist, jumpUrl: "http://yinyue.kuwo.cn/play_detail/" + id, - musicUrl: url.data.url || "https://win-web-ra01-sycdn.kuwo.cn", + musicUrl: url.data.data.url || "https://win-web-ra01-sycdn.kuwo.cn", preview: rsp.pic, } as any }