discord-self-lite 0.1.11 → 0.1.13

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "discord-self-lite",
-  "version": "0.1.11",
+  "version": "0.1.13",
   "description": "Lightweight Discord selfbot library",
   "keywords": [
     "discord",

package/src/classes/Channel.js

@@ -135,7 +135,7 @@ class Channel {
    * @returns {Guild|null} The guild instance or null if not a guild channel
    */
   getGuild() {
-    const guildId = this.data.guild_id;
+    const guildId = this.guildId;
     if (!guildId) return null;
     return this.client.getGuild(guildId);
   }
@@ -145,7 +145,7 @@ class Channel {
    * @returns {Promise<Guild|null>} The guild instance or null if not a guild channel
    */
   async fetchGuild() {
-    const guildId = this.data.guild_id;
+    const guildId = this.guildId;
     if (!guildId) return null;
     return await this.client.fetchGuild(guildId);
   }
@@ -214,7 +214,7 @@ class Channel {
     if (this.isDM() || this.isGroupDM()) {
       return `https://discord.com/channels/@me/${this.id}`;
     }
-    const guildId = this.data.guild_id;
+    const guildId = this.guildId;
     return `https://discord.com/channels/${guildId}/${this.id}`;
   }
 
@@ -235,8 +235,8 @@ class Channel {
     }
 
     // Apply channel permission overwrites
-    if (this.data.permission_overwrites) {
-      const overwrites = this.data.permission_overwrites;
+    if (this.permissionOverwrites) {
+      const overwrites = this.permissionOverwrites;
 
       // Role overwrites (deny takes precedence over allow)
       const memberRoles = member.roles || [];
@@ -245,7 +245,7 @@ class Channel {
           // Role overwrite
           if (
             memberRoles.includes(overwrite.id) ||
-            overwrite.id === this.data.guild_id
+            overwrite.id === this.guildId
           ) {
             permissions &= ~toBigInt(overwrite.deny || 0);
             permissions |= toBigInt(overwrite.allow || 0);

package/src/classes/Guild.js

@@ -105,10 +105,10 @@ class Guild {
    * @returns {string|null} The icon URL or null if no icon
    */
   getIconURL(options = {}) {
-    if (!this.data.icon) return null;
+    if (!this.icon) return null;
     const size = options.size || 512;
     const format = options.format || "png";
-    return `https://cdn.discordapp.com/icons/${this.id}/${this.data.icon}.${format}?size=${size}`;
+    return `https://cdn.discordapp.com/icons/${this.id}/${this.icon}.${format}?size=${size}`;
   }
 
   /**
@@ -119,10 +119,10 @@ class Guild {
    * @returns {string|null} The banner URL or null if no banner
    */
   getBannerURL(options = {}) {
-    if (!this.data.banner) return null;
+    if (!this.banner) return null;
     const size = options.size || 512;
     const format = options.format || "png";
-    return `https://cdn.discordapp.com/banners/${this.id}/${this.data.banner}.${format}?size=${size}`;
+    return `https://cdn.discordapp.com/banners/${this.id}/${this.banner}.${format}?size=${size}`;
   }
 
   /**

package/src/classes/Message.js

@@ -1,5 +1,21 @@
 const User = require("./User");
 
+function camelCaseKeys(obj) {
+  if (Array.isArray(obj)) {
+    return obj.map((item) => camelCaseKeys(item));
+  } else if (obj !== null && typeof obj === "object") {
+    const newObj = {};
+    for (const [key, value] of Object.entries(obj)) {
+      const camelKey = key.replace(/_([a-z])/g, (_, letter) =>
+        letter.toUpperCase(),
+      );
+      newObj[camelKey] = camelCaseKeys(value);
+    }
+    return newObj;
+  }
+  return obj;
+}
+
 /**
  * Represents a Discord message
  */
@@ -31,12 +47,14 @@ class Message {
       }
     }
 
-    this.components = this.components || [];
+    this.components = camelCaseKeys(this.components || []);
     this.attachments = this.attachments || [];
-    this.embeds = this.embeds || [];
+    this.embeds = camelCaseKeys(this.embeds || []);
     this.mentions = this.mentions || [];
     this.mentionRoles = this.mentionRoles || [];
     this.reactions = this.reactions || [];
+    this.guildId =
+      this.guildId || this.client.getChannel(this.channelId)?.guildId || null;
     this.url = `https://discord.com/channels/${this.guildId ? this.guildId : "@me"}/${this.channelId}/${this.id}`;
   }
 
@@ -65,9 +83,9 @@ class Message {
       this[camelKey] = value;
     }
 
-    this.components = this.components || [];
+    this.components = camelCaseKeys(this.components || []);
     this.attachments = this.attachments || [];
-    this.embeds = this.embeds || [];
+    this.embeds = camelCaseKeys(this.embeds || []);
     this.mentions = this.mentions || [];
     this.mentionRoles = this.mentionRoles || [];
     this.reactions = this.reactions || [];
@@ -117,11 +135,11 @@ class Message {
 
     // Get all buttons from components
     const buttons = [];
-    if (this.data.components && Array.isArray(this.data.components)) {
-      for (const row of this.data.components) {
+    if (this.components && Array.isArray(this.components)) {
+      for (const row of this.components) {
         if (row.components && Array.isArray(row.components)) {
           for (const component of row.components) {
-            if (component.type === 2 && component.custom_id) {
+            if (component.type === 2 && component.customId) {
               // Type 2 is button
               buttons.push(component);
             }
@@ -137,7 +155,7 @@ class Message {
     // Handle different input types
     if (input === null) {
       // No input: click first button
-      customId = buttons[0].custom_id;
+      customId = buttons[0].customId;
     } else if (typeof input === "number") {
       // Integer input: click button at that index
       if (input < 0 || input >= buttons.length) {
@@ -147,17 +165,17 @@ class Message {
           } button(s) (0-${buttons.length - 1})`,
         );
       }
-      customId = buttons[input].custom_id;
+      customId = buttons[input].customId;
     } else if (typeof input === "string") {
-      // String input: use as custom_id directly (preserving original behavior)
+      // String input: use as customId directly
       customId = input;
     } else {
       throw new Error("Invalid input type. Expected null, number, or string.");
     }
 
     // Get required data for button interaction
-    const applicationId = this.data.application_id || this.author.id;
-    const messageFlags = this.data.flags || 0;
+    const applicationId = this.applicationId || this.author.id;
+    const messageFlags = this.flags || 0;
 
     if (!this.client.sessionId) {
       throw new Error(
@@ -207,13 +225,15 @@ class Message {
     let channel;
     try {
       channel = await this.client.resolveChannel(channelId);
-    } catch {
+    } catch (error) {
+      console.error(error);
       return null;
     }
 
     try {
       return await channel.fetchMessage(messageId);
-    } catch {
+    } catch (error) {
+      console.error(error);
       return null;
     }
   }

package/src/connection/rest/RestManager.js

@@ -680,7 +680,19 @@ class RestManager {
    * @returns {Promise<object>} Message data
    */
   async fetchMessage(channelId, messageId) {
-    return await this.request(`/channels/${channelId}/messages/${messageId}`);
+    const messages = await this.request(
+      `/channels/${channelId}/messages?limit=1&around=${messageId}`,
+    );
+    if (Array.isArray(messages)) {
+      const message = messages.find((m) => m.id === messageId);
+      if (message) return message;
+    }
+    throw new DiscordAPIError(
+      "Unknown Message",
+      404,
+      `/channels/${channelId}/messages/${messageId}`,
+      { message: "Unknown Message", code: 10008 },
+    );
   }
 
   /**

package/src/connection/webhook/WebhookClient.js

@@ -22,18 +22,79 @@ function resolveColor(color) {
 class WebhookClient {
   /**
    * Create a new WebhookClient
-   * @param {string} url - The webhook URL
-   * @param {object} [options={}] - Default options for the webhook
-   * @param {string} [options.username] - Default username for the webhook
-   * @param {string} [options.avatarURL] - Default avatar URL for the webhook
+   * @param {string|object} urlOrId - The webhook URL, an object containing `id` and `token` (or `url`), or just the webhook ID
+   * @param {string|object} [tokenOrOptions={}] - The webhook token (if first arg is ID) or default options
+   * @param {object} [options={}] - Default options for the webhook (if first two args are ID and token)
    */
-  constructor(url, options = {}) {
-    this.url = url;
-    this.options = {
-      username: options.username || null,
-      avatarURL: options.avatarURL || null,
-      ...options,
-    };
+  constructor(urlOrId, tokenOrOptions = {}, options = {}) {
+    if (typeof urlOrId === "object" && urlOrId !== null) {
+      // constructor({ id, token, url, ...options }, options)
+      const data = urlOrId;
+      const opts = tokenOrOptions || {};
+
+      if (data.url) {
+        this.url = data.url;
+        try {
+          const parsed = WebhookClient.parseURL(data.url);
+          this.id = parsed.id;
+          this.token = parsed.token;
+        } catch {
+          // Ignore parse errors for custom/mock URLs
+        }
+      } else if (data.id && data.token) {
+        this.id = data.id.toString();
+        this.token = data.token;
+        this.url = `https://discord.com/api/webhooks/${this.id}/${this.token}`;
+      } else {
+        throw new Error(
+          "WebhookClient requires either a URL or an ID and Token",
+        );
+      }
+
+      this.options = {
+        username: data.username || opts.username || null,
+        avatarURL: data.avatarURL || opts.avatarURL || null,
+        ...data,
+        ...opts,
+      };
+
+      // Clean up internal keys from options
+      delete this.options.id;
+      delete this.options.token;
+      delete this.options.url;
+    } else if (
+      typeof urlOrId === "string" &&
+      typeof tokenOrOptions === "string"
+    ) {
+      // constructor(id, token, options)
+      this.id = urlOrId;
+      this.token = tokenOrOptions;
+      this.url = `https://discord.com/api/webhooks/${this.id}/${this.token}`;
+      this.options = {
+        username: options.username || null,
+        avatarURL: options.avatarURL || null,
+        ...options,
+      };
+    } else if (typeof urlOrId === "string") {
+      // constructor(url, options)
+      this.url = urlOrId;
+      try {
+        const parsed = WebhookClient.parseURL(urlOrId);
+        this.id = parsed.id;
+        this.token = parsed.token;
+      } catch {
+        // Ignore parse errors for custom/mock URLs
+      }
+      this.options = {
+        username: tokenOrOptions.username || null,
+        avatarURL: tokenOrOptions.avatarURL || null,
+        ...tokenOrOptions,
+      };
+    } else {
+      throw new Error(
+        "Invalid parameters provided to WebhookClient constructor",
+      );
+    }
   }
 
   /**