revbot.js 0.2.1 → 0.2.3

package/README.md

@@ -3,7 +3,7 @@
 # Note: this package is currently in the early stages of development and testing
 
 `revbot.js` is a Node.js library for building bots on the Revolt platform. It provides an easy-to-use interface for interacting with Revolt's API, managing events, and handling various bot functionalities. NOTE: node 21 is required to run this
-[revolt server](https://rvlt.gg/2NcCgYZ0) [docs](https://jade3375.github.io/revbot.js/)
+[revolt server](https://stt.gg/cFSwBt4R) [docs](https://jade3375.github.io/revbot.js/)
 
 ## Installation
 

package/dist/index.d.mts

@@ -740,9 +740,9 @@ declare class MessageStruct extends Base {
     /**
      * Retrieves the author of the message.
      *
-     * @returns {User | null} The user who authored the message, or `null` if not found.
+     * @returns {User | ServerMember | null} The user who authored the message, or `null` if not found.
      */
-    get author(): User | null;
+    get author(): User | ServerMember | null;
     /**
      * Retrieves the channel where the message was sent.
      *
@@ -1850,6 +1850,39 @@ declare class ServerMember extends Base {
      * ```
      */
     leave(): Promise<void>;
+    /**
+     * Gets the effective permissions for this server member based on their roles.
+     *
+     * The permissions are calculated by:
+     * 1. Starting with a base FullPermissions with no permissions
+     * 2. For each role the member has, applying the role's allow permissions
+     * 3. For each role the member has, removing the role's deny permissions
+     *
+     * @returns {FullPermissions} The effective permissions for this member
+     *
+     * @example
+     * ```typescript
+     * const permissions = member.getPermissions();
+     * console.log(permissions.has('MANAGE_MESSAGES')); // true or false
+     * ```
+     */
+    permissions(): FullPermissions;
+    /**
+     * Checks if this server member has a specific permission.
+     *
+     * @param {string | number | FullPermissions} permission - The permission to check for
+     * @returns {boolean} Whether the member has the permission
+     *
+     * @example
+     * ```typescript
+     * if (member.hasPermission('MANAGE_MESSAGES')) {
+     *   // Member can manage messages
+     * }
+     * ```
+     *
+     * note this works on the same basis as stoats permissions checking
+     */
+    hasPermission(permission: string | number | FullPermissions): boolean;
     /**
      * Retrieves the user associated with this server member.
      *
@@ -2068,7 +2101,7 @@ declare class UserManager extends BaseManager<User, User$1> {
      * @param resolvable The user to resolve
      * @returns The user or null if it cannot be resolved
      */
-    resolve(resolvable: MessageStruct | User): User;
+    resolve(resolvable: MessageStruct | User): User | null;
     resolve(resolvable: string | User$1): User | null;
     /**
      * get a user id form cache
@@ -2190,6 +2223,8 @@ declare class WebSocketClient {
     reconnecting: Promise<unknown> | null;
     /** Whether the WebSocket client is ready. */
     ready: boolean;
+    /** The number of reconnection attempts made. */
+    retryCount: number;
     /**
      * Creates a new WebSocketClient instance.
      *
@@ -2272,7 +2307,7 @@ declare class WebSocketClient {
      *
      * @returns {Promise<void>} A promise that resolves when the connection is destroyed.
      */
-    destroy(): Promise<void>;
+    destroy(isUserInitiated?: boolean): Promise<void>;
 }
 
 /**

package/dist/index.d.ts

@@ -740,9 +740,9 @@ declare class MessageStruct extends Base {
     /**
      * Retrieves the author of the message.
      *
-     * @returns {User | null} The user who authored the message, or `null` if not found.
+     * @returns {User | ServerMember | null} The user who authored the message, or `null` if not found.
      */
-    get author(): User | null;
+    get author(): User | ServerMember | null;
     /**
      * Retrieves the channel where the message was sent.
      *
@@ -1850,6 +1850,39 @@ declare class ServerMember extends Base {
      * ```
      */
     leave(): Promise<void>;
+    /**
+     * Gets the effective permissions for this server member based on their roles.
+     *
+     * The permissions are calculated by:
+     * 1. Starting with a base FullPermissions with no permissions
+     * 2. For each role the member has, applying the role's allow permissions
+     * 3. For each role the member has, removing the role's deny permissions
+     *
+     * @returns {FullPermissions} The effective permissions for this member
+     *
+     * @example
+     * ```typescript
+     * const permissions = member.getPermissions();
+     * console.log(permissions.has('MANAGE_MESSAGES')); // true or false
+     * ```
+     */
+    permissions(): FullPermissions;
+    /**
+     * Checks if this server member has a specific permission.
+     *
+     * @param {string | number | FullPermissions} permission - The permission to check for
+     * @returns {boolean} Whether the member has the permission
+     *
+     * @example
+     * ```typescript
+     * if (member.hasPermission('MANAGE_MESSAGES')) {
+     *   // Member can manage messages
+     * }
+     * ```
+     *
+     * note this works on the same basis as stoats permissions checking
+     */
+    hasPermission(permission: string | number | FullPermissions): boolean;
     /**
      * Retrieves the user associated with this server member.
      *
@@ -2068,7 +2101,7 @@ declare class UserManager extends BaseManager<User, User$1> {
      * @param resolvable The user to resolve
      * @returns The user or null if it cannot be resolved
      */
-    resolve(resolvable: MessageStruct | User): User;
+    resolve(resolvable: MessageStruct | User): User | null;
     resolve(resolvable: string | User$1): User | null;
     /**
      * get a user id form cache
@@ -2190,6 +2223,8 @@ declare class WebSocketClient {
     reconnecting: Promise<unknown> | null;
     /** Whether the WebSocket client is ready. */
     ready: boolean;
+    /** The number of reconnection attempts made. */
+    retryCount: number;
     /**
      * Creates a new WebSocketClient instance.
      *
@@ -2272,7 +2307,7 @@ declare class WebSocketClient {
      *
      * @returns {Promise<void>} A promise that resolves when the connection is destroyed.
      */
-    destroy(): Promise<void>;
+    destroy(isUserInitiated?: boolean): Promise<void>;
 }
 
 /**

package/dist/index.js

@@ -940,11 +940,14 @@ var MessageStruct = class extends Base {
   /**
    * Retrieves the author of the message.
    *
-   * @returns {User | null} The user who authored the message, or `null` if not found.
+   * @returns {User | ServerMember | null} The user who authored the message, or `null` if not found.
    */
   get author() {
-    var _a;
-    return (_a = this.client.users.cache.get(this.authorId)) != null ? _a : null;
+    var _a, _b, _c, _d;
+    if (this.inServer()) {
+      return (_c = (_b = (_a = this.server) == null ? void 0 : _a.members.cache.get(this.authorId)) != null ? _b : this.client.users.cache.get(this.authorId)) != null ? _c : null;
+    }
+    return (_d = this.client.users.cache.get(this.authorId)) != null ? _d : null;
   }
   /**
    * Retrieves the channel where the message was sent.
@@ -2352,6 +2355,58 @@ var ServerMember3 = class extends Base {
   leave() {
     return this.client.servers.delete(this.serverId);
   }
+  /**
+   * Gets the effective permissions for this server member based on their roles.
+   *
+   * The permissions are calculated by:
+   * 1. Starting with a base FullPermissions with no permissions
+   * 2. For each role the member has, applying the role's allow permissions
+   * 3. For each role the member has, removing the role's deny permissions
+   *
+   * @returns {FullPermissions} The effective permissions for this member
+   *
+   * @example
+   * ```typescript
+   * const permissions = member.getPermissions();
+   * console.log(permissions.has('MANAGE_MESSAGES')); // true or false
+   * ```
+   */
+  permissions() {
+    var _a, _b;
+    let permissions = new FullPermissions();
+    for (const role of this.roles) {
+      if ((_a = role.overwrite) == null ? void 0 : _a.allow) {
+        permissions = permissions.add(role.overwrite.allow);
+      }
+    }
+    for (const role of this.roles) {
+      if ((_b = role.overwrite) == null ? void 0 : _b.deny) {
+        permissions = permissions.remove(role.overwrite.deny);
+      }
+    }
+    return permissions;
+  }
+  /**
+   * Checks if this server member has a specific permission.
+   *
+   * @param {string | number | FullPermissions} permission - The permission to check for
+   * @returns {boolean} Whether the member has the permission
+   *
+   * @example
+   * ```typescript
+   * if (member.hasPermission('MANAGE_MESSAGES')) {
+   *   // Member can manage messages
+   * }
+   * ```
+   *
+   * note this works on the same basis as stoats permissions checking
+   */
+  hasPermission(permission) {
+    var _a;
+    if (((_a = this.client.servers.cache.get(this.serverId)) == null ? void 0 : _a.ownerId) === this.id)
+      return true;
+    return this.permissions().has(permission);
+  }
   //   async displayAvatarURL(options?: { size: number }): Promise<string> {
   //     return await this.user.displayAvatarURL(options);
   //   }
@@ -2767,7 +2822,8 @@ var UserManager = class extends BaseManager {
     });
   }
   resolve(resolvable) {
-    if (resolvable instanceof MessageStruct) return resolvable.author;
+    if (resolvable instanceof MessageStruct)
+      return resolvable.author;
     return super.resolve(resolvable);
   }
   /**
@@ -3304,7 +3360,7 @@ var import_node_events = require("events");
 var import_axios4 = __toESM(require("axios"));
 
 // package.json
-var version = "0.2.0";
+var version = "0.2.3";
 
 // src/rest/restUtils/rateLimitQueue.ts
 var import_axios3 = __toESM(require("axios"));
@@ -4070,13 +4126,33 @@ var ServerRoleUpdate = class extends Event {
    * @returns {void}
    */
   handle(data) {
-    const server = this.client.servers.cache.get(data.id);
-    if (!server) return;
-    const role = server.roles.cache.get(data.role_id);
-    const oldRole = role == null ? void 0 : role._update(data.data, data.clear);
-    if (role && oldRole && !role.equals(oldRole)) {
-      this.client.emit("roleUpdate" /* ROLE_UPDATE */, oldRole, role);
-    }
+    return __async(this, null, function* () {
+      const server = this.client.servers.cache.get(data.id);
+      if (!server) return;
+      let role = server.roles.cache.get(data.role_id);
+      const oldRole = role == null ? void 0 : role._update(data.data, data.clear);
+      if (!oldRole && !role) {
+        yield Promise.all(
+          Object.values(data.data).map((raw) => __async(this, null, function* () {
+            if (raw && typeof raw === "object") {
+              server.roles._add(__spreadProps(__spreadValues({
+                name: "",
+                permissions: {
+                  a: 0,
+                  d: 0
+                }
+              }, raw), {
+                id: data.role_id
+              }));
+            }
+          }))
+        );
+        role = server.roles.cache.get(data.role_id);
+      }
+      if (role && oldRole && !role.equals(oldRole)) {
+        this.client.emit("roleUpdate" /* ROLE_UPDATE */, oldRole, role);
+      }
+    });
   }
 };
 
@@ -4306,6 +4382,8 @@ var WebSocketClient = class {
     this.reconnecting = null;
     /** Whether the WebSocket client is ready. */
     this.ready = false;
+    /** The number of reconnection attempts made. */
+    this.retryCount = 0;
   }
   /**
    * Logs a debug message.
@@ -4445,6 +4523,8 @@ var WebSocketClient = class {
           break;
         case "Authenticated" /* AUTHENTICATED */:
           this.connected = true;
+          this.retryCount = 0;
+          this.debug(`Successfully authenticated.`);
           break;
         case "Pong" /* PONG */:
           this.debug(`Received a heartbeat.`);
@@ -4504,6 +4584,15 @@ var WebSocketClient = class {
    * @returns {Promise<this>} A promise that resolves when the connection is established.
    */
   connect() {
+    this.retryCount = this.retryCount + 1;
+    if (this.retryCount > 10) {
+      this.debug("Max retry attempts reached");
+      return Promise.reject(
+        new Error(
+          "Max retry attempts reached on WS connection, try again later."
+        )
+      );
+    }
     return new Promise((resolve) => __async(this, null, function* () {
       var _a, _b, _c, _d;
       if (((_a = this.socket) == null ? void 0 : _a.readyState) === WebSocket.OPEN && this.ready) {
@@ -4531,7 +4620,7 @@ var WebSocketClient = class {
    *
    * @returns {Promise<void>} A promise that resolves when the connection is destroyed.
    */
-  destroy() {
+  destroy(isUserInitiated) {
     return new Promise((resolve) => {
       var _a;
       this.setHeartbeatTimer(-1);
@@ -4540,11 +4629,20 @@ var WebSocketClient = class {
       if (((_a = this.socket) == null ? void 0 : _a.readyState) === WebSocket.OPEN) {
         this.socket.addEventListener("close", () => {
           this.socket = null;
+          if (!isUserInitiated) {
+            setTimeout(() => this.connect(), 1e3);
+          }
           resolve();
         });
         this.socket.close();
+        if (!isUserInitiated) {
+          setTimeout(() => this.connect(), 1e3);
+        }
       } else {
         this.socket = null;
+        if (!isUserInitiated) {
+          setTimeout(() => this.connect(), 1e3);
+        }
         resolve();
       }
     });
@@ -4636,7 +4734,7 @@ var client2 = class extends BaseClient {
       this.token = null;
       this.user = null;
       this.readyAt = null;
-      yield this.ws.destroy();
+      yield this.ws.destroy(true);
     });
   }
   /**