@fluxerjs/core 1.1.7 → 1.1.8

package/dist/index.mjs

@@ -1,27 +1,27 @@
 import {
   GuildEmoji
-} from "./chunk-5QRROWJS.mjs";
+} from "./chunk-IHXSHE2Z.mjs";
 import {
   GuildSticker
-} from "./chunk-KUMLJGXY.mjs";
+} from "./chunk-KR26CBFE.mjs";
 import {
   Guild,
   GuildMemberManager
-} from "./chunk-BRIU4HGS.mjs";
+} from "./chunk-4SWR3ZEZ.mjs";
 import {
   MessageReaction
-} from "./chunk-B6F5LWNS.mjs";
+} from "./chunk-TDQUAKUL.mjs";
 import {
   ClientUser,
   User
-} from "./chunk-S25KNTHZ.mjs";
+} from "./chunk-JW4BRX5E.mjs";
 import {
   Message,
   ReactionCollector
 } from "./chunk-4OEOU7G7.mjs";
 import {
   Webhook
-} from "./chunk-2245SAIA.mjs";
+} from "./chunk-FHFXUKFP.mjs";
 import {
   Invite
 } from "./chunk-QEXIYXXU.mjs";
@@ -35,11 +35,11 @@ import {
   MessageManager,
   TextChannel,
   VoiceChannel
-} from "./chunk-EUKEYW72.mjs";
+} from "./chunk-DJQXAQLR.mjs";
 import {
   ErrorCodes,
   FluxerError
-} from "./chunk-PU73YRKJ.mjs";
+} from "./chunk-6S3BDHBI.mjs";
 import {
   Events
 } from "./chunk-AH7KYH2Z.mjs";
@@ -49,7 +49,7 @@ import {
 } from "./chunk-VJDH54HJ.mjs";
 import {
   GuildMember
-} from "./chunk-5JEDVRKU.mjs";
+} from "./chunk-24E6OQID.mjs";
 import {
   cdnAvatarURL,
   cdnBannerURL,
@@ -57,8 +57,11 @@ import {
   cdnDisplayAvatarURL,
   cdnMemberAvatarURL,
   cdnMemberBannerURL
-} from "./chunk-X6K3ZD62.mjs";
-import "./chunk-HQMYRYMY.mjs";
+} from "./chunk-G6F6VL4O.mjs";
+import {
+  CDN_URL,
+  STATIC_CDN_URL
+} from "./chunk-BKPVGBOT.mjs";
 import {
   Role
 } from "./chunk-2ZSMLDEI.mjs";
@@ -98,7 +101,7 @@ var ChannelManager = class extends Collection {
     const cached = this.get(channelId);
     if (cached) return cached;
     try {
-      const { Channel: Channel2 } = await import("./Channel-L6UE2MAF.mjs");
+      const { Channel: Channel2 } = await import("./Channel-JFQXR7SZ.mjs");
       const data = await this.client.rest.get(
         Routes.channel(channelId)
       );
@@ -190,7 +193,7 @@ var GuildManager = class extends Collection2 {
    * @returns The created guild
    */
   async create(options) {
-    const { Guild: Guild2 } = await import("./Guild-RXGLAN54.mjs");
+    const { Guild: Guild2 } = await import("./Guild-3PLQFT2I.mjs");
     const data = await this.client.rest.post(Routes2.guilds(), {
       body: options,
       auth: true
@@ -211,7 +214,7 @@ var GuildManager = class extends Collection2 {
     const cached = this.get(guildId);
     if (cached) return cached;
     try {
-      const { Guild: Guild2 } = await import("./Guild-RXGLAN54.mjs");
+      const { Guild: Guild2 } = await import("./Guild-3PLQFT2I.mjs");
       const data = await this.client.rest.get(
         Routes2.guild(guildId)
       );
@@ -225,7 +228,12 @@ var GuildManager = class extends Collection2 {
 };
 
 // src/client/Client.ts
-import { emitDeprecationWarning as emitDeprecationWarning2, formatEmoji, parseEmoji } from "@fluxerjs/util";
+import {
+  emitDeprecationWarning as emitDeprecationWarning2,
+  formatEmoji,
+  getUnicodeFromShortcode,
+  parseEmoji
+} from "@fluxerjs/util";
 
 // src/client/UsersManager.ts
 import { Collection as Collection3 } from "@fluxerjs/collection";
@@ -297,7 +305,7 @@ var UsersManager = class extends Collection3 {
 var handlers = /* @__PURE__ */ new Map();
 handlers.set("MESSAGE_CREATE", async (client, d) => {
   const { Message: Message2 } = await import("./Message-QNWAPT55.mjs");
-  const { GuildMember: GuildMember2 } = await import("./GuildMember-F5FZJOHD.mjs");
+  const { GuildMember: GuildMember2 } = await import("./GuildMember-FSGDPKUU.mjs");
   const data = d;
   if (data.guild_id && data.member && data.author) {
     const guild = client.guilds.get(data.guild_id);
@@ -319,12 +327,14 @@ handlers.set("MESSAGE_DELETE", async (client, d) => {
   client.emit(Events.MessageDelete, {
     id: data.id,
     channelId: data.channel_id,
-    channel
+    channel,
+    content: data.content ?? null,
+    authorId: data.author_id ?? null
   });
 });
 handlers.set("MESSAGE_REACTION_ADD", async (client, d) => {
   const data = d;
-  const { MessageReaction: MessageReaction2 } = await import("./MessageReaction-MFK2N3AD.mjs");
+  const { MessageReaction: MessageReaction2 } = await import("./MessageReaction-MUBQ6GIN.mjs");
   const reaction = new MessageReaction2(client, data);
   const user = client.getOrCreateUser({
     id: data.user_id,
@@ -343,7 +353,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-MFK2N3AD.mjs");
+  const { MessageReaction: MessageReaction2 } = await import("./MessageReaction-MUBQ6GIN.mjs");
   const reaction = new MessageReaction2(client, data);
   const user = client.getOrCreateUser({
     id: data.user_id,
@@ -370,9 +380,9 @@ handlers.set("MESSAGE_REACTION_REMOVE_EMOJI", async (client, d) => {
   );
 });
 handlers.set("GUILD_CREATE", async (client, d) => {
-  const { Guild: Guild2 } = await import("./Guild-RXGLAN54.mjs");
-  const { Channel: Channel2 } = await import("./Channel-L6UE2MAF.mjs");
-  const { GuildMember: GuildMember2 } = await import("./GuildMember-F5FZJOHD.mjs");
+  const { Guild: Guild2 } = await import("./Guild-3PLQFT2I.mjs");
+  const { Channel: Channel2 } = await import("./Channel-JFQXR7SZ.mjs");
+  const { GuildMember: GuildMember2 } = await import("./GuildMember-FSGDPKUU.mjs");
   const raw = d;
   const guildData = raw?.properties != null ? { ...raw.properties, roles: raw.roles } : raw;
   const guild = new Guild2(client, guildData);
@@ -395,7 +405,7 @@ handlers.set("GUILD_CREATE", async (client, d) => {
   }
 });
 handlers.set("GUILD_UPDATE", async (client, d) => {
-  const { Guild: Guild2 } = await import("./Guild-RXGLAN54.mjs");
+  const { Guild: Guild2 } = await import("./Guild-3PLQFT2I.mjs");
   const raw = d;
   const guildData = raw?.properties != null ? { ...raw.properties, roles: raw.roles } : raw;
   const old = client.guilds.get(guildData.id);
@@ -412,7 +422,7 @@ handlers.set("GUILD_DELETE", async (client, d) => {
   }
 });
 handlers.set("CHANNEL_CREATE", async (client, d) => {
-  const { Channel: Channel2 } = await import("./Channel-L6UE2MAF.mjs");
+  const { Channel: Channel2 } = await import("./Channel-JFQXR7SZ.mjs");
   const ch = Channel2.from(client, d);
   if (ch) {
     client.channels.set(ch.id, ch);
@@ -420,7 +430,7 @@ handlers.set("CHANNEL_CREATE", async (client, d) => {
   }
 });
 handlers.set("CHANNEL_UPDATE", async (client, d) => {
-  const { Channel: Channel2 } = await import("./Channel-L6UE2MAF.mjs");
+  const { Channel: Channel2 } = await import("./Channel-JFQXR7SZ.mjs");
   const ch = d;
   const oldCh = client.channels.get(ch.id);
   const newCh = Channel2.from(client, ch);
@@ -438,7 +448,7 @@ handlers.set("CHANNEL_DELETE", async (client, d) => {
   }
 });
 handlers.set("GUILD_MEMBER_ADD", async (client, d) => {
-  const { GuildMember: GuildMember2 } = await import("./GuildMember-F5FZJOHD.mjs");
+  const { GuildMember: GuildMember2 } = await import("./GuildMember-FSGDPKUU.mjs");
   const data = d;
   const guild = client.guilds.get(data.guild_id);
   if (guild) {
@@ -448,7 +458,7 @@ handlers.set("GUILD_MEMBER_ADD", async (client, d) => {
   }
 });
 handlers.set("GUILD_MEMBER_UPDATE", async (client, d) => {
-  const { GuildMember: GuildMember2 } = await import("./GuildMember-F5FZJOHD.mjs");
+  const { GuildMember: GuildMember2 } = await import("./GuildMember-FSGDPKUU.mjs");
   const data = d;
   const guild = client.guilds.get(data.guild_id);
   if (guild) {
@@ -462,7 +472,7 @@ handlers.set("GUILD_MEMBER_REMOVE", async (client, d) => {
   const data = d;
   const guild = client.guilds.get(data.guild_id);
   if (!guild || !data.user?.id) return;
-  const { GuildMember: GuildMember2 } = await import("./GuildMember-F5FZJOHD.mjs");
+  const { GuildMember: GuildMember2 } = await import("./GuildMember-FSGDPKUU.mjs");
   let member = guild.members.get(data.user.id);
   if (member) {
     guild.members.delete(data.user.id);
@@ -637,20 +647,31 @@ var Client = class extends EventEmitter {
    * Resolve an emoji argument to the API format (unicode or "name:id").
    * Supports: <:name:id>, :name:, name:id, { name, id }, unicode.
    * When id is missing (e.g. :name:), fetches guild emojis if guildId provided.
+   * When reacting in a guild channel, custom emojis must be from that guild.
    * @param emoji - Emoji string or object
    * @param guildId - Guild ID for resolving custom emoji by name (required when id is missing)
    * @returns API-formatted string for reactions
    */
   async resolveEmoji(emoji, guildId) {
     if (typeof emoji === "object" && emoji.id) {
+      if (guildId) {
+        await this.assertEmojiInGuild(emoji.id, guildId);
+      }
       return formatEmoji({ name: emoji.name, id: emoji.id, animated: emoji.animated });
     }
     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 (parsed.id) {
+      if (guildId) {
+        await this.assertEmojiInGuild(parsed.id, guildId);
+      }
+      return formatEmoji(parsed);
+    }
     if (!/^\w+$/.test(parsed.name)) return encodeURIComponent(parsed.name);
+    const unicodeFromShortcode = getUnicodeFromShortcode(parsed.name);
+    if (unicodeFromShortcode) return encodeURIComponent(unicodeFromShortcode);
     if (guildId) {
       const emojis = await this.rest.get(Routes4.guildEmojis(guildId));
       const list = Array.isArray(emojis) ? emojis : Object.values(emojis ?? {});
@@ -667,6 +688,21 @@ var Client = class extends EventEmitter {
     }
     return encodeURIComponent(parsed.name);
   }
+  /**
+   * Asserts that a custom emoji (by id) belongs to the given guild.
+   * Used when reacting in guild channels to reject emojis from other servers.
+   * @throws FluxerError with EMOJI_NOT_IN_GUILD if the emoji is not in the guild
+   */
+  async assertEmojiInGuild(emojiId, guildId) {
+    const emojis = await this.rest.get(Routes4.guildEmojis(guildId));
+    const list = Array.isArray(emojis) ? emojis : Object.values(emojis ?? {});
+    const found = list.some((e) => e.id === emojiId);
+    if (!found) {
+      throw new FluxerError("Custom emoji is from another server. Use an emoji from this server.", {
+        code: ErrorCodes.EmojiNotInGuild
+      });
+    }
+  }
   /**
    * Fetch instance info (API URL, gateway URL, features). GET /instance.
    * Does not require authentication.
@@ -776,9 +812,9 @@ var Client = class extends EventEmitter {
       async ({
         data
       }) => {
-        const { ClientUser: ClientUser2 } = await import("./ClientUser-JCRVGIJL.mjs");
-        const { Guild: Guild2 } = await import("./Guild-RXGLAN54.mjs");
-        const { Channel: Channel2 } = await import("./Channel-L6UE2MAF.mjs");
+        const { ClientUser: ClientUser2 } = await import("./ClientUser-2OHUFUV5.mjs");
+        const { Guild: Guild2 } = await import("./Guild-3PLQFT2I.mjs");
+        const { Channel: Channel2 } = await import("./Channel-JFQXR7SZ.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 ? {
@@ -844,6 +880,7 @@ import {
 export {
   AttachmentBuilder,
   Base,
+  CDN_URL,
   CategoryChannel,
   Channel,
   ChannelManager,
@@ -875,6 +912,7 @@ export {
   ReactionCollector,
   Role,
   Routes5 as Routes,
+  STATIC_CDN_URL,
   TextChannel,
   User,
   UserFlagsBitField,

package/package.json

@@ -3,7 +3,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "version": "1.1.7",
+  "version": "1.1.8",
   "description": "A fully-featured SDK for Fluxer bots",
   "repository": {
     "type": "git",
@@ -34,12 +34,12 @@
     "dist"
   ],
   "dependencies": {
-    "@fluxerjs/rest": "1.1.7",
-    "@fluxerjs/collection": "1.1.7",
-    "@fluxerjs/ws": "1.1.7",
-    "@fluxerjs/builders": "1.1.7",
-    "@fluxerjs/util": "1.1.7",
-    "@fluxerjs/types": "1.1.7"
+    "@fluxerjs/rest": "1.1.8",
+    "@fluxerjs/collection": "1.1.8",
+    "@fluxerjs/ws": "1.1.8",
+    "@fluxerjs/types": "1.1.8",
+    "@fluxerjs/builders": "1.1.8",
+    "@fluxerjs/util": "1.1.8"
   },
   "devDependencies": {
     "@types/node": "^20.0.0",