Northern_Lights/NapCatQQ
1
0
Fork 0
mirror of https://github.com/NapNeko/NapCatQQ.git synced 2026-02-06 13:05:09 +00:00
Code Issues Actions 8 Packages Projects Releases Wiki Activity

refactor: rename function convertMessage2List to normalize

Browse Source
This commit is contained in:
Wesley F. Young
2024-05-15 16:33:15 +08:00
parent 3983e7e78d
commit a3f6c6fa5e
4 changed files with 13 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/onebot11/action/go-cqhttp/SendForwardMsg.ts
View File

@@ -1,4 +1,4 @@
import SendMsg, { convertMessage2List } from '../msg/SendMsg';
import SendMsg, { normalize } from '../msg/SendMsg';
import { OB11PostSendMsg } from '../../types';
import { ActionName } from '../types';
@@ -6,7 +6,7 @@ export class GoCQHTTPSendForwardMsg extends SendMsg {
actionName = ActionName.GoCQHTTP_SendForwardMsg;
protected async check(payload: OB11PostSendMsg) {
if (payload.messages) payload.message = convertMessage2List(payload.messages);
if (payload.messages) payload.message = normalize(payload.messages);
return super.check(payload);
}
}
@@ -17,4 +17,4 @@ export class GoCQHTTPSendPrivateForwardMsg extends GoCQHTTPSendForwardMsg {
export class GoCQHTTPSendGroupForwardMsg extends GoCQHTTPSendForwardMsg {
actionName = ActionName.GoCQHTTP_SendGroupForwardMsg;
}
}

23
src/onebot11/action/msg/SendMsg/index.ts
View File

@@ -72,22 +72,13 @@ export interface ReturnDataType {
message_id: number;
}
export function convertMessage2List(message: OB11MessageMixType, autoEscape = false) {
if (typeof message === 'string') {
if (autoEscape === true) {
message = [{
type: OB11MessageDataType.text,
data: {
text: message
}
}];
} else {
message = decodeCQCode(message.toString());
}
} else if (!Array.isArray(message)) {
message = [message];
}
return message;
// Normalizes a mixed type (CQCode/a single segment/segment array) into a segment array.
export function normalize(message: OB11MessageMixType, autoEscape = false): OB11MessageData[] {
return typeof message === 'string' ? (
autoEscape ?
[{ type: OB11MessageDataType.text, data: { text: message } }] :
decodeCQCode(message)
) : Array.isArray(message) ? message : [message];
}
export async function sendMsg(peer: Peer, sendElements: SendMessageElement[], deleteAfterSentFiles: string[], waitComplete = true) {