@satorijs/adapter-discord 4.1.3 → 4.1.5

package/lib/index.js

@@ -100,10 +100,9 @@ var import_satori2 = require("@satorijs/satori");
 
 // satori/adapters/discord/src/types/internal.ts
 var import_satori = require("@satorijs/satori");
-var logger = new import_satori.Logger("discord");
 var _Internal = class _Internal {
-  constructor(http) {
-    this.http = http;
+  constructor(bot) {
+    this.bot = bot;
   }
   static define(routes) {
     for (const path in routes) {
@@ -131,8 +130,8 @@ var _Internal = class _Internal {
               throw new Error(`too many arguments for ${path}, received ${raw}`);
             }
             try {
-              logger.debug(`${method} ${url}`, config);
-              return await this.http(method, url, config);
+              this.bot.logger.debug(`${method} ${url}`, config);
+              return await this.bot.http(method, url, config);
             } catch (error) {
               if (!import_satori.Quester.isAxiosError(error) || !error.response)
                 throw error;
@@ -1538,7 +1537,6 @@ __name(encodeCommandOptions, "encodeCommandOptions");
 // satori/adapters/discord/src/message.ts
 var import_satori3 = require("@satorijs/satori");
 var import_form_data = __toESM(require("form-data"));
-var logger2 = new import_satori3.Logger("discord");
 var _State = class _State {
   // forward: send the first message and create a thread
   constructor(type) {
@@ -1607,7 +1605,7 @@ var _DiscordMessageEncoder = class _DiscordMessageEncoder extends import_satori3
     } catch (e) {
       if (import_satori3.Quester.isAxiosError(e) && e.response) {
         if (((_a = e.response.data) == null ? void 0 : _a.code) === 10015) {
-          logger2.debug("webhook has been deleted, recreating..., %o", e.response.data);
+          this.bot.logger.debug("webhook has been deleted, recreating..., %o", e.response.data);
           if (!this.bot.webhookLock[this.channelId])
             this.bot.webhooks[this.channelId] = null;
           await this.ensureWebhook();
@@ -1775,7 +1773,6 @@ var _DiscordMessageEncoder = class _DiscordMessageEncoder extends import_satori3
       await this.render(children);
       if (!this.buffer.endsWith("\n"))
         this.buffer += "\n";
-      this.buffer += "\n";
     } else if (type === "blockquote") {
       if (!this.buffer.endsWith("\n"))
         this.buffer += "\n";
@@ -1953,7 +1950,6 @@ var DiscordMessageEncoder = _DiscordMessageEncoder;
 
 // satori/adapters/discord/src/ws.ts
 var import_satori4 = require("@satorijs/satori");
-var logger3 = new import_satori4.Logger("discord");
 var _WsClient = class _WsClient extends import_satori4.Adapter.WsClient {
   _d = 0;
   _ping;
@@ -1967,7 +1963,7 @@ var _WsClient = class _WsClient extends import_satori4.Adapter.WsClient {
     return this.bot.http.ws(url + "/?v=10&encoding=json");
   }
   heartbeat() {
-    logger3.debug(`heartbeat d ${this._d}`);
+    this.bot.logger.debug(`heartbeat d ${this._d}`);
     this.socket.send(JSON.stringify({
       op: Gateway.Opcode.HEARTBEAT,
       d: this._d
@@ -1980,16 +1976,16 @@ var _WsClient = class _WsClient extends import_satori4.Adapter.WsClient {
       try {
         parsed = JSON.parse(data.toString());
       } catch (error) {
-        return logger3.warn("cannot parse message", data);
+        return this.bot.logger.warn("cannot parse message", data);
       }
-      logger3.debug(parsed);
+      this.bot.logger.debug(parsed);
       if (parsed.s) {
         this._d = parsed.s;
       }
       if (parsed.op === Gateway.Opcode.HELLO) {
         this._ping = setInterval(() => this.heartbeat(), parsed.d.heartbeat_interval);
         if (this._sessionId) {
-          logger3.debug("resuming");
+          this.bot.logger.debug("resuming");
           this.socket.send(JSON.stringify({
             op: Gateway.Opcode.RESUME,
             d: {
@@ -2014,7 +2010,7 @@ var _WsClient = class _WsClient extends import_satori4.Adapter.WsClient {
         if (parsed.d)
           return;
         this._sessionId = "";
-        logger3.warn("offline: invalid session");
+        this.bot.logger.warn("offline: invalid session");
         (_a = this.socket) == null ? void 0 : _a.close();
       }
       if (parsed.op === Gateway.Opcode.DISPATCH) {
@@ -2027,7 +2023,7 @@ var _WsClient = class _WsClient extends import_satori4.Adapter.WsClient {
           this._sessionId = parsed.d.session_id;
           this._resumeUrl = parsed.d.resume_gateway_url;
           this.bot.user = decodeUser(parsed.d.user);
-          logger3.debug("session_id " + this._sessionId);
+          this.bot.logger.debug("session_id " + this._sessionId);
           return this.bot.online();
         }
         if (parsed.t === "RESUMED") {
@@ -2038,7 +2034,7 @@ var _WsClient = class _WsClient extends import_satori4.Adapter.WsClient {
           this.bot.dispatch(session);
       }
       if (parsed.op === Gateway.Opcode.RECONNECT) {
-        logger3.warn("offline: discord request reconnect");
+        this.bot.logger.warn("offline: discord request reconnect");
         (_b = this.socket) == null ? void 0 : _b.close();
       }
     });
@@ -2060,7 +2056,6 @@ var WsClient = _WsClient;
 
 // satori/adapters/discord/src/bot.ts
 var import_package = require("../package.json");
-var logger4 = new import_satori5.Logger("discord");
 var _DiscordBot = class _DiscordBot extends import_satori5.Bot {
   http;
   internal;
@@ -2068,8 +2063,7 @@ var _DiscordBot = class _DiscordBot extends import_satori5.Bot {
   webhookLock = {};
   commands = [];
   constructor(ctx, config) {
-    super(ctx, config);
-    this.platform = "discord";
+    super(ctx, config, "discord");
     this.http = ctx.http.extend({
       ...config,
       headers: {
@@ -2078,7 +2072,7 @@ var _DiscordBot = class _DiscordBot extends import_satori5.Bot {
         ...config.headers
       }
     });
-    this.internal = new Internal(this.http);
+    this.internal = new Internal(this);
     ctx.plugin(WsClient, this);
   }
   async _ensureWebhook(channelId) {
@@ -2222,7 +2216,7 @@ var _DiscordBot = class _DiscordBot extends import_satori5.Bot {
     this.commands = commands;
     const updates = commands.map(encodeCommand);
     if (updates.length) {
-      logger4.debug("update %d command(s)", updates.length);
+      this.logger.debug("update %d command(s)", updates.length);
       await this.internal.bulkOverwriteGlobalApplicationCommands(this.selfId, updates);
     }
   }