From 554ef91903dc8116b080be775776f429e3ce0019 Mon Sep 17 00:00:00 2001 From: zhiyu1998 <542716863@qq.com> Date: Thu, 1 Aug 2024 16:50:33 +0800 Subject: [PATCH] =?UTF-8?q?=E2=9C=A8=20feat:=20=E6=B7=BB=E5=8A=A0=20`Q=20Q?= =?UTF-8?q?=20M=20U=20S=20I=20C`=20=E7=9A=84=E9=80=82=E9=85=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- apps/tools.js | 62 +++++++++++++++++++++++++++++++++++++++++----- constants/tools.js | 6 +++++ utils/common.js | 18 ++++++++++++++ 3 files changed, 80 insertions(+), 6 deletions(-) diff --git a/apps/tools.js b/apps/tools.js index e827208..d43012a 100644 --- a/apps/tools.js +++ b/apps/tools.js @@ -35,7 +35,7 @@ import { XHS_NO_WATERMARK_HEADER, } from "../constants/constant.js"; import { - checkCommandExists, + checkCommandExists, cleanFilename, downloadAudio, downloadImg, estimateReadingTime, @@ -65,7 +65,7 @@ import { NETEASE_API_CN, NETEASE_SONG_DETAIL, NETEASE_SONG_DOWNLOAD, - NETEASE_TEMP_API, + NETEASE_TEMP_API, QQ_MUSIC_TEMP_API, TWITTER_TWEET_INFO, WEIBO_SINGLE_INFO, WEISHI_VIDEO_INFO, @@ -185,6 +185,10 @@ export class tools extends plugin { { reg: "#(RPT|rpt)$", fnc: "pictureTranslate" + }, + { + reg: "(y.qq.com)", + fnc: "qqMusic" } ], }); @@ -1202,16 +1206,24 @@ export class tools extends plugin { // 临时接口 async musicTempApi(e, title, musicType) { + let musicReqApi = NETEASE_TEMP_API; + if (musicType === "QQ音乐") { + musicReqApi = QQ_MUSIC_TEMP_API; + } // 临时接口，title经过变换后搜索到的音乐质量提升 - const vipMusicData = await axios.get(NETEASE_TEMP_API.replace("{}", title.replace("-", " ")), { + const vipMusicData = await axios.get(musicReqApi.replace("{}", title.replace("-", " ")), { headers: { "User-Agent": COMMON_USER_AGENT, }, }); const messageTitle = title + "\nR插件检测到当前为VIP音乐，正在转换..."; - const url = vipMusicData.data.mp3; - const cover = vipMusicData.data.img; - e.reply([segment.image(cover), `识别：${ musicType }，${ messageTitle }`]); + // ??后的内容是适配`QQ_MUSIC_TEMP_API` + const url = vipMusicData.data.mp3 ??　vipMusicData.data.data.url; + const cover = vipMusicData.data.img ??　vipMusicData.data.data.cover; + + logger.info(url) + logger.info(cover) + await e.reply([segment.image(cover), `识别：${ musicType }，${ messageTitle }`]); return url; } @@ -1740,6 +1752,44 @@ export class tools extends plugin { return true; } + // q q m u s i c 解析 + async qqMusic(e) { + // case1:　Taylor Swift/Bleachers《Anti-Hero (Feat. Bleachers) (Explicit)》 https://c6.y.qq.com/base/fcgi-bin/u?__=lg19lFgQerbo @QQ音乐 + /** case 2: + * {"app":"com.tencent.structmsg","config":{"ctime":1722497864,"forward":1,"token":"987908ab4a1c566d3645ef0ca52a162a","type":"normal"},"extra":{"app_type":1,"appid":100497308,"uin":542716863},"meta":{"news":{"action":"","android_pkg_name":"","app_type":1,"appid":100497308,"ctime":1722497864,"desc":"Taylor Swift/Bleachers","jumpUrl":"https://i.y.qq.com/v8/playsong.html?hosteuin=7KvA7i6sNeCi&sharefrom=gedan&from_id=1674373010&from_idtype=10014&from_name=(7rpl)&songid=382775503&songmid=&type=0&platform=1&appsongtype=1&_wv=1&source=qq&appshare=iphone&media_mid=000dKYJS3KCzpu&ADTAG=qfshare","preview":"https://pic.ugcimg.cn/1070bf5a6962b75263eee1404953c9b2/jpg1","source_icon":"https://p.qpic.cn/qqconnect/0/app_100497308_1626060999/100?max-age=2592000&t=0","source_url":"","tag":"QQ音乐","title":"Anti-Hero (Feat. Bleachers) (E…","uin":542716863}},"prompt":"[分享]Anti-Hero (Feat. Bleachers) (E…","ver":"0.0.0.1","view":"news"} + */ + let musicInfo; + if (e.msg.includes(`"app":"com.tencent.structmsg"`)) { + logger.info("[R插件][qqMusic] 识别为小程序分享"); + const musicInfoJson = JSON.parse(e.msg); + const prompt = musicInfoJson.meta?.news?.title || ''; + const desc = musicInfoJson.meta?.news?.desc || ''; + musicInfo = prompt + "-" + desc; + if (musicInfo.trim() === "") { + logger.info(`没有识别到QQ音乐小程序，帮助文档如下：${ HELP_DOC }`) + return true; + } + } else { + const normalRegex = /^(.*?)\s+https?:\/\//; + musicInfo = normalRegex.exec(e.msg)?.[1].trim(); + } + // 删除特殊字符 + musicInfo = cleanFilename(musicInfo); + // 使用临时接口下载 + const url = await this.musicTempApi(e, musicInfo, "QQ音乐"); + // 下载音乐 + await downloadAudio(url, this.getCurDownloadPath(e), musicInfo, 'follow').then(async path => { + // 发送语音 + await e.reply(segment.record(path)); + // 判断是不是icqq + await this.uploadGroupFile(e, path); + await checkAndRemoveFile(path); + }).catch(err => { + logger.error(`下载音乐失败，错误信息为: ${ err.message }`); + }); + return true; + } + /** * 哔哩哔哩下载 * @param title diff --git a/constants/tools.js b/constants/tools.js index 20ec816..95f6164 100644 --- a/constants/tools.js +++ b/constants/tools.js @@ -149,6 +149,12 @@ export const NETEASE_API_CN = 'https://www.markingchen.ink'; */ export const NETEASE_TEMP_API = "https://api.lolimi.cn/API/wydg/api.php?msg={}&n=1" +/** + * 下载VIP的临时接口2 + * @type {string} + */ +export const QQ_MUSIC_TEMP_API = "https://api.lolimi.cn/API/yiny/?word={}&n=1&q=8" + /** * 单条微博的接口 * @type {string} diff --git a/utils/common.js b/utils/common.js index fcac47e..a42fccd 100644 --- a/utils/common.js +++ b/utils/common.js @@ -449,4 +449,22 @@ export function saveJsonToFile(jsonData, filename, callback) { if (callback) callback(null); } }); +} + +/** + * 删除文件名中的特殊符号（待完善） + * @param filename + * @returns {string} + */ +export function cleanFilename(filename) { + // 去除省略号（…） + filename = filename.replace(/…/g, ''); + // 删除括号及其内容 + filename = filename.replace(/\(|\)/g, ''); + // 删除反斜杠 + filename = filename.replace(/\//g, ''); + + filename = filename.trim(); + + return filename; } \ No newline at end of file