Northern_Lights/NapCatQQ
1
0
Fork 0
mirror of https://github.com/NapNeko/NapCatQQ.git synced 2026-02-12 16:00:27 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Merge branch 'main' of https://github.com/Wesley-Young/NapCatQQ.Patch into pr/23

Browse Source
This commit is contained in:
手瓜一十雪
2024-05-15 19:46:46 +08:00
parent a4fd07da71 251e7fedf8
commit 5159e2259e
9 changed files with 374 additions and 408 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/onebot11/server/postOB11Event.ts
View File

@@ -3,11 +3,11 @@ import { OB11BaseMetaEvent } from '../event/meta/OB11BaseMetaEvent';
import { OB11BaseNoticeEvent } from '../event/notice/OB11BaseNoticeEvent';
import { WebSocket as WebSocketClass } from 'ws';
import { wsReply } from './ws/reply';
import { log, logDebug, logError } from '@/common/utils/log';
import { logDebug, logError } from '@/common/utils/log';
import { ob11Config } from '@/onebot11/config';
import crypto from 'crypto';
import { ChatType, Group, GroupRequestOperateTypes, Peer } from '@/core/entities';
import { convertMessage2List, sendMsg } from '../action/msg/SendMsg';
import { normalize, sendMsg } from '../action/msg/SendMsg';
import { OB11FriendRequestEvent } from '../event/request/OB11FriendRequest';
import { OB11GroupRequestEvent } from '../event/request/OB11GroupRequest';
import { isNull } from '@/common/utils/helper';
@@ -139,7 +139,7 @@ export function postOB11Event(msg: PostEventType, reportSelf = false, postWs = t
} as OB11MessageAt);
}
}
replyMessage = replyMessage.concat(convertMessage2List(reply, resJson.auto_escape));
replyMessage = replyMessage.concat(normalize(reply, resJson.auto_escape));
const { sendElements, deleteAfterSentFiles } = await createSendElements(replyMessage, group);
sendMsg(peer, sendElements, deleteAfterSentFiles, false).then();
} else if (resJson.delete) {