Jerry/rc-plugin
1
0
Fork 0
mirror of https://github.com/Jerryplusy/rc-plugin.git synced 2025-10-14 08:09:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #59 from xiowo/master

Browse Source 
patch🚑: 修复QQ音乐解析
This commit is contained in:
Zhiyu 2025-01-30 19:20:45 +08:00 committed by GitHub
commit 90711f0686
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 16 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
apps/tools.js
View File

@ -781,11 +781,11 @@ export class tools extends plugin {
segment.image(user_cover), segment.image(user_cover),
segment.image(keyframe), segment.image(keyframe),
[`${ this.identifyPrefix }识别：哔哩哔哩直播，${ title }`, [`${ this.identifyPrefix }识别：哔哩哔哩直播，${ title }`,
`${ description ? `📝 简述：${ description.replace(`<p>`, '').replace(`</p>`, '') }` : '' }`, `${ description ? `📝 简述：${ description.replace(`<p>`, '').replace(`</p>`, '') }` : '' }`,
`${ tags ? `🔖 标签：${ tags }` : '' }`, `${ tags ? `🔖 标签：${ tags }` : '' }`,
`📍 分区：${ parent_area_name ? `${ parent_area_name }` : '' }${ area_name ? `-${ area_name }` : '' }`, `📍 分区：${ parent_area_name ? `${ parent_area_name }` : '' }${ area_name ? `-${ area_name }` : '' }`,
`${ live_time ? `⏰ 直播时间：${ live_time }` : '' }`, `${ live_time ? `⏰ 直播时间：${ live_time }` : '' }`,
`📺 独立播放器: https://www.bilibili.com/blackboard/live/live-activity-player.html?enterTheRoom=0&cid=${ streamId }` `📺 独立播放器: https://www.bilibili.com/blackboard/live/live-activity-player.html?enterTheRoom=0&cid=${ streamId }`
].filter(item => item.trim() !== "").join("\n") ].filter(item => item.trim() !== "").join("\n")
]); ]);
const streamData = await this.getBiliStream(streamId); const streamData = await this.getBiliStream(streamId);
@ -1916,10 +1916,10 @@ export class tools extends plugin {
}); });
// const messageTitle = title + "\nR插件检测到当前为VIP音乐，正在转换..."; // const messageTitle = title + "\nR插件检测到当前为VIP音乐，正在转换...";
// ??后的内容是适配`QQ_MUSIC_TEMP_API`、最后是汽水 // ??后的内容是适配`QQ_MUSIC_TEMP_API`、最后是汽水
const url = vipMusicData.data?.music_url ?? vipMusicData.data?.data?.url ?? vipMusicData.data?.music; const url = vipMusicData.data?.music_url ?? vipMusicData.data?.data?.music_url ?? vipMusicData.data?.music;
const cover = vipMusicData.data?.cover ?? vipMusicData.data?.data?.cover ?? vipMusicData.data?.cover; const cover = vipMusicData.data?.cover ?? vipMusicData.data?.data?.cover ?? vipMusicData.data?.cover;
const name = vipMusicData.data?.title ?? vipMusicData.data?.data?.song ?? vipMusicData.data?.title; const name = vipMusicData.data?.title ?? vipMusicData.data?.data?.song_name ?? vipMusicData.data?.title;
const singer = vipMusicData.data?.singer ?? vipMusicData.data?.data?.singer ?? vipMusicData.data?.singer; const singer = vipMusicData.data?.singer ?? vipMusicData.data?.data?.song_singer ?? vipMusicData.data?.singer;
const id = vipMusicData.data?.id ?? vipMusicData.data?.data?.quality ?? vipMusicData.data?.pay; const id = vipMusicData.data?.id ?? vipMusicData.data?.data?.quality ?? vipMusicData.data?.pay;
if (musicType === "网易云音乐") { if (musicType === "网易云音乐") {
musicInfo.size = id; musicInfo.size = id;
@ -2505,7 +2505,7 @@ export class tools extends plugin {
*/ */
let musicInfo; let musicInfo;
// applet判定 // applet判定
if (e.msg.includes(`"app":"com.tencent.structmsg"`)) { if (e.msg.includes(`"app":"com.tencent.music.lua"`) || e.msg.includes(`"app":"com.tencent.structmsg"`)) {
logger.info("[R插件][qqMusic] 识别为小程序分享"); logger.info("[R插件][qqMusic] 识别为小程序分享");
const musicInfoJson = JSON.parse(e.msg); const musicInfoJson = JSON.parse(e.msg);
// 歌手和歌名 // 歌手和歌名
@ -2525,7 +2525,13 @@ export class tools extends plugin {
} }
// 删除特殊字符 // 删除特殊字符
musicInfo = cleanFilename(musicInfo); musicInfo = cleanFilename(musicInfo);
// 判断音乐信息是否存在
if (!musicInfo) {
console.log('[R插件][qqMusic]: 暂不支持此类链接');
return true;
}
logger.info(`[R插件][qqMusic] 识别音乐为：${ musicInfo }`); logger.info(`[R插件][qqMusic] 识别音乐为：${ musicInfo }`);
// 使用临时接口下载 // 使用临时接口下载
const url = await this.musicTempApi(e, musicInfo, "QQ音乐"); const url = await this.musicTempApi(e, musicInfo, "QQ音乐");
// 下载音乐 // 下载音乐

2
constants/tools.js
View File

@ -210,7 +210,7 @@ export const NETEASE_TEMP_API = "https://www.hhlqilongzhu.cn/api/dg_wyymusic.php
* 备用：https://www.hhlqilongzhu.cn/api/dg_qqmusic.php?gm={}&n=1&type=json * 备用：https://www.hhlqilongzhu.cn/api/dg_qqmusic.php?gm={}&n=1&type=json
* @type {string} * @type {string}
*/ */
export const QQ_MUSIC_TEMP_API = "https://api.lolimi.cn/API/qqdg/?word={}&n=1"; export const QQ_MUSIC_TEMP_API = "https://www.hhlqilongzhu.cn/api/dg_shenmiMusic_SQ.php?msg={}&n=1&type=json";
/** /**
* 下载VIP的临时接口3 * 下载VIP的临时接口3