🐞 fix: 修复无法正取匹配问题

This commit is contained in:
秋刀鱼 2024-11-19 16:48:12 +08:00
parent 4ee740d14d
commit e9ff3ab728

View File

@ -295,12 +295,12 @@ export class songRequest extends plugin {
const musicUrlReg2 = /(http:|https:)\/\/y.music.163.com\/m\/song\?(.*)&id=(\d+)/; const musicUrlReg2 = /(http:|https:)\/\/y.music.163.com\/m\/song\?(.*)&id=(\d+)/;
const musicUrlReg3 = /(http:|https:)\/\/music.163.com\/m\/song\/(\d+)/; const musicUrlReg3 = /(http:|https:)\/\/music.163.com\/m\/song\/(\d+)/;
const id = const id =
musicUrlReg2.exec(msg.message[0].data)?.[3] || musicUrlReg2.exec(msg.message[0].data.data)?.[3] ||
musicUrlReg.exec(msg.message[0].data)?.[2] || musicUrlReg.exec(msg.message[0].data.data)?.[2] ||
musicUrlReg3.exec(msg.message[0].data)?.[2] || musicUrlReg3.exec(msg.message[0].data.data)?.[2] ||
/(?<!user)id=(\d+)/.exec(msg.message[0].data)[1] || ""; /(?<!user)id=(\d+)/.exec(msg.message[0].data.data)[1] || "";
const title = msg.message[0].data.match(/"title":"([^"]+)"/)[1] const title = msg.message[0].data.data.match(/"title":"([^"]+)"/)[1]
const desc = msg.message[0].data.match(/"desc":"([^"]+)"/)[1] const desc = msg.message[0].data.data.match(/"desc":"([^"]+)"/)[1]
if (id === "") return if (id === "") return
let path = this.getCurDownloadPath(e) + '/' + desc + '-' + title + '.' + FileSuffix let path = this.getCurDownloadPath(e) + '/' + desc + '-' + title + '.' + FileSuffix
try { try {
@ -321,12 +321,12 @@ export class songRequest extends plugin {
const musicUrlReg2 = /(http:|https:)\/\/y.music.163.com\/m\/song\?(.*)&id=(\d+)/; const musicUrlReg2 = /(http:|https:)\/\/y.music.163.com\/m\/song\?(.*)&id=(\d+)/;
const musicUrlReg3 = /(http:|https:)\/\/music.163.com\/m\/song\/(\d+)/; const musicUrlReg3 = /(http:|https:)\/\/music.163.com\/m\/song\/(\d+)/;
const id = const id =
musicUrlReg2.exec(msg.message[0].data)?.[3] || musicUrlReg2.exec(msg.message[0].data.data)?.[3] ||
musicUrlReg.exec(msg.message[0].data)?.[2] || musicUrlReg.exec(msg.message[0].data.data)?.[2] ||
musicUrlReg3.exec(msg.message[0].data)?.[2] || musicUrlReg3.exec(msg.message[0].data.data)?.[2] ||
/(?<!user)id=(\d+)/.exec(msg.message[0].data)[1] || ""; /(?<!user)id=(\d+)/.exec(msg.message[0].data.data)[1] || "";
const title = msg.message[0].data.match(/"title":"([^"]+)"/)[1] const title = msg.message[0].data.data.match(/"title":"([^"]+)"/)[1]
const desc = msg.message[0].data.match(/"desc":"([^"]+)"/)[1] const desc = msg.message[0].data.data.match(/"desc":"([^"]+)"/)[1]
if (id === "") return if (id === "") return
let path = this.getCurDownloadPath(e) + '/' + desc + '-' + title + '.' + FileSuffix let path = this.getCurDownloadPath(e) + '/' + desc + '-' + title + '.' + FileSuffix
const tryUpload = async () => { const tryUpload = async () => {