From be1b3bee50f15684840f692046d212cf64d66d24 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=A7=8B=E5=88=80=E9=B1=BC?= <9903082+qdyovo@user.noreply.gitee.com> Date: Thu, 14 Nov 2024 11:42:11 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=F0=9F=90=9E=20fix:=20=E4=BF=AE=E5=A4=8D=20?= =?UTF-8?q?=E5=A4=9A=E4=BD=99=E7=9A=84=E5=AF=BC=E5=85=A5=20=E5=AF=BC?= =?UTF-8?q?=E8=87=B4=E7=9A=84=E4=BE=9D=E8=B5=96=E6=8A=A5=E9=94=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- apps/songRequest.js | 1 - 1 file changed, 1 deletion(-) diff --git a/apps/songRequest.js b/apps/songRequest.js index 1ad2e3c..c7aa6aa 100644 --- a/apps/songRequest.js +++ b/apps/songRequest.js @@ -13,7 +13,6 @@ import { sendMusicCard, getGroupFileUrl } from "../utils/yunzai-util.js"; import config from "../model/config.js"; import FormData from 'form-data'; import NodeID3 from 'node-id3'; -import { isError } from "node:util"; let FileSuffix = 'flac' From 9dce4fcba532df96c141074101a40752c47810bf Mon Sep 17 00:00:00 2001 From: OduckO <1564571378@qq.com> Date: Sun, 17 Nov 2024 04:39:02 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=F0=9F=90=9E=20fix:=20=E4=BF=AE=E5=A4=8D?= =?UTF-8?q?=E7=BE=A4=E7=BB=84ID=E8=8E=B7=E5=8F=96=E9=94=99=E8=AF=AF?= =?UTF-8?q?=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- apps/songRequest.js | 14 +++++++------- utils/yunzai-util.js | 2 +- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/apps/songRequest.js b/apps/songRequest.js index 9d5f696..1fb1713 100644 --- a/apps/songRequest.js +++ b/apps/songRequest.js @@ -94,11 +94,11 @@ export class songRequest extends plugin { // 获取自定义API const autoSelectNeteaseApi = await this.pickApi() // 只在群里可以使用 - let group_id = e.group.group_id + let group_id = e.group_id if (!group_id) return // 初始化 let songInfo = await redisGetKey(REDIS_YUNZAI_SONGINFO) || [] - const saveId = songInfo.findIndex(item => item.group_id === e.group.group_id) + const saveId = songInfo.findIndex(item => item.group_id === e.group_id) let musicDate = { 'group_id': group_id, data: [] } // 获取搜索歌曲列表信息 let detailUrl = autoSelectNeteaseApi + "/song/detail?ids={}&time=" + Date.now() //歌曲详情API @@ -179,10 +179,10 @@ export class songRequest extends plugin { } else if (await redisGetKey(REDIS_YUNZAI_SONGINFO) != []) { if (e.msg.replace(/\s+/g, "").match(/^#听(\d+)/)) { const pickNumber = e.msg.replace(/\s+/g, "").match(/^#听(\d+)/)[1] - 1 - let group_id = e.group.group_id + let group_id = e.group_id if (!group_id) return let songInfo = await redisGetKey(REDIS_YUNZAI_SONGINFO) - const saveId = songInfo.findIndex(item => item.group_id === e.group.group_id) + const saveId = songInfo.findIndex(item => item.group_id === e.group_id) const AUTO_NETEASE_SONG_DOWNLOAD = autoSelectNeteaseApi + "/song/url/v1?id={}&level=" + this.neteaseCloudAudioQuality; const pickSongUrl = AUTO_NETEASE_SONG_DOWNLOAD.replace("{}", songInfo[saveId].data[pickNumber].id) const songWikiUrl = autoSelectNeteaseApi + '/song/wiki/summary?id=' + songInfo[saveId].data[pickNumber].id @@ -202,7 +202,7 @@ export class songRequest extends plugin { return } // 只在群里可以使用 - let group_id = e.group.group_id + let group_id = e.group_id if (!group_id) return const autoSelectNeteaseApi = await this.pickApi() let songInfo = [] @@ -635,8 +635,8 @@ export class songRequest extends plugin { // 发送卡片 await sendMusicCard(e, '163', songInfo[pickNumber].id) } catch (error) { - if (error.error.message) { - logger.error("发送卡片错误错误:", error.error.message, '发送群语音'); + if (error.message) { + logger.error("发送卡片错误错误:", error.message, '发送群语音'); } else { logger.error("发送卡片错误错误，请查看控制台报错，将发送群语音") logger.error(error) diff --git a/utils/yunzai-util.js b/utils/yunzai-util.js index e2d865c..ca6a471 100644 --- a/utils/yunzai-util.js +++ b/utils/yunzai-util.js @@ -21,7 +21,7 @@ export function textArrayToMakeForward(e, textArray) { */ export async function sendMusicCard(e, platformType, musicId) { await e.bot.sendApi('send_group_msg', { - group_id: e.group.group_id, + group_id: e.group_id, message: [ { type: 'music', From b24c01104a19bb466f2acd112ab38085882d648c Mon Sep 17 00:00:00 2001 From: zhiyu1998 <542716863@qq.com> Date: Sun, 17 Nov 2024 10:00:36 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=F0=9F=AA=9B=20chore:=20=E5=AE=8C=E5=96=84?= =?UTF-8?q?=E6=97=A5=E5=BF=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- apps/songRequest.js | 4 ++-- apps/tools.js | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/apps/songRequest.js b/apps/songRequest.js index 1fb1713..7da826e 100644 --- a/apps/songRequest.js +++ b/apps/songRequest.js @@ -527,10 +527,10 @@ export class songRequest extends plugin { const userInfo = res.data.data.profile await config.updateField("tools", "neteaseUserId", res.data.data.profile.userId); if (userInfo) { - logger.info('ck活着，使用ck进行高音质下载') + logger.info('[R插件][ncm-Cookie检测]ck活着，使用ck进行高音质下载') status = true } else { - logger.info('ck失效，将启用临时接口下载') + logger.info('[R插件][ncm-Cookie检测]ck失效，将启用临时接口下载') status = false } }) diff --git a/apps/tools.js b/apps/tools.js index 8ae255b..447febb 100644 --- a/apps/tools.js +++ b/apps/tools.js @@ -1693,10 +1693,10 @@ export class tools extends plugin { }).then(res => { const userInfo = res.data.data.profile if (userInfo) { - logger.info('ck活着，使用ck进行高音质下载') + logger.info('[R插件][netease]ck活着，使用ck进行高音质下载') return true } else { - logger.info('ck失效，将启用临时接口下载') + logger.info('[R插件][netease]ck失效，将启用临时接口下载') return false } })