revbot.js 0.0.5 → 0.0.7

package/dist/index.d.mts

@@ -233,6 +233,8 @@ interface ClientEvents {
 interface clientOptions {
     /** Whether to fetch all members of a server. */
     fetchMembers?: boolean;
+    /** wether to use X-Session-Token or X-Bot-Token*/
+    isBot?: boolean;
     /** Configuration for REST API requests. */
     rest?: {
         /** The timeout for REST requests in milliseconds. */
@@ -1437,10 +1439,17 @@ declare class MessageEmbed {
     /**
      * Sets the media (e.g., image or video) of the embed.
      *
-     * @param {string} media - The media URL to set.
+     * @param {Readable | string | File} media - The media URL, File or Stream to set.
      * @returns {this} The updated `MessageEmbed` instance.
      */
-    setMedia(media: string): this;
+    setMedia(media: Readable | string | File$1): this;
+    /**
+     *
+     * @param client The client instance used to send the embed.
+     * @returns SendableEmbed
+     * Converts the embed to a JSON object that can be sent to the API, including media handling.
+     */
+    toJSONWithMedia(client: client): Promise<SendableEmbed>;
     /**
      * Converts the embed to a JSON object that can be sent to the API.
      *

package/dist/index.d.ts

@@ -233,6 +233,8 @@ interface ClientEvents {
 interface clientOptions {
     /** Whether to fetch all members of a server. */
     fetchMembers?: boolean;
+    /** wether to use X-Session-Token or X-Bot-Token*/
+    isBot?: boolean;
     /** Configuration for REST API requests. */
     rest?: {
         /** The timeout for REST requests in milliseconds. */
@@ -1437,10 +1439,17 @@ declare class MessageEmbed {
     /**
      * Sets the media (e.g., image or video) of the embed.
      *
-     * @param {string} media - The media URL to set.
+     * @param {Readable | string | File} media - The media URL, File or Stream to set.
      * @returns {this} The updated `MessageEmbed` instance.
      */
-    setMedia(media: string): this;
+    setMedia(media: Readable | string | File$1): this;
+    /**
+     *
+     * @param client The client instance used to send the embed.
+     * @returns SendableEmbed
+     * Converts the embed to a JSON object that can be sent to the API, including media handling.
+     */
+    toJSONWithMedia(client: client): Promise<SendableEmbed>;
     /**
      * Converts the embed to a JSON object that can be sent to the API.
      *

package/dist/index.js

@@ -1715,6 +1715,10 @@ var Mentions = class {
 };
 
 // src/struct/messageEmbed.ts
+var import_stream = require("stream");
+var import_axios = __toESM(require("axios"));
+var import_form_data = __toESM(require("form-data"));
+var import_node_buffer = require("buffer");
 var _url, _title, _description, _icon_url, _color, _media;
 var MessageEmbed = class {
   constructor() {
@@ -1778,26 +1782,68 @@ var MessageEmbed = class {
   /**
    * Sets the media (e.g., image or video) of the embed.
    *
-   * @param {string} media - The media URL to set.
+   * @param {Readable | string | File} media - The media URL, File or Stream to set.
    * @returns {this} The updated `MessageEmbed` instance.
    */
   setMedia(media) {
     __privateSet(this, _media, media);
     return this;
   }
+  /**
+   *
+   * @param client The client instance used to send the embed.
+   * @returns SendableEmbed
+   * Converts the embed to a JSON object that can be sent to the API, including media handling.
+   */
+  toJSONWithMedia(client3) {
+    return __async(this, null, function* () {
+      const embed = {
+        title: __privateGet(this, _title),
+        icon_url: __privateGet(this, _icon_url),
+        colour: __privateGet(this, _color),
+        description: __privateGet(this, _description),
+        url: __privateGet(this, _url)
+      };
+      if (__privateGet(this, _media)) {
+        let att = __privateGet(this, _media);
+        const data = new import_form_data.default();
+        if (typeof att === "string") {
+          const readableStream = yield import_axios.default.get(att, {
+            responseType: "stream"
+          });
+          data.append("file", readableStream.data, {
+            filename: att.split("/").pop()
+          });
+        }
+        if (att instanceof import_stream.Readable) {
+          data.append("file", att);
+        }
+        if (att instanceof import_node_buffer.File) {
+          const buffer = Buffer.from(yield att.arrayBuffer());
+          data.append("file", buffer, { filename: att.name });
+        }
+        yield client3.cdn.post("/attachments", data).then((attachment) => {
+          const { id } = attachment;
+          embed.media = id;
+        });
+      }
+      return embed;
+    });
+  }
   /**
    * Converts the embed to a JSON object that can be sent to the API.
    *
    * @returns {SendableEmbed} The JSON representation of the embed.
    */
   toJSON() {
+    var _a;
     return {
       title: __privateGet(this, _title),
-      description: __privateGet(this, _description),
-      url: __privateGet(this, _url),
       icon_url: __privateGet(this, _icon_url),
       colour: __privateGet(this, _color),
-      media: __privateGet(this, _media)
+      description: __privateGet(this, _description),
+      url: __privateGet(this, _url),
+      media: (_a = __privateGet(this, _media)) == null ? void 0 : _a.toString()
     };
   }
 };
@@ -2566,10 +2612,10 @@ var UserManager = class extends BaseManager {
 };
 
 // src/managers/messageManager.ts
-var import_node_buffer = require("buffer");
-var import_stream = require("stream");
-var import_form_data = __toESM(require("form-data"));
-var import_axios = __toESM(require("axios"));
+var import_node_buffer2 = require("buffer");
+var import_stream2 = require("stream");
+var import_form_data2 = __toESM(require("form-data"));
+var import_axios2 = __toESM(require("axios"));
 var MessageManager = class extends BaseManager {
   constructor(channel) {
     super(channel.client);
@@ -2592,19 +2638,19 @@ var MessageManager = class extends BaseManager {
       let embeds = [];
       if (Array.isArray(content.attachments)) {
         const promises = content.attachments.map((att) => __async(this, null, function* () {
-          const data = new import_form_data.default();
+          const data = new import_form_data2.default();
           if (typeof att === "string") {
-            const readableStream = yield import_axios.default.get(att, {
+            const readableStream = yield import_axios2.default.get(att, {
               responseType: "stream"
             });
             data.append("file", readableStream.data, {
               filename: att.split("/").pop()
             });
           }
-          if (att instanceof import_stream.Readable) {
+          if (att instanceof import_stream2.Readable) {
             data.append("file", att);
           }
-          if (att instanceof import_node_buffer.File) {
+          if (att instanceof import_node_buffer2.File) {
             const buffer = Buffer.from(yield att.arrayBuffer());
             data.append("file", buffer, { filename: att.name });
           }
@@ -2616,7 +2662,11 @@ var MessageManager = class extends BaseManager {
         yield Promise.all(promises);
       }
       if (Array.isArray(content.embeds)) {
-        content.embeds.map((embed) => embeds.push(embed.toJSON()));
+        const promises = content.embeds.map((embed) => __async(this, null, function* () {
+          const json = yield embed.toJSONWithMedia(this.client);
+          embeds.push(json);
+        }));
+        yield Promise.all(promises);
       }
       const resp = yield this.client.api.post(
         `/channels/${this.channel.id}/messages`,
@@ -3038,10 +3088,10 @@ var ServerMemberManager = class extends BaseManager {
 var import_node_events = require("events");
 
 // src/rest/restClient.ts
-var import_axios2 = __toESM(require("axios"));
+var import_axios3 = __toESM(require("axios"));
 
 // package.json
-var version = "0.0.4";
+var version = "0.0.7";
 
 // src/rest/restClient.ts
 var RestClient = class {
@@ -3060,17 +3110,18 @@ var RestClient = class {
     return __async(this, null, function* () {
       try {
         if (!this.client.token) throw new Error("Token is required");
+        const authHeader = this.client.bot ? "X-Bot-Token" : "X-Session-Token";
         const config = {
           method,
           url: `${apiUrl}${url}`,
           params: query,
           data: body == null ? void 0 : body.body,
           headers: {
-            "X-Bot-Token": this.client.token,
+            [authHeader]: this.client.token,
             "User-Agent": `RevBot.js/${version}`
           }
         };
-        const response = yield (0, import_axios2.default)(config);
+        const response = yield (0, import_axios3.default)(config);
         return response.data;
       } catch (error) {
         console.error("API call failed:", error);
@@ -3139,7 +3190,7 @@ var RestClient = class {
 };
 
 // src/rest/CDNClient.ts
-var import_axios3 = __toESM(require("axios"));
+var import_axios4 = __toESM(require("axios"));
 var CDNClient = class {
   constructor(client3) {
     this.client = client3;
@@ -3156,6 +3207,7 @@ var CDNClient = class {
     return __async(this, null, function* () {
       try {
         if (!this.client.token) throw new Error("Token is required");
+        const authHeader = this.client.bot ? "X-Bot-Token" : "X-Session-Token";
         const config = {
           method,
           url: `${cdnUrl}${url}`,
@@ -3163,12 +3215,12 @@ var CDNClient = class {
           data,
           maxBodyLength: Infinity,
           headers: __spreadValues({
-            "X-Bot-Token": this.client.token,
+            [authHeader]: this.client.token,
             "Content-Type": "multipart/form-data",
             "User-Agent": `RevBot.js/${version}`
           }, data.getHeaders())
         };
-        const response = yield (0, import_axios3.default)(config);
+        const response = yield (0, import_axios4.default)(config);
         return response.data;
       } catch (error) {
         console.error("API call failed:", error);
@@ -3199,12 +3251,14 @@ var BaseClient = class extends import_node_events.EventEmitter {
    * @param {clientOptions} [options={}] - The options for configuring the client.
    */
   constructor(options = {}) {
+    var _a;
     super();
     /** The authentication token for the client. */
     __privateAdd(this, _token, null);
     /** Whether the client is a bot. */
     this.bot = true;
     this.options = __spreadValues({}, options);
+    this.bot = (_a = this.options.isBot) != null ? _a : true;
     this.api = new RestClient(this);
     this.cdn = new CDNClient(this);
   }

package/dist/index.mjs

@@ -1642,6 +1642,10 @@ var Mentions = class {
 };
 
 // src/struct/messageEmbed.ts
+import { Readable } from "stream";
+import axios from "axios";
+import FormData from "form-data";
+import { File } from "node:buffer";
 var _url, _title, _description, _icon_url, _color, _media;
 var MessageEmbed = class {
   constructor() {
@@ -1705,26 +1709,68 @@ var MessageEmbed = class {
   /**
    * Sets the media (e.g., image or video) of the embed.
    *
-   * @param {string} media - The media URL to set.
+   * @param {Readable | string | File} media - The media URL, File or Stream to set.
    * @returns {this} The updated `MessageEmbed` instance.
    */
   setMedia(media) {
     __privateSet(this, _media, media);
     return this;
   }
+  /**
+   *
+   * @param client The client instance used to send the embed.
+   * @returns SendableEmbed
+   * Converts the embed to a JSON object that can be sent to the API, including media handling.
+   */
+  toJSONWithMedia(client3) {
+    return __async(this, null, function* () {
+      const embed = {
+        title: __privateGet(this, _title),
+        icon_url: __privateGet(this, _icon_url),
+        colour: __privateGet(this, _color),
+        description: __privateGet(this, _description),
+        url: __privateGet(this, _url)
+      };
+      if (__privateGet(this, _media)) {
+        let att = __privateGet(this, _media);
+        const data = new FormData();
+        if (typeof att === "string") {
+          const readableStream = yield axios.get(att, {
+            responseType: "stream"
+          });
+          data.append("file", readableStream.data, {
+            filename: att.split("/").pop()
+          });
+        }
+        if (att instanceof Readable) {
+          data.append("file", att);
+        }
+        if (att instanceof File) {
+          const buffer = Buffer.from(yield att.arrayBuffer());
+          data.append("file", buffer, { filename: att.name });
+        }
+        yield client3.cdn.post("/attachments", data).then((attachment) => {
+          const { id } = attachment;
+          embed.media = id;
+        });
+      }
+      return embed;
+    });
+  }
   /**
    * Converts the embed to a JSON object that can be sent to the API.
    *
    * @returns {SendableEmbed} The JSON representation of the embed.
    */
   toJSON() {
+    var _a;
     return {
       title: __privateGet(this, _title),
-      description: __privateGet(this, _description),
-      url: __privateGet(this, _url),
       icon_url: __privateGet(this, _icon_url),
       colour: __privateGet(this, _color),
-      media: __privateGet(this, _media)
+      description: __privateGet(this, _description),
+      url: __privateGet(this, _url),
+      media: (_a = __privateGet(this, _media)) == null ? void 0 : _a.toString()
     };
   }
 };
@@ -2493,10 +2539,10 @@ var UserManager = class extends BaseManager {
 };
 
 // src/managers/messageManager.ts
-import { File } from "node:buffer";
-import { Readable } from "stream";
-import FormData from "form-data";
-import axios from "axios";
+import { File as File2 } from "node:buffer";
+import { Readable as Readable2 } from "stream";
+import FormData2 from "form-data";
+import axios2 from "axios";
 var MessageManager = class extends BaseManager {
   constructor(channel) {
     super(channel.client);
@@ -2519,19 +2565,19 @@ var MessageManager = class extends BaseManager {
       let embeds = [];
       if (Array.isArray(content.attachments)) {
         const promises = content.attachments.map((att) => __async(this, null, function* () {
-          const data = new FormData();
+          const data = new FormData2();
           if (typeof att === "string") {
-            const readableStream = yield axios.get(att, {
+            const readableStream = yield axios2.get(att, {
               responseType: "stream"
             });
             data.append("file", readableStream.data, {
               filename: att.split("/").pop()
             });
           }
-          if (att instanceof Readable) {
+          if (att instanceof Readable2) {
             data.append("file", att);
           }
-          if (att instanceof File) {
+          if (att instanceof File2) {
             const buffer = Buffer.from(yield att.arrayBuffer());
             data.append("file", buffer, { filename: att.name });
           }
@@ -2543,7 +2589,11 @@ var MessageManager = class extends BaseManager {
         yield Promise.all(promises);
       }
       if (Array.isArray(content.embeds)) {
-        content.embeds.map((embed) => embeds.push(embed.toJSON()));
+        const promises = content.embeds.map((embed) => __async(this, null, function* () {
+          const json = yield embed.toJSONWithMedia(this.client);
+          embeds.push(json);
+        }));
+        yield Promise.all(promises);
       }
       const resp = yield this.client.api.post(
         `/channels/${this.channel.id}/messages`,
@@ -2965,10 +3015,10 @@ var ServerMemberManager = class extends BaseManager {
 import { EventEmitter } from "node:events";
 
 // src/rest/restClient.ts
-import axios2 from "axios";
+import axios3 from "axios";
 
 // package.json
-var version = "0.0.4";
+var version = "0.0.7";
 
 // src/rest/restClient.ts
 var RestClient = class {
@@ -2987,17 +3037,18 @@ var RestClient = class {
     return __async(this, null, function* () {
       try {
         if (!this.client.token) throw new Error("Token is required");
+        const authHeader = this.client.bot ? "X-Bot-Token" : "X-Session-Token";
         const config = {
           method,
           url: `${apiUrl}${url}`,
           params: query,
           data: body == null ? void 0 : body.body,
           headers: {
-            "X-Bot-Token": this.client.token,
+            [authHeader]: this.client.token,
             "User-Agent": `RevBot.js/${version}`
           }
         };
-        const response = yield axios2(config);
+        const response = yield axios3(config);
         return response.data;
       } catch (error) {
         console.error("API call failed:", error);
@@ -3066,7 +3117,7 @@ var RestClient = class {
 };
 
 // src/rest/CDNClient.ts
-import axios3 from "axios";
+import axios4 from "axios";
 var CDNClient = class {
   constructor(client3) {
     this.client = client3;
@@ -3083,6 +3134,7 @@ var CDNClient = class {
     return __async(this, null, function* () {
       try {
         if (!this.client.token) throw new Error("Token is required");
+        const authHeader = this.client.bot ? "X-Bot-Token" : "X-Session-Token";
         const config = {
           method,
           url: `${cdnUrl}${url}`,
@@ -3090,12 +3142,12 @@ var CDNClient = class {
           data,
           maxBodyLength: Infinity,
           headers: __spreadValues({
-            "X-Bot-Token": this.client.token,
+            [authHeader]: this.client.token,
             "Content-Type": "multipart/form-data",
             "User-Agent": `RevBot.js/${version}`
           }, data.getHeaders())
         };
-        const response = yield axios3(config);
+        const response = yield axios4(config);
         return response.data;
       } catch (error) {
         console.error("API call failed:", error);
@@ -3126,12 +3178,14 @@ var BaseClient = class extends EventEmitter {
    * @param {clientOptions} [options={}] - The options for configuring the client.
    */
   constructor(options = {}) {
+    var _a;
     super();
     /** The authentication token for the client. */
     __privateAdd(this, _token, null);
     /** Whether the client is a bot. */
     this.bot = true;
     this.options = __spreadValues({}, options);
+    this.bot = (_a = this.options.isBot) != null ? _a : true;
     this.api = new RestClient(this);
     this.cdn = new CDNClient(this);
   }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "revbot.js",
-  "version": "0.0.5",
+  "version": "0.0.7",
   "description": "A Revolt bot client used to interact with the revolt api for Node.js, written in TypeScript.",
   "main": "./dist/index.js",
   "module": "./dist/index.mjs",