@alemonjs/qq-bot 2.1.36 → 2.1.37

package/lib/framework-events.js

@@ -0,0 +1,182 @@
+import { getIdentity } from "./config.js";
+
+//#region src/framework-events.ts
+/** Preserve scoped identities in every author/mention, not only the top-level sender. */
+const normalizeMessageUser = (raw, scope) => {
+	const UserId = (scope === "group" ? raw.member_openid : scope === "c2c" ? raw.user_openid : raw.id) || raw.id || "";
+	const [IsMaster, UserKey] = getIdentity(UserId);
+	return {
+		UserId,
+		UserKey,
+		IsMaster,
+		UserName: raw.username,
+		IsBot: raw.bot ?? false,
+		SourceUserId: raw.id,
+		DirectUserId: raw.user_openid,
+		MemberId: raw.member_openid,
+		UnionId: raw.union_openid,
+		AccountId: raw.union_user_account,
+		Role: raw.member_role
+	};
+};
+const normalizeJoinRequest = (raw, guildId = raw.group_openid) => ({
+	id: raw.join_request_id,
+	guildId,
+	userId: raw.member_openid,
+	userName: raw.username,
+	unionId: raw.union_openid,
+	isBot: raw.bot,
+	risk: raw.risk_tips,
+	appliedAt: raw.apply_at,
+	source: raw.apply_source,
+	inviterId: raw.invited_by,
+	verification: raw.verify_info && {
+		method: raw.verify_info.method,
+		message: raw.verify_info.verify_message,
+		questions: raw.verify_info.review_qa_list
+	},
+	approvedByStrategyId: raw.auto_approved?.strategy_id
+});
+const context = (items = []) => Object.fromEntries(items.map((item) => {
+	const at = item.indexOf("=");
+	return at < 0 ? [item, ""] : [item.slice(0, at), item.slice(at + 1)];
+}));
+const normalizeAttachments = (attachments = []) => attachments.map((item) => ({
+	Type: item.content_type === "voice" || item.content_type?.startsWith("audio/") ? "audio" : item.content_type?.startsWith("image/") ? "image" : item.content_type?.startsWith("video/") ? "video" : "file",
+	Url: item.url,
+	FileId: item.id,
+	FileName: item.filename,
+	FileSize: item.size,
+	MimeType: item.content_type,
+	Width: item.width,
+	Height: item.height,
+	AudioUrl: item.voice_wav_url,
+	Transcript: item.asr_refer_text
+}));
+const message = (raw, scope) => {
+	const ext = context(raw.message_scene?.ext);
+	return {
+		type: raw.message_type,
+		referenceId: ext.msg_idx,
+		replyReferenceId: ext.ref_msg_idx,
+		source: raw.message_scene?.source,
+		context: ext,
+		card: raw.ark_data && {
+			type: raw.ark_data.ark_type,
+			name: raw.ark_data.ark_name,
+			prompt: raw.ark_data.prompt,
+			fields: raw.ark_data.fields
+		},
+		elements: raw.msg_elements?.map((item) => ({
+			referenceId: item.msg_idx,
+			userId: item.author ? normalizeMessageUser(item.author, scope).UserId : void 0,
+			author: item.author && normalizeMessageUser(item.author, scope),
+			userName: item.author?.username,
+			text: item.content,
+			content: message(item, scope),
+			attachments: normalizeAttachments(item.attachments)
+		}))
+	};
+};
+const interactionTypes = {
+	11: "button",
+	12: "menu",
+	13: "feedback",
+	14: "clear-session",
+	15: "story",
+	16: "model",
+	18: "authorization",
+	19: "authorization",
+	20: "authorization-status"
+};
+/** Standard fields expose platform capabilities without business code reading raw QQ data. */
+const normalizeFrameworkEvent = (event, acknowledged = false) => {
+	const raw = event.value;
+	const tag = "_tag" in event ? String(event._tag) : "";
+	if (!raw || typeof raw !== "object") return event;
+	const details = {};
+	const timestamp = typeof raw.timestamp === "number" ? raw.timestamp * 1e3 : Date.parse(raw.timestamp);
+	if (Number.isFinite(timestamp)) details.OccurredAt = timestamp;
+	if (raw.author) {
+		details.UnionId = raw.author.union_openid;
+		details.AccountId = raw.author.union_user_account;
+		details.Role = raw.author.member_role;
+	}
+	if (raw.group_openid) details.Target = {
+		scope: "group",
+		targetId: raw.group_openid,
+		BotId: event.BotId
+	};
+	else if (/^(C2C_|FRIEND_|SUBSCRIBE_MESSAGE_STATUS|INTERACTION_CREATE_C2C)/.test(tag)) {
+		const id = raw.openid || raw.user_openid || raw.author?.user_openid || raw.author?.id;
+		if (id) details.Target = {
+			scope: "c2c",
+			targetId: id,
+			BotId: event.BotId
+		};
+	}
+	if (/^(GROUP_MESSAGE_CREATE|GROUP_AT_MESSAGE_CREATE|C2C_MESSAGE_CREATE)$/.test(tag)) {
+		const scope = tag.startsWith("GROUP_") ? "group" : "c2c";
+		if (raw.author) Object.assign(details, normalizeMessageUser(raw.author, scope));
+		details.MessageContent = message(raw, scope);
+		details.MessageMentions = raw.mentions?.map((item) => normalizeMessageUser(item, scope)) ?? [];
+		details.MessageMedia = normalizeAttachments(raw.attachments);
+	}
+	if (tag === "GROUP_MEMBER_ADD" || tag === "GROUP_MEMBER_REMOVE") {
+		details.MemberId = raw.member_openid;
+		details.DirectUserId = raw.user_openid;
+	}
+	if (tag === "GROUP_JOIN_REQUEST") details.Notice = {
+		type: "join-request",
+		request: normalizeJoinRequest(raw)
+	};
+	if (tag === "SUBSCRIBE_MESSAGE_STATUS") details.Notice = {
+		type: "subscription",
+		subscriptions: raw.result.map((r) => ({
+			templateId: r.template_id,
+			customTemplateId: r.custom_template_id,
+			allowed: r.op === 1,
+			subscriptionId: r.subscribe_id,
+			subscribedAt: r.subscribe_ts,
+			updatedAt: r.update_ts
+		}))
+	};
+	if (/^(C2C|GROUP)_MSG_(RECEIVE|REJECT)$/.test(tag)) details.Notice = {
+		type: "message-permission",
+		enabled: tag.endsWith("RECEIVE")
+	};
+	if (tag === "FRIEND_ADD" || tag === "FRIEND_DEL") details.FriendSource = {
+		scene: raw.scene,
+		data: raw.scene_param,
+		code: raw.short_code,
+		unionId: raw.author?.union_openid
+	};
+	if (tag.startsWith("INTERACTION_CREATE")) {
+		const r = raw.data?.resolved ?? {};
+		details.EventId = raw.event_id || raw.id;
+		details.Interaction = {
+			type: interactionTypes[raw.type] ?? "unknown",
+			buttonId: r.button_id === void 0 ? void 0 : String(r.button_id),
+			data: r.button_data,
+			featureId: r.feature_id,
+			messageId: r.message_id,
+			feedback: r.feedback_opt === "LIKE" ? "like" : r.feedback_opt === "UNLIKE" ? "dislike" : void 0,
+			checked: r.checked === void 0 ? void 0 : Boolean(r.checked),
+			action: r.action,
+			authorization: r.authorize_data && {
+				scene: r.authorize_data.opt_scene,
+				scope: r.authorize_data.scope
+			},
+			context: context(r.message_scene?.ext),
+			requiresAck: raw.type === 11 || raw.type === 12,
+			acknowledged
+		};
+	} else if (!tag.endsWith("MESSAGE_CREATE")) details.EventId = raw.id;
+	return {
+		...event,
+		...details
+	};
+};
+
+//#endregion
+export { normalizeAttachments, normalizeFrameworkEvent, normalizeJoinRequest, normalizeMessageUser };

package/lib/hook.d.ts

@@ -1,6 +1,9 @@
+import { QQBotAPI } from "./sdk/api.js";
+import { SUBSCRIBE_MESSAGE_STATUS_TYPE } from "./message/group/SUBSCRIBE_MESSAGE_STATUS.js";
+import { GROUP_MEMBER_ADD } from "./message/group/GROUP_MEMBER_ADD.js";
+import { GROUP_MEMBER_REMOVE } from "./message/group/GROUP_MEMBER_REMOVE.js";
 import { GROUP_AT_MESSAGE_CREATE_TYPE } from "./message/group/GROUP_AT_MESSAGE_CREATE.js";
 import { GROUP_MESSAGE_CREATE_TYPE } from "./message/group/GROUP_MESSAGE_CREATE.js";
-import { QQBotAPI } from "./sdk/api.js";
 import { AT_MESSAGE_CREATE_TYPE } from "./message/AT_MESSAGE_CREATE.js";
 import { INTERACTION_CREATE_TYPE } from "./message/INTERACTION_CREATE.js";
 import { DIRECT_MESSAGE_CREATE_TYPE } from "./message/DIRECT_MESSAGE_CREATE.js";
@@ -31,6 +34,10 @@ import { C2C_MSG_REJECT_TYPE } from "./message/group/C2C_MSG_REJECT.js";
 import { MESSAGE_AUDIT_PASS_TYPE } from "./message/group/MESSAGE_AUDIT_PASS.js";
 import { MESSAGE_AUDIT_REJECT_TYPE } from "./message/group/MESSAGE_AUDIT_REJECT.js";
 import { GROUP_JOIN_REQUEST_TYPE } from "./message/group/GROUP_JOIN_REQUEST.js";
+import { GUILD_AUDIT_TYPE } from "./message/GUILD_AUDIT.js";
+import { FORUM_EVENT_TYPE } from "./message/FORUM_EVENT.js";
+import { AUDIO_EVENT_TYPE, AUDIO_OR_LIVE_CHANNEL_MEMBER_EVENT_TYPE } from "./message/AUDIO_EVENT.js";
+import { READY_TYPE } from "./message/READY.js";
 import { EventKeys, Events } from "alemonjs";
 //#region src/hook.d.ts
 type MAP = {
@@ -49,31 +56,28 @@ type MAP = {
   'guild.join': GUILD_CREATE_TYPE | GROUP_ADD_ROBOT_TYPE;
   'guild.exit': GUILD_DELETE_TYPE | GROUP_DEL_ROBOT_TYPE;
   'guild.update': GUILD_UPDATE_TYPE;
-  'member.add': GUILD_MEMBER_ADD_TYPE;
-  'member.remove': GUILD_MEMBER_REMOVE_TYPE;
+  'member.add': GUILD_MEMBER_ADD_TYPE | GROUP_MEMBER_ADD;
+  'member.remove': GUILD_MEMBER_REMOVE_TYPE | GROUP_MEMBER_REMOVE;
   'member.ban': undefined;
   'member.unban': undefined;
   'member.update': GUILD_MEMBER_UPDATE_TYPE;
-  'notice.create': GROUP_MSG_RECEIVE_TYPE | GROUP_MSG_REJECT_TYPE | MESSAGE_AUDIT_PASS_TYPE | MESSAGE_AUDIT_REJECT_TYPE | GROUP_JOIN_REQUEST_TYPE;
+  'notice.create': SUBSCRIBE_MESSAGE_STATUS_TYPE | GROUP_MSG_RECEIVE_TYPE | GROUP_MSG_REJECT_TYPE | MESSAGE_AUDIT_PASS_TYPE | MESSAGE_AUDIT_REJECT_TYPE | GUILD_AUDIT_TYPE | GROUP_JOIN_REQUEST_TYPE | FORUM_EVENT_TYPE | AUDIO_EVENT_TYPE | AUDIO_OR_LIVE_CHANNEL_MEMBER_EVENT_TYPE | READY_TYPE;
   'private.message.update': undefined;
   'private.message.delete': DIRECT_MESSAGE_DELETE_TYPE;
   'private.friend.add': FRIEND_ADD_TYPE;
   'private.friend.remove': FRIEND_DEL_TYPE;
   'private.guild.add': undefined;
-  'private.notice.create': C2C_MSG_RECEIVE_TYPE | C2C_MSG_REJECT_TYPE;
+  'private.notice.create': C2C_MSG_RECEIVE_TYPE | C2C_MSG_REJECT_TYPE | SUBSCRIBE_MESSAGE_STATUS_TYPE;
 };
+type EventValues = MAP & { [K in Exclude<EventKeys, keyof MAP>]: unknown; };
+/** 保留完整官方事件数据，不需要 useClient。 */
+declare const useValue: <T extends EventKeys>(event: Events[T]) => readonly [EventValues[T]];
 /**
  *
  * @param event
  * @returns
  */
-declare const useValue: <T extends EventKeys>(event: Events[T]) => readonly [MAP[T]];
-/**
- *
- * @param event
- * @returns
- */
-declare const useClient: <T extends EventKeys>(event: Events[T]) => readonly [QQBotAPI, MAP[T]];
+declare const useClient: <T extends EventKeys>(event: Events[T]) => readonly [QQBotAPI, EventValues[T]];
 /**
  * 判断当前模式
  * @param event

package/lib/hook.js

@@ -1,14 +1,10 @@
 import { QQBotAPI } from "./sdk/api.js";
-import { createEventValue, useClient as useClient$1 } from "alemonjs";
+import { useClient as useClient$1 } from "alemonjs";
 
 //#region src/hook.ts
-/**
-*
-* @param event
-* @returns
-*/
+/** 保留完整官方事件数据，不需要 useClient。 */
 const useValue = (event) => {
-	return [createEventValue(event)];
+	return [event.value];
 };
 /**
 *
@@ -17,7 +13,7 @@ const useValue = (event) => {
 */
 const useClient = (event) => {
 	const [client] = useClient$1(event, QQBotAPI);
-	return [client, createEventValue(event)];
+	return [client, event.value];
 };
 /**
 * 判断当前模式
@@ -25,7 +21,7 @@ const useClient = (event) => {
 * @returns
 */
 const useMode = (event) => {
-	const tag = event._tag;
+	const tag = "_tag" in event ? event._tag : void 0;
 	let currentMode = "group";
 	if (tag === "GROUP_AT_MESSAGE_CREATE") currentMode = "group";
 	if (tag === "GROUP_MESSAGE_CREATE") currentMode = "group";

package/lib/index.d.ts

@@ -1,7 +1,11 @@
+import { ApiRequestData, ButtonType, FileType, GlobalMuteRule, GroupAction, JoinApprovalStrategy, JoinRequest, KeyboardType, MarkdownType, MemberMuteState, MessageType, Options, SetMemberMuteState, StreamMessageData, StreamMessageResult, UploadConfig, UploadPart, UploadPartFinishData, UploadPrepareData, UploadPrepareResult, VerifyInfo } from "./sdk/typing.js";
 import { platform } from "./config.js";
+import { QQBotArkData, QQBotAttachment, QQBotBlacklistUser, QQBotGroupMember, QQBotInteractionResolved, QQBotMenu, QQBotMenuItem, QQBotMessageContent, QQBotMessageElement, QQBotMessageResult, QQBotMessageUser, QQBotPage, QQBotPanel, QQBotPanelCreate, QQBotPanelRecord, QQBotPanelScope } from "./sdk/non-channel-types.js";
 import { QQBotAPI } from "./sdk/api.js";
 import { useClient, useMode, useValue } from "./hook.js";
+import { QQBotGroupEventMap } from "./sdk/message.group.js";
+import { QQBotPublicEventMap } from "./sdk/message.public.js";
 //#region src/index.d.ts
 declare const _default: () => any;
 //#endregion
-export { QQBotAPI as API, _default as default, platform, useClient, useMode, useValue };
+export { QQBotAPI as API, type ApiRequestData, type ButtonType, type FileType, type GlobalMuteRule, type GroupAction, type JoinApprovalStrategy, type JoinRequest, type KeyboardType, type MarkdownType, type MemberMuteState, type MessageType, type Options, type QQBotArkData, type QQBotAttachment, type QQBotBlacklistUser, type QQBotGroupEventMap, type QQBotGroupMember, type QQBotInteractionResolved, type QQBotMenu, type QQBotMenuItem, type QQBotMessageContent, type QQBotMessageElement, type QQBotMessageResult, type QQBotMessageUser, type QQBotPage, type QQBotPanel, type QQBotPanelCreate, type QQBotPanelRecord, type QQBotPanelScope, type QQBotPublicEventMap, type SetMemberMuteState, type StreamMessageData, type StreamMessageResult, type UploadConfig, type UploadPart, type UploadPartFinishData, type UploadPrepareData, type UploadPrepareResult, type VerifyInfo, _default as default, platform, useClient, useMode, useValue };

package/lib/index.websoket.js

@@ -109,7 +109,9 @@ const connectAll = (registry) => {
 		"GUILD_MEMBERS",
 		"GUILD_MESSAGE_REACTIONS",
 		"DIRECT_MESSAGE",
-		"PUBLIC_GUILD_MESSAGES"
+		"PUBLIC_GUILD_MESSAGES",
+		"MESSAGE_AUDIT",
+		"AUDIO_ACTION"
 	];
 	const isPrivateIntents = [
 		"GUILDS",
@@ -117,7 +119,9 @@ const connectAll = (registry) => {
 		"GUILD_MESSAGES",
 		"GUILD_MESSAGE_REACTIONS",
 		"DIRECT_MESSAGE",
-		"FORUMS_EVENT"
+		"FORUMS_EVENT",
+		"MESSAGE_AUDIT",
+		"AUDIO_ACTION"
 	];
 	const isGroupIntents = ["GROUP_AND_C2C_EVENT", "GROUP_MEMBER_EVENT"];
 	const pubIntents = ["INTERACTION"];

package/lib/message/AUDIO_EVENT.d.ts

@@ -0,0 +1,20 @@
+//#region src/message/AUDIO_EVENT.d.ts
+/** 音频机器人网关事件（AUDIO_START / FINISH / ON_MIC / OFF_MIC）。 */
+type AUDIO_EVENT_TYPE = {
+  channel_id: string;
+  guild_id?: string;
+  audio_url?: string;
+  text?: string;
+  status?: 0 | 1 | 2 | 3;
+  event_id?: string;
+};
+/** 音视频或直播子频道成员进出事件。 */
+type AUDIO_OR_LIVE_CHANNEL_MEMBER_EVENT_TYPE = {
+  guild_id: string;
+  channel_id: string;
+  /** 2：音视频子频道；5：直播子频道。 */
+  channel_type: 2 | 5;
+  user_id: string;
+};
+//#endregion
+export { AUDIO_EVENT_TYPE, AUDIO_OR_LIVE_CHANNEL_MEMBER_EVENT_TYPE };

package/lib/message/AUDIO_EVENT.js

@@ -0,0 +1 @@
+export {  };

package/lib/message/FORUM_EVENT.d.ts

@@ -0,0 +1,33 @@
+//#region src/message/FORUM_EVENT.d.ts
+type QQBotForumThread = {
+  thread_id: string;
+  title?: string;
+  content?: string;
+  datetime?: string;
+};
+type QQBotForumPost = {
+  post_id: string;
+  content?: string;
+  datetime?: string;
+};
+type QQBotForumReply = {
+  reply_id: string;
+  content?: string;
+  datetime?: string;
+};
+/** 私域论坛网关事件的公共字段。 */
+type FORUM_EVENT_TYPE = {
+  guild_id: string;
+  channel_id: string;
+  author_id: string;
+  thread_info?: QQBotForumThread;
+  post_info?: QQBotForumPost;
+  reply_info?: QQBotForumReply;
+  audit_result?: {
+    task_id?: string;
+    result?: number;
+    err_msg?: string;
+  };
+};
+//#endregion
+export { FORUM_EVENT_TYPE, QQBotForumPost, QQBotForumReply, QQBotForumThread };

package/lib/message/FORUM_EVENT.js

@@ -0,0 +1 @@
+export {  };

package/lib/message/GUILD_AUDIT.d.ts

@@ -0,0 +1,14 @@
+//#region src/message/GUILD_AUDIT.d.ts
+/** 频道消息审核结果（MESSAGE_AUDIT_PASS / MESSAGE_AUDIT_REJECT）。 */
+type GUILD_AUDIT_TYPE = {
+  audit_id: string;
+  audit_time: string;
+  channel_id?: string;
+  guild_id?: string;
+  message_id?: string;
+  create_time?: string;
+  /** 兼容群聊审核事件；频道事件不携带该字段。 */
+  group_openid?: string;
+};
+//#endregion
+export { GUILD_AUDIT_TYPE };

package/lib/message/GUILD_AUDIT.js

@@ -0,0 +1 @@
+export {  };

package/lib/message/INTERACTION_CREATE.d.ts

@@ -1,3 +1,4 @@
+import { QQBotInteractionResolved } from "../sdk/non-channel-types.js";
 //#region src/message/INTERACTION_CREATE.d.ts
 /**
  * 交互消息事件 | 按钮消息
@@ -6,13 +7,11 @@
  */
 type INTERACTION_CREATE_TYPE = {
   application_id: string;
-  chat_type: 1;
+  event_id?: string;
+  chat_type?: 1;
   data: {
-    resolved: {
-      button_data: string;
-      button_id: number;
-    };
-    type: number;
+    type?: number;
+    resolved?: QQBotInteractionResolved;
   };
   group_member_openid: string;
   group_openid: string;
@@ -23,13 +22,11 @@ type INTERACTION_CREATE_TYPE = {
   version: number;
 } | {
   application_id: string;
-  chat_type: 2;
+  event_id?: string;
+  chat_type?: 2;
   data: {
-    resolved: {
-      button_data: string;
-      button_id: number;
-    };
-    type: number;
+    type?: number;
+    resolved?: QQBotInteractionResolved;
   };
   id: string;
   scene: 'c2c';
@@ -39,15 +36,11 @@ type INTERACTION_CREATE_TYPE = {
   version: number;
 } | {
   application_id: string;
-  chat_type: 0;
+  event_id?: string;
+  chat_type?: 0;
   data: {
-    resolved: {
-      message_id: string;
-      button_data: string;
-      button_id: number;
-      user_id: string;
-    };
-    type: number;
+    type?: number;
+    resolved?: QQBotInteractionResolved;
   };
   id: string;
   scene: 'guild';

package/lib/message/MESSAGE_CREATE.d.ts

@@ -1,12 +1,6 @@
+import { AT_MESSAGE_CREATE_TYPE } from "./AT_MESSAGE_CREATE.js";
 //#region src/message/MESSAGE_CREATE.d.ts
-/**
- * *私域*
- */
-/**
- * 频道内的全部消息
- * @param event
- * @returns
- */
-type MESSAGE_CREATE_TYPE = any;
+/** 私域全量频道消息与 AT_MESSAGE_CREATE 使用同一 Message 对象。 */
+type MESSAGE_CREATE_TYPE = AT_MESSAGE_CREATE_TYPE;
 //#endregion
 export { MESSAGE_CREATE_TYPE };

package/lib/message/MESSAGE_DELETE.d.ts

@@ -7,6 +7,20 @@
  * @param event
  * @returns
  */
-type MESSAGE_DELETE_TYPE = any;
+type MESSAGE_DELETE_TYPE = {
+  message: {
+    id: string;
+    channel_id: string;
+    guild_id: string;
+    author?: {
+      id: string;
+      username?: string;
+      bot?: boolean;
+    };
+  };
+  op_user?: {
+    id: string;
+  };
+};
 //#endregion
 export { MESSAGE_DELETE_TYPE };

package/lib/message/group/C2C_MESSAGE_CREATE.d.ts

@@ -1,17 +1,7 @@
+import { QQBotMessageContent, QQBotMessageUser } from "../../sdk/non-channel-types.js";
 //#region src/message/group/C2C_MESSAGE_CREATE.d.ts
-type C2C_MESSAGE_CREATE_TYPE = {
-  attachments?: {
-    id?: string;
-    url?: string;
-    content_type?: string;
-    filename?: string;
-    size?: number;
-  }[];
-  author: {
-    id: string;
-    user_openid: string;
-    username: string;
-  };
+type C2C_MESSAGE_CREATE_TYPE = QQBotMessageContent & {
+  author: QQBotMessageUser;
   content: string;
   id: string;
   timestamp: string;

package/lib/message/group/C2C_MSG_RECEIVE.d.ts

@@ -8,7 +8,7 @@ type C2C_MSG_RECEIVE_TYPE = {
    */
   id?: string;
   openid: string;
-  timestamp: string;
+  timestamp: number | string;
 };
 //#endregion
 export { C2C_MSG_RECEIVE_TYPE };

package/lib/message/group/C2C_MSG_REJECT.d.ts

@@ -4,7 +4,7 @@
  */
 type C2C_MSG_REJECT_TYPE = {
   openid: string;
-  timestamp: string;
+  timestamp: number | string;
 };
 //#endregion
 export { C2C_MSG_REJECT_TYPE };

package/lib/message/group/FRIEND_ADD.d.ts

@@ -7,8 +7,14 @@ type FRIEND_ADD_TYPE = {
    * 网关信封事件 ID（SDK 从 payload.id 回填），可用于发送消息时的 event_id 被动回复
    */
   id?: string;
+  scene?: number;
+  scene_param?: string;
+  short_code?: string;
+  author?: {
+    union_openid?: string;
+  };
   openid: string;
-  timestamp: string;
+  timestamp: number | string;
 };
 //#endregion
 export { FRIEND_ADD_TYPE };

package/lib/message/group/FRIEND_DEL.d.ts

@@ -3,8 +3,11 @@
  * 好友删除
  */
 type FRIEND_DEL_TYPE = {
+  author?: {
+    union_openid?: string;
+  };
   openid: string;
-  timestamp: string;
+  timestamp: number | string;
 };
 //#endregion
 export { FRIEND_DEL_TYPE };

package/lib/message/group/GROUP_AT_MESSAGE_CREATE.d.ts

@@ -1,40 +1,19 @@
+import { QQBotMessageContent, QQBotMessageUser } from "../../sdk/non-channel-types.js";
 //#region src/message/group/GROUP_AT_MESSAGE_CREATE.d.ts
 /**
  * 群消息事件 AT 事件
  */
-interface GROUP_AT_MESSAGE_CREATE_TYPE {
-  attachments?: {
-    id?: string;
-    url?: string;
-    content_type?: string;
-    filename?: string;
-    size?: number;
-  }[];
-  author: {
-    bot?: boolean;
-    id: string;
-    member_openid: string;
-    union_openid: string;
-    username: string;
-  };
+interface GROUP_AT_MESSAGE_CREATE_TYPE extends QQBotMessageContent {
+  author: QQBotMessageUser;
   content: string;
   group_openid: string;
-  group_id: string;
+  group_id?: string;
   id: string;
-  mentions?: {
-    bot?: boolean;
-    id: string;
+  mentions?: (QQBotMessageUser & {
     is_you?: boolean;
-    member_openid?: string;
     scope?: string;
-    username: string;
-  }[];
+  })[];
   timestamp: string;
-  message_scene: {
-    ext: string[];
-    source: string;
-  };
-  message_type: number;
 }
 //#endregion
 export { GROUP_AT_MESSAGE_CREATE_TYPE };

package/lib/message/group/GROUP_MEMBER_ADD.d.ts

@@ -1,9 +1,11 @@
 //#region src/message/group/GROUP_MEMBER_ADD.d.ts
 type GROUP_MEMBER_ADD = {
-  op_member_openid: string;
+  op_member_openid?: string;
   member_openid: string;
+  timestamp?: number;
+  user_openid?: string;
   group_openid: string;
-  username: string;
+  username?: string;
 };
 //#endregion
 export { GROUP_MEMBER_ADD };

package/lib/message/group/GROUP_MEMBER_REMOVE.d.ts

@@ -1,9 +1,11 @@
 //#region src/message/group/GROUP_MEMBER_REMOVE.d.ts
 type GROUP_MEMBER_REMOVE = {
-  op_member_openid: string;
+  op_member_openid?: string;
   member_openid: string;
+  timestamp?: number;
+  user_openid?: string;
   group_openid: string;
-  username: string;
+  username?: string;
 };
 //#endregion
 export { GROUP_MEMBER_REMOVE };