woodenfish-bot 4.6.6 → 4.6.8

package/es/index.js

@@ -43,6 +43,7 @@ var apiMap = {
   memberRoleURI: '/guilds/:guildID/members/:userID/roles/:roleID',
   userMeDMURI: '/users/@me/dms',
   dmsURI: '/dms/:guildID/messages',
+  dmMessageURI: '/dms/:guildID/messages/:messageID',
   channelPermissionsURI: '/channels/:channelID/members/:userID/permissions',
   channelRolePermissionsURI: '/channels/:channelID/roles/:roleID/permissions',
   schedulesURI: '/channels/:channelID/schedules',
@@ -63,11 +64,11 @@ var apiMap = {
   // 语音子频道在线成员车查询
   botMic: '/channels/:channelID/mic',
   // 机器人上麦|下麦
-  groupMessagesURI: '/v2/groups/:groupID/messages',
+  groupMessagesURI: '/v2/groups/:groupOpenid/messages',
   // 群组消息
-  groupRichMediaURI: '/v2/groups/:groupID/files',
+  groupRichMediaURI: '/v2/groups/:groupOpenid/files',
   // 群组富媒体消息
-  groupMessageURI: '/v2/groups/:groupID/messages/:messageID',
+  groupMessageURI: '/v2/groups/:groupOpenid/messages/:messageID',
   // 群组撤回消息
   c2cMessagesURI: '/v2/users/:userID/messages',
   // C2C消息
@@ -299,7 +300,7 @@ var Guild = /*#__PURE__*/function () {
   }]);
 }();
 
-var version = "4.6.6";
+var version = "4.6.8";
 
 function getDefaultExportFromCjs (x) {
 	return x && x.__esModule && Object.prototype.hasOwnProperty.call(x, 'default') ? x['default'] : x;
@@ -1192,7 +1193,7 @@ var Message = /*#__PURE__*/function () {
     key: "deleteMessage",
     value: function deleteMessage(channelID, messageID, hideTip) {
       var params = Object.create(null);
-      if (hideTip) {
+      if (typeof hideTip === 'boolean') {
         params.hidetip = hideTip;
       }
       var options = {
@@ -1207,12 +1208,32 @@ var Message = /*#__PURE__*/function () {
       return this.request(options);
     }
 
+    // 频道私信撤回消息
+  }, {
+    key: "deleteDirectMessage",
+    value: function deleteDirectMessage(guildID, messageID, hideTip) {
+      var params = Object.create(null);
+      if (typeof hideTip === 'boolean') {
+        params.hidetip = hideTip;
+      }
+      var options = {
+        method: 'DELETE',
+        url: getURL('dmMessageURI'),
+        rest: {
+          guildID: guildID,
+          messageID: messageID
+        },
+        params: params
+      };
+      return this.request(options);
+    }
+
     // C2C撤回消息
   }, {
     key: "deleteC2CMessage",
     value: function deleteC2CMessage(userID, messageID, hideTip) {
       var params = Object.create(null);
-      if (hideTip) {
+      if (typeof hideTip === 'boolean') {
         params.hidetip = hideTip;
       }
       var options = {
@@ -1222,7 +1243,8 @@ var Message = /*#__PURE__*/function () {
           userID: userID,
           messageID: messageID
         },
-        params: params
+        params: params,
+        apiVersion: 'v2'
       };
       return this.request(options);
     }
@@ -1230,19 +1252,20 @@ var Message = /*#__PURE__*/function () {
     // 群组撤回消息
   }, {
     key: "deleteGroupMessage",
-    value: function deleteGroupMessage(groupID, messageID, hideTip) {
+    value: function deleteGroupMessage(groupOpenid, messageID, hideTip) {
       var params = Object.create(null);
-      if (hideTip) {
+      if (typeof hideTip === 'boolean') {
         params.hidetip = hideTip;
       }
       var options = {
         method: 'DELETE',
         url: getURL('groupMessageURI'),
         rest: {
-          groupID: groupID,
+          groupOpenid: groupOpenid,
           messageID: messageID
         },
-        params: params
+        params: params,
+        apiVersion: 'v2'
       };
       return this.request(options);
     }
@@ -1250,13 +1273,13 @@ var Message = /*#__PURE__*/function () {
     // 发送群消息
   }, {
     key: "postGroupMessage",
-    value: function postGroupMessage(groupID, message) {
+    value: function postGroupMessage(groupOpenid, message) {
       message.timestamp = Date.now();
       var options = {
         method: 'POST',
         url: getURL('groupMessagesURI'),
         rest: {
-          groupID: groupID
+          groupOpenid: groupOpenid
         },
         data: message,
         apiVersion: 'v2'
@@ -1284,12 +1307,12 @@ var Message = /*#__PURE__*/function () {
     // 发送群富媒体消息
   }, {
     key: "postGroupMedia",
-    value: function postGroupMedia(groupID, message) {
+    value: function postGroupMedia(groupOpenid, message) {
       var options = {
         method: 'POST',
         url: getURL('groupRichMediaURI'),
         rest: {
-          groupID: groupID
+          groupOpenid: groupOpenid
         },
         data: message,
         apiVersion: 'v2'
@@ -1523,6 +1546,26 @@ var DirectMessage = /*#__PURE__*/function () {
       };
       return this.request(options);
     }
+
+    // 在私信频道内撤回消息
+  }, {
+    key: "deleteDirectMessage",
+    value: function deleteDirectMessage(guildID, messageID, hideTip) {
+      var params = Object.create(null);
+      if (typeof hideTip === 'boolean') {
+        params.hidetip = hideTip;
+      }
+      var options = {
+        method: 'DELETE',
+        url: getURL('dmMessageURI'),
+        rest: {
+          guildID: guildID,
+          messageID: messageID
+        },
+        params: params
+      };
+      return this.request(options);
+    }
   }]);
 }();
 
@@ -2387,6 +2430,8 @@ var WsEventType = {
   //  ======= GROUP_C2C_EVENT ======
   GROUP_AT_MESSAGE_CREATE: AvailableIntentsEventsEnum.GROUP_C2C_EVENT,
   // 机器人在群聊被@时触发
+  GROUP_MESSAGE_CREATE: AvailableIntentsEventsEnum.GROUP_C2C_EVENT,
+  // 机器人收到群聊全量消息时触发
   C2C_MESSAGE_CREATE: AvailableIntentsEventsEnum.GROUP_C2C_EVENT,
   // 机器人收到C2C消息时触发
   FRIEND_ADD: AvailableIntentsEventsEnum.GROUP_C2C_EVENT,
@@ -2867,11 +2912,16 @@ var Ws = /*#__PURE__*/function () {
       var eventId = wsRes.id || '';
       // 如果没有事件，即刻退出
       if (!msg || !eventType) return;
-      this.event.emit(WsEventType[eventType], {
+      var intentEventType = WsEventType[eventType];
+      var eventData = {
         eventType: eventType,
         eventId: eventId,
         msg: msg
-      });
+      };
+      if (intentEventType) {
+        this.event.emit(intentEventType, eventData);
+      }
+      this.event.emit(eventType, eventData);
     }
 
     // 主动关闭会话

package/lib/index.js

@@ -45,6 +45,7 @@ var apiMap = {
   memberRoleURI: '/guilds/:guildID/members/:userID/roles/:roleID',
   userMeDMURI: '/users/@me/dms',
   dmsURI: '/dms/:guildID/messages',
+  dmMessageURI: '/dms/:guildID/messages/:messageID',
   channelPermissionsURI: '/channels/:channelID/members/:userID/permissions',
   channelRolePermissionsURI: '/channels/:channelID/roles/:roleID/permissions',
   schedulesURI: '/channels/:channelID/schedules',
@@ -65,11 +66,11 @@ var apiMap = {
   // 语音子频道在线成员车查询
   botMic: '/channels/:channelID/mic',
   // 机器人上麦|下麦
-  groupMessagesURI: '/v2/groups/:groupID/messages',
+  groupMessagesURI: '/v2/groups/:groupOpenid/messages',
   // 群组消息
-  groupRichMediaURI: '/v2/groups/:groupID/files',
+  groupRichMediaURI: '/v2/groups/:groupOpenid/files',
   // 群组富媒体消息
-  groupMessageURI: '/v2/groups/:groupID/messages/:messageID',
+  groupMessageURI: '/v2/groups/:groupOpenid/messages/:messageID',
   // 群组撤回消息
   c2cMessagesURI: '/v2/users/:userID/messages',
   // C2C消息
@@ -301,7 +302,7 @@ var Guild = /*#__PURE__*/function () {
   }]);
 }();
 
-var version = "4.6.6";
+var version = "4.6.8";
 
 function getDefaultExportFromCjs (x) {
 	return x && x.__esModule && Object.prototype.hasOwnProperty.call(x, 'default') ? x['default'] : x;
@@ -1194,7 +1195,7 @@ var Message = /*#__PURE__*/function () {
     key: "deleteMessage",
     value: function deleteMessage(channelID, messageID, hideTip) {
       var params = Object.create(null);
-      if (hideTip) {
+      if (typeof hideTip === 'boolean') {
         params.hidetip = hideTip;
       }
       var options = {
@@ -1209,12 +1210,32 @@ var Message = /*#__PURE__*/function () {
       return this.request(options);
     }
 
+    // 频道私信撤回消息
+  }, {
+    key: "deleteDirectMessage",
+    value: function deleteDirectMessage(guildID, messageID, hideTip) {
+      var params = Object.create(null);
+      if (typeof hideTip === 'boolean') {
+        params.hidetip = hideTip;
+      }
+      var options = {
+        method: 'DELETE',
+        url: getURL('dmMessageURI'),
+        rest: {
+          guildID: guildID,
+          messageID: messageID
+        },
+        params: params
+      };
+      return this.request(options);
+    }
+
     // C2C撤回消息
   }, {
     key: "deleteC2CMessage",
     value: function deleteC2CMessage(userID, messageID, hideTip) {
       var params = Object.create(null);
-      if (hideTip) {
+      if (typeof hideTip === 'boolean') {
         params.hidetip = hideTip;
       }
       var options = {
@@ -1224,7 +1245,8 @@ var Message = /*#__PURE__*/function () {
           userID: userID,
           messageID: messageID
         },
-        params: params
+        params: params,
+        apiVersion: 'v2'
       };
       return this.request(options);
     }
@@ -1232,19 +1254,20 @@ var Message = /*#__PURE__*/function () {
     // 群组撤回消息
   }, {
     key: "deleteGroupMessage",
-    value: function deleteGroupMessage(groupID, messageID, hideTip) {
+    value: function deleteGroupMessage(groupOpenid, messageID, hideTip) {
       var params = Object.create(null);
-      if (hideTip) {
+      if (typeof hideTip === 'boolean') {
         params.hidetip = hideTip;
       }
       var options = {
         method: 'DELETE',
         url: getURL('groupMessageURI'),
         rest: {
-          groupID: groupID,
+          groupOpenid: groupOpenid,
           messageID: messageID
         },
-        params: params
+        params: params,
+        apiVersion: 'v2'
       };
       return this.request(options);
     }
@@ -1252,13 +1275,13 @@ var Message = /*#__PURE__*/function () {
     // 发送群消息
   }, {
     key: "postGroupMessage",
-    value: function postGroupMessage(groupID, message) {
+    value: function postGroupMessage(groupOpenid, message) {
       message.timestamp = Date.now();
       var options = {
         method: 'POST',
         url: getURL('groupMessagesURI'),
         rest: {
-          groupID: groupID
+          groupOpenid: groupOpenid
         },
         data: message,
         apiVersion: 'v2'
@@ -1286,12 +1309,12 @@ var Message = /*#__PURE__*/function () {
     // 发送群富媒体消息
   }, {
     key: "postGroupMedia",
-    value: function postGroupMedia(groupID, message) {
+    value: function postGroupMedia(groupOpenid, message) {
       var options = {
         method: 'POST',
         url: getURL('groupRichMediaURI'),
         rest: {
-          groupID: groupID
+          groupOpenid: groupOpenid
         },
         data: message,
         apiVersion: 'v2'
@@ -1525,6 +1548,26 @@ var DirectMessage = /*#__PURE__*/function () {
       };
       return this.request(options);
     }
+
+    // 在私信频道内撤回消息
+  }, {
+    key: "deleteDirectMessage",
+    value: function deleteDirectMessage(guildID, messageID, hideTip) {
+      var params = Object.create(null);
+      if (typeof hideTip === 'boolean') {
+        params.hidetip = hideTip;
+      }
+      var options = {
+        method: 'DELETE',
+        url: getURL('dmMessageURI'),
+        rest: {
+          guildID: guildID,
+          messageID: messageID
+        },
+        params: params
+      };
+      return this.request(options);
+    }
   }]);
 }();
 
@@ -2389,6 +2432,8 @@ var WsEventType = {
   //  ======= GROUP_C2C_EVENT ======
   GROUP_AT_MESSAGE_CREATE: AvailableIntentsEventsEnum.GROUP_C2C_EVENT,
   // 机器人在群聊被@时触发
+  GROUP_MESSAGE_CREATE: AvailableIntentsEventsEnum.GROUP_C2C_EVENT,
+  // 机器人收到群聊全量消息时触发
   C2C_MESSAGE_CREATE: AvailableIntentsEventsEnum.GROUP_C2C_EVENT,
   // 机器人收到C2C消息时触发
   FRIEND_ADD: AvailableIntentsEventsEnum.GROUP_C2C_EVENT,
@@ -2869,11 +2914,16 @@ var Ws = /*#__PURE__*/function () {
       var eventId = wsRes.id || '';
       // 如果没有事件，即刻退出
       if (!msg || !eventType) return;
-      this.event.emit(WsEventType[eventType], {
+      var intentEventType = WsEventType[eventType];
+      var eventData = {
         eventType: eventType,
         eventId: eventId,
         msg: msg
-      });
+      };
+      if (intentEventType) {
+        this.event.emit(intentEventType, eventData);
+      }
+      this.event.emit(eventType, eventData);
     }
 
     // 主动关闭会话

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "woodenfish-bot",
-    "version": "4.6.6",
+    "version": "4.6.8",
     "description": "woodenfish-bot",
     "publishConfig": {
         "registry": "https://registry.npmjs.org/"
@@ -51,8 +51,8 @@
         "@types/lodash.assignin": "^4.2.9",
         "@types/node": "^22.19.7",
         "@types/ws": "^8.18.1",
-        "@typescript-eslint/eslint-plugin": "^8.61.1",
-        "@typescript-eslint/parser": "^8.61.1",
+        "@typescript-eslint/eslint-plugin": "^8.62.0",
+        "@typescript-eslint/parser": "^8.62.0",
         "chalk": "^5.6.2",
         "commitizen": "^4.3.2",
         "cross-env": "^10.1.0",
@@ -61,7 +61,7 @@
         "eslint-config-prettier": "^10.1.8",
         "eslint-plugin-jest": "^29.15.2",
         "eslint-plugin-prettier": "^5.5.6",
-        "globals": "^17.6.0",
+        "globals": "^17.7.0",
         "handlebars": "^4.7.9",
         "inquirer": "^13.4.2",
         "jest": "^30.4.2",
@@ -70,12 +70,12 @@
         "prettier": "^3.8.4",
         "readline-sync": "^1.4.10",
         "rimraf": "^6.1.3",
-        "rollup": "^4.62.0",
+        "rollup": "^4.62.2",
         "rollup-plugin-dts": "^6.4.1",
         "rollup-plugin-typescript-paths": "^1.5.0",
         "standard-version": "^9.5.0",
         "typescript": "^5.9.3",
-        "typescript-eslint": "^8.61.1"
+        "typescript-eslint": "^8.62.0"
     },
     "dependencies": {
         "@babel/runtime": "^7.29.2",

package/typings/index.d.ts

@@ -293,13 +293,14 @@ 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: (groupID: string, message: MessageToCreate) => Promise<RestyResponse<IMessage>>;
+    postGroupMessage: (groupOpenid: string, message: MessageToCreate) => Promise<RestyResponse<IMessage>>;
     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>>;
-    deleteGroupMessage: (groupID: 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>>;
     deleteC2CMessage: (userID: string, messageID: string, hideTip?: boolean) => Promise<RestyResponse<any>>;
-    postGroupMedia: (groupID: string, message: MediaToCreate) => Promise<RestyResponse<IMedia>>;
+    postGroupMedia: (groupOpenid: string, message: MediaToCreate) => Promise<RestyResponse<IMedia>>;
     postC2CMedia: (userID: string, message: MediaToCreate) => Promise<RestyResponse<IMedia>>;
 }
 interface MessageAttachment {
@@ -435,6 +436,7 @@ interface Permission {
 interface DirectMessageAPI {
     createDirectMessage: (dm: DirectMessageToCreate) => Promise<RestyResponse<IDirectMessage>>;
     postDirectMessage: (guildID: string, msg: MessageToCreate) => Promise<RestyResponse<IMessage>>;
+    deleteDirectMessage: (guildID: string, messageID: string, hideTip?: boolean) => Promise<RestyResponse<any>>;
 }
 interface DirectMessageToCreate {
     source_guild_id: string;