From dff1aedf84764cf3eae3f3fd3f478d48c0ef7b8e Mon Sep 17 00:00:00 2001
From: MortalCat <169629556@qq.com>
Date: Wed, 29 Jan 2025 05:09:26 +0800
Subject: [PATCH] =?UTF-8?q?patch=F0=9F=9A=91:=20=E4=BF=AE=E5=A4=8DQQ?=
 =?UTF-8?q?=E9=9F=B3=E4=B9=90=E8=A7=A3=E6=9E=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 apps/tools.js      | 24 +++++++++++++++---------
 constants/tools.js |  2 +-
 2 files changed, 16 insertions(+), 10 deletions(-)

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