revbot.js 0.0.1 → 0.0.3

package/dist/index.d.mts

@@ -538,7 +538,7 @@ declare class User extends Base {
     /**
      * Fetches the latest data for the user from the API.
      *
-     * @param {boolean} [force=true] - Whether to force a fetch even if the user is cached.
+     * @param {boolean} [force=false] - Whether to force a fetch even if the user is cached.
      * @returns {Promise<User>} A promise that resolves with the updated user instance.
      */
     fetch(force?: boolean): Promise<User>;
@@ -1567,6 +1567,8 @@ declare class ServerMember extends Base {
     nickname: string | null;
     /** The avatar of the member, or `null` if none is set. */
     avatar: Attachment | null;
+    /** roles assigned to the member */
+    roles: Role[];
     /**
      * Creates a new ServerMember instance.
      *
@@ -1595,6 +1597,24 @@ declare class ServerMember extends Base {
      * ```
      */
     setNickname(nickname?: string): Promise<this>;
+    /**
+     * adds a role to the server member.
+     * @param roleId - The ID of the role to add to the member.
+     * @returns
+     */
+    addRole(roleId: string): Promise<this>;
+    /**
+     * Removes a role from the server member.
+     *
+     * @param {string} roleId - The ID of the role to remove from the member.
+     * @returns {Promise<this>} A promise that resolves with the updated server member instance.
+     *
+     * @example
+     * ```typescript
+     * await member.removeRole("roleId");
+     * ```
+     */
+    removeRole(roleId: string): Promise<this>;
     /**
      * Bans the server member.
      *
@@ -1835,8 +1855,8 @@ declare class UserManager extends BaseManager<User, User$1> {
     holds: typeof User;
     /**
      *
-     * @param user The user to delete
-     * @returns A promise that resolves when the user is deleted
+     * @param user The user to fetch
+     * @returns A promise that resolves when the user is fetched
      */
     fetch(user: UserResolvable, { force }?: {
         force?: boolean | undefined;

package/dist/index.d.ts

@@ -538,7 +538,7 @@ declare class User extends Base {
     /**
      * Fetches the latest data for the user from the API.
      *
-     * @param {boolean} [force=true] - Whether to force a fetch even if the user is cached.
+     * @param {boolean} [force=false] - Whether to force a fetch even if the user is cached.
      * @returns {Promise<User>} A promise that resolves with the updated user instance.
      */
     fetch(force?: boolean): Promise<User>;
@@ -1567,6 +1567,8 @@ declare class ServerMember extends Base {
     nickname: string | null;
     /** The avatar of the member, or `null` if none is set. */
     avatar: Attachment | null;
+    /** roles assigned to the member */
+    roles: Role[];
     /**
      * Creates a new ServerMember instance.
      *
@@ -1595,6 +1597,24 @@ declare class ServerMember extends Base {
      * ```
      */
     setNickname(nickname?: string): Promise<this>;
+    /**
+     * adds a role to the server member.
+     * @param roleId - The ID of the role to add to the member.
+     * @returns
+     */
+    addRole(roleId: string): Promise<this>;
+    /**
+     * Removes a role from the server member.
+     *
+     * @param {string} roleId - The ID of the role to remove from the member.
+     * @returns {Promise<this>} A promise that resolves with the updated server member instance.
+     *
+     * @example
+     * ```typescript
+     * await member.removeRole("roleId");
+     * ```
+     */
+    removeRole(roleId: string): Promise<this>;
     /**
      * Bans the server member.
      *
@@ -1835,8 +1855,8 @@ declare class UserManager extends BaseManager<User, User$1> {
     holds: typeof User;
     /**
      *
-     * @param user The user to delete
-     * @returns A promise that resolves when the user is deleted
+     * @param user The user to fetch
+     * @returns A promise that resolves when the user is fetched
      */
     fetch(user: UserResolvable, { force }?: {
         force?: boolean | undefined;

package/dist/index.js

@@ -452,7 +452,7 @@ var ChannelTypes = /* @__PURE__ */ ((ChannelTypes2) => {
   return ChannelTypes2;
 })(ChannelTypes || {});
 var DEFAULT_CLIENT_OPTIONS = {
-  fetchMembers: false,
+  fetchMembers: true,
   rest: {
     timeout: 15e3,
     retries: 3
@@ -678,10 +678,10 @@ var User = class extends Base {
   /**
    * Fetches the latest data for the user from the API.
    *
-   * @param {boolean} [force=true] - Whether to force a fetch even if the user is cached.
+   * @param {boolean} [force=false] - Whether to force a fetch even if the user is cached.
    * @returns {Promise<User>} A promise that resolves with the updated user instance.
    */
-  fetch(force = true) {
+  fetch(force = false) {
     return this.client.users.fetch(this, { force });
   }
   /**
@@ -1997,6 +1997,8 @@ var ServerMember3 = class extends Base {
     this.nickname = null;
     /** The avatar of the member, or `null` if none is set. */
     this.avatar = null;
+    /** roles assigned to the member */
+    this.roles = [];
     this._patch(data);
   }
   /**
@@ -2020,6 +2022,20 @@ var ServerMember3 = class extends Base {
       this.serverId = data._id.server;
       this.id = data._id.user;
     }
+    if (Array.isArray(data.roles)) {
+      if (!data.roles.length) this.roles = [];
+      else {
+        this.roles = data.roles.map((roleId) => {
+          const role = this.server.roles.cache.get(roleId);
+          if (!role) {
+            throw new Error(
+              `Role with ID ${roleId} not found in server ${this.serverId}`
+            );
+          }
+          return role;
+        });
+      }
+    }
     for (const field of clear) {
       if (field === "Avatar") this.avatar = null;
       if (field === "Nickname") this.nickname = null;
@@ -2043,6 +2059,46 @@ var ServerMember3 = class extends Base {
       return this;
     });
   }
+  /**
+   * adds a role to the server member.
+   * @param roleId - The ID of the role to add to the member.
+   * @returns
+   */
+  addRole(roleId) {
+    return __async(this, null, function* () {
+      const currentRoles = this.roles.map((role) => role.id);
+      if (currentRoles.includes(roleId)) {
+        return this;
+      }
+      yield this.server.members.edit(this, {
+        roles: [...currentRoles, roleId]
+      });
+      return this;
+    });
+  }
+  /**
+   * Removes a role from the server member.
+   *
+   * @param {string} roleId - The ID of the role to remove from the member.
+   * @returns {Promise<this>} A promise that resolves with the updated server member instance.
+   *
+   * @example
+   * ```typescript
+   * await member.removeRole("roleId");
+   * ```
+   */
+  removeRole(roleId) {
+    return __async(this, null, function* () {
+      const currentRoles = this.roles.map((role) => role.id);
+      if (!currentRoles.includes(roleId)) {
+        return this;
+      }
+      yield this.server.members.edit(this, {
+        roles: currentRoles.filter((id) => id !== roleId)
+      });
+      return this;
+    });
+  }
   /**
    * Bans the server member.
    *
@@ -2477,11 +2533,11 @@ var UserManager = class extends BaseManager {
   }
   /**
    *
-   * @param user The user to delete
-   * @returns A promise that resolves when the user is deleted
+   * @param user The user to fetch
+   * @returns A promise that resolves when the user is fetched
    */
   fetch(_0) {
-    return __async(this, arguments, function* (user, { force = true } = {}) {
+    return __async(this, arguments, function* (user, { force = false } = {}) {
       const id = this.resolveId(user);
       if (!id) throw new TypeError("INVALID_TYPE");
       if (!force) {
@@ -2913,9 +2969,12 @@ var ServerMemberManager = class extends BaseManager {
         );
         return this._add(data);
       }
-      const { members } = yield this.client.api.get(
-        `/servers/${this.server.id}/members`
-      );
+      const { users, members } = yield this.client.api.get(`/servers/${this.server.id}/members`);
+      users.reduce((coll, cur) => {
+        const user = this.client.users._add(cur);
+        coll.set(user.id, user);
+        return coll;
+      }, this.client.users.cache);
       return members.reduce((coll, cur) => {
         const member2 = this._add(cur);
         coll.set(member2.id, member2);
@@ -3428,15 +3487,22 @@ var ServerMemberUpdate = class extends Event {
    * @returns {void}
    */
   handle(data) {
-    var _a, _b;
-    const server = this.client.servers.cache.get(data.id);
-    const member = server == null ? void 0 : server.members.cache.get((_b = (_a = data.data) == null ? void 0 : _a._id) == null ? void 0 : _b.user);
-    const oldMember = member == null ? void 0 : member._update(data.data);
-    if (oldMember && member && !member.equals(oldMember)) {
+    const updateData = __spreadProps(__spreadValues({}, data.data), {
+      _id: { server: data.id.server, user: data.id.user }
+    });
+    const server = this.client.servers.cache.get(data.id.server);
+    const member = server == null ? void 0 : server.members.cache.get(data.id.user);
+    const oldMember = member == null ? void 0 : member._update(updateData);
+    if (oldMember && member && (!member.equals(oldMember) || areRolesDifferent(member.roles, oldMember.roles))) {
       this.client.emit("serverMemberUpdate" /* SERVER_MEMBER_UPDATE */, oldMember, member);
     }
   }
 };
+function areRolesDifferent(rolesA, rolesB) {
+  const idsA = rolesA.map((role) => role.id).sort();
+  const idsB = rolesB.map((role) => role.id).sort();
+  return idsA.length !== idsB.length || !idsA.every((id, index) => id === idsB[index]);
+}
 
 // src/client/events/serverRoleDelete.ts
 var ServerRoleDelete = class extends Event {

package/dist/index.mjs

@@ -380,7 +380,7 @@ var ChannelTypes = /* @__PURE__ */ ((ChannelTypes2) => {
   return ChannelTypes2;
 })(ChannelTypes || {});
 var DEFAULT_CLIENT_OPTIONS = {
-  fetchMembers: false,
+  fetchMembers: true,
   rest: {
     timeout: 15e3,
     retries: 3
@@ -606,10 +606,10 @@ var User = class extends Base {
   /**
    * Fetches the latest data for the user from the API.
    *
-   * @param {boolean} [force=true] - Whether to force a fetch even if the user is cached.
+   * @param {boolean} [force=false] - Whether to force a fetch even if the user is cached.
    * @returns {Promise<User>} A promise that resolves with the updated user instance.
    */
-  fetch(force = true) {
+  fetch(force = false) {
     return this.client.users.fetch(this, { force });
   }
   /**
@@ -1925,6 +1925,8 @@ var ServerMember3 = class extends Base {
     this.nickname = null;
     /** The avatar of the member, or `null` if none is set. */
     this.avatar = null;
+    /** roles assigned to the member */
+    this.roles = [];
     this._patch(data);
   }
   /**
@@ -1948,6 +1950,20 @@ var ServerMember3 = class extends Base {
       this.serverId = data._id.server;
       this.id = data._id.user;
     }
+    if (Array.isArray(data.roles)) {
+      if (!data.roles.length) this.roles = [];
+      else {
+        this.roles = data.roles.map((roleId) => {
+          const role = this.server.roles.cache.get(roleId);
+          if (!role) {
+            throw new Error(
+              `Role with ID ${roleId} not found in server ${this.serverId}`
+            );
+          }
+          return role;
+        });
+      }
+    }
     for (const field of clear) {
       if (field === "Avatar") this.avatar = null;
       if (field === "Nickname") this.nickname = null;
@@ -1971,6 +1987,46 @@ var ServerMember3 = class extends Base {
       return this;
     });
   }
+  /**
+   * adds a role to the server member.
+   * @param roleId - The ID of the role to add to the member.
+   * @returns
+   */
+  addRole(roleId) {
+    return __async(this, null, function* () {
+      const currentRoles = this.roles.map((role) => role.id);
+      if (currentRoles.includes(roleId)) {
+        return this;
+      }
+      yield this.server.members.edit(this, {
+        roles: [...currentRoles, roleId]
+      });
+      return this;
+    });
+  }
+  /**
+   * Removes a role from the server member.
+   *
+   * @param {string} roleId - The ID of the role to remove from the member.
+   * @returns {Promise<this>} A promise that resolves with the updated server member instance.
+   *
+   * @example
+   * ```typescript
+   * await member.removeRole("roleId");
+   * ```
+   */
+  removeRole(roleId) {
+    return __async(this, null, function* () {
+      const currentRoles = this.roles.map((role) => role.id);
+      if (!currentRoles.includes(roleId)) {
+        return this;
+      }
+      yield this.server.members.edit(this, {
+        roles: currentRoles.filter((id) => id !== roleId)
+      });
+      return this;
+    });
+  }
   /**
    * Bans the server member.
    *
@@ -2405,11 +2461,11 @@ var UserManager = class extends BaseManager {
   }
   /**
    *
-   * @param user The user to delete
-   * @returns A promise that resolves when the user is deleted
+   * @param user The user to fetch
+   * @returns A promise that resolves when the user is fetched
    */
   fetch(_0) {
-    return __async(this, arguments, function* (user, { force = true } = {}) {
+    return __async(this, arguments, function* (user, { force = false } = {}) {
       const id = this.resolveId(user);
       if (!id) throw new TypeError("INVALID_TYPE");
       if (!force) {
@@ -2841,9 +2897,12 @@ var ServerMemberManager = class extends BaseManager {
         );
         return this._add(data);
       }
-      const { members } = yield this.client.api.get(
-        `/servers/${this.server.id}/members`
-      );
+      const { users, members } = yield this.client.api.get(`/servers/${this.server.id}/members`);
+      users.reduce((coll, cur) => {
+        const user = this.client.users._add(cur);
+        coll.set(user.id, user);
+        return coll;
+      }, this.client.users.cache);
       return members.reduce((coll, cur) => {
         const member2 = this._add(cur);
         coll.set(member2.id, member2);
@@ -3356,15 +3415,22 @@ var ServerMemberUpdate = class extends Event {
    * @returns {void}
    */
   handle(data) {
-    var _a, _b;
-    const server = this.client.servers.cache.get(data.id);
-    const member = server == null ? void 0 : server.members.cache.get((_b = (_a = data.data) == null ? void 0 : _a._id) == null ? void 0 : _b.user);
-    const oldMember = member == null ? void 0 : member._update(data.data);
-    if (oldMember && member && !member.equals(oldMember)) {
+    const updateData = __spreadProps(__spreadValues({}, data.data), {
+      _id: { server: data.id.server, user: data.id.user }
+    });
+    const server = this.client.servers.cache.get(data.id.server);
+    const member = server == null ? void 0 : server.members.cache.get(data.id.user);
+    const oldMember = member == null ? void 0 : member._update(updateData);
+    if (oldMember && member && (!member.equals(oldMember) || areRolesDifferent(member.roles, oldMember.roles))) {
       this.client.emit("serverMemberUpdate" /* SERVER_MEMBER_UPDATE */, oldMember, member);
     }
   }
 };
+function areRolesDifferent(rolesA, rolesB) {
+  const idsA = rolesA.map((role) => role.id).sort();
+  const idsB = rolesB.map((role) => role.id).sort();
+  return idsA.length !== idsB.length || !idsA.every((id, index) => id === idsB[index]);
+}
 
 // src/client/events/serverRoleDelete.ts
 var ServerRoleDelete = class extends Event {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "revbot.js",
-  "version": "0.0.1",
+  "version": "0.0.3",
   "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",
@@ -37,7 +37,7 @@
   },
   "dependencies": {
     "axios": "^1.9.0",
-    "revolt-api": "^0.8.4",
+    "revolt-api": "^0.8.6-1",
     "ws": "^8.18.1"
   },
   "scripts": {