chore: 解耦

2025-07-19 12:03:37 +00:00 · 2024-08-22 14:11:20 +08:00
parent 4fac6d5aa3
commit 71a2e52739
4 changed files with 162 additions and 162 deletions
--- a/src/onebot/helper/converter.ts
+++ b/src/onebot/helper/converter.ts
@@ -1,164 +1,9 @@
-import { UUIDConverter, calcQQLevel } from '@/common/utils/helper';
-import { MessageUnique } from '@/common/utils/MessageUnique';
-import { NapCatCore, RawMessage, ChatType, AtType, VideoElement, FaceIndex, NTGrayTipElementSubTypeV2, TipGroupElementType, Peer, SelfInfo, FriendV2, Friend, Sex, GroupMember, User, Group } from '@/core';
-import { NapCatOneBot11Adapter } from '..';
-import { OB11BaseNoticeEvent } from '../event/notice/OB11BaseNoticeEvent';
-import { OB11FriendAddNoticeEvent } from '../event/notice/OB11FriendAddNoticeEvent';
-import { OB11GroupCardEvent } from '../event/notice/OB11GroupCardEvent';
-import { OB11GroupDecreaseEvent } from '../event/notice/OB11GroupDecreaseEvent';
-import { OB11GroupEssenceEvent } from '../event/notice/OB11GroupEssenceEvent';
-import { OB11GroupNoticeEvent } from '../event/notice/OB11GroupNoticeEvent';
-import { OB11GroupTitleEvent } from '../event/notice/OB11GroupTitleEvent';
-import { OB11GroupUploadNoticeEvent } from '../event/notice/OB11GroupUploadNoticeEvent';
-import { OB11GroupPokeEvent } from '../event/notice/OB11PokeEvent';
-import { EventType } from '../event/OB11BaseEvent';
-import { OB11Message, OB11MessageData, OB11MessageDataType, OB11User, OB11GroupMemberRole, OB11UserSex, OB11GroupMember, OB11Group } from '../types';
-import { encodeCQCode } from './cqcode';
+import { calcQQLevel } from '@/common/utils/helper';
+import { SelfInfo, FriendV2, Friend, Sex, GroupMember, User, Group } from '@/core';
+import { OB11User, OB11GroupMemberRole, OB11UserSex, OB11GroupMember, OB11Group } from '../types';


 export class OB11Constructor {
-    static async PrivateEvent(core: NapCatCore, obContext: NapCatOneBot11Adapter, msg: RawMessage): Promise<OB11BaseNoticeEvent | undefined> {
-        if (msg.chatType !== ChatType.friend) {
-            return;
-        }
-        for (const element of msg.elements) {
-            if (element.grayTipElement) {
-                if (element.grayTipElement.subElementType == NTGrayTipElementSubTypeV2.GRAYTIP_ELEMENT_SUBTYPE_JSON) {
-                    if (element.grayTipElement.jsonGrayTipElement.busiId == 1061) {
-                        let PokeEvent = await obContext.apiContext.FriendApi.parsePrivatePokeEvent(element.grayTipElement);
-                        if (PokeEvent) return PokeEvent;
-                    }
-                }
-                if (element.grayTipElement.subElementType == NTGrayTipElementSubTypeV2.GRAYTIP_ELEMENT_SUBTYPE_XMLMSG) {
-                    //好友添加成功事件
-                    if (element.grayTipElement.xmlElement.templId === '10229' && msg.peerUin !== '') {
-                        return new OB11FriendAddNoticeEvent(core, parseInt(msg.peerUin));
-                    }
-                }
-            }
-        }
-    }
-
-    static async GroupEvent(core: NapCatCore, obContext: NapCatOneBot11Adapter, msg: RawMessage): Promise<OB11GroupNoticeEvent | undefined> {
-        const NTQQGroupApi = core.apis.GroupApi;
-        const NTQQUserApi = core.apis.UserApi;
-        const NTQQMsgApi = core.apis.MsgApi;
-        const logger = core.context.logger;
-        if (msg.chatType !== ChatType.group) {
-            return;
-        }
-        //log("group msg", msg);
-        if (msg.senderUin && msg.senderUin !== '0') {
-            const member = await NTQQGroupApi.getGroupMember(msg.peerUid, msg.senderUin);
-            if (member && member.cardName !== msg.sendMemberName) {
-                const newCardName = msg.sendMemberName || '';
-                const event = new OB11GroupCardEvent(core, parseInt(msg.peerUid), parseInt(msg.senderUin), newCardName, member.cardName);
-                member.cardName = newCardName;
-                return event;
-            }
-        }
-
-        for (const element of msg.elements) {
-            if (element.grayTipElement && element.grayTipElement.groupElement) {
-                const groupElement = element.grayTipElement.groupElement;
-                if (groupElement.type == TipGroupElementType.memberIncrease) {
-                    let MemberIncreaseEvent = await obContext.apiContext.GroupApi.parseGroupMemberIncreaseEvent(msg.peerUid, element.grayTipElement);
-                    if (MemberIncreaseEvent) return MemberIncreaseEvent;
-                } else if (groupElement.type === TipGroupElementType.ban) {
-                    let BanEvent = await obContext.apiContext.GroupApi.parseGroupBanEvent(msg.peerUid, element.grayTipElement);
-                    if (BanEvent) return BanEvent;
-                } else if (groupElement.type == TipGroupElementType.kicked) {
-                    NTQQGroupApi.quitGroup(msg.peerUid).then();
-                    try {
-                        let KickEvent = await obContext.apiContext.GroupApi.parseGroupKickEvent(msg.peerUid, element.grayTipElement);
-                        if (KickEvent) return KickEvent;
-                    } catch (e) {
-                        return new OB11GroupDecreaseEvent(
-                            core,
-                            parseInt(msg.peerUid),
-                            parseInt(core.selfInfo.uin),
-                            0,
-                            'leave'
-                        );
-                    }
-                }
-            } else if (element.fileElement) {
-                return new OB11GroupUploadNoticeEvent(
-                    core,
-                    parseInt(msg.peerUid), parseInt(msg.senderUin || ''),
-                    {
-                        id: element.fileElement.fileUuid!,
-                        name: element.fileElement.fileName,
-                        size: parseInt(element.fileElement.fileSize),
-                        busid: element.fileElement.fileBizId || 0,
-                    }
-                );
-            }
-            if (element.grayTipElement) {
-                if (element.grayTipElement.xmlElement?.templId === '10382') {
-                    let emojiLikeEvent = await obContext.apiContext.GroupApi.parseGroupEmjioLikeEvent(msg.peerUid, element.grayTipElement);
-                    if (emojiLikeEvent) return emojiLikeEvent;
-                }
-                if (element.grayTipElement.subElementType == NTGrayTipElementSubTypeV2.GRAYTIP_ELEMENT_SUBTYPE_XMLMSG) {
-                    let GroupIncreaseEvent = await obContext.apiContext.GroupApi.parseGroupMemberIncreaseEvent(msg.peerUid, element.grayTipElement);
-                    if (GroupIncreaseEvent) return GroupIncreaseEvent;
-                }
-
-                //代码歧义 GrayTipElementSubType.MEMBER_NEW_TITLE
-                else if (element.grayTipElement.subElementType == NTGrayTipElementSubTypeV2.GRAYTIP_ELEMENT_SUBTYPE_JSON) {
-                    const json = JSON.parse(element.grayTipElement.jsonGrayTipElement.jsonStr);
-                    if (element.grayTipElement.jsonGrayTipElement.busiId == 1061) {
-                        //判断业务类型
-                        //Poke事件
-                        const pokedetail: any[] = json.items;
-                        //筛选item带有uid的元素
-                        const poke_uid = pokedetail.filter(item => item.uid);
-                        if (poke_uid.length == 2) {
-                            return new OB11GroupPokeEvent(
-                                core,
-                                parseInt(msg.peerUid),
-                                parseInt((await NTQQUserApi.getUinByUidV2(poke_uid[0].uid))!),
-                                parseInt((await NTQQUserApi.getUinByUidV2(poke_uid[1].uid))!),
-                                pokedetail
-                            );
-                        }
-                    }
-                    if (element.grayTipElement.jsonGrayTipElement.busiId == 2401) {
-                        const searchParams = new URL(json.items[0].jp).searchParams;
-                        const msgSeq = searchParams.get('msgSeq')!;
-                        const Group = searchParams.get('groupCode');
-                        // const businessId = searchParams.get('businessid');
-                        const Peer: Peer = {
-                            guildId: '',
-                            chatType: ChatType.group,
-                            peerUid: Group!,
-                        };
-                        const msgData = await NTQQMsgApi.getMsgsBySeqAndCount(Peer, msgSeq.toString(), 1, true, true);
-                        return new OB11GroupEssenceEvent(
-                            core,
-                            parseInt(msg.peerUid),
-                            MessageUnique.getShortIdByMsgId(msgData.msgList[0].msgId)!,
-                            parseInt(msgData.msgList[0].senderUin)
-                        );
-                        // 获取MsgSeq+Peer可获取具体消息
-                    }
-                    if (element.grayTipElement.jsonGrayTipElement.busiId == 2407) {
-                        //下面得改 上面也是错的grayTipElement.subElementType == GrayTipElementSubType.MEMBER_NEW_TITLE
-                        const memberUin = json.items[1].param[0];
-                        const title = json.items[3].txt;
-                        logger.logDebug('收到群成员新头衔消息', json);
-                        return new OB11GroupTitleEvent(
-                            core,
-                            parseInt(msg.peerUid),
-                            parseInt(memberUin),
-                            title
-                        );
-                    }
-                }
-            }
-        }
-    }
-
    static selfInfo(selfInfo: SelfInfo): OB11User {
        return {
            user_id: parseInt(selfInfo.uin),
--- a/src/onebot/helper/event.ts
+++ b/src/onebot/helper/event.ts
@@ -0,0 +1,154 @@
+import { NapCatOneBot11Adapter } from "..";
+import { OB11BaseNoticeEvent } from "../event/notice/OB11BaseNoticeEvent";
+import { OB11FriendAddNoticeEvent } from "../event/notice/OB11FriendAddNoticeEvent";
+import { OB11GroupNoticeEvent } from "../event/notice/OB11GroupNoticeEvent";
+import { OB11GroupCardEvent } from "../event/notice/OB11GroupCardEvent";
+import { OB11GroupDecreaseEvent } from "../event/notice/OB11GroupDecreaseEvent";
+import { OB11GroupUploadNoticeEvent } from "../event/notice/OB11GroupUploadNoticeEvent";
+import { OB11GroupPokeEvent } from "../event/notice/OB11PokeEvent";
+import { OB11GroupEssenceEvent } from "../event/notice/OB11GroupEssenceEvent";
+import { MessageUnique } from "@/common/utils/MessageUnique";
+import { OB11GroupTitleEvent } from "../event/notice/OB11GroupTitleEvent";
+import { NapCatCore, RawMessage, ChatType, NTGrayTipElementSubTypeV2, TipGroupElementType, Peer } from '@/core';
+
+export async function NT2PrivateEvent(core: NapCatCore, obContext: NapCatOneBot11Adapter, msg: RawMessage): Promise<OB11BaseNoticeEvent | undefined> {
+    if (msg.chatType !== ChatType.friend) {
+        return;
+    }
+    for (const element of msg.elements) {
+        if (element.grayTipElement) {
+            if (element.grayTipElement.subElementType == NTGrayTipElementSubTypeV2.GRAYTIP_ELEMENT_SUBTYPE_JSON) {
+                if (element.grayTipElement.jsonGrayTipElement.busiId == 1061) {
+                    let PokeEvent = await obContext.apiContext.FriendApi.parsePrivatePokeEvent(element.grayTipElement);
+                    if (PokeEvent) return PokeEvent;
+                }
+            }
+            if (element.grayTipElement.subElementType == NTGrayTipElementSubTypeV2.GRAYTIP_ELEMENT_SUBTYPE_XMLMSG) {
+                //好友添加成功事件
+                if (element.grayTipElement.xmlElement.templId === '10229' && msg.peerUin !== '') {
+                    return new OB11FriendAddNoticeEvent(core, parseInt(msg.peerUin));
+                }
+            }
+        }
+    }
+}
+
+export async function NT2GroupEvent(core: NapCatCore, obContext: NapCatOneBot11Adapter, msg: RawMessage): Promise<OB11GroupNoticeEvent | undefined> {
+    const NTQQGroupApi = core.apis.GroupApi;
+    const NTQQUserApi = core.apis.UserApi;
+    const NTQQMsgApi = core.apis.MsgApi;
+    const logger = core.context.logger;
+    if (msg.chatType !== ChatType.group) {
+        return;
+    }
+    //log("group msg", msg);
+    if (msg.senderUin && msg.senderUin !== '0') {
+        const member = await NTQQGroupApi.getGroupMember(msg.peerUid, msg.senderUin);
+        if (member && member.cardName !== msg.sendMemberName) {
+            const newCardName = msg.sendMemberName || '';
+            const event = new OB11GroupCardEvent(core, parseInt(msg.peerUid), parseInt(msg.senderUin), newCardName, member.cardName);
+            member.cardName = newCardName;
+            return event;
+        }
+    }
+
+    for (const element of msg.elements) {
+        if (element.grayTipElement && element.grayTipElement.groupElement) {
+            const groupElement = element.grayTipElement.groupElement;
+            if (groupElement.type == TipGroupElementType.memberIncrease) {
+                let MemberIncreaseEvent = await obContext.apiContext.GroupApi.parseGroupMemberIncreaseEvent(msg.peerUid, element.grayTipElement);
+                if (MemberIncreaseEvent) return MemberIncreaseEvent;
+            } else if (groupElement.type === TipGroupElementType.ban) {
+                let BanEvent = await obContext.apiContext.GroupApi.parseGroupBanEvent(msg.peerUid, element.grayTipElement);
+                if (BanEvent) return BanEvent;
+            } else if (groupElement.type == TipGroupElementType.kicked) {
+                NTQQGroupApi.quitGroup(msg.peerUid).then();
+                try {
+                    let KickEvent = await obContext.apiContext.GroupApi.parseGroupKickEvent(msg.peerUid, element.grayTipElement);
+                    if (KickEvent) return KickEvent;
+                } catch (e) {
+                    return new OB11GroupDecreaseEvent(
+                        core,
+                        parseInt(msg.peerUid),
+                        parseInt(core.selfInfo.uin),
+                        0,
+                        'leave'
+                    );
+                }
+            }
+        } else if (element.fileElement) {
+            return new OB11GroupUploadNoticeEvent(
+                core,
+                parseInt(msg.peerUid), parseInt(msg.senderUin || ''),
+                {
+                    id: element.fileElement.fileUuid!,
+                    name: element.fileElement.fileName,
+                    size: parseInt(element.fileElement.fileSize),
+                    busid: element.fileElement.fileBizId || 0,
+                }
+            );
+        }
+        if (element.grayTipElement) {
+            if (element.grayTipElement.xmlElement?.templId === '10382') {
+                let emojiLikeEvent = await obContext.apiContext.GroupApi.parseGroupEmjioLikeEvent(msg.peerUid, element.grayTipElement);
+                if (emojiLikeEvent) return emojiLikeEvent;
+            }
+            if (element.grayTipElement.subElementType == NTGrayTipElementSubTypeV2.GRAYTIP_ELEMENT_SUBTYPE_XMLMSG) {
+                let GroupIncreaseEvent = await obContext.apiContext.GroupApi.parseGroupMemberIncreaseEvent(msg.peerUid, element.grayTipElement);
+                if (GroupIncreaseEvent) return GroupIncreaseEvent;
+            }
+
+            //代码歧义 GrayTipElementSubType.MEMBER_NEW_TITLE
+            else if (element.grayTipElement.subElementType == NTGrayTipElementSubTypeV2.GRAYTIP_ELEMENT_SUBTYPE_JSON) {
+                const json = JSON.parse(element.grayTipElement.jsonGrayTipElement.jsonStr);
+                if (element.grayTipElement.jsonGrayTipElement.busiId == 1061) {
+                    //判断业务类型
+                    //Poke事件
+                    const pokedetail: any[] = json.items;
+                    //筛选item带有uid的元素
+                    const poke_uid = pokedetail.filter(item => item.uid);
+                    if (poke_uid.length == 2) {
+                        return new OB11GroupPokeEvent(
+                            core,
+                            parseInt(msg.peerUid),
+                            parseInt((await NTQQUserApi.getUinByUidV2(poke_uid[0].uid))!),
+                            parseInt((await NTQQUserApi.getUinByUidV2(poke_uid[1].uid))!),
+                            pokedetail
+                        );
+                    }
+                }
+                if (element.grayTipElement.jsonGrayTipElement.busiId == 2401) {
+                    const searchParams = new URL(json.items[0].jp).searchParams;
+                    const msgSeq = searchParams.get('msgSeq')!;
+                    const Group = searchParams.get('groupCode');
+                    // const businessId = searchParams.get('businessid');
+                    const Peer: Peer = {
+                        guildId: '',
+                        chatType: ChatType.group,
+                        peerUid: Group!,
+                    };
+                    const msgData = await NTQQMsgApi.getMsgsBySeqAndCount(Peer, msgSeq.toString(), 1, true, true);
+                    return new OB11GroupEssenceEvent(
+                        core,
+                        parseInt(msg.peerUid),
+                        MessageUnique.getShortIdByMsgId(msgData.msgList[0].msgId)!,
+                        parseInt(msgData.msgList[0].senderUin)
+                    );
+                    // 获取MsgSeq+Peer可获取具体消息
+                }
+                if (element.grayTipElement.jsonGrayTipElement.busiId == 2407) {
+                    //下面得改 上面也是错的grayTipElement.subElementType == GrayTipElementSubType.MEMBER_NEW_TITLE
+                    const memberUin = json.items[1].param[0];
+                    const title = json.items[3].txt;
+                    logger.logDebug('收到群成员新头衔消息', json);
+                    return new OB11GroupTitleEvent(
+                        core,
+                        parseInt(msg.peerUid),
+                        parseInt(memberUin),
+                        title
+                    );
+                }
+            }
+        }
+    }
+}
--- a/src/onebot/helper/index.ts
+++ b/src/onebot/helper/index.ts
@@ -3,3 +3,4 @@ export * from './message';
 export * from './converter';
 export * from './quick';
 export * from './msg';
+export * from './event';
--- a/src/onebot/index.ts
+++ b/src/onebot/index.ts
@@ -35,7 +35,7 @@ import { OB11GroupRequestEvent } from '@/onebot/event/request/OB11GroupRequest';
 import { OB11FriendRecallNoticeEvent } from '@/onebot/event/notice/OB11FriendRecallNoticeEvent';
 import { OB11GroupRecallNoticeEvent } from '@/onebot/event/notice/OB11GroupRecallNoticeEvent';
 import { LRUCache } from '@/common/utils/LRU';
-import { RawNTMsg2Onebot } from './helper';
+import { NT2GroupEvent, NT2PrivateEvent, RawNTMsg2Onebot } from './helper';

 //OneBot实现类
 export class NapCatOneBot11Adapter {
@@ -468,14 +468,14 @@ export class NapCatOneBot11Adapter {
            this.networkManager.emitEvent(ob11Msg);
        }).catch(e => this.context.logger.logError('constructMessage error: ', e));

-        OB11Constructor.GroupEvent(this.core, this, message).then(groupEvent => {
+        NT2GroupEvent(this.core, this, message).then(groupEvent => {
            if (groupEvent) {
                // log("post group event", groupEvent);
                this.networkManager.emitEvent(groupEvent);
            }
        }).catch(e => this.context.logger.logError('constructGroupEvent error: ', e));

-        OB11Constructor.PrivateEvent(this.core, this, message).then(privateEvent => {
+        NT2PrivateEvent(this.core, this, message).then(privateEvent => {
            if (privateEvent) {
                // log("post private event", privateEvent);
                this.networkManager.emitEvent(privateEvent);