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

Merge pull request #49 from nikoyoke1/master

Browse Source 
🐞 fix: 修复标签为空时无法触发的问题
This commit is contained in:
Zhiyu 2024-11-08 22:08:26 +08:00 committed by GitHub
commit a6dc918727
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 40 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
apps/songRequest.js
View File

@ -19,7 +19,7 @@ export class songRequest extends plugin {
priority: 300, priority: 300,
rule: [ rule: [
{ {
reg: '^#点歌|#?听[1-9][0-9]*|#?听[1-9]*$', reg: '^#点歌|#听[1-9][0-9]*|#听[1-9]*$',
fnc: 'pickSong' fnc: 'pickSong'
}, },
{ {
@ -57,7 +57,7 @@ export class songRequest extends plugin {
// 判断功能是否开启 // 判断功能是否开启
if (!this.useNeteaseSongRequest) { if (!this.useNeteaseSongRequest) {
logger.info('当前未开启网易云点歌') logger.info('当前未开启网易云点歌')
return return false
} }
const autoSelectNeteaseApi = await this.pickApi() const autoSelectNeteaseApi = await this.pickApi()
// 只在群里可以使用 // 只在群里可以使用
@ -112,8 +112,8 @@ export class songRequest extends plugin {
} }
}) })
} else if (await redisGetKey(REDIS_YUNZAI_SONGINFO) != []) { } else if (await redisGetKey(REDIS_YUNZAI_SONGINFO) != []) {
if (e.msg.replace(/\s+/g, "").match(/听(\d+)/)) { if (e.msg.replace(/\s+/g, "").match(/^#听(\d+)/)) {
const pickNumber = e.msg.replace(/\s+/g, "").match(/听(\d+)/)[1] - 1 const pickNumber = e.msg.replace(/\s+/g, "").match(/^#听(\d+)/)[1] - 1
let group_id = e.group.group_id let group_id = e.group.group_id
if (!group_id) return if (!group_id) return
let songInfo = await redisGetKey(REDIS_YUNZAI_SONGINFO) let songInfo = await redisGetKey(REDIS_YUNZAI_SONGINFO)
@ -306,11 +306,11 @@ export class songRequest extends plugin {
}, },
}).then(res => { }).then(res => {
const wikiData = res.data.data.blocks[1].creatives const wikiData = res.data.data.blocks[1].creatives
try {
typelist.push(wikiData[0].resources[0].uiElement.mainTitle.title) typelist.push(wikiData[0].resources[0]?.uiElement?.mainTitle?.title || "")
// 防止数据过深出错 // 防止数据过深出错
const recTags = wikiData[1] const recTags = wikiData[1]
if (recTags.resources[0]) { if (recTags?.resources[0]) {
for (let i = 0; i < Math.min(3, recTags.resources.length); i++) { for (let i = 0; i < Math.min(3, recTags.resources.length); i++) {
if (recTags.resources[i] && recTags.resources[i].uiElement && recTags.resources[i].uiElement.mainTitle.title) { if (recTags.resources[i] && recTags.resources[i].uiElement && recTags.resources[i].uiElement.mainTitle.title) {
typelist.push(recTags.resources[i].uiElement.mainTitle.title) typelist.push(recTags.resources[i].uiElement.mainTitle.title)
@ -322,7 +322,10 @@ export class songRequest extends plugin {
if (wikiData[2].uiElement.mainTitle.title == 'BPM') { if (wikiData[2].uiElement.mainTitle.title == 'BPM') {
typelist.push('BPM ' + wikiData[2].uiElement.textLinks[0].text) typelist.push('BPM ' + wikiData[2].uiElement.textLinks[0].text)
} else { } else {
typelist.push(wikiData[2].uiElement.textLinks[0].text) typelist.push(wikiData[2].uiElement.textLinks[0].text || '')
}
} catch (error) {
logger.error('获取标签报错：', error)
} }
typelist.push(AudioLevel) typelist.push(AudioLevel)
}) })

11
apps/tools.js
View File

@ -1794,10 +1794,11 @@ export class tools extends plugin {
}, },
}).then(res => { }).then(res => {
const wikiData = res.data.data.blocks[1].creatives const wikiData = res.data.data.blocks[1].creatives
typelist.push(wikiData[0].resources[0].uiElement.mainTitle.title) try {
typelist.push(wikiData[0].resources[0]?.uiElement?.mainTitle?.title || "")
// 防止数据过深出错 // 防止数据过深出错
const recTags = wikiData[1] const recTags = wikiData[1]
if (recTags.resources[0]) { if (recTags?.resources[0]) {
for (let i = 0; i < Math.min(3, recTags.resources.length); i++) { for (let i = 0; i < Math.min(3, recTags.resources.length); i++) {
if (recTags.resources[i] && recTags.resources[i].uiElement && recTags.resources[i].uiElement.mainTitle.title) { if (recTags.resources[i] && recTags.resources[i].uiElement && recTags.resources[i].uiElement.mainTitle.title) {
typelist.push(recTags.resources[i].uiElement.mainTitle.title) typelist.push(recTags.resources[i].uiElement.mainTitle.title)
@ -1806,11 +1807,13 @@ export class tools extends plugin {
} else { } else {
if (recTags.uiElement.textLinks[0].text) typelist.push(recTags.uiElement.textLinks[0].text) if (recTags.uiElement.textLinks[0].text) typelist.push(recTags.uiElement.textLinks[0].text)
} }
if (wikiData[2].uiElement.mainTitle.title == 'BPM') { if (wikiData[2].uiElement.mainTitle.title == 'BPM') {
typelist.push('BPM ' + wikiData[2].uiElement.textLinks[0].text) typelist.push('BPM ' + wikiData[2].uiElement.textLinks[0].text)
} else { } else {
typelist.push(wikiData[2].uiElement.textLinks[0].text) typelist.push(wikiData[2].uiElement.textLinks[0].text || '')
}
} catch (error) {
logger.error('获取标签报错：', error)
} }
typelist.push(AudioLevel) typelist.push(AudioLevel)
}) })