@onebots/adapter-discord 1.0.0 → 1.0.5

package/lib/adapter.js

@@ -23,9 +23,10 @@ export class DiscordAdapter extends Adapter {
         if (!account)
             throw new Error(`Account ${uin} not found`);
         const bot = account.client;
-        const { scene_id, scene_type, message } = params;
+        const { scene_type, message } = params;
+        const sceneId = this.coerceId(params.scene_id);
         let messageId;
-        const channelId = scene_id.string;
+        const channelId = sceneId.string;
         // 构建消息内容
         const { content, embeds } = this.buildDiscordMessage(message);
         try {
@@ -59,8 +60,8 @@ export class DiscordAdapter extends Adapter {
         if (!account)
             throw new Error(`Account ${uin} not found`);
         const bot = account.client;
-        const messageId = params.message_id.string;
-        const channelId = params.scene_id?.string;
+        const messageId = this.coerceId(params.message_id).string;
+        const channelId = params.scene_id != null ? this.coerceId(params.scene_id).string : '';
         if (!channelId) {
             throw new Error('删除消息需要提供 scene_id (频道ID)');
         }
@@ -74,8 +75,8 @@ export class DiscordAdapter extends Adapter {
         if (!account)
             throw new Error(`Account ${uin} not found`);
         const bot = account.client;
-        const messageId = params.message_id.string;
-        const channelId = params.scene_id?.string;
+        const messageId = this.coerceId(params.message_id).string;
+        const channelId = params.scene_id != null ? this.coerceId(params.scene_id).string : '';
         if (!channelId) {
             throw new Error('获取消息需要提供 scene_id (频道ID)');
         }
@@ -90,7 +91,7 @@ export class DiscordAdapter extends Adapter {
         if (!account)
             throw new Error(`Account ${uin} not found`);
         const bot = account.client;
-        const channelId = params.scene_id.string;
+        const channelId = this.coerceId(params.scene_id).string;
         const limit = params.limit || 50;
         const messages = await bot.getMessageHistory(channelId, limit);
         return [...messages.values()].map(msg => this.convertMessageToInfo(msg));
@@ -286,8 +287,8 @@ export class DiscordAdapter extends Adapter {
         if (!account)
             throw new Error(`Account ${uin} not found`);
         const bot = account.client;
-        const guildId = params.group_id.string;
-        const userId = params.user_id.string;
+        const guildId = this.coerceId(params.group_id).string;
+        const userId = this.coerceId(params.user_id).string;
         await bot.setMemberNickname(guildId, userId, params.card || null);
     }
     /**
@@ -298,8 +299,8 @@ export class DiscordAdapter extends Adapter {
         if (!account)
             throw new Error(`Account ${uin} not found`);
         const bot = account.client;
-        const channelId = params.group_id.string;
-        const messageId = params.message_id.string;
+        const channelId = this.coerceId(params.group_id).string;
+        const messageId = this.coerceId(params.message_id).string;
         // Discord 使用 Unicode emoji 或自定义 emoji 格式
         const emoji = String.fromCodePoint(params.face_id);
         await bot.addReaction(channelId, messageId, emoji);
@@ -679,10 +680,12 @@ export class DiscordAdapter extends Adapter {
             }
             else {
                 messageType = 'channel';
-                if (message.guild) {
+                // 使用 channel.id 作为 group.id，以便 OneBot send_group_msg 时 scene_id 为频道 ID（Discord 发消息必须用 channel_id，用 guild_id 会 404 Unknown Channel）
+                if (message.channel) {
+                    const ch = message.channel;
                     group = {
-                        id: this.createId(message.guild.id),
-                        name: message.guild.name,
+                        id: this.createId(ch.id),
+                        name: ch.name || message.guild?.name || '',
                     };
                 }
             }

package/lib/index.js

@@ -1,3 +1,4 @@
+import { AdapterRegistry } from 'onebots';
 export { ChannelType, MessageType, ActivityType } from './types.js';
 // 导出适配器
 export * from './adapter.js';
@@ -5,4 +6,19 @@ export * from './adapter.js';
 export { DiscordBot } from './bot.js';
 // 导出轻量版客户端（用于独立使用或 Serverless）
 export * from './lite/index.js';
+const discordSchema = {
+    account_id: { type: 'string', required: true, label: '账号标识' },
+    token: { type: 'string', required: true, label: 'Bot Token' },
+    proxy: {
+        url: { type: 'string', label: '代理地址' },
+        username: { type: 'string', label: '代理用户名' },
+        password: { type: 'string', label: '代理密码' },
+    },
+    intents: { type: 'array', label: 'Gateway Intents' },
+    presence: {
+        status: { type: 'string', enum: ['online', 'idle', 'dnd', 'invisible'], label: '状态' },
+        activities: { type: 'array', label: '活动列表' },
+    },
+};
+AdapterRegistry.registerSchema('discord', discordSchema);
 //# sourceMappingURL=index.js.map

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@onebots/adapter-discord",
-  "version": "1.0.0",
+  "version": "1.0.5",
   "description": "onebots Discord 适配器（轻量版，支持 Node.js 和 Cloudflare Workers）",
   "type": "module",
   "main": "lib/index.js",
@@ -34,12 +34,12 @@
     "/lib/**/*.d.ts"
   ],
   "devDependencies": {
+    "@types/node": "^22.7.3",
     "tsc-alias": "latest",
-    "typescript": "latest",
-    "@types/node": "^22.7.3"
+    "typescript": "latest"
   },
   "peerDependencies": {
-    "onebots": "1.0.0"
+    "onebots": "1.0.5"
   },
   "peerDependenciesMeta": {
     "ws": {
@@ -52,11 +52,14 @@
       "optional": true
     }
   },
-  "dependencies": {},
   "optionalDependencies": {
-    "ws": "^8.18.0",
     "https-proxy-agent": "^7.0.6",
-    "socks-proxy-agent": "^8.0.5"
+    "socks-proxy-agent": "^8.0.5",
+    "ws": "^8.18.0"
+  },
+  "repository": {
+    "type": "git",
+    "url": "git+https://github.com/lc-cn/onebots.git"
   },
   "scripts": {
     "build": "rm -f *.tsbuildinfo && tsc --project tsconfig.json && tsc-alias -p tsconfig.json",