@satorijs/adapter-discord 3.8.2 → 3.8.4

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>;
@@ -41,7 +41,7 @@ export declare class DiscordBot extends Bot<DiscordBot.Config> {
     setGuildMemberRole(guildId: string, userId: string, roleId: string): Promise<void>;
     unsetGuildMemberRole(guildId: string, userId: string, roleId: string): Promise<void>;
     getGuildRoles(guildId: string): Promise<Universal.Role[]>;
-    createGuildRole(guildId: string, data: Partial<Universal.Role>): Promise<Universal.Role>;
+    createGuildRole(guildId: string, data: Partial<Universal.Role>): Promise<string>;
     modifyGuildRole(guildId: string, roleId: string, data: Partial<Universal.Role>): Promise<void>;
     deleteGuildRole(guildId: string, roleId: string): Promise<void>;
     sendPrivateMessage(userId: string, content: Fragment, options?: SendOptions): Promise<string[]>;

package/lib/index.js

@@ -95,7 +95,7 @@ var import_satori2 = require("@satorijs/satori");
 
 // satori/adapters/discord/src/types/internal.ts
 var import_satori = require("@satorijs/satori");
-var Internal = class {
+var _Internal = class _Internal {
   constructor(http) {
     this.http = http;
   }
@@ -104,7 +104,7 @@ var Internal = class {
       for (const key in routes[path]) {
         const method = key;
         for (const name of (0, import_satori.makeArray)(routes[path][method])) {
-          Internal.prototype[name] = async function(...args) {
+          _Internal.prototype[name] = async function(...args) {
             const raw = args.join(", ");
             const url = path.replace(/\{([^}]+)\}/g, () => {
               if (!args.length)
@@ -137,7 +137,8 @@ var Internal = class {
     }
   }
 };
-__name(Internal, "Internal");
+__name(_Internal, "Internal");
+var Internal = _Internal;
 
 // satori/adapters/discord/src/types/application.ts
 var ApplicationFlag = /* @__PURE__ */ ((ApplicationFlag2) => {
@@ -1314,7 +1315,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);
@@ -1466,7 +1467,7 @@ __name(encodeCommandOptions, "encodeCommandOptions");
 var import_satori3 = require("@satorijs/satori");
 var import_form_data = __toESM(require("form-data"));
 var logger = new import_satori3.Logger("discord");
-var State = class {
+var _State = class _State {
   // forward: send the first message and create a thread
   constructor(type) {
     this.type = type;
@@ -1478,8 +1479,9 @@ var State = class {
     this.threadCreated = false;
   }
 };
-__name(State, "State");
-var DiscordMessageEncoder = class extends import_satori3.MessageEncoder {
+__name(_State, "State");
+var State = _State;
+var _DiscordMessageEncoder = class _DiscordMessageEncoder extends import_satori3.MessageEncoder {
   constructor() {
     super(...arguments);
     this.stack = [new State("message")];
@@ -1487,6 +1489,7 @@ var DiscordMessageEncoder = class extends import_satori3.MessageEncoder {
     this.addition = {};
     this.figure = null;
     this.mode = "default";
+    this.listType = null;
   }
   async getUrl() {
     var _a, _b, _c, _d;
@@ -1631,8 +1634,30 @@ var DiscordMessageEncoder = class extends import_satori3.MessageEncoder {
         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}>`;
@@ -1755,7 +1780,8 @@ var DiscordMessageEncoder = class extends import_satori3.MessageEncoder {
     }
   }
 };
-__name(DiscordMessageEncoder, "DiscordMessageEncoder");
+__name(_DiscordMessageEncoder, "DiscordMessageEncoder");
+var DiscordMessageEncoder = _DiscordMessageEncoder;
 ((DiscordMessageEncoder2) => {
   DiscordMessageEncoder2.Config = import_satori3.Schema.object({
     handleExternalAsset: import_satori3.Schema.union([
@@ -1774,7 +1800,7 @@ __name(DiscordMessageEncoder, "DiscordMessageEncoder");
 // satori/adapters/discord/src/ws.ts
 var import_satori4 = require("@satorijs/satori");
 var logger2 = new import_satori4.Logger("discord");
-var WsClient = class extends import_satori4.Adapter.WsClient {
+var _WsClient = class _WsClient extends import_satori4.Adapter.WsClient {
   constructor() {
     super(...arguments);
     this._d = 0;
@@ -1869,7 +1895,8 @@ var WsClient = class extends import_satori4.Adapter.WsClient {
     });
   }
 };
-__name(WsClient, "WsClient");
+__name(_WsClient, "WsClient");
+var WsClient = _WsClient;
 ((WsClient2) => {
   WsClient2.Config = import_satori4.Schema.intersect([
     import_satori4.Schema.object({
@@ -1882,7 +1909,7 @@ __name(WsClient, "WsClient");
 // satori/adapters/discord/src/bot.ts
 var import_package = require("../package.json");
 var logger3 = new import_satori5.Logger("discord");
-var DiscordBot = class extends import_satori5.Bot {
+var _DiscordBot = class _DiscordBot extends import_satori5.Bot {
   constructor(ctx, config) {
     super(ctx, config);
     this.webhooks = {};
@@ -1899,8 +1926,8 @@ var DiscordBot = class 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;
@@ -2020,7 +2047,7 @@ var DiscordBot = class extends import_satori5.Bot {
   }
   async createGuildRole(guildId, data) {
     const role = await this.internal.createGuildRole(guildId, encodeRole(data));
-    return decodeRole(role);
+    return role.id;
   }
   async modifyGuildRole(guildId, roleId, data) {
     await this.internal.modifyGuildRole(guildId, roleId, encodeRole(data));
@@ -2056,8 +2083,9 @@ var DiscordBot = class extends import_satori5.Bot {
     }
   }
 };
-__name(DiscordBot, "DiscordBot");
-DiscordBot.MessageEncoder = DiscordMessageEncoder;
+__name(_DiscordBot, "DiscordBot");
+_DiscordBot.MessageEncoder = DiscordMessageEncoder;
+var DiscordBot = _DiscordBot;
 function shapeEqual(a, b, strict = false) {
   if (a === b)
     return true;