diff --git a/src/core/entities/msg.ts b/src/core/entities/msg.ts index d23d4a04..0c77e3b7 100644 --- a/src/core/entities/msg.ts +++ b/src/core/entities/msg.ts @@ -517,6 +517,12 @@ export enum AtType { atAll = 1, atUser = 2 } +export enum MsgSourceType { + K_DOWN_SOURCETYPE_AIOINNER = 1, + K_DOWN_SOURCETYPE_BIGSCREEN = 2, + K_DOWN_SOURCETYPE_HISTORY = 3, + K_DOWN_SOURCETYPE_UNKNOWN = 0 +} // 来自Android分析 export enum ChatType { @@ -874,6 +880,8 @@ export interface RawMessage { /** * 扩展字段,与 Ob11 msg ID 有关 */ + + id?: number; guildId: string; @@ -950,6 +958,8 @@ export interface RawMessage { records: RawMessage[]; elements: MessageElement[]; + + sourceType: MsgSourceType; } export interface QueryMsgsParams { chatInfo: Peer; diff --git a/src/onebot/index.ts b/src/onebot/index.ts index 43af0253..38ef38a4 100644 --- a/src/onebot/index.ts +++ b/src/onebot/index.ts @@ -6,6 +6,7 @@ import { GroupNotifyMsgStatus, GroupNotifyMsgType, InstanceContext, + MsgSourceType, NapCatCore, NodeIKernelBuddyListener, NodeIKernelGroupListener, @@ -303,8 +304,10 @@ export class NapCatOneBot11Adapter { }, m.msgId, ); - await this.emitMsg(m) - .catch(e => this.context.logger.logError.bind(this.context.logger)('处理消息失败', e)); + if (m.sourceType == MsgSourceType.K_DOWN_SOURCETYPE_AIOINNER) { + await this.emitMsg(m) + .catch(e => this.context.logger.logError.bind(this.context.logger)('处理消息失败', e)); + } } }; @@ -573,6 +576,8 @@ export class NapCatOneBot11Adapter { this.networkManager.emitEvent(ob11Msg); }).catch(e => this.context.logger.logError.bind(this.context.logger)('constructMessage error: ', e)); + console.log('message', message); + this.apis.GroupApi.parseGroupEvent(message).then(groupEvent => { if (groupEvent) { // log("post group event", groupEvent);