@satorijs/adapter-discord 3.8.5 → 3.8.6

package/lib/index.js

@@ -1322,15 +1322,17 @@ __name(setupReaction, "setupReaction");
 async function adaptSession(bot, input) {
   const session = bot.session({}, input);
   if (input.t === "MESSAGE_CREATE") {
-    if (input.d.webhook_id) {
-      const webhook = await bot.ensureWebhook(input.d.channel_id);
-      if (webhook.id === input.d.webhook_id) {
-        return;
+    setupMessageGuildId(session, input.d.guild_id);
+    if (input.d.webhook_id && !session.isDirect) {
+      try {
+        const webhook = await bot.ensureWebhook(input.d.channel_id);
+        if (webhook.id === input.d.webhook_id)
+          return;
+      } catch (e) {
       }
     }
     session.type = "message";
     await decodeMessage(bot, input.d, session);
-    setupMessageGuildId(session, input.d.guild_id);
   } else if (input.t === "MESSAGE_UPDATE") {
     session.type = "message-updated";
     const message = await bot.internal.getChannelMessage(input.d.channel_id, input.d.id);
@@ -1384,7 +1386,7 @@ async function adaptSession(bot, input) {
     session.subtype = input.d.guild_id ? "group" : "private";
     session.channelId = input.d.channel_id;
     session.guildId = input.d.guild_id;
-    session.userId = input.d.member.user.id;
+    session.userId = session.isDirect ? input.d.user.id : input.d.member.user.id;
     session.messageId = input.d.id;
     session.content = "";
     session.data.argv = decodeArgv(data, command);
@@ -1433,7 +1435,7 @@ var decodeArgv = /* @__PURE__ */ __name((data, command) => {
   return result;
 }, "decodeArgv");
 function encodeCommandOptions(cmd) {
-  var _a, _b, _c, _d;
+  var _a, _b;
   const result = [];
   if (cmd.children.length) {
     result.push(...cmd.children.map((child) => ({
@@ -1449,8 +1451,8 @@ function encodeCommandOptions(cmd) {
         name: arg.name.toLowerCase().replace(/[^a-z0-9]/g, ""),
         description: arg.description[""] || arg.name,
         description_localizations: (0, import_satori2.pick)(arg.description, Locale3),
-        type: (_a = types[arg.type]) != null ? _a : types.text,
-        required: (_b = arg.required) != null ? _b : false
+        type: (_a = types[arg.type]) != null ? _a : types.text
+        // required: arg.required ?? false,
       });
     }
     for (const option of cmd.options) {
@@ -1458,8 +1460,8 @@ function encodeCommandOptions(cmd) {
         name: option.name.toLowerCase(),
         description: option.description[""] || option.name,
         description_localizations: (0, import_satori2.pick)(option.description, Locale3),
-        type: (_c = types[option.type]) != null ? _c : types.text,
-        required: (_d = option.required) != null ? _d : false,
+        type: (_b = types[option.type]) != null ? _b : types.text,
+        // required: option.required ?? false,
         min_value: option.type === "posint" ? 1 : void 0
       });
     }
@@ -2066,7 +2068,8 @@ var _DiscordBot = class _DiscordBot extends import_satori5.Bot {
   async updateCommands(commands) {
     this.commands = commands;
     const local = Object.fromEntries(commands.map((cmd) => [cmd.name, cmd]));
-    const remote = Object.fromEntries((await this.internal.getGlobalApplicationCommands(this.selfId)).filter((cmd) => cmd.type === ApplicationCommand2.Type.CHAT_INPUT).map((cmd) => [cmd.name, cmd]));
+    const remote = Object.fromEntries((await this.internal.getGlobalApplicationCommands(this.selfId, { with_localizations: true })).filter((cmd) => cmd.type === ApplicationCommand2.Type.CHAT_INPUT).map((cmd) => [cmd.name, cmd]));
+    const updates = [];
     for (const key in { ...local, ...remote }) {
       if (!local[key]) {
         logger3.debug("delete command %s", key);
@@ -2077,26 +2080,31 @@ var _DiscordBot = class _DiscordBot extends import_satori5.Bot {
       logger3.debug(data, remote[key]);
       if (!remote[key]) {
         logger3.debug("create command: %s", local[key].name);
-        await this.internal.createGlobalApplicationCommand(this.selfId, data);
-      } else if (shapeEqual(data, remote[key])) {
+        updates.push(data);
+      } else if (!shapeEqual(data, remote[key])) {
         logger3.debug("edit command: %s", local[key].name);
-        await this.internal.editGlobalApplicationCommand(this.selfId, remote[key].id, data);
+        updates.push(data);
       }
     }
+    if (updates.length) {
+      await this.internal.bulkOverwriteGlobalApplicationCommands(this.selfId, updates);
+    }
   }
 };
 __name(_DiscordBot, "DiscordBot");
 __publicField(_DiscordBot, "MessageEncoder", DiscordMessageEncoder);
 var DiscordBot = _DiscordBot;
-function shapeEqual(a, b, strict = false) {
+function shapeEqual(a, b) {
   if (a === b)
     return true;
-  if (!strict && (0, import_satori5.isNullable)(a) && (0, import_satori5.isNullable)(b))
+  if ((0, import_satori5.isNullable)(a) && (0, import_satori5.isNullable)(b))
     return true;
   if (typeof a !== typeof b)
     return false;
   if (typeof a !== "object")
     return false;
+  if (Object.values(a).every(import_satori5.isNullable) && (0, import_satori5.isNullable)(b))
+    return true;
   if (!a || !b)
     return false;
   if (Array.isArray(a)) {
@@ -2106,7 +2114,7 @@ function shapeEqual(a, b, strict = false) {
   } else if (Array.isArray(b)) {
     return false;
   }
-  return Object.keys(a).every((key) => shapeEqual(a[key], b[key], strict));
+  return Object.keys(a).every((key) => shapeEqual(a[key], b[key]));
 }
 __name(shapeEqual, "shapeEqual");
 ((DiscordBot2) => {