beniocord.js 2.0.3 → 2.0.4

package/Client.js

@@ -19,6 +19,10 @@ class ClientError extends Error {
   }
 }
 
+let global = {
+  token: "",
+  apiUrl: "https://api-bots.beniocord.site"
+};
 /**
  * @fires Client#ready
  * @fires Client#messageCreate
@@ -36,8 +40,9 @@ class Client extends EventEmitter {
       throw new ClientError("Valid token is required", "INVALID_TOKEN");
     }
 
-    this.token = token.trim();
-    this.apiUrl = "https://api-bots.beniocord.site";
+    // this.token = token.trim();
+    global.token = token.trim();
+    // this.apiUrl = "https://api-bots.beniocord.site";
     this.socket = null;
     this.user = null;
     this.isConnected = false;
@@ -64,12 +69,13 @@ class Client extends EventEmitter {
     this._sentMessages = new Set();
 
     this._axios = axios.create({
-      baseURL: this.apiUrl,
+      baseURL: global.apiUrl,
       timeout: this.config.requestTimeout,
       headers: {
-        'Authorization': `Bearer ${this.token}`,
+        'Authorization': `Bearer ${global.token}`,
+        'x-bot-token': global.token,
         'Content-Type': 'application/json',
-        'Origin': this.apiUrl
+        'Origin': global.apiUrl
       }
     });
 
@@ -173,9 +179,9 @@ class Client extends EventEmitter {
         ));
       }, this.config.connectionTimeout);
 
-      this.socket = io(this.apiUrl, {
-        auth: { token: this.token },
-        extraHeaders: { 'Origin': this.apiUrl },
+      this.socket = io(global.apiUrl, {
+        auth: { token: global.token },
+        extraHeaders: { 'Origin': global.apiUrl },
         timeout: 5000,
         reconnection: true,
         reconnectionDelay: this.config.reconnectionDelay,
@@ -295,12 +301,34 @@ class Client extends EventEmitter {
       this.emit('presenceUpdate', data);
     });
 
-    this.socket.on('member:join', (data) => {
+    this.socket.on('member:join', async (data) => {
+      const member = await this.fetchUser(data.memberId).catch(() => null);
+      const channel = await this.fetchChannel(data.channelId).catch(() => null);
+
+      if (data.addedBy) {
+        data.addedBy = new User(data.addedBy, this);
+      }
+
+      data.member = member;
+      data.channel = channel;
+
       this.emit('memberJoin', data);
+      console.log('join', data);
     });
 
-    this.socket.on('member:leave', (data) => {
+    this.socket.on('member:leave', async (data) => {
+      const member = await this.fetchUser(data.memberId).catch(() => null);
+      const channel = await this.fetchChannel(data.channelId).catch(() => null);
+
+      if (data.removedBy) {
+        data.removedBy = new User(data.removedBy, this);
+      }
+
+      data.member = member;
+      data.channel = channel;
+
       this.emit('memberLeave', data);
+      console.log('leave', data);
     });
 
     this.socket.on('channel:update', (data) => {
@@ -823,8 +851,8 @@ class Client extends EventEmitter {
   /**
    * @param {string} id
    */
-  async fetchChannel(id) {
-    if (this.cache.channels.has(id)) {
+  async fetchChannel(id, force = false) {
+    if (!force && this.cache.channels.has(id)) {
       return this.cache.channels.get(id);
     }
 
@@ -834,7 +862,9 @@ class Client extends EventEmitter {
       this.cache.channels.set(channel.id, channel);
       return channel;
     } catch (error) {
-      throw error instanceof ClientError ? error : new ClientError(error.message, "FETCH_CHANNEL_ERROR");
+      throw error instanceof ClientError
+        ? error
+        : new ClientError(error.message, "FETCH_CHANNEL_ERROR");
     }
   }
 
@@ -965,18 +995,28 @@ class Client extends EventEmitter {
   /**
    * @param {string} id
    */
-  async fetchUser(id) {
+  async fetchUser(id, force = false) {
+    if (!force && this.cache.users.has(id)) {
+      return this.cache.users.get(id);
+    }
+
     try {
       const res = await this._axios.get(`/api/users/${id}`);
       const user = new User(res.data, this);
       this.cache.users.set(user.id, user);
       return user;
     } catch (error) {
-      throw error instanceof ClientError ? error : new ClientError(error.message, "FETCH_USER_ERROR");
+      throw error instanceof ClientError
+        ? error
+        : new ClientError(error.message, "FETCH_USER_ERROR");
     }
   }
 
-  async fetchMe() {
+  async fetchMe(force = false) {
+    if (!force && this.user) {
+      return this.user;
+    }
+
     try {
       const res = await this._axios.get('/api/users/me');
       const user = new User(res.data, this);
@@ -984,7 +1024,9 @@ class Client extends EventEmitter {
       this.user = user;
       return user;
     } catch (error) {
-      throw error instanceof ClientError ? error : new ClientError(error.message, "FETCH_ME_ERROR");
+      throw error instanceof ClientError
+        ? error
+        : new ClientError(error.message, "FETCH_ME_ERROR");
     }
   }
 
@@ -1004,14 +1046,20 @@ class Client extends EventEmitter {
   /**
    * @param {string} id
    */
-  async fetchEmoji(id) {
+  async fetchEmoji(id, force = false) {
+    if (!force && this.cache.emojis.has(id)) {
+      return this.cache.emojis.get(id);
+    }
+
     try {
       const res = await this._axios.get(`/api/emojis/${id}`);
-      const emoji = new Emoji(res.data, this.apiUrl);
+      const emoji = new Emoji(res.data);
       this.cache.emojis.set(emoji.id, emoji);
       return emoji;
     } catch (error) {
-      throw error instanceof ClientError ? error : new ClientError(error.message, "FETCH_EMOJI_ERROR");
+      throw error instanceof ClientError
+        ? error
+        : new ClientError(error.message, "FETCH_EMOJI_ERROR");
     }
   }
 
@@ -1029,7 +1077,7 @@ class Client extends EventEmitter {
 
       const res = await this._axios.get(endpoint, { params });
       const emojis = res.data.map(e => {
-        const emoji = new Emoji(e, this.apiUrl);
+        const emoji = new Emoji(e);
         this.cache.emojis.set(emoji.id, emoji);
         return emoji;
       });
@@ -1043,13 +1091,19 @@ class Client extends EventEmitter {
   /**
    * @param {string} id
    */
-  async fetchSticker(id) {
+  async fetchSticker(id, force = false) {
+    if (!force && this.cache.stickers.has(id)) {
+      return this.cache.stickers.get(id);
+    }
+
     try {
       const res = await this._axios.get(`/api/stickers/${id}`);
       this.cache.stickers.set(res.data.id, res.data);
       return res.data;
     } catch (error) {
-      throw error instanceof ClientError ? error : new ClientError(error.message, "FETCH_STICKER_ERROR");
+      throw error instanceof ClientError
+        ? error
+        : new ClientError(error.message, "FETCH_STICKER_ERROR");
     }
   }
 

package/package.json

@@ -4,7 +4,7 @@
     "socket.io-client": "^4.8.1"
   },
   "name": "beniocord.js",
-  "version": "2.0.3",
+  "version": "2.0.4",
   "description": "Uma biblioteca leve e intuitiva para integração com APIs de bots em plataformas de mensagens, como Discord. Facilita o envio de mensagens, gerenciamento de canais e interação com usuários, proporcionando uma experiência de desenvolvimento ágil e eficiente.",
   "main": "Client.js",
   "devDependencies": {},

package/structures/Channel.js

@@ -1,8 +1,9 @@
 const MessageCollector = require('./MessageCollector');
 
+let client;
 class Channel {
-  constructor(data, client) {
-    this.client = client;
+  constructor(data, clientInstance) {
+    client = clientInstance;
 
     this.id = data.id;
     this.name = data.name;
@@ -10,26 +11,26 @@ class Channel {
     this.type = data.type || "text";
     this.isPrivate = data.is_private;
     this.isDm = data.is_dm;
-    this.iconUrl = data.icon_url ? client.apiUrl + data.icon_url : undefined;
+    this.iconUrl = data.icon_url ? 'https://api.beniocord.site' + data.icon_url : undefined;
     this.createdBy = data.created_by;
     this.createdAt = data.created_at;
     this.updatedAt = data.updated_at;
   }
 
   async send(content, opts = {}) {
-    return this.client.sendMessage(this.id, content, opts);
+    return client.sendMessage(this.id, content, opts);
   }
 
   startTyping() {
-    return this.client.startTyping(this.id);
+    return client.startTyping(this.id);
   }
 
   stopTyping() {
-    return this.client.stopTyping(this.id);
+    return client.stopTyping(this.id);
   }
 
   createMessageCollector(options = {}) {
-    return new MessageCollector(this, options);
+    return new MessageCollector(this, options, client);
   }
 
 }

package/structures/Emoji.js

@@ -1,9 +1,9 @@
 class Emoji {
-    constructor(data, api_url) {
+    constructor(data) {
         this.id = data.id;
         this.userId = data.user_id;
         this.name = data.name;
-        this.url = data.url ? api_url + data.url : undefined;
+        this.url = data.url ? 'https://api.beniocord.site' + data.url : undefined;
         this.createdAt = data.created_at;
         this.updatedAt = data.updated_at;
     }

package/structures/Message.js

@@ -1,12 +1,13 @@
 const User = require("./User");
 const Channel = require("./Channel");
 
+let client;
 class Message {
-  constructor(data, client) {
+  constructor(data, clientInstance) {
     this.id = data.id;
     this.content = data.content;
     this.messageType = data.message_type || "text";
-    this.fileUrl = data.file_url ? client.apiUrl + data.file_url : undefined;
+    this.fileUrl = data.file_url ? 'https://api.beniocord.site' + data.file_url : undefined;
     this.fileName = data.file_name;
     this.fileSize = data.file_size;
     this.replyTo = data.reply_to;
@@ -25,24 +26,25 @@ class Message {
     }
 
     // this.author = data.user ? new User(data.user, this) : null;
-    this.author = data.user ? new User(data.user, client) : null;
-    this.channel = data.channel ? new Channel(data.channel, client) : null;
+    this.author = data.user ? new User(data.user, clientInstance) : null;
+    this.channel = data.channel ? new Channel(data.channel, clientInstance) : null;
     // this.member = { user: this.author }
-    this.client = client;
+    client = clientInstance;
   }
 
-  async reply(content) {
-    return this.client.sendMessage(this.channel.id, content, {
+  async reply(content, opts = {}) {
+    return client.sendMessage(this.channel.id, content, {
       replyTo: this.id,
+      ...opts
     });
   }
 
   async edit(content) {
-    return this.client.editMessage(this.id, content);
+    return client.editMessage(this.id, content);
   }
 
   async delete() {
-    return this.client.deleteMessage(this.id);
+    return client.deleteMessage(this.id);
   }
 }
 

package/structures/MessageCollector.js

@@ -1,11 +1,12 @@
 const EventEmitter = require('events');
 
 class MessageCollector extends EventEmitter {
-  constructor(channel, options = {}) {
+  constructor(channel, options = {}, client) {
     super();
     
     this.channel = channel;
-    this.client = channel.client;
+    this.client = client;
+    // this.client = channel.client;
     this.filter = options.filter || (() => true);
     this.time = options.time || 60000;
     this.max = options.max || Infinity;

package/structures/User.js

@@ -3,7 +3,7 @@ class User {
     this.id = data.id;
     this.username = data.username;
     this.displayName = data.display_name;
-    this.avatarUrl = data.avatar_url ? client.apiUrl + data.avatar_url : undefined;
+    this.avatarUrl = data.avatar_url ? 'https://api.beniocord.site' + data.avatar_url : undefined;
     this.status = data.status || "offline";
     this.emblems = data.emblems || [];
     this.lastSeen = data.last_seen;