@satorijs/adapter-discord 3.8.3 → 3.8.5

package/lib/bot.d.ts

@@ -11,7 +11,7 @@ export declare class DiscordBot extends Bot<DiscordBot.Config> {
     webhookLock: Record<string, Promise<Webhook>>;
     commands: Universal.Command[];
     constructor(ctx: Context, config: DiscordBot.Config);
-    session(payload?: {}): import("@satorijs/core").Session;
+    session(payload?: any, input?: any): import("@satorijs/core").Session;
     private _ensureWebhook;
     ensureWebhook(channelId: string): Promise<Discord.Webhook>;
     getSelf(): Promise<Universal.User>;

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 = {};
@@ -1315,7 +1320,7 @@ function setupReaction(session, data) {
 }
 __name(setupReaction, "setupReaction");
 async function adaptSession(bot, input) {
-  const session = bot.session();
+  const session = bot.session({}, input);
   if (input.t === "MESSAGE_CREATE") {
     if (input.d.webhook_id) {
       const webhook = await bot.ensureWebhook(input.d.channel_id);
@@ -1471,25 +1476,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";
-  }
+  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;
@@ -1633,8 +1636,30 @@ var _DiscordMessageEncoder = class _DiscordMessageEncoder extends import_satori3
         this.buffer += ` (<${attrs.href}>) `;
       }
     } else if (type === "p") {
+      if (!this.buffer.endsWith("\n"))
+        this.buffer += "\n";
       await this.render(children);
       this.buffer += "\n";
+    } else if (type === "blockquote") {
+      if (!this.buffer.endsWith("\n"))
+        this.buffer += "\n";
+      this.buffer += "> ";
+      await this.render(children);
+      this.buffer += "\n";
+    } else if (type === "ul" || type === "ol") {
+      this.listType = type;
+      await this.render(children);
+      this.listType = null;
+    } else if (type === "li") {
+      if (!this.buffer.endsWith("\n"))
+        this.buffer += "\n";
+      if (this.listType === "ol") {
+        this.buffer += "0. ";
+      } else if (this.listType === "ul") {
+        this.buffer += "- ";
+      }
+      this.render(children);
+      this.buffer += "\n";
     } else if (type === "at") {
       if (attrs.id) {
         this.buffer += `<@${attrs.id}>`;
@@ -1778,11 +1803,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");
@@ -1847,10 +1871,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();
         }
@@ -1887,11 +1909,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: {
@@ -1903,8 +1928,8 @@ var _DiscordBot = class _DiscordBot extends import_satori5.Bot {
     this.internal = new Internal(this.http);
     ctx.plugin(WsClient, this);
   }
-  session(payload = {}) {
-    return (0, import_satori5.defineProperty)(super.session(), "discord", Object.assign(Object.create(this.internal), payload));
+  session(payload, input) {
+    return (0, import_satori5.defineProperty)(super.session(payload), "discord", Object.assign(Object.create(this.internal), input));
   }
   async _ensureWebhook(channelId) {
     let webhook;
@@ -2061,7 +2086,7 @@ var _DiscordBot = class _DiscordBot extends import_satori5.Bot {
   }
 };
 __name(_DiscordBot, "DiscordBot");
-_DiscordBot.MessageEncoder = DiscordMessageEncoder;
+__publicField(_DiscordBot, "MessageEncoder", DiscordMessageEncoder);
 var DiscordBot = _DiscordBot;
 function shapeEqual(a, b, strict = false) {
   if (a === b)
@@ -2094,7 +2119,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;