@fluxerjs/core 1.1.0 → 1.1.2

package/dist/index.mjs

@@ -1,15 +1,14 @@
 import {
-  ErrorCodes,
-  FluxerError,
-  Guild
-} from "./chunk-4XJIM6SC.mjs";
+  Guild,
+  GuildMemberManager
+} from "./chunk-KOTF4TTZ.mjs";
 import {
   MessageReaction
-} from "./chunk-CEABHTAF.mjs";
+} from "./chunk-YL5S4W6R.mjs";
 import {
   ClientUser,
   User
-} from "./chunk-JHNKZIHY.mjs";
+} from "./chunk-G2YVDCRB.mjs";
 import {
   Message,
   ReactionCollector
@@ -30,7 +29,11 @@ import {
   MessageManager,
   TextChannel,
   VoiceChannel
-} from "./chunk-LU2SNC5G.mjs";
+} from "./chunk-ZKKBIQBA.mjs";
+import {
+  ErrorCodes,
+  FluxerError
+} from "./chunk-PU73YRKJ.mjs";
 import {
   Events
 } from "./chunk-AH7KYH2Z.mjs";
@@ -53,7 +56,7 @@ import {
 } from "./chunk-HQMYRYMY.mjs";
 import {
   Role
-} from "./chunk-DQ4TNBPG.mjs";
+} from "./chunk-5I54OXBG.mjs";
 import {
   GuildBan
 } from "./chunk-UXIF75BV.mjs";
@@ -65,8 +68,7 @@ import {
 import { EventEmitter } from "events";
 import { REST } from "@fluxerjs/rest";
 import { WebSocketManager } from "@fluxerjs/ws";
-import { Routes as Routes3 } from "@fluxerjs/types";
-import { Collection as Collection3 } from "@fluxerjs/collection";
+import { Routes as Routes4 } from "@fluxerjs/types";
 
 // src/client/ChannelManager.ts
 import { Collection } from "@fluxerjs/collection";
@@ -91,7 +93,7 @@ var ChannelManager = class extends Collection {
     const cached = this.get(channelId);
     if (cached) return cached;
     try {
-      const { Channel: Channel2 } = await import("./Channel-WJZZSNML.mjs");
+      const { Channel: Channel2 } = await import("./Channel-YB3LWDHZ.mjs");
       const data = await this.client.rest.get(
         Routes.channel(channelId)
       );
@@ -188,7 +190,7 @@ var GuildManager = class extends Collection2 {
     const cached = this.get(guildId);
     if (cached) return cached;
     try {
-      const { Guild: Guild2 } = await import("./Guild-2P77HBQM.mjs");
+      const { Guild: Guild2 } = await import("./Guild-MDW7KF33.mjs");
       const data = await this.client.rest.get(
         Routes2.guild(guildId)
       );
@@ -204,6 +206,76 @@ var GuildManager = class extends Collection2 {
 // src/client/Client.ts
 import { emitDeprecationWarning as emitDeprecationWarning2, formatEmoji, parseEmoji } from "@fluxerjs/util";
 
+// src/client/UsersManager.ts
+import { Collection as Collection3 } from "@fluxerjs/collection";
+import { Routes as Routes3 } from "@fluxerjs/types";
+var UsersManager = class extends Collection3 {
+  constructor(client) {
+    super();
+    this.client = client;
+  }
+  /**
+   * Fetch a user by ID from the API.
+   * Updates cache if user already exists.
+   * @param userId - Snowflake of the user
+   * @returns The user
+   * @throws FluxerError (or REST error) if user not found
+   * @example
+   * const user = await client.users.fetch(userId);
+   * console.log(user.username);
+   */
+  async fetch(userId) {
+    const data = await this.client.rest.get(Routes3.user(userId));
+    return this.client.getOrCreateUser(data);
+  }
+  /**
+   * Fetch a user with full profile and optional guild context.
+   * Returns user, global profile, server profile (when guildId), and member (when guildId).
+   * Ideal for userinfo commands.
+   * @param userId - Snowflake of the user
+   * @param options - Optional guildId for server profile and member data
+   * @returns User, raw data, profiles, and member (when in guild)
+   * @throws FluxerError (or REST error) if user not found
+   * @example
+   * const { user, globalProfile, serverProfile, member } = await client.users.fetchWithProfile(
+   *   userId,
+   *   { guildId: message.guildId ?? undefined },
+   * );
+   */
+  async fetchWithProfile(userId, options) {
+    const guildId = options?.guildId ?? void 0;
+    const [userData, globalProfileData, serverProfileData, memberData] = await Promise.all([
+      this.client.rest.get(Routes3.user(userId)),
+      this.client.rest.get(Routes3.userProfile(userId)).catch(() => null),
+      guildId ? this.client.rest.get(Routes3.userProfile(userId, guildId)).catch(() => null) : Promise.resolve(null),
+      guildId ? this.client.rest.get(Routes3.guildMember(guildId, userId)).catch(() => null) : Promise.resolve(null)
+    ]);
+    const user = this.client.getOrCreateUser(userData);
+    const globalProfile = globalProfileData && typeof globalProfileData === "object" ? globalProfileData : null;
+    const serverProfile = serverProfileData && typeof serverProfileData === "object" ? serverProfileData : null;
+    let member = null;
+    if (memberData && guildId) {
+      const guild = this.client.guilds.get(guildId) ?? await this.client.guilds.fetch(guildId);
+      if (guild) {
+        member = new GuildMember(
+          this.client,
+          { ...memberData, guild_id: guildId },
+          guild
+        );
+        guild.members.set(member.id, member);
+      }
+    }
+    return {
+      user,
+      userData,
+      globalProfile,
+      serverProfile,
+      member,
+      memberData
+    };
+  }
+};
+
 // src/client/EventHandlerRegistry.ts
 var handlers = /* @__PURE__ */ new Map();
 handlers.set("MESSAGE_CREATE", async (client, d) => {
@@ -235,7 +307,7 @@ handlers.set("MESSAGE_DELETE", async (client, d) => {
 });
 handlers.set("MESSAGE_REACTION_ADD", async (client, d) => {
   const data = d;
-  const { MessageReaction: MessageReaction2 } = await import("./MessageReaction-V4UZ7OXE.mjs");
+  const { MessageReaction: MessageReaction2 } = await import("./MessageReaction-GYQNJ6GX.mjs");
   const reaction = new MessageReaction2(client, data);
   const user = client.getOrCreateUser({
     id: data.user_id,
@@ -254,7 +326,7 @@ handlers.set("MESSAGE_REACTION_ADD", async (client, d) => {
 });
 handlers.set("MESSAGE_REACTION_REMOVE", async (client, d) => {
   const data = d;
-  const { MessageReaction: MessageReaction2 } = await import("./MessageReaction-V4UZ7OXE.mjs");
+  const { MessageReaction: MessageReaction2 } = await import("./MessageReaction-GYQNJ6GX.mjs");
   const reaction = new MessageReaction2(client, data);
   const user = client.getOrCreateUser({
     id: data.user_id,
@@ -281,8 +353,8 @@ handlers.set("MESSAGE_REACTION_REMOVE_EMOJI", async (client, d) => {
   );
 });
 handlers.set("GUILD_CREATE", async (client, d) => {
-  const { Guild: Guild2 } = await import("./Guild-2P77HBQM.mjs");
-  const { Channel: Channel2 } = await import("./Channel-WJZZSNML.mjs");
+  const { Guild: Guild2 } = await import("./Guild-MDW7KF33.mjs");
+  const { Channel: Channel2 } = await import("./Channel-YB3LWDHZ.mjs");
   const raw = d;
   const guildData = raw?.properties != null ? { ...raw.properties, roles: raw.roles } : raw;
   const guild = new Guild2(client, guildData);
@@ -298,7 +370,7 @@ handlers.set("GUILD_CREATE", async (client, d) => {
   }
 });
 handlers.set("GUILD_UPDATE", async (client, d) => {
-  const { Guild: Guild2 } = await import("./Guild-2P77HBQM.mjs");
+  const { Guild: Guild2 } = await import("./Guild-MDW7KF33.mjs");
   const raw = d;
   const guildData = raw?.properties != null ? { ...raw.properties, roles: raw.roles } : raw;
   const old = client.guilds.get(guildData.id);
@@ -315,7 +387,7 @@ handlers.set("GUILD_DELETE", async (client, d) => {
   }
 });
 handlers.set("CHANNEL_CREATE", async (client, d) => {
-  const { Channel: Channel2 } = await import("./Channel-WJZZSNML.mjs");
+  const { Channel: Channel2 } = await import("./Channel-YB3LWDHZ.mjs");
   const ch = Channel2.from(client, d);
   if (ch) {
     client.channels.set(ch.id, ch);
@@ -323,7 +395,7 @@ handlers.set("CHANNEL_CREATE", async (client, d) => {
   }
 });
 handlers.set("CHANNEL_UPDATE", async (client, d) => {
-  const { Channel: Channel2 } = await import("./Channel-WJZZSNML.mjs");
+  const { Channel: Channel2 } = await import("./Channel-YB3LWDHZ.mjs");
   const ch = d;
   const oldCh = client.channels.get(ch.id);
   const newCh = Channel2.from(client, ch);
@@ -409,7 +481,7 @@ handlers.set("GUILD_ROLE_CREATE", async (client, d) => {
   const data = d;
   const guild = client.guilds.get(data.guild_id);
   if (guild) {
-    const { Role: Role2 } = await import("./Role-5MWSGL66.mjs");
+    const { Role: Role2 } = await import("./Role-N2ZEMRUQ.mjs");
     guild.roles.set(data.role.id, new Role2(client, data.role, guild.id));
   }
   client.emit(Events.GuildRoleCreate, data);
@@ -418,8 +490,13 @@ handlers.set("GUILD_ROLE_UPDATE", async (client, d) => {
   const data = d;
   const guild = client.guilds.get(data.guild_id);
   if (guild) {
-    const { Role: Role2 } = await import("./Role-5MWSGL66.mjs");
-    guild.roles.set(data.role.id, new Role2(client, data.role, guild.id));
+    const existing = guild.roles.get(data.role.id);
+    if (existing) {
+      existing._patch(data.role);
+    } else {
+      const { Role: Role2 } = await import("./Role-N2ZEMRUQ.mjs");
+      guild.roles.set(data.role.id, new Role2(client, data.role, guild.id));
+    }
   }
   client.emit(Events.GuildRoleUpdate, data);
 });
@@ -496,6 +573,10 @@ var Client = class extends EventEmitter {
       get: () => this.guilds,
       configurable: true
     });
+    Object.defineProperty(this.users, "cache", {
+      get: () => this.users,
+      configurable: true
+    });
     this.rest = new REST({
       api: options.rest?.api ?? "https://api.fluxer.app",
       version: options.rest?.version ?? "1",
@@ -505,7 +586,7 @@ var Client = class extends EventEmitter {
   rest;
   guilds = new GuildManager(this);
   channels = new ChannelManager(this);
-  users = new Collection3();
+  users = new UsersManager(this);
   /** Typed event handlers. Use client.events.MessageReactionAdd((reaction, user, messageId, channelId, emoji, userId) => {...}) or client.on(Events.MessageReactionAdd, ...). */
   events;
   /** The authenticated bot user. Null until READY is received. */
@@ -525,11 +606,14 @@ var Client = class extends EventEmitter {
     if (typeof emoji === "object" && emoji.id) {
       return formatEmoji({ name: emoji.name, id: emoji.id, animated: emoji.animated });
     }
-    const parsed = parseEmoji(typeof emoji === "string" ? emoji : `:${emoji.name}:`);
+    const parsed = parseEmoji(
+      typeof emoji === "string" ? emoji : emoji.id ? `:${emoji.name}:` : emoji.name
+    );
     if (!parsed) throw new Error("Invalid emoji");
     if (parsed.id) return formatEmoji(parsed);
+    if (!/^\w+$/.test(parsed.name)) return encodeURIComponent(parsed.name);
     if (guildId) {
-      const emojis = await this.rest.get(Routes3.guildEmojis(guildId));
+      const emojis = await this.rest.get(Routes4.guildEmojis(guildId));
       const list = Array.isArray(emojis) ? emojis : Object.values(emojis ?? {});
       const found = list.find((e) => e.name && e.name.toLowerCase() === parsed.name.toLowerCase());
       if (found) return formatEmoji({ ...parsed, id: found.id, animated: found.animated });
@@ -646,9 +730,9 @@ var Client = class extends EventEmitter {
       async ({
         data
       }) => {
-        const { ClientUser: ClientUser2 } = await import("./ClientUser-DJO2FS7P.mjs");
-        const { Guild: Guild2 } = await import("./Guild-2P77HBQM.mjs");
-        const { Channel: Channel2 } = await import("./Channel-WJZZSNML.mjs");
+        const { ClientUser: ClientUser2 } = await import("./ClientUser-QQXLZ5WP.mjs");
+        const { Guild: Guild2 } = await import("./Guild-MDW7KF33.mjs");
+        const { Channel: Channel2 } = await import("./Channel-YB3LWDHZ.mjs");
         this.user = new ClientUser2(this, data.user);
         for (const g of data.guilds ?? []) {
           const guildData = g && typeof g === "object" && "properties" in g && g.properties ? {
@@ -696,12 +780,12 @@ var Client = class extends EventEmitter {
     return this.readyAt !== null && this.user !== null;
   }
   static get Routes() {
-    return Routes3;
+    return Routes4;
   }
 };
 
 // src/structures/GuildEmoji.ts
-import { Routes as Routes4 } from "@fluxerjs/types";
+import { Routes as Routes5 } from "@fluxerjs/types";
 var GuildEmoji = class extends Base {
   client;
   id;
@@ -728,7 +812,7 @@ var GuildEmoji = class extends Base {
   }
   /** Delete this emoji. Requires Manage Emojis and Stickers permission. */
   async delete() {
-    await this.client.rest.delete(Routes4.guildEmoji(this.guildId, this.id), {
+    await this.client.rest.delete(Routes5.guildEmoji(this.guildId, this.id), {
       auth: true
     });
   }
@@ -737,7 +821,7 @@ var GuildEmoji = class extends Base {
    * Requires Manage Emojis and Stickers permission.
    */
   async edit(options) {
-    const data = await this.client.rest.patch(Routes4.guildEmoji(this.guildId, this.id), {
+    const data = await this.client.rest.patch(Routes5.guildEmoji(this.guildId, this.id), {
       body: options,
       auth: true
     });
@@ -747,7 +831,7 @@ var GuildEmoji = class extends Base {
 };
 
 // src/structures/GuildSticker.ts
-import { Routes as Routes5 } from "@fluxerjs/types";
+import { Routes as Routes6 } from "@fluxerjs/types";
 var GuildSticker = class extends Base {
   client;
   id;
@@ -774,7 +858,7 @@ var GuildSticker = class extends Base {
   }
   /** Delete this sticker. Requires Manage Emojis and Stickers permission. */
   async delete() {
-    await this.client.rest.delete(Routes5.guildSticker(this.guildId, this.id), {
+    await this.client.rest.delete(Routes6.guildSticker(this.guildId, this.id), {
       auth: true
     });
   }
@@ -783,7 +867,7 @@ var GuildSticker = class extends Base {
    * Requires Manage Emojis and Stickers permission.
    */
   async edit(options) {
-    const data = await this.client.rest.patch(Routes5.guildSticker(this.guildId, this.id), {
+    const data = await this.client.rest.patch(Routes6.guildSticker(this.guildId, this.id), {
       body: options,
       auth: true
     });
@@ -796,11 +880,14 @@ var GuildSticker = class extends Base {
 
 // src/index.ts
 import { EmbedBuilder, MessagePayload, AttachmentBuilder } from "@fluxerjs/builders";
-import { Routes as Routes6, GatewayOpcodes, MessageAttachmentFlags } from "@fluxerjs/types";
+import { Routes as Routes7, GatewayOpcodes, MessageAttachmentFlags } from "@fluxerjs/types";
 import { resolveTenorToImageUrl } from "@fluxerjs/util";
 import {
   PermissionsBitField,
-  PermissionFlags
+  PermissionFlags,
+  resolvePermissionsToBitfield,
+  UserFlagsBitField,
+  UserFlagsBits
 } from "@fluxerjs/util";
 export {
   AttachmentBuilder,
@@ -821,6 +908,7 @@ export {
   GuildChannel,
   GuildEmoji,
   GuildMember,
+  GuildMemberManager,
   GuildSticker,
   Invite,
   LinkChannel,
@@ -834,9 +922,12 @@ export {
   PermissionsBitField,
   ReactionCollector,
   Role,
-  Routes6 as Routes,
+  Routes7 as Routes,
   TextChannel,
   User,
+  UserFlagsBitField,
+  UserFlagsBits,
+  UsersManager,
   VoiceChannel,
   Webhook,
   cdnAvatarURL,
@@ -845,5 +936,6 @@ export {
   cdnDisplayAvatarURL,
   cdnMemberAvatarURL,
   cdnMemberBannerURL,
+  resolvePermissionsToBitfield,
   resolveTenorToImageUrl
 };

package/package.json

@@ -3,7 +3,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "version": "1.1.0",
+  "version": "1.1.2",
   "description": "A fully-featured SDK for Fluxer bots",
   "repository": {
     "type": "git",
@@ -19,7 +19,7 @@
     "bot",
     "api"
   ],
-  "license": "AGPL-3.0",
+  "license": "Apache-2.0",
   "main": "./dist/index.js",
   "module": "./dist/index.mjs",
   "types": "./dist/index.d.ts",
@@ -34,12 +34,12 @@
     "dist"
   ],
   "dependencies": {
-    "@fluxerjs/ws": "1.1.0",
-    "@fluxerjs/collection": "1.1.0",
-    "@fluxerjs/rest": "1.1.0",
-    "@fluxerjs/builders": "1.1.0",
-    "@fluxerjs/util": "1.1.0",
-    "@fluxerjs/types": "1.1.0"
+    "@fluxerjs/rest": "1.1.2",
+    "@fluxerjs/ws": "1.1.2",
+    "@fluxerjs/builders": "1.1.2",
+    "@fluxerjs/util": "1.1.2",
+    "@fluxerjs/types": "1.1.2",
+    "@fluxerjs/collection": "1.1.2"
   },
   "devDependencies": {
     "@types/node": "^20.0.0",

package/dist/chunk-DQ4TNBPG.mjs

@@ -1,63 +0,0 @@
-import {
-  Base
-} from "./chunk-XNS4O6QJ.mjs";
-
-// src/structures/Role.ts
-import { PermissionFlags } from "@fluxerjs/util";
-var Role = class extends Base {
-  client;
-  id;
-  guildId;
-  name;
-  color;
-  position;
-  permissions;
-  hoist;
-  mentionable;
-  unicodeEmoji;
-  /** Separately sorted position for hoisted roles. Null if not set. */
-  hoistPosition;
-  /** @param client - The client instance */
-  /** @param data - API role from GET /guilds/{id}/roles or gateway role events */
-  /** @param guildId - The guild this role belongs to */
-  constructor(client, data, guildId) {
-    super();
-    this.client = client;
-    this.id = data.id;
-    this.guildId = guildId;
-    this.name = data.name;
-    this.color = data.color;
-    this.position = data.position;
-    this.permissions = data.permissions;
-    this.hoist = !!data.hoist;
-    this.mentionable = !!data.mentionable;
-    this.unicodeEmoji = data.unicode_emoji ?? null;
-    this.hoistPosition = data.hoist_position ?? null;
-  }
-  /** Returns a mention string (e.g. `<@&123456>`). */
-  toString() {
-    return `<@&${this.id}>`;
-  }
-  /**
-   * Check if this role has a permission. Administrator grants all permissions.
-   * @param permission - Permission flag, name, or resolvable
-   * @returns true if the role has the permission
-   * @example
-   * if (role.has(PermissionFlags.BanMembers)) { ... }
-   * if (role.has('ManageChannels')) { ... }
-   */
-  has(permission) {
-    const perm = typeof permission === "number" ? permission : PermissionFlags[permission];
-    if (perm === void 0) return false;
-    const permNum = Number(perm);
-    const rolePerms = BigInt(this.permissions);
-    const permBig = BigInt(permNum);
-    if (permBig < 0) return false;
-    if ((rolePerms & BigInt(PermissionFlags.Administrator)) !== 0n) return true;
-    return (rolePerms & permBig) === permBig;
-  }
-};
-
-export {
-  Role
-};