Northern_Lights/NapCatQQ
1
0
Fork 0
mirror of https://github.com/NapNeko/NapCatQQ.git synced 2026-02-06 21:10:23 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

feat: new message logging using raw msg object

Browse Source
This commit is contained in:
Wesley F. Young
2024-08-12 17:45:24 +08:00
parent 108855f8d8
commit bc52b933b1
4 changed files with 113 additions and 99 deletions
Download Patch File Download Diff File Expand all files Collapse all files

86
src/onebot/helper/log.ts
View File

@@ -1,86 +0,0 @@
import { Group, NapCatCore } from '@/core';
import { OB11Message } from '@/onebot/types';
import chalk from 'chalk';
const spSegColor = chalk.blue;// for special segment
const spColor = chalk.cyan;// for special
// todo: 应该放到core去用RawMessage解析打印
export async function logOB11Message(coreContext: NapCatCore, ob11Message: OB11Message) {
const isSelfSent = ob11Message.sender.user_id.toString() === coreContext.selfInfo.uin;
let prefix = '';
let group: Group | undefined;
if (isSelfSent) {
prefix = '发送消息 ';
if (ob11Message.message_type === 'private') {
prefix += '给私聊 ';
prefix += `${ob11Message.target_id}`;
} else {
prefix += '给群聊 ';
}
}
if (ob11Message.message_type === 'group') {
if (ob11Message.group_id == 284840486) {
// group = await coreContext.ApiContext.GroupApi.getGroup(ob11Message.group_id!.toString());
prefix += '转发消息[外部来源] ';
} else {
group = await coreContext.apis.GroupApi.getGroup(ob11Message.group_id!.toString());
prefix += `群[${group?.groupName}(${ob11Message.group_id})] `;
}
}
let msgChain: string;
if (Array.isArray(ob11Message.message)) {
const msgParts = [];
for (const segment of ob11Message.message) {
if (segment.type === 'text') {
msgParts.push(segment.data.text);
} else if (segment.type === 'at') {
const groupMember = await coreContext.apis.GroupApi.getGroupMember(ob11Message.group_id!, segment.data.qq!);
msgParts.push(spSegColor(`[@${groupMember?.cardName || groupMember?.nick}(${segment.data.qq})]`));
} else if (segment.type === 'reply') {
msgParts.push(spSegColor(`[回复消息|id:${segment.data.id}]`));
} else if (segment.type === 'image') {
msgParts.push(spSegColor(`[图片|${segment.data.url}]`));
} else if (segment.type === 'face') {
msgParts.push(spSegColor(`[表情|id:${segment.data.id}]`));
} else if (segment.type === 'mface') {
// @ts-expect-error 商城表情 url
msgParts.push(spSegColor(`[商城表情|${segment.data.url}]`));
} else if (segment.type === 'record') {
msgParts.push(spSegColor(`[语音|${segment.data.file}]`));
} else if (segment.type === 'file') {
msgParts.push(spSegColor(`[文件|${segment.data.file}]`));
} else if (segment.type === 'json') {
msgParts.push(spSegColor(`[json|${JSON.stringify(segment.data)}]`));
} else if (segment.type === 'markdown') {
msgParts.push(spSegColor(`[markdown|${segment.data.content}]`));
} else if (segment.type === 'video') {
msgParts.push(spSegColor(`[视频|${segment.data.url}]`));
} else if (segment.type === 'forward') {
msgParts.push(spSegColor(`[转发|${segment.data.id}|消息开始]`));
segment.data.content.forEach((msg) => {
logOB11Message(coreContext, msg);
});
msgParts.push(spSegColor(`[转发|${segment.data.id}|消息结束]`));
} else {
msgParts.push(spSegColor(`[未实现|${JSON.stringify(segment)}]`));
}
}
msgChain = msgParts.join(' ');
} else {
msgChain = ob11Message.message;
}
let msgString = `${prefix}${ob11Message.sender.nickname}(${ob11Message.sender.user_id}): ${msgChain}`;
if (isSelfSent) {
msgString = `${prefix}: ${msgChain}`;
}
coreContext.context.logger.log(msgString);
}
export async function logOB11Notice(coreContext: NapCatCore, ob11Notice: any) {
coreContext.context.logger.log(spColor('[Notice]'), ob11Notice);
}
export async function logOB11Request(coreContext: NapCatCore, ob11Request: any) {
coreContext.context.logger.log(spColor('[Request]'), ob11Request);
}

13
src/onebot/index.ts
View File

@@ -25,7 +25,6 @@ import { WebUiDataRuntime } from '@/webui/src/helper/Data';
import { OB11InputStatusEvent } from '@/onebot/event/notice/OB11InputStatusEvent';
import { MessageUnique } from '@/common/utils/MessageUnique';
import { OB11Constructor } from '@/onebot/helper/data';
import { logOB11Message } from '@/onebot/helper/log';
import { proxiedListenerOf } from '@/common/utils/proxy-handler';
import { OB11FriendRequestEvent } from '@/onebot/event/request/OB11FriendRequest';
import { OB11GroupAdminNoticeEvent } from '@/onebot/event/notice/OB11GroupAdminNoticeEvent';
@@ -252,7 +251,7 @@ export class NapCatOneBot11Adapter {
for (const msg of msgList.filter(e => e.senderUin == this.core.selfInfo.uin)) {
// console.log(msg);
if (!!msgIdSend.get(msg.msgId)) continue;
if (msgIdSend.get(msg.msgId)) continue;
msgIdSend.put(msg.msgId, true);
if (msg.sendStatus == 2) {
// 完成后再post
@@ -267,7 +266,7 @@ export class NapCatOneBot11Adapter {
}, msg.msgId);
this.emitMsg(msg);
} else {
logOB11Message(this.core, ob11Msg);
// logOB11Message(this.core, ob11Msg);
}
});
}
@@ -426,9 +425,9 @@ export class NapCatOneBot11Adapter {
private async emitMsg(message: RawMessage) {
const { debug, reportSelfMessage, messagePostFormat } = this.configLoader.configData;
this.context.logger.logDebug('收到新消息', message);
this.context.logger.logDebug('收到新消息 RawMessage', message);
OB11Constructor.message(this.core, message, messagePostFormat).then((ob11Msg) => {
this.context.logger.logDebug('收到消息: ', ob11Msg);
this.context.logger.logDebug('转化为 OB11Message', ob11Msg);
if (debug) {
ob11Msg.raw = message;
} else {
@@ -436,8 +435,8 @@ export class NapCatOneBot11Adapter {
return;
}
}
logOB11Message(this.core, ob11Msg)
.catch(e => this.context.logger.logError('logMessage error: ', e));
// logOB11Message(this.core, ob11Msg)
// .catch(e => this.context.logger.logError('logMessage error: ', e));
const isSelfMsg = ob11Msg.user_id.toString() == this.core.selfInfo.uin;
if (isSelfMsg && !reportSelfMessage) {
return;