@satorijs/adapter-discord 3.8.4 → 3.8.6

package/lib/index.js

@@ -4,6 +4,7 @@ var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
 var __getOwnPropNames = Object.getOwnPropertyNames;
 var __getProtoOf = Object.getPrototypeOf;
 var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __defNormalProp = (obj, key, value) => key in obj ? __defProp(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
 var __name = (target, value) => __defProp(target, "name", { value, configurable: true });
 var __export = (target, all) => {
   for (var name in all)
@@ -26,6 +27,10 @@ var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__ge
   mod
 ));
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+var __publicField = (obj, key, value) => {
+  __defNormalProp(obj, typeof key !== "symbol" ? key + "" : key, value);
+  return value;
+};
 
 // satori/adapters/discord/src/index.ts
 var src_exports = {};
@@ -1317,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);
@@ -1379,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);
@@ -1428,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) => ({
@@ -1444,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) {
@@ -1453,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
       });
     }
@@ -1471,26 +1478,23 @@ var _State = class _State {
   // forward: send the first message and create a thread
   constructor(type) {
     this.type = type;
-    this.author = {};
-    this.quote = {};
-    this.channel = {};
-    this.fakeMessageMap = {};
-    // [userInput] = discord messages
-    this.threadCreated = false;
   }
+  author = {};
+  quote = {};
+  channel = {};
+  fakeMessageMap = {};
+  // [userInput] = discord messages
+  threadCreated = false;
 };
 __name(_State, "State");
 var State = _State;
 var _DiscordMessageEncoder = class _DiscordMessageEncoder extends import_satori3.MessageEncoder {
-  constructor() {
-    super(...arguments);
-    this.stack = [new State("message")];
-    this.buffer = "";
-    this.addition = {};
-    this.figure = null;
-    this.mode = "default";
-    this.listType = null;
-  }
+  stack = [new State("message")];
+  buffer = "";
+  addition = {};
+  figure = null;
+  mode = "default";
+  listType = null;
   async getUrl() {
     var _a, _b, _c, _d;
     const input = (_b = (_a = this.options) == null ? void 0 : _a.session) == null ? void 0 : _b.discord;
@@ -1801,11 +1805,10 @@ var DiscordMessageEncoder = _DiscordMessageEncoder;
 var import_satori4 = require("@satorijs/satori");
 var logger2 = new import_satori4.Logger("discord");
 var _WsClient = class _WsClient extends import_satori4.Adapter.WsClient {
-  constructor() {
-    super(...arguments);
-    this._d = 0;
-    this._sessionId = "";
-  }
+  _d = 0;
+  _ping;
+  _sessionId = "";
+  _resumeUrl;
   async prepare() {
     if (this._resumeUrl) {
       return this.bot.http.ws(this._resumeUrl + "/?v=10&encoding=json");
@@ -1870,10 +1873,8 @@ var _WsClient = class _WsClient extends import_satori4.Adapter.WsClient {
         if (parsed.t === "READY") {
           this._sessionId = parsed.d.session_id;
           this._resumeUrl = parsed.d.resume_gateway_url;
-          const self = decodeUser(parsed.d.user);
-          self.selfId = self.userId;
-          delete self.userId;
-          Object.assign(this.bot, self);
+          const user = decodeUser(parsed.d.user);
+          Object.assign(this.bot, user);
           logger2.debug("session_id " + this._sessionId);
           return this.bot.online();
         }
@@ -1910,11 +1911,14 @@ var WsClient = _WsClient;
 var import_package = require("../package.json");
 var logger3 = new import_satori5.Logger("discord");
 var _DiscordBot = class _DiscordBot extends import_satori5.Bot {
+  http;
+  internal;
+  webhooks = {};
+  webhookLock = {};
+  commands = [];
   constructor(ctx, config) {
     super(ctx, config);
-    this.webhooks = {};
-    this.webhookLock = {};
-    this.commands = [];
+    this.platform = "discord";
     this.http = ctx.http.extend({
       ...config,
       headers: {
@@ -2064,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);
@@ -2075,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");
-_DiscordBot.MessageEncoder = DiscordMessageEncoder;
+__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)) {
@@ -2104,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) => {
@@ -2117,7 +2127,6 @@ __name(shapeEqual, "shapeEqual");
     import_satori5.Quester.createConfig("https://discord.com/api/v10")
   ]);
 })(DiscordBot || (DiscordBot = {}));
-DiscordBot.prototype.platform = "discord";
 
 // satori/adapters/discord/src/index.ts
 var src_default = DiscordBot;