woodenfish-bot 4.7.2 → 4.7.4

package/es/index.js

@@ -319,7 +319,7 @@ var Guild = /*#__PURE__*/function () {
   }]);
 }();
 
-var version = "4.7.2";
+var version = "4.7.4";
 
 function getDefaultExportFromCjs (x) {
 	return x && x.__esModule && Object.prototype.hasOwnProperty.call(x, 'default') ? x['default'] : x;
@@ -1270,11 +1270,7 @@ var Message = /*#__PURE__*/function () {
     // 群组撤回消息
   }, {
     key: "deleteGroupMessage",
-    value: function deleteGroupMessage(groupOpenid, messageID, hideTip) {
-      var params = Object.create(null);
-      if (typeof hideTip === 'boolean') {
-        params.hidetip = hideTip;
-      }
+    value: function deleteGroupMessage(groupOpenid, messageID) {
       var options = {
         method: 'DELETE',
         url: getURL('groupMessageURI'),
@@ -1282,7 +1278,6 @@ var Message = /*#__PURE__*/function () {
           groupOpenid: groupOpenid,
           messageID: messageID
         },
-        params: params,
         apiVersion: 'v2'
       };
       return this.request(options);
@@ -1292,7 +1287,6 @@ var Message = /*#__PURE__*/function () {
   }, {
     key: "postGroupMessage",
     value: function postGroupMessage(groupOpenid, message) {
-      message.timestamp = Date.now();
       var options = {
         method: 'POST',
         url: getURL('groupMessagesURI'),
@@ -2493,6 +2487,7 @@ var AvailableIntentsEventsEnum = /*#__PURE__*/function (AvailableIntentsEventsEn
   AvailableIntentsEventsEnum["PUBLIC_GUILD_MESSAGES"] = "PUBLIC_GUILD_MESSAGES";
   AvailableIntentsEventsEnum["MESSAGE_AUDIT"] = "MESSAGE_AUDIT";
   AvailableIntentsEventsEnum["INTERACTION"] = "INTERACTION";
+  AvailableIntentsEventsEnum["GROUP_MEMBER"] = "GROUP_MEMBER";
   AvailableIntentsEventsEnum["GROUP_AND_C2C_EVENT"] = "GROUP_AND_C2C_EVENT";
   return AvailableIntentsEventsEnum;
 }({});
@@ -2628,11 +2623,13 @@ var WsEventType = {
   // 群管理员主动在机器人资料页操作开启通知
   GROUP_MSG_REJECT: AvailableIntentsEventsEnum.GROUP_AND_C2C_EVENT,
   // 群管理员主动在机器人资料页操作关闭通知
-  GROUP_MEMBER_ADD: AvailableIntentsEventsEnum.GROUP_AND_C2C_EVENT,
+  GROUP_JOIN_REQUEST: AvailableIntentsEventsEnum.GROUP_AND_C2C_EVENT,
+  // 用户申请加群
+
+  //  ======= GROUP_MEMBER（兼容旧版群成员事件位） ======
+  GROUP_MEMBER_ADD: AvailableIntentsEventsEnum.GROUP_MEMBER,
   // 群成员加入
-  GROUP_MEMBER_REMOVE: AvailableIntentsEventsEnum.GROUP_AND_C2C_EVENT,
-  // 群成员退出或被移出
-  GROUP_JOIN_REQUEST: AvailableIntentsEventsEnum.GROUP_AND_C2C_EVENT // 用户申请加群
+  GROUP_MEMBER_REMOVE: AvailableIntentsEventsEnum.GROUP_MEMBER // 群成员退出或被移出
 };
 var WSCodes = {
   1000: 'WS_CLOSE_REQUESTED',
@@ -2721,6 +2718,7 @@ var IntentEvents = {
   DIRECT_MESSAGE: 1 << 12,
   OPEN_FORUM_EVENT: 1 << 18,
   AUDIO_OR_LIVE_CHANNEL_MEMBER: 1 << 19,
+  GROUP_MEMBER: 1 << 24,
   GROUP_AND_C2C_EVENT: 1 << 25,
   INTERACTION: 1 << 26,
   MESSAGE_AUDIT: 1 << 27,
@@ -2748,6 +2746,7 @@ var Intents = {
   DIRECT_MESSAGE_TYPING: 14,
   OPEN_FORUM_EVENT: 18,
   AUDIO_OR_LIVE_CHANNEL_MEMBER: 19,
+  GROUP_MEMBER: 24,
   GROUP_AND_C2C_EVENT: 25,
   INTERACTION: 26,
   MESSAGE_AUDIT: 27,

package/lib/index.js

@@ -321,7 +321,7 @@ var Guild = /*#__PURE__*/function () {
   }]);
 }();
 
-var version = "4.7.2";
+var version = "4.7.4";
 
 function getDefaultExportFromCjs (x) {
 	return x && x.__esModule && Object.prototype.hasOwnProperty.call(x, 'default') ? x['default'] : x;
@@ -1272,11 +1272,7 @@ var Message = /*#__PURE__*/function () {
     // 群组撤回消息
   }, {
     key: "deleteGroupMessage",
-    value: function deleteGroupMessage(groupOpenid, messageID, hideTip) {
-      var params = Object.create(null);
-      if (typeof hideTip === 'boolean') {
-        params.hidetip = hideTip;
-      }
+    value: function deleteGroupMessage(groupOpenid, messageID) {
       var options = {
         method: 'DELETE',
         url: getURL('groupMessageURI'),
@@ -1284,7 +1280,6 @@ var Message = /*#__PURE__*/function () {
           groupOpenid: groupOpenid,
           messageID: messageID
         },
-        params: params,
         apiVersion: 'v2'
       };
       return this.request(options);
@@ -1294,7 +1289,6 @@ var Message = /*#__PURE__*/function () {
   }, {
     key: "postGroupMessage",
     value: function postGroupMessage(groupOpenid, message) {
-      message.timestamp = Date.now();
       var options = {
         method: 'POST',
         url: getURL('groupMessagesURI'),
@@ -2495,6 +2489,7 @@ var AvailableIntentsEventsEnum = /*#__PURE__*/function (AvailableIntentsEventsEn
   AvailableIntentsEventsEnum["PUBLIC_GUILD_MESSAGES"] = "PUBLIC_GUILD_MESSAGES";
   AvailableIntentsEventsEnum["MESSAGE_AUDIT"] = "MESSAGE_AUDIT";
   AvailableIntentsEventsEnum["INTERACTION"] = "INTERACTION";
+  AvailableIntentsEventsEnum["GROUP_MEMBER"] = "GROUP_MEMBER";
   AvailableIntentsEventsEnum["GROUP_AND_C2C_EVENT"] = "GROUP_AND_C2C_EVENT";
   return AvailableIntentsEventsEnum;
 }({});
@@ -2630,11 +2625,13 @@ var WsEventType = {
   // 群管理员主动在机器人资料页操作开启通知
   GROUP_MSG_REJECT: AvailableIntentsEventsEnum.GROUP_AND_C2C_EVENT,
   // 群管理员主动在机器人资料页操作关闭通知
-  GROUP_MEMBER_ADD: AvailableIntentsEventsEnum.GROUP_AND_C2C_EVENT,
+  GROUP_JOIN_REQUEST: AvailableIntentsEventsEnum.GROUP_AND_C2C_EVENT,
+  // 用户申请加群
+
+  //  ======= GROUP_MEMBER（兼容旧版群成员事件位） ======
+  GROUP_MEMBER_ADD: AvailableIntentsEventsEnum.GROUP_MEMBER,
   // 群成员加入
-  GROUP_MEMBER_REMOVE: AvailableIntentsEventsEnum.GROUP_AND_C2C_EVENT,
-  // 群成员退出或被移出
-  GROUP_JOIN_REQUEST: AvailableIntentsEventsEnum.GROUP_AND_C2C_EVENT // 用户申请加群
+  GROUP_MEMBER_REMOVE: AvailableIntentsEventsEnum.GROUP_MEMBER // 群成员退出或被移出
 };
 var WSCodes = {
   1000: 'WS_CLOSE_REQUESTED',
@@ -2723,6 +2720,7 @@ var IntentEvents = {
   DIRECT_MESSAGE: 1 << 12,
   OPEN_FORUM_EVENT: 1 << 18,
   AUDIO_OR_LIVE_CHANNEL_MEMBER: 1 << 19,
+  GROUP_MEMBER: 1 << 24,
   GROUP_AND_C2C_EVENT: 1 << 25,
   INTERACTION: 1 << 26,
   MESSAGE_AUDIT: 1 << 27,
@@ -2750,6 +2748,7 @@ var Intents = {
   DIRECT_MESSAGE_TYPING: 14,
   OPEN_FORUM_EVENT: 18,
   AUDIO_OR_LIVE_CHANNEL_MEMBER: 19,
+  GROUP_MEMBER: 24,
   GROUP_AND_C2C_EVENT: 25,
   INTERACTION: 26,
   MESSAGE_AUDIT: 27,

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "woodenfish-bot",
-    "version": "4.7.2",
+    "version": "4.7.4",
     "description": "woodenfish-bot",
     "publishConfig": {
         "registry": "https://registry.npmjs.org/"

package/typings/index.d.ts

@@ -66,6 +66,7 @@ declare enum AvailableIntentsEventsEnum {
     PUBLIC_GUILD_MESSAGES = "PUBLIC_GUILD_MESSAGES",
     MESSAGE_AUDIT = "MESSAGE_AUDIT",
     INTERACTION = "INTERACTION",
+    GROUP_MEMBER = "GROUP_MEMBER",
     GROUP_AND_C2C_EVENT = "GROUP_AND_C2C_EVENT"
 }
 declare const WsEventType: {
@@ -123,6 +124,7 @@ declare const Intents: {
     DIRECT_MESSAGE_TYPING: number;
     OPEN_FORUM_EVENT: number;
     AUDIO_OR_LIVE_CHANNEL_MEMBER: number;
+    GROUP_MEMBER: number;
     GROUP_AND_C2C_EVENT: number;
     INTERACTION: number;
     MESSAGE_AUDIT: number;
@@ -177,13 +179,13 @@ interface GroupInfo {
     group_member_num: number;
 }
 type GroupReceiveMessageSetting = 'all' | 'only_mention' | 'mention_and_context';
-type GroupMemberRole = 'member' | 'owner' | 'admin';
+type GroupMemberRole$1 = 'member' | 'owner' | 'admin';
 interface GroupBotState {
     member_openid: string;
     joined_at: string;
     allow_proactive_msg: boolean;
     recv_msg_setting: GroupReceiveMessageSetting;
-    member_role: GroupMemberRole;
+    member_role: GroupMemberRole$1;
 }
 interface GroupCursorPager {
     cursor?: string;
@@ -328,6 +330,61 @@ interface GroupMemberEvent {
 }
 type GroupMemberAddEvent = GroupMemberEvent;
 type GroupMemberRemoveEvent = GroupMemberEvent;
+type GroupMemberRole = 'member' | 'admin' | 'owner';
+interface GroupMessageUser {
+    id: string;
+    username: string;
+    bot: boolean;
+    union_openid?: string;
+    union_user_account?: string;
+    user_openid?: string;
+    member_openid?: string;
+    member_role?: GroupMemberRole;
+}
+interface GroupMessageScene {
+    source: string;
+    ext: string[];
+}
+interface GroupMessageAttachment {
+    url: string;
+    filename: string;
+    width?: number;
+    height?: number;
+    size: number;
+    content_type: string;
+    voice_wav_url?: string;
+    asr_refer_text?: string;
+}
+interface GroupMessageArkData {
+    prompt: string;
+    ark_type: string;
+    ark_name: string;
+    fields: Record<string, unknown>;
+}
+interface GroupMessageElement {
+    msg_idx?: string;
+    author?: GroupMessageUser;
+    message_type?: number;
+    content?: string;
+    attachments?: GroupMessageAttachment[];
+    ark_data?: GroupMessageArkData;
+    msg_elements?: GroupMessageElement[];
+}
+interface GroupMessageEvent {
+    id: string;
+    author: GroupMessageUser;
+    content: string;
+    group_openid: string;
+    timestamp: string;
+    message_type: number;
+    message_scene: GroupMessageScene;
+    attachments?: GroupMessageAttachment[];
+    mentions?: GroupMessageUser[];
+    ark_data?: GroupMessageArkData;
+    msg_elements?: GroupMessageElement[];
+}
+type GroupAtMessageCreateEvent = GroupMessageEvent;
+type GroupMessageCreateEvent = GroupMessageEvent;
 interface GroupJoinRequestEvent extends GroupJoinRequest {
     group_openid: string;
     auto_approved?: {
@@ -335,6 +392,8 @@ interface GroupJoinRequestEvent extends GroupJoinRequest {
     };
 }
 interface GroupEventPayloadMap {
+    GROUP_AT_MESSAGE_CREATE: GroupAtMessageCreateEvent;
+    GROUP_MESSAGE_CREATE: GroupMessageCreateEvent;
     GROUP_ADD_ROBOT: GroupAddRobotEvent;
     GROUP_DEL_ROBOT: GroupDelRobotEvent;
     GROUP_MSG_RECEIVE: GroupMsgReceiveEvent;
@@ -488,12 +547,12 @@ interface MessageAPI {
     message: (channelID: string, messageID: string) => Promise<RestyResponse<IMessageRes>>;
     messages: (channelID: string, pager: MessagesPager) => Promise<RestyResponse<IMessage[]>>;
     postMessage: (channelID: string, message: MessageToCreate) => Promise<RestyResponse<IMessage>>;
-    postGroupMessage: (groupOpenid: string, message: MessageToCreate) => Promise<RestyResponse<IMessage>>;
+    postGroupMessage: (groupOpenid: string, message: GroupMessageToCreate) => Promise<RestyResponse<GroupMessageResponse>>;
     postC2CMessage: (userID: string, message: MessageToCreate) => Promise<RestyResponse<IMessage>>;
     patchMessage: (channelID: string, messageID: string, message: MessageToCreate) => Promise<RestyResponse<IMessage>>;
     deleteMessage: (channelID: string, messageID: string, hideTip?: boolean) => Promise<RestyResponse<any>>;
     deleteDirectMessage: (guildID: string, messageID: string, hideTip?: boolean) => Promise<RestyResponse<any>>;
-    deleteGroupMessage: (groupOpenid: string, messageID: string, hideTip?: boolean) => Promise<RestyResponse<any>>;
+    deleteGroupMessage: (groupOpenid: string, messageID: string) => Promise<RestyResponse<Record<string, never>>>;
     deleteC2CMessage: (userID: string, messageID: string, hideTip?: boolean) => Promise<RestyResponse<any>>;
     postGroupMedia: (groupOpenid: string, message: MediaToCreate) => Promise<RestyResponse<IMedia>>;
     postC2CMedia: (userID: string, message: MediaToCreate) => Promise<RestyResponse<IMedia>>;
@@ -564,6 +623,38 @@ interface MessageReference {
     message_id: string;
     ignore_get_message_error?: boolean;
 }
+interface GroupMessageReference {
+    message_id: string;
+}
+interface MessageMarkdown {
+    /** @deprecated 平台 Markdown 模板已废弃。 */
+    template_id?: number;
+    content?: string;
+    /** @deprecated 自定义 Markdown 模板已废弃。 */
+    custom_template_id?: string;
+    force_verify_image_resource?: boolean;
+}
+type GroupMessageType = 0 | 2 | 7;
+interface GroupMessageToCreate {
+    msg_type?: GroupMessageType;
+    content?: string;
+    markdown?: MessageMarkdown;
+    keyboard?: MessageKeyboard;
+    msg_id?: string;
+    event_id?: string;
+    msg_seq?: number;
+    media?: Media;
+    message_reference?: GroupMessageReference;
+    is_wakeup?: boolean;
+}
+interface MessageExtInfo {
+    ref_idx: string;
+}
+interface GroupMessageResponse {
+    id: string;
+    timestamp: string;
+    ext_info: MessageExtInfo;
+}
 interface MessageToCreate {
     content?: string;
     embed?: Embed;
@@ -610,17 +701,21 @@ interface Button {
 interface RenderData {
     label?: string;
     visited_label?: string;
-    style?: number;
+    style?: 0 | 1 | 2 | 3;
 }
 interface Action {
-    type?: number;
+    type?: 0 | 1 | 2;
     permission?: Permission;
     click_limit?: number;
     data?: string;
+    unsupport_tips?: string;
+    enter?: boolean;
+    reply?: boolean;
+    anchor?: number;
     at_bot_show_channel_list?: boolean;
 }
 interface Permission {
-    type?: number;
+    type?: 0 | 1 | 2;
     specify_role_ids?: string[];
     specify_user_ids?: string[];
 }
@@ -975,4 +1070,4 @@ declare function createOpenAPI(config: Config): OpenAPI;
 declare function createWebsocket(config: GetWsParam): WebsocketClient;
 
 export { AvailableIntentsEventsEnum, IntentEvents, Intents, OpCode, SessionEvents, WSCodes, WebsocketCloseReason, WebsocketCode, WsEventType, WsObjRequestOptions, createOpenAPI, createWebsocket, selectOpenAPIVersion };
-export type { APIVersion, Action, AnnounceAPI, Ark, ArkKV, ArkObj, ArkObjKV, AudioAPI, AudioControl, Button, ChannelAPI, ChannelPermissionsAPI, ChannelSubType, ChannelType, Config, CreateGroupJoinApprovalStrategy, CustomKeyboard, DirectMessageAPI, DirectMessageToCreate, Embed, EmbedField, EmbedThumbnail, EventTypes, GetWsParam, GroupAPI, GroupAddRobotEvent, GroupBotState, GroupCursorPager, GroupDelRobotEvent, GroupEventPayloadMap, GroupEventType, GroupGlobalMuteRule, GroupInfo, GroupJoinApplySource, GroupJoinApprovalStrategy, GroupJoinApprovalStrategyGroupAction, GroupJoinApprovalStrategyGroups, GroupJoinApprovalStrategyList, GroupJoinApprovalStrategyResult, GroupJoinApprovalStrategyState, GroupJoinApprovalStrategyWhitelistResult, GroupJoinRequest, GroupJoinRequestApproval, GroupJoinRequestEvent, GroupJoinRequestList, GroupJoinReviewQA, GroupJoinVerifyInfo, GroupJoinVerifyMethod, GroupMemberAddEvent, GroupMemberEvent, GroupMemberMuteState, GroupMemberRemoveEvent, GroupMemberRole, GroupMsgReceiveEvent, GroupMsgRejectEvent, GroupMuteMode, GroupMuteRecurringRule, GroupMuteScheduleRule, GroupReceiveMessageSetting, GroupRestrictChatSetting, GroupRobotEvent, GuildAPI, GuildMembersPager, GuildPermission, GuildPermissionDemand, GuildPermissionDemandIdentify, GuildPermissionRes, GuildPermissionsAPI, GuildRoles, HeartbeatParam, IAnnounce, IChannel, IChannelPermissions, IChannelRolePermissions, IDirectMessage, IGuild, IMedia, IMember, IMessage, IMessageRes, IOpenAPI, IPinsMessage, IRole, IRoleFilter, ISchedule, IUser, IVoiceMember, InputNotify, IntentEventsMapType, InteractionAPI, InteractionData, MeAPI, MeGuildsReq, Media, MediaToCreate, MemberAPI, MemberAddRoleBody, MessageAPI, MessageAttachment, MessageKeyboard, MessageReference, MessageToCreate, MessagesPager, MuteAPI, MuteOptions, Nullish, OpenAPIRequest, OpenAPIRequestOptions, PatchChannelObj, Permission, PermissionDemandToCreate, PinsMessageAPI, PostChannelObj, ReactionAPI, ReactionObj, ReactionUserListObj, RecommendChannel, RecommendObj, RenderData, RoleAPI, Row, ScheduleAPI, ScheduleRemindType, ScheduleToCreate, ScheduleToPatch, SessionRecord, SetGroupMemberMuteState, SetGroupRestrictChatSetting, ThreadReplyToCreate, ThreadsAPI, ThreadsToCreate, Token, UpdateChannelPermissions, UpdateGroupJoinApprovalStrategy, UpdateGroupJoinApprovalStrategyWhitelist, UpdateRoleRes, WebsocketAPI, WebsocketEventData, WsAddressObj, WsDataInfo, wsResData };
+export type { APIVersion, Action, AnnounceAPI, Ark, ArkKV, ArkObj, ArkObjKV, AudioAPI, AudioControl, Button, ChannelAPI, ChannelPermissionsAPI, ChannelSubType, ChannelType, Config, CreateGroupJoinApprovalStrategy, CustomKeyboard, DirectMessageAPI, DirectMessageToCreate, Embed, EmbedField, EmbedThumbnail, EventTypes, GetWsParam, GroupAPI, GroupAddRobotEvent, GroupAtMessageCreateEvent, GroupBotState, GroupCursorPager, GroupDelRobotEvent, GroupEventPayloadMap, GroupEventType, GroupGlobalMuteRule, GroupInfo, GroupJoinApplySource, GroupJoinApprovalStrategy, GroupJoinApprovalStrategyGroupAction, GroupJoinApprovalStrategyGroups, GroupJoinApprovalStrategyList, GroupJoinApprovalStrategyResult, GroupJoinApprovalStrategyState, GroupJoinApprovalStrategyWhitelistResult, GroupJoinRequest, GroupJoinRequestApproval, GroupJoinRequestEvent, GroupJoinRequestList, GroupJoinReviewQA, GroupJoinVerifyInfo, GroupJoinVerifyMethod, GroupMemberAddEvent, GroupMemberEvent, GroupMemberMuteState, GroupMemberRemoveEvent, GroupMessageArkData, GroupMessageAttachment, GroupMessageCreateEvent, GroupMessageElement, GroupMessageEvent, GroupMessageReference, GroupMessageResponse, GroupMessageScene, GroupMessageToCreate, GroupMessageType, GroupMessageUser, GroupMsgReceiveEvent, GroupMsgRejectEvent, GroupMuteMode, GroupMuteRecurringRule, GroupMuteScheduleRule, GroupReceiveMessageSetting, GroupRestrictChatSetting, GroupRobotEvent, GuildAPI, GuildMembersPager, GuildPermission, GuildPermissionDemand, GuildPermissionDemandIdentify, GuildPermissionRes, GuildPermissionsAPI, GuildRoles, HeartbeatParam, IAnnounce, IChannel, IChannelPermissions, IChannelRolePermissions, IDirectMessage, IGuild, IMedia, IMember, IMessage, IMessageRes, IOpenAPI, IPinsMessage, IRole, IRoleFilter, ISchedule, IUser, IVoiceMember, InputNotify, IntentEventsMapType, InteractionAPI, InteractionData, MeAPI, MeGuildsReq, Media, MediaToCreate, MemberAPI, MemberAddRoleBody, MessageAPI, MessageAttachment, MessageExtInfo, MessageKeyboard, MessageMarkdown, MessageReference, MessageToCreate, MessagesPager, MuteAPI, MuteOptions, Nullish, OpenAPIRequest, OpenAPIRequestOptions, PatchChannelObj, Permission, PermissionDemandToCreate, PinsMessageAPI, PostChannelObj, ReactionAPI, ReactionObj, ReactionUserListObj, RecommendChannel, RecommendObj, RenderData, RoleAPI, Row, ScheduleAPI, ScheduleRemindType, ScheduleToCreate, ScheduleToPatch, SessionRecord, SetGroupMemberMuteState, SetGroupRestrictChatSetting, ThreadReplyToCreate, ThreadsAPI, ThreadsToCreate, Token, UpdateChannelPermissions, UpdateGroupJoinApprovalStrategy, UpdateGroupJoinApprovalStrategyWhitelist, UpdateRoleRes, WebsocketAPI, WebsocketEventData, WsAddressObj, WsDataInfo, wsResData };