diff --git a/src/core/src/apis/msg.ts b/src/core/src/apis/msg.ts index 12d88721..06032df9 100644 --- a/src/core/src/apis/msg.ts +++ b/src/core/src/apis/msg.ts @@ -130,6 +130,10 @@ export class NTQQMsgApi { }); return retMsg; } + static async getMsgUniqueEx(){ + let msgId = await NTQQMsgApi.getMsgUnique(await NTQQMsgApi.getServerTime()); + return msgId; + } static async getMsgUnique(time: string) { return napCatCore.session.getMsgService().getMsgUniqueId(time); } diff --git a/src/core/src/core.ts b/src/core/src/core.ts index 0ec1a157..3174a37e 100644 --- a/src/core/src/core.ts +++ b/src/core/src/core.ts @@ -249,6 +249,7 @@ export class NapCatCore { stat.last_message_time = Math.floor(Date.now() / 1000); }; msgListener.onRecvMsg = (msgList: RawMessage[]) => { + // console.log(JSON.stringify(msgList[0],null,2)); stat.packet_received += 1; stat.message_received += msgList.length; stat.last_message_time = Math.floor(Date.now() / 1000); diff --git a/src/core/src/services/NodeIKernelMsgService.ts b/src/core/src/services/NodeIKernelMsgService.ts index d7b1f618..3bf2721e 100644 --- a/src/core/src/services/NodeIKernelMsgService.ts +++ b/src/core/src/services/NodeIKernelMsgService.ts @@ -21,7 +21,7 @@ export interface NodeIKernelMsgService { getAutoReplyTextList(...args: unknown[]): unknown; - getOnLineDev(): Promise; + getOnLineDev(): void; kickOffLine(DevInfo: Object): unknown; @@ -115,7 +115,7 @@ export interface NodeIKernelMsgService { addLocalTofuRecordMsg(...args: unknown[]): unknown; - addLocalRecordMsg(...args: unknown[]): unknown; + addLocalRecordMsg(Peer: Peer, msgId: string, rawMessage: RawMessage, attr: Array | number, front: boolean): Promise; deleteMsg(...args: unknown[]): unknown; diff --git a/src/onebot11/main.ts b/src/onebot11/main.ts index 58e87bc5..156cf867 100644 --- a/src/onebot11/main.ts +++ b/src/onebot11/main.ts @@ -1,5 +1,5 @@ import { napCatCore } from '@/core'; -import { MsgListener, TempOnRecvParams } from '@/core/listeners'; +import { DebugGroupListener, MsgListener, TempOnRecvParams } from '@/core/listeners'; import { OB11Constructor } from '@/onebot11/constructor'; import { postOB11Event } from '@/onebot11/server/postOB11Event'; import { @@ -22,7 +22,7 @@ import { ob11ReverseWebsockets } from '@/onebot11/server/ws/ReverseWebsocket'; import { getGroup, getGroupMember, groupMembers, selfInfo, tempGroupCodeMap } from '@/core/data'; import { BuddyListener, GroupListener, NodeIKernelBuddyListener } from '@/core/listeners'; import { OB11FriendRequestEvent } from '@/onebot11/event/request/OB11FriendRequest'; -import { NTQQUserApi } from '@/core/apis'; +import { NTQQGroupApi, NTQQUserApi } from '@/core/apis'; import { log, logDebug, logError, setLogSelfInfo } from '@/common/utils/log'; import { OB11GroupRequestEvent } from '@/onebot11/event/request/OB11GroupRequest'; import { OB11GroupAdminNoticeEvent } from '@/onebot11/event/notice/OB11GroupAdminNoticeEvent'; @@ -265,6 +265,15 @@ export class NapCatOnebot11 { // GroupListener const groupListener = new GroupListener(); + // groupListener.onMemberListChange = async (arg: { + // sceneId: string, + // ids: string[], + // infos: Map, // uid -> GroupMember + // finish: boolean, + // hasRobot: boolean + // }) => { + + // } groupListener.onGroupNotifiesUpdated = async (doubt, notifies) => { //console.log('ob11 onGroupNotifiesUpdated', notifies[0]); if (![GroupNotifyTypes.ADMIN_SET, GroupNotifyTypes.ADMIN_UNSET, GroupNotifyTypes.ADMIN_UNSET_OTHER].includes(notifies[0].type)) { @@ -314,7 +323,7 @@ export class NapCatOnebot11 { const isPrivilege = role === 3 || role === 4; for (const member of members.values()) { //console.log(member?.isDelete, role, isPrivilege); - if (member?.isDelete && !isPrivilege && selfInfo.uin !== member.uin && this.bootTime < Date.now() / 1000) { + if (member?.isDelete && !isPrivilege && selfInfo.uin !== member.uin) { log('[群聊] 群组 ', groupCode, ' 成员' + member.uin + '退出'); const groupDecreaseEvent = new OB11GroupDecreaseEvent(parseInt(groupCode), parseInt(member.uin), 0, 'leave');// 不知道怎么出去的 postOB11Event(groupDecreaseEvent, true); @@ -388,18 +397,18 @@ export class NapCatOnebot11 { ob11Config.save(NewOb11, true);//保存新配置 const isHttpChanged = !isEqual(NewOb11.http.enable, OldConfig.http.enable) || - !isEqual(NewOb11.http.host, OldConfig.http.host) || - !isEqual(NewOb11.http.port, OldConfig.http.port); + !isEqual(NewOb11.http.host, OldConfig.http.host) || + !isEqual(NewOb11.http.port, OldConfig.http.port); // const isHttpPostChanged = !isEqual(NewOb11.http.postUrls, OldConfig.http.postUrls); // const isEnanleHttpPostChanged = !isEqual(NewOb11.http.enablePost, OldConfig.http.enablePost); const isWsChanged = !isEqual(NewOb11.ws.enable, OldConfig.ws.enable) || - !isEqual(NewOb11.ws.host, OldConfig.ws.host) || - !isEqual(NewOb11.ws.port, OldConfig.ws.port); + !isEqual(NewOb11.ws.host, OldConfig.ws.host) || + !isEqual(NewOb11.ws.port, OldConfig.ws.port); const isWsReverseChanged = !isEqual(NewOb11.reverseWs.enable, OldConfig.reverseWs.enable) || - !isEqual(NewOb11.reverseWs.urls, OldConfig.reverseWs.urls); + !isEqual(NewOb11.reverseWs.urls, OldConfig.reverseWs.urls); //const isEnableHeartBeatChanged = !isEqual(NewOb11.heartInterval, OldConfig.heartInterval);