discord-self-lite 0.1.13 → 0.1.15

package/package.json

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

package/src/classes/Channel.js

@@ -74,10 +74,12 @@ class Channel {
    * @param {number} [options.limit] - Number of messages to fetch
    * @param {string} [options.before] - Fetch messages before this message ID
    * @param {string} [options.after] - Fetch messages after this message ID
-   * @returns {Promise<Array>} Array of message data
+   * @returns {Promise<Message[]>} Array of message instances
    */
   async fetchMessages(options = {}) {
-    return await this.rest.fetchMessages(this.id, options);
+    const data = await this.rest.fetchMessages(this.id, options);
+    if (!Array.isArray(data)) return data;
+    return data.map((msg) => new Message(this.client, msg));
   }
 
   /**

package/src/classes/Client.js

@@ -248,10 +248,12 @@ class Client extends EventEmitter {
    * @param {number} [options.limit] - Number of messages to fetch
    * @param {string} [options.before] - Fetch messages before this message ID
    * @param {string} [options.after] - Fetch messages after this message ID
-   * @returns {Promise<Array>} Array of message data
+   * @returns {Promise<Message[]>} Array of message instances
    */
   async fetchMessages(channelId, options = {}) {
-    return await this.rest.fetchMessages(channelId, options);
+    const data = await this.rest.fetchMessages(channelId, options);
+    if (!Array.isArray(data)) return data;
+    return data.map((msg) => new Message(this, msg));
   }
 
   /**

package/src/classes/MessageAttachment.js

@@ -0,0 +1,18 @@
+/**
+ * Represents an attachment in a message
+ */
+class MessageAttachment {
+  /**
+   * Create a new MessageAttachment instance
+   * @param {Buffer|string|ArrayBuffer} data - File data buffer or string
+   * @param {string} name - Filename
+   * @param {string|null} [description=null] - Description of the attachment
+   */
+  constructor(data, name, description = null) {
+    this.data = data;
+    this.name = name;
+    this.description = description;
+  }
+}
+
+module.exports = MessageAttachment;

package/src/connection/rest/RestManager.js

@@ -231,13 +231,18 @@ class RestManager {
 
     while (attempt < maxRetries) {
       try {
+        const headers = {
+          Authorization: this.token,
+          ...options.headers,
+        };
+
+        if (!(options.body instanceof FormData)) {
+          headers["Content-Type"] = "application/json";
+        }
+
         const response = await fetch(url, {
           ...options,
-          headers: {
-            Authorization: this.token,
-            "Content-Type": "application/json",
-            ...options.headers,
-          },
+          headers,
         });
 
         // Update rate limit info from headers

package/src/connection/rest/methods/react.js

@@ -3,12 +3,16 @@
  * @param {RestManager} rest - The REST manager instance
  * @param {string} channelId - The channel ID
  * @param {string} messageId - The message ID
- * @param {string} emoji - The emoji to react with (unicode or custom emoji)
+ * @param {string|object} emoji - The emoji to react with (unicode, custom emoji string, or emoji object)
  * @returns {Promise<void>}
  */
 async function react(rest, channelId, messageId, emoji) {
+  let emojiStr = emoji;
+  if (emoji && typeof emoji === "object") {
+    emojiStr = emoji.id ? `${emoji.name}:${emoji.id}` : emoji.name;
+  }
   // Encode emoji for URL (e.g., 😀 -> %F0%9F%98%80, or custom:123 -> custom%3A123)
-  const encodedEmoji = encodeURIComponent(emoji);
+  const encodedEmoji = encodeURIComponent(emojiStr);
   return await rest.request(
     `/channels/${channelId}/messages/${messageId}/reactions/${encodedEmoji}/@me`,
     {

package/src/connection/rest/methods/sendMessage.js

@@ -8,7 +8,75 @@
 async function sendMessage(rest, channelId, payload) {
   // If payload is a string, treat it as content
   const messagePayload =
-    typeof payload === "string" ? { content: payload } : payload;
+    typeof payload === "string" ? { content: payload } : { ...payload };
+
+  const filesToUpload = [];
+  const keepAttachments = [];
+
+  const rawAttachments = messagePayload.attachments || [];
+  if (Array.isArray(rawAttachments)) {
+    for (const att of rawAttachments) {
+      if (
+        att &&
+        typeof att === "object" &&
+        (att.data !== undefined || att.attachment !== undefined)
+      ) {
+        filesToUpload.push(att);
+      } else {
+        keepAttachments.push(att);
+      }
+    }
+  }
+
+  const rawFiles = messagePayload.files || [];
+  if (Array.isArray(rawFiles)) {
+    for (const file of rawFiles) {
+      if (
+        file &&
+        typeof file === "object" &&
+        (file.data !== undefined || file.attachment !== undefined)
+      ) {
+        filesToUpload.push(file);
+      } else if (file) {
+        filesToUpload.push({ data: file });
+      }
+    }
+  }
+
+  if (filesToUpload.length > 0) {
+    const formData = new FormData();
+
+    const uploadedAttachmentsMetadata = filesToUpload.map((file, index) => {
+      const filename = file.name || `file_${index}`;
+      const description = file.description || null;
+      return {
+        id: index,
+        filename,
+        description,
+      };
+    });
+
+    messagePayload.attachments = [
+      ...keepAttachments,
+      ...uploadedAttachmentsMetadata,
+    ];
+
+    delete messagePayload.files;
+
+    formData.append("payload_json", JSON.stringify(messagePayload));
+
+    filesToUpload.forEach((file, index) => {
+      const fileData = file.data || file.attachment;
+      const filename = file.name || `file_${index}`;
+      const blob = new Blob([fileData]);
+      formData.append(`files[${index}]`, blob, filename);
+    });
+
+    return await rest.request(`/channels/${channelId}/messages`, {
+      method: "POST",
+      body: formData,
+    });
+  }
 
   return await rest.request(`/channels/${channelId}/messages`, {
     method: "POST",

package/src/connection/webhook/WebhookClient.js

@@ -130,12 +130,81 @@ class WebhookClient {
       payload = this._buildPayload("", options);
     }
 
+    const filesToUpload = [];
+    const keepAttachments = [];
+
+    const rawAttachments = payload.attachments || [];
+    if (Array.isArray(rawAttachments)) {
+      for (const att of rawAttachments) {
+        if (
+          att &&
+          typeof att === "object" &&
+          (att.data !== undefined || att.attachment !== undefined)
+        ) {
+          filesToUpload.push(att);
+        } else {
+          keepAttachments.push(att);
+        }
+      }
+    }
+
+    const rawFiles = payload.files || [];
+    if (Array.isArray(rawFiles)) {
+      for (const file of rawFiles) {
+        if (
+          file &&
+          typeof file === "object" &&
+          (file.data !== undefined || file.attachment !== undefined)
+        ) {
+          filesToUpload.push(file);
+        } else if (file) {
+          filesToUpload.push({ data: file });
+        }
+      }
+    }
+
+    let requestBody;
+    const headers = {};
+
+    if (filesToUpload.length > 0) {
+      const formData = new FormData();
+
+      const uploadedAttachmentsMetadata = filesToUpload.map((file, index) => {
+        const filename = file.name || `file_${index}`;
+        const description = file.description || null;
+        return {
+          id: index,
+          filename,
+          description,
+        };
+      });
+
+      payload.attachments = [
+        ...keepAttachments,
+        ...uploadedAttachmentsMetadata,
+      ];
+
+      delete payload.files;
+
+      formData.append("payload_json", JSON.stringify(payload));
+
+      filesToUpload.forEach((file, index) => {
+        const fileData = file.data || file.attachment;
+        const filename = file.name || `file_${index}`;
+        const blob = new Blob([fileData]);
+        formData.append(`files[${index}]`, blob, filename);
+      });
+
+      requestBody = formData;
+    } else {
+      headers["Content-Type"] = "application/json";
+      requestBody = JSON.stringify(payload);
+    }
+
     const response = await fetch(this.url, {
       method: "POST",
-      headers: {
-        "Content-Type": "application/json",
-      },
-      body: JSON.stringify(payload),
+      headers,
+      body: requestBody,
     });
 
     if (!response.ok) {

package/src/index.js

@@ -21,6 +21,7 @@ const Client = require("./classes/Client");
 const WebhookClient = require("./connection/webhook/WebhookClient");
 const Permissions = require("./classes/Permissions");
 const BitField = require("./classes/BitField");
+const MessageAttachment = require("./classes/MessageAttachment");
 
 /**
  * Main package exports
@@ -54,4 +55,11 @@ module.exports = {
    * @see {@link BitField}
    */
   BitField,
+
+  /**
+   * Represents an attachment to be sent in a message
+   * @type {MessageAttachment}
+   * @see {@link MessageAttachment}
+   */
+  MessageAttachment,
 };