加个捕获,防止无意义的报错导致转发整个无法发送 (#284)

* 加个捕获,防止无意义的报错导致转发整个无法发送

* 更新 common.js
This commit is contained in:
Zyy955 2023-10-16 03:56:56 +08:00 committed by GitHub
parent f429cb215a
commit 2ab062f4f2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 29 additions and 21 deletions

View File

@ -77,8 +77,12 @@ async function makeForwardMsg (e, msg = [], dec = '', msgsscr = false) {
let id = msgsscr ? e.user_id : Bot.uin
if (e.isGroup) {
let info = await e.bot.getGroupMemberInfo(e.group_id, id)
name = info.card || info.nickname
try {
let info = await e.bot.getGroupMemberInfo(e.group_id, id)
name = info.card || info.nickname
} catch (err) {
logger.error(err)
}
}
let userInfo = {
@ -98,27 +102,31 @@ async function makeForwardMsg (e, msg = [], dec = '', msgsscr = false) {
}
/** 制作转发内容 */
if (e?.group?.makeForwardMsg) {
forwardMsg = await e.group.makeForwardMsg(forwardMsg)
} else if (e?.friend?.makeForwardMsg) {
forwardMsg = await e.friend.makeForwardMsg(forwardMsg)
} else {
return msg.join('\n')
}
if (dec) {
/** 处理描述 */
if (typeof (forwardMsg.data) === 'object') {
let detail = forwardMsg.data?.meta?.detail
if (detail) {
detail.news = [{ text: dec }]
}
try {
if (e?.group?.makeForwardMsg) {
forwardMsg = await e.group.makeForwardMsg(forwardMsg)
} else if (e?.friend?.makeForwardMsg) {
forwardMsg = await e.friend.makeForwardMsg(forwardMsg)
} else {
forwardMsg.data = forwardMsg.data
.replace(/\n/g, '')
.replace(/<title color="#777777" size="26">(.+?)<\/title>/g, '___')
.replace(/___+/, `<title color="#777777" size="26">${dec}</title>`)
return msg.join('\n')
}
if (dec) {
/** 处理描述 */
if (typeof (forwardMsg.data) === 'object') {
let detail = forwardMsg.data?.meta?.detail
if (detail) {
detail.news = [{ text: dec }]
}
} else {
forwardMsg.data = forwardMsg.data
.replace(/\n/g, '')
.replace(/<title color="#777777" size="26">(.+?)<\/title>/g, '___')
.replace(/___+/, `<title color="#777777" size="26">${dec}</title>`)
}
}
} catch (err) {
logger.error(err)
}
return forwardMsg