From dc3a08907075f57edf4edefb9ccbf771d4f8d599 Mon Sep 17 00:00:00 2001 From: pk5ls20 Date: Mon, 28 Oct 2024 07:59:24 +0800 Subject: [PATCH] chore: rename msg to message in packet module --- src/common/forward-msg-builder.ts | 2 +- src/core/apis/packet.ts | 8 ++++++-- src/core/packet/highway/session.ts | 2 +- src/core/packet/{msg => message}/builder.ts | 4 ++-- src/core/packet/{msg => message}/converter.ts | 4 ++-- src/core/packet/{msg => message}/element.ts | 2 +- src/core/packet/{msg => message}/message.ts | 2 +- src/core/packet/packer.ts | 8 ++++---- src/onebot/action/msg/SendMsg.ts | 4 ++-- 9 files changed, 20 insertions(+), 16 deletions(-) rename src/core/packet/{msg => message}/builder.ts (98%) rename src/core/packet/{msg => message}/converter.ts (98%) rename src/core/packet/{msg => message}/element.ts (99%) rename src/core/packet/{msg => message}/message.ts (85%) diff --git a/src/common/forward-msg-builder.ts b/src/common/forward-msg-builder.ts index 78c98a4b..17c164e9 100644 --- a/src/common/forward-msg-builder.ts +++ b/src/common/forward-msg-builder.ts @@ -1,4 +1,4 @@ -import { PacketMsg } from "@/core/packet/msg/message"; +import { PacketMsg } from "@/core/packet/message/message"; import * as crypto from "node:crypto"; interface ForwardMsgJson { diff --git a/src/core/apis/packet.ts b/src/core/apis/packet.ts index a5f2f5bc..d6fc11fb 100644 --- a/src/core/apis/packet.ts +++ b/src/core/apis/packet.ts @@ -10,14 +10,14 @@ import { OidbSvcTrpcTcpBase, OidbSvcTrpcTcpBaseRsp } from '@/core/packet/proto/o import { OidbSvcTrpcTcp0XFE1_2RSP } from '@/core/packet/proto/oidb/Oidb.0XFE1_2'; import { LogWrapper } from "@/common/log"; import { SendLongMsgResp } from "@/core/packet/proto/message/action"; -import { PacketMsg } from "@/core/packet/msg/message"; +import { PacketMsg } from "@/core/packet/message/message"; import { OidbSvcTrpcTcp0x6D6Response } from "@/core/packet/proto/oidb/Oidb.0x6D6"; import { PacketMsgFileElement, PacketMsgPicElement, PacketMsgPttElement, PacketMsgVideoElement -} from "@/core/packet/msg/element"; +} from "@/core/packet/message/element"; interface OffsetType { @@ -185,4 +185,8 @@ export class NTQQPacketApi { } return `https://${resp.download.downloadDns}/ftn_handler/${Buffer.from(resp.download.downloadUrl).toString('hex')}/?fname=`; } + + async signMiniAppShareInfo(appid: string, title: string, desc: string, time: number, scene: number, templateType: number, businessType: number, picUrl: string, vidUrl: string, jumpUrl: string, iconUrl: string, verType: number, shareType: number, versionId: string, withShareTicket: number, webURL: string, appidRich: string, template: any, field20: string) { + + } } diff --git a/src/core/packet/highway/session.ts b/src/core/packet/highway/session.ts index 6bbccc2c..997c5aa9 100644 --- a/src/core/packet/highway/session.ts +++ b/src/core/packet/highway/session.ts @@ -13,7 +13,7 @@ import { PacketMsgPicElement, PacketMsgPttElement, PacketMsgVideoElement -} from "@/core/packet/msg/element"; +} from "@/core/packet/message/element"; import { FileUploadExt, NTV2RichMediaHighwayExt } from "@/core/packet/proto/highway/highway"; import { int32ip2str, oidbIpv4s2HighwayIpv4s } from "@/core/packet/highway/utils"; import { calculateSha1, calculateSha1StreamBytes, computeMd5AndLengthWithLimit } from "@/core/packet/utils/crypto/hash"; diff --git a/src/core/packet/msg/builder.ts b/src/core/packet/message/builder.ts similarity index 98% rename from src/core/packet/msg/builder.ts rename to src/core/packet/message/builder.ts index fe201757..63f92593 100644 --- a/src/core/packet/msg/builder.ts +++ b/src/core/packet/message/builder.ts @@ -2,8 +2,8 @@ import * as crypto from "crypto"; import { PushMsgBody } from "@/core/packet/proto/message/message"; import { NapProtoEncodeStructType } from "@/core/packet/proto/NapProto"; import { LogWrapper } from "@/common/log"; -import { PacketMsg, PacketSendMsgElement } from "@/core/packet/msg/message"; -import { IPacketMsgElement, PacketMsgTextElement } from "@/core/packet/msg/element"; +import { PacketMsg, PacketSendMsgElement } from "@/core/packet/message/message"; +import { IPacketMsgElement, PacketMsgTextElement } from "@/core/packet/message/element"; import { SendTextElement } from "@/core"; export class PacketMsgBuilder { diff --git a/src/core/packet/msg/converter.ts b/src/core/packet/message/converter.ts similarity index 98% rename from src/core/packet/msg/converter.ts rename to src/core/packet/message/converter.ts index 053c1d03..2414e946 100644 --- a/src/core/packet/msg/converter.ts +++ b/src/core/packet/message/converter.ts @@ -30,8 +30,8 @@ import { PacketMsgTextElement, PacketMsgVideoElement, PacketMultiMsgElement -} from "@/core/packet/msg/element"; -import { PacketMsg, PacketSendMsgElement } from "@/core/packet/msg/message"; +} from "@/core/packet/message/element"; +import { PacketMsg, PacketSendMsgElement } from "@/core/packet/message/message"; import { LogWrapper } from "@/common/log"; const SupportedElementTypes = [ diff --git a/src/core/packet/msg/element.ts b/src/core/packet/message/element.ts similarity index 99% rename from src/core/packet/msg/element.ts rename to src/core/packet/message/element.ts index e5808ebb..9e6853dc 100644 --- a/src/core/packet/msg/element.ts +++ b/src/core/packet/message/element.ts @@ -25,7 +25,7 @@ import { SendVideoElement } from "@/core"; import { MsgInfo } from "@/core/packet/proto/oidb/common/Ntv2.RichMediaReq"; -import { PacketMsg, PacketSendMsgElement } from "@/core/packet/msg/message"; +import { PacketMsg, PacketSendMsgElement } from "@/core/packet/message/message"; import { ForwardMsgBuilder } from "@/common/forward-msg-builder"; import { FileExtra, GroupFileExtra } from "@/core/packet/proto/message/component"; import { OidbSvcTrpcTcp0XE37_800Response } from "@/core/packet/proto/oidb/Oidb.0XE37_800"; diff --git a/src/core/packet/msg/message.ts b/src/core/packet/message/message.ts similarity index 85% rename from src/core/packet/msg/message.ts rename to src/core/packet/message/message.ts index 7a5db703..bb936e1a 100644 --- a/src/core/packet/msg/message.ts +++ b/src/core/packet/message/message.ts @@ -1,4 +1,4 @@ -import { IPacketMsgElement } from "@/core/packet/msg/element"; +import { IPacketMsgElement } from "@/core/packet/message/element"; import { SendMessageElement, SendStructLongMsgElement } from "@/core"; export type PacketSendMsgElement = SendMessageElement | SendStructLongMsgElement diff --git a/src/core/packet/packer.ts b/src/core/packet/packer.ts index 5135a871..7e0ca0bf 100644 --- a/src/core/packet/packer.ts +++ b/src/core/packet/packer.ts @@ -10,18 +10,18 @@ import { OidbSvcTrpcTcp0XED3_1 } from "@/core/packet/proto/oidb/Oidb.0xED3_1"; import { NTV2RichMediaReq } from "@/core/packet/proto/oidb/common/Ntv2.RichMediaReq"; import { HttpConn0x6ff_501 } from "@/core/packet/proto/action/action"; import { LongMsgResult, SendLongMsgReq } from "@/core/packet/proto/message/action"; -import { PacketMsgBuilder } from "@/core/packet/msg/builder"; +import { PacketMsgBuilder } from "@/core/packet/message/builder"; import { PacketMsgFileElement, PacketMsgPicElement, PacketMsgPttElement, PacketMsgVideoElement -} from "@/core/packet/msg/element"; +} from "@/core/packet/message/element"; import { LogWrapper } from "@/common/log"; -import { PacketMsg } from "@/core/packet/msg/message"; +import { PacketMsg } from "@/core/packet/message/message"; import { OidbSvcTrpcTcp0x6D6 } from "@/core/packet/proto/oidb/Oidb.0x6D6"; import { OidbSvcTrpcTcp0XE37_1200 } from "@/core/packet/proto/oidb/Oidb.0xE37_1200"; -import { PacketMsgConverter } from "@/core/packet/msg/converter"; +import { PacketMsgConverter } from "@/core/packet/message/converter"; import { PacketClient } from "@/core/packet/client"; import { OidbSvcTrpcTcp0XE37_1700 } from "@/core/packet/proto/oidb/Oidb.0xE37_1700"; import { OidbSvcTrpcTcp0XE37_800 } from "@/core/packet/proto/oidb/Oidb.0XE37_800"; diff --git a/src/onebot/action/msg/SendMsg.ts b/src/onebot/action/msg/SendMsg.ts index f1f1fc74..fcfd5919 100644 --- a/src/onebot/action/msg/SendMsg.ts +++ b/src/onebot/action/msg/SendMsg.ts @@ -11,8 +11,8 @@ import { decodeCQCode } from '@/onebot/cqcode'; import { MessageUnique } from '@/common/message-unique'; import { ChatType, ElementType, NapCatCore, Peer, RawMessage, SendArkElement, SendMessageElement } from '@/core'; import BaseAction from '../BaseAction'; -import { rawMsgWithSendMsg } from "@/core/packet/msg/converter"; -import { PacketMsg } from "@/core/packet/msg/message"; +import { rawMsgWithSendMsg } from "@/core/packet/message/converter"; +import { PacketMsg } from "@/core/packet/message/message"; import { ForwardMsgBuilder } from "@/common/forward-msg-builder"; import { stringifyWithBigInt } from "@/common/helper";