GuanM/LLOneBot
1
0
Fork 0
mirror of https://github.com/LLOneBot/LLOneBot.git synced 2024-11-22 01:56:33 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

chore: Conflict resolution

Browse Source
This commit is contained in:
Disy
2024-02-19 13:31:57 +08:00
parent d1eef6759c
commit 9b0f2d0983
51 changed files with 385 additions and 556 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
src/ntqqapi/hook.ts
View File

@@ -1,15 +1,12 @@
import {BrowserWindow} from 'electron';
import {log, sleep} from "../common/utils";
import {NTQQApi, NTQQApiClass, sendMessagePool} from "./ntcall";
import {Group, GroupMember, RawMessage, User} from "./types";
import {Group, RawMessage, User} from "./types";
import {addHistoryMsg, friends, groups, msgHistory} from "../common/data";
import {v4 as uuidv4} from 'uuid';
import {callEvent, EventType} from "../onebot11/event/manager";
import {OB11Message} from "../onebot11/types";
import {OB11Constructor} from "../onebot11/constructor";
import BaseMessageEvent from "../onebot11/event/BaseMessageEvent";
import GroupDecreaseEvent from "../onebot11/event/GroupDecreaseEvent";
import GroupIncreaseEvent from "../onebot11/event/GroupIncreaseEvent";
import {OB11GroupDecreaseEvent} from "../onebot11/event/notice/OB11GroupDecreaseEvent";
import {OB11GroupIncreaseEvent} from "../onebot11/event/notice/OB11GroupIncreaseEvent";
import {postMsg} from "../onebot11/server";
export let hookApiCallbacks: Record<string, (apiReturn: any) => void> = {}
@@ -140,7 +137,7 @@ async function processGroupEvent(payload) {
for (const member of oldMembers) {
if (!newMembersSet.has(member.uin)) {
callEvent(new GroupDecreaseEvent(group.groupCode, parseInt(member.uin)));
postMsg(new OB11GroupDecreaseEvent(group.groupCode, parseInt(member.uin)));
break;
}
}
@@ -159,7 +156,7 @@ async function processGroupEvent(payload) {
group.members = newMembers;
for (const member of newMembers) {
if (!oldMembersSet.has(member.uin)) {
callEvent(new GroupIncreaseEvent(group.groupCode, parseInt(member.uin)));
postMsg(new OB11GroupIncreaseEvent(group.groupCode, parseInt(member.uin)));
break;
}
}
@@ -211,22 +208,10 @@ registerReceiveHook<{
}
})
registerReceiveHook<{ msgList: Array<RawMessage> }>(ReceiveCmd.UPDATE_MSG, (payload) => {
for (const message of payload.msgList) {
addHistoryMsg(message)
}
})
registerReceiveHook<{ msgList: Array<RawMessage> }>(ReceiveCmd.NEW_MSG, (payload) => {
for (const message of payload.msgList) {
// log("收到新消息，push到历史记录", message)
addHistoryMsg(message)
OB11Constructor.message(message).then(
function (message) {
callEvent<OB11Message>(new BaseMessageEvent(), message);
}
);
}
const msgIds = Object.keys(msgHistory);
if (msgIds.length > 30000) {