QQ/NapCatQQ
1
0
Fork 0
mirror of https://github.com/NapNeko/NapCatQQ.git synced 2024-09-27 19:46:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

增加处理消息段时的检查，过滤无效消息段。

Browse Source
This commit is contained in:
123233513 2024-09-19 21:31:33 +08:00
parent 0d65e1e314
commit 3ad64b7cbb
1 changed files with 20 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
src/onebot/api/msg.ts
View File

@ -421,6 +421,10 @@ export class OneBotMsgApi {
// 从face_config.json中获取表情名称
const sysFaces = faceConfig.sysface;
const face: any = sysFaces.find((systemFace) => systemFace.QSid === parsedFaceId.toString());
if (!face) {
this.core.context.logger.logError('不支持的ID', id);
return undefined;
}
parsedFaceId = parseInt(parsedFaceId.toString());
let faceType = 1;
if (parsedFaceId >= 222) {
@ -701,36 +705,46 @@ export class OneBotMsgApi {
}
}
const msgSegments = (await Promise.allSettled(msg.elements.map(
// 处理消息段
const msgSegments = await Promise.allSettled(msg.elements.map(
async (element) => {
for (const key in element) {
if (keyCanBeParsed(key, this.rawToOb11Converters) && element[key]) {
return await this.rawToOb11Converters[key]?.(
const parsedElement = await this.rawToOb11Converters[key]?.(
// eslint-disable-next-line
// @ts-ignore
element[key],
msg,
element,
);
// 对于 face 类型的消息，检查是否存在
if (key === 'faceElement' && !parsedElement) {
return null; // 如果没有找到对应的表情，返回 null
}
return parsedElement;
}
}
},
))).filter(entry => {
));
// 过滤掉无效的消息段
const validSegments = msgSegments.filter(entry => {
if (entry.status === 'fulfilled') {
return !!entry.value;
} else {
this.core.context.logger.logError('消息段解析失败', entry.reason);
return false;
}
}).map((entry) => (<PromiseFulfilledResult<OB11MessageData>>entry).value);
}).map((entry) => (<PromiseFulfilledResult<OB11MessageData>>entry).value).filter(value => value != null);
const msgAsCQCode = msgSegments.map(msg => encodeCQCode(msg)).join('').trim();
const msgAsCQCode = validSegments.map(msg => encodeCQCode(msg)).join('').trim();
if (messagePostFormat === 'string') {
resMsg.message = msgAsCQCode;
resMsg.raw_message = msgAsCQCode;
} else {
resMsg.message = msgSegments;
resMsg.message = validSegments;
resMsg.raw_message = msgAsCQCode;
}
return resMsg;