@magicyan/discord 1.0.18 → 1.0.20

package/dist/constants/chars.cjs

@@ -0,0 +1,7 @@
+'use strict';
+
+const chars = {
+  invisible: "\u200B"
+};
+
+exports.chars = chars;

package/dist/constants/chars.mjs

@@ -0,0 +1,5 @@
+const chars = {
+  invisible: "\u200B"
+};
+
+export { chars };

package/dist/functions/channels.cjs

@@ -6,9 +6,9 @@ function findChannel(guild, type) {
   const channelType = type ?? discord_js.ChannelType.GuildText;
   const cache = guild.channels.cache;
   return {
-    byName(name) {
+    byName(name, filter = () => true) {
       return cache.find(
-        (c) => c.name === name && c.type === channelType
+        (c) => c.name === name && c.type === channelType && filter
       );
     },
     byId(id) {
@@ -16,30 +16,43 @@ function findChannel(guild, type) {
         (c) => c.id === id && c.type === channelType
       );
     },
+    byFilter(filter) {
+      return cache.find((c) => c.type == type && filter);
+    },
     inCategoryId(id) {
       return {
-        byName(name) {
+        byName(name, filter = () => true) {
+          return cache.find(
+            (c) => c.name === name && c.type === channelType && c.parentId == id && filter
+          );
+        },
+        byId(id2, filter = () => true) {
           return cache.find(
-            (c) => c.name === name && c.type === channelType && c.parentId == id
+            (c) => c.id === id2 && c.type === channelType && c.parentId == id2 && filter
           );
         },
-        byId(id2) {
+        byFilter(filter) {
           return cache.find(
-            (c) => c.id === id2 && c.type === channelType && c.parentId == id2
+            (c) => c.type === channelType && c.parent?.id == id && filter
           );
         }
       };
     },
     inCategoryName(name) {
       return {
-        byName(name2) {
+        byName(name2, filter = () => true) {
+          return cache.find(
+            (c) => c.name === name2 && c.type === channelType && c.parent?.name == name2 && filter
+          );
+        },
+        byId(id, filter = () => true) {
           return cache.find(
-            (c) => c.name === name2 && c.type === channelType && c.parent?.name == name2
+            (c) => c.id === id && c.type === channelType && c.parent?.name == name && filter
           );
         },
-        byId(id) {
+        byFilter(filter) {
           return cache.find(
-            (c) => c.id === id && c.type === channelType && c.parent?.name == name
+            (c) => c.type === channelType && c.parent?.name == name && filter
           );
         }
       };

package/dist/functions/channels.mjs

@@ -4,9 +4,9 @@ function findChannel(guild, type) {
   const channelType = type ?? ChannelType.GuildText;
   const cache = guild.channels.cache;
   return {
-    byName(name) {
+    byName(name, filter = () => true) {
       return cache.find(
-        (c) => c.name === name && c.type === channelType
+        (c) => c.name === name && c.type === channelType && filter
       );
     },
     byId(id) {
@@ -14,30 +14,43 @@ function findChannel(guild, type) {
         (c) => c.id === id && c.type === channelType
       );
     },
+    byFilter(filter) {
+      return cache.find((c) => c.type == type && filter);
+    },
     inCategoryId(id) {
       return {
-        byName(name) {
+        byName(name, filter = () => true) {
+          return cache.find(
+            (c) => c.name === name && c.type === channelType && c.parentId == id && filter
+          );
+        },
+        byId(id2, filter = () => true) {
           return cache.find(
-            (c) => c.name === name && c.type === channelType && c.parentId == id
+            (c) => c.id === id2 && c.type === channelType && c.parentId == id2 && filter
           );
         },
-        byId(id2) {
+        byFilter(filter) {
           return cache.find(
-            (c) => c.id === id2 && c.type === channelType && c.parentId == id2
+            (c) => c.type === channelType && c.parent?.id == id && filter
           );
         }
       };
     },
     inCategoryName(name) {
       return {
-        byName(name2) {
+        byName(name2, filter = () => true) {
+          return cache.find(
+            (c) => c.name === name2 && c.type === channelType && c.parent?.name == name2 && filter
+          );
+        },
+        byId(id, filter = () => true) {
           return cache.find(
-            (c) => c.name === name2 && c.type === channelType && c.parent?.name == name2
+            (c) => c.id === id && c.type === channelType && c.parent?.name == name && filter
           );
         },
-        byId(id) {
+        byFilter(filter) {
           return cache.find(
-            (c) => c.id === id && c.type === channelType && c.parent?.name == name
+            (c) => c.type === channelType && c.parent?.name == name && filter
           );
         }
       };

package/dist/functions/embeds.cjs

@@ -1,7 +1,8 @@
 'use strict';
 
-const core = require('@magicyan/core');
 const discord_js = require('discord.js');
+const chars = require('../constants/chars.cjs');
+const core = require('@magicyan/core');
 
 function createEmbedAuthor(options) {
   const {
@@ -14,7 +15,7 @@ function createEmbedAuthor(options) {
     suffix = ""
   } = options;
   return {
-    name: `${prefix}${user[property]}${suffix}`,
+    name: prefix + user[property] + suffix,
     url,
     iconURL: iconURL || user.displayAvatarURL({ size })
   };
@@ -27,25 +28,108 @@ function createEmbedAsset(source, options) {
   if (source instanceof discord_js.Attachment || source instanceof discord_js.AttachmentBuilder) {
     return { url: `attachment://${source.name}`, ...options };
   }
+  if (source && typeof source === "object" && "url" in source) {
+    return source;
+  }
   return source ? { url: source, ...options } : void 0;
 }
-function createEmbed(options) {
-  const { extend: extendRaw = {}, ...embedRaw } = options;
-  const { color: embedColor, modify, ...embedData } = embedRaw;
-  const { color: extendColor, ...extendData } = extendRaw;
-  const data = { ...extendData, ...embedData };
-  const builder = new discord_js.EmbedBuilder(data);
-  if (extendColor)
-    builder.setColor(extendColor);
-  if (embedColor)
-    builder.setColor(embedColor);
-  if (modify?.fields && typeof modify.fields === "function") {
-    const fields = modify.fields(builder.data.fields || []);
-    builder.setFields(fields);
-  }
-  return builder;
+class EmbedBuilderPlus extends discord_js.EmbedBuilder {
+  constructor(data) {
+    const fields = (data.mergeFields ? [data.extend?.fields ?? [], data.fields ?? []].flat() : data.fields ?? data.extend?.fields ?? []).map(({ name = chars.chars.invisible, value = chars.chars.invisible, inline }) => ({
+      name,
+      value,
+      inline
+    }));
+    const extend = data.extend ? new EmbedBuilderPlus(
+      data.extend instanceof discord_js.Embed ? data.extend.data : data.extend instanceof discord_js.EmbedBuilder ? data.extend.data : data.extend
+    ).data : {};
+    const { fields: _, ...exetendData } = extend;
+    const embed = new discord_js.EmbedBuilder({
+      ...exetendData,
+      ...data.title ? { title: data.title } : {},
+      ...data.description ? { description: data.description } : {},
+      ...data.url ? { url: data.url } : {},
+      ...data.footer ? { footer: createEmbedFooter(data.footer) } : {},
+      ...data.author ? { author: data.author } : {},
+      ...data.image ? { image: createEmbedAsset(data.image) } : {},
+      ...data.thumbnail ? { thumbnail: createEmbedAsset(data.thumbnail) } : {},
+      ...fields.length > 0 ? { fields } : {}
+    });
+    if (data.timestamp)
+      embed.setTimestamp(
+        typeof data.timestamp === "string" ? new Date(data.timestamp) : data.timestamp
+      );
+    if (data.color)
+      embed.setColor(data.color);
+    super(embed.data);
+  }
+  has(property) {
+    return Object.hasOwn(this, property);
+  }
+  toArray() {
+    return [this];
+  }
+  toString(space = 2) {
+    return JSON.stringify(this, null, space);
+  }
+  updateField(index, field) {
+    if (this.fields.at(index)) {
+      const fields = Array.from(this.fields);
+      if (field.name)
+        fields[index].name = field.name;
+      if (field.value)
+        fields[index].value = field.value;
+      if (field.inline)
+        fields[index].inline = field.inline;
+      this.setFields(fields);
+    }
+    return this;
+  }
+  deleteField(index) {
+    if (this.fields.at(index)) {
+      this.setFields(this.fields.toSpliced(index, 1));
+    }
+    return this;
+  }
+  popField() {
+    const fields = Array.from(this.fields);
+    const field = fields.pop();
+    this.setFields(fields);
+    return field;
+  }
+  setAsset(asset, source) {
+    let url = void 0;
+    if (source instanceof discord_js.Attachment || source instanceof discord_js.AttachmentBuilder) {
+      url = `attachment://${source.name}`;
+    }
+    if (source && typeof source === "object" && "url" in source) {
+      url = source.url;
+    }
+    if (!url)
+      return this;
+    if (asset === "thumbnail") {
+      this.setImage(url);
+    } else {
+      this.setThumbnail(url);
+    }
+    return this;
+  }
+  get fieldsLength() {
+    return this.data.fields?.length ?? 0;
+  }
+  get fields() {
+    return this.data.fields ?? [];
+  }
+  createFromThis(data = {}) {
+    data.extend = this;
+    return new EmbedBuilderPlus(data);
+  }
+}
+function createEmbed(data) {
+  return new EmbedBuilderPlus(data);
 }
 
+exports.EmbedBuilderPlus = EmbedBuilderPlus;
 exports.createEmbed = createEmbed;
 exports.createEmbedAsset = createEmbedAsset;
 exports.createEmbedAuthor = createEmbedAuthor;

package/dist/functions/embeds.mjs

@@ -1,5 +1,6 @@
+import { Attachment, AttachmentBuilder, EmbedBuilder, Embed } from 'discord.js';
+import { chars } from '../constants/chars.mjs';
 import { notFound } from '@magicyan/core';
-import { Attachment, AttachmentBuilder, EmbedBuilder } from 'discord.js';
 
 function createEmbedAuthor(options) {
   const {
@@ -12,7 +13,7 @@ function createEmbedAuthor(options) {
     suffix = ""
   } = options;
   return {
-    name: `${prefix}${user[property]}${suffix}`,
+    name: prefix + user[property] + suffix,
     url,
     iconURL: iconURL || user.displayAvatarURL({ size })
   };
@@ -25,23 +26,105 @@ function createEmbedAsset(source, options) {
   if (source instanceof Attachment || source instanceof AttachmentBuilder) {
     return { url: `attachment://${source.name}`, ...options };
   }
+  if (source && typeof source === "object" && "url" in source) {
+    return source;
+  }
   return source ? { url: source, ...options } : void 0;
 }
-function createEmbed(options) {
-  const { extend: extendRaw = {}, ...embedRaw } = options;
-  const { color: embedColor, modify, ...embedData } = embedRaw;
-  const { color: extendColor, ...extendData } = extendRaw;
-  const data = { ...extendData, ...embedData };
-  const builder = new EmbedBuilder(data);
-  if (extendColor)
-    builder.setColor(extendColor);
-  if (embedColor)
-    builder.setColor(embedColor);
-  if (modify?.fields && typeof modify.fields === "function") {
-    const fields = modify.fields(builder.data.fields || []);
-    builder.setFields(fields);
-  }
-  return builder;
+class EmbedBuilderPlus extends EmbedBuilder {
+  constructor(data) {
+    const fields = (data.mergeFields ? [data.extend?.fields ?? [], data.fields ?? []].flat() : data.fields ?? data.extend?.fields ?? []).map(({ name = chars.invisible, value = chars.invisible, inline }) => ({
+      name,
+      value,
+      inline
+    }));
+    const extend = data.extend ? new EmbedBuilderPlus(
+      data.extend instanceof Embed ? data.extend.data : data.extend instanceof EmbedBuilder ? data.extend.data : data.extend
+    ).data : {};
+    const { fields: _, ...exetendData } = extend;
+    const embed = new EmbedBuilder({
+      ...exetendData,
+      ...data.title ? { title: data.title } : {},
+      ...data.description ? { description: data.description } : {},
+      ...data.url ? { url: data.url } : {},
+      ...data.footer ? { footer: createEmbedFooter(data.footer) } : {},
+      ...data.author ? { author: data.author } : {},
+      ...data.image ? { image: createEmbedAsset(data.image) } : {},
+      ...data.thumbnail ? { thumbnail: createEmbedAsset(data.thumbnail) } : {},
+      ...fields.length > 0 ? { fields } : {}
+    });
+    if (data.timestamp)
+      embed.setTimestamp(
+        typeof data.timestamp === "string" ? new Date(data.timestamp) : data.timestamp
+      );
+    if (data.color)
+      embed.setColor(data.color);
+    super(embed.data);
+  }
+  has(property) {
+    return Object.hasOwn(this, property);
+  }
+  toArray() {
+    return [this];
+  }
+  toString(space = 2) {
+    return JSON.stringify(this, null, space);
+  }
+  updateField(index, field) {
+    if (this.fields.at(index)) {
+      const fields = Array.from(this.fields);
+      if (field.name)
+        fields[index].name = field.name;
+      if (field.value)
+        fields[index].value = field.value;
+      if (field.inline)
+        fields[index].inline = field.inline;
+      this.setFields(fields);
+    }
+    return this;
+  }
+  deleteField(index) {
+    if (this.fields.at(index)) {
+      this.setFields(this.fields.toSpliced(index, 1));
+    }
+    return this;
+  }
+  popField() {
+    const fields = Array.from(this.fields);
+    const field = fields.pop();
+    this.setFields(fields);
+    return field;
+  }
+  setAsset(asset, source) {
+    let url = void 0;
+    if (source instanceof Attachment || source instanceof AttachmentBuilder) {
+      url = `attachment://${source.name}`;
+    }
+    if (source && typeof source === "object" && "url" in source) {
+      url = source.url;
+    }
+    if (!url)
+      return this;
+    if (asset === "thumbnail") {
+      this.setImage(url);
+    } else {
+      this.setThumbnail(url);
+    }
+    return this;
+  }
+  get fieldsLength() {
+    return this.data.fields?.length ?? 0;
+  }
+  get fields() {
+    return this.data.fields ?? [];
+  }
+  createFromThis(data = {}) {
+    data.extend = this;
+    return new EmbedBuilderPlus(data);
+  }
+}
+function createEmbed(data) {
+  return new EmbedBuilderPlus(data);
 }
 
-export { createEmbed, createEmbedAsset, createEmbedAuthor, createEmbedFooter };
+export { EmbedBuilderPlus, createEmbed, createEmbedAsset, createEmbedAuthor, createEmbedFooter };

package/dist/index.cjs

@@ -1,5 +1,6 @@
 'use strict';
 
+const chars = require('./constants/chars.cjs');
 const client = require('./constants/client.cjs');
 const channels = require('./functions/channels.cjs');
 const commands = require('./functions/commands.cjs');
@@ -14,6 +15,7 @@ const core = require('@magicyan/core');
 
 
 
+exports.chars = chars.chars;
 exports.CustomItents = client.CustomItents;
 exports.CustomPartials = client.CustomPartials;
 exports.findChannel = channels.findChannel;
@@ -22,6 +24,7 @@ exports.createComponentsManager = components.createComponentsManager;
 exports.createLinkButton = components.createLinkButton;
 exports.createModalInput = components.createModalInput;
 exports.createRow = components.createRow;
+exports.EmbedBuilderPlus = embeds.EmbedBuilderPlus;
 exports.createEmbed = embeds.createEmbed;
 exports.createEmbedAsset = embeds.createEmbedAsset;
 exports.createEmbedAuthor = embeds.createEmbedAuthor;

package/dist/index.d.cts

@@ -1,7 +1,11 @@
 import * as discord_js from 'discord.js';
-import { GatewayIntentBits, Partials, ChannelType, Guild, CommandInteractionOption, Client, ApplicationCommand, AnyComponentBuilder, ActionRowBuilder, TextInputBuilder, ButtonBuilder, ActionRow, MessageActionRowComponent, TextInputComponentData, LinkButtonComponentData, ButtonComponent, StringSelectMenuComponent, UserSelectMenuComponent, ChannelSelectMenuComponent, RoleSelectMenuComponent, MentionableSelectMenuComponent, EmbedAuthorData, EmbedFooterData, EmbedAssetData, EmbedBuilder, User, ImageURLOptions, Attachment, AttachmentBuilder, ColorResolvable, GuildEmoji, GuildBasedChannel, Role, GuildMember, GuildTextBasedChannel, Message } from 'discord.js';
+import { GatewayIntentBits, Partials, ChannelType, Guild, CommandInteractionOption, Client, ApplicationCommand, AnyComponentBuilder, ActionRowBuilder, TextInputBuilder, ButtonBuilder, ActionRow, MessageActionRowComponent, TextInputComponentData, LinkButtonComponentData, ButtonComponent, StringSelectMenuComponent, UserSelectMenuComponent, ChannelSelectMenuComponent, RoleSelectMenuComponent, MentionableSelectMenuComponent, EmbedAuthorData, EmbedFooterData, EmbedAssetData, EmbedBuilder, User, ImageURLOptions, Attachment, AttachmentBuilder, EmbedData, APIEmbed, Embed, ColorResolvable, GuildEmoji, GuildBasedChannel, Role, GuildMember, GuildTextBasedChannel, Message } from 'discord.js';
 export * from '@magicyan/core';
 
+declare const chars: {
+    invisible: string;
+};
+
 declare const CustomItents: {
     Messages: GatewayIntentBits[];
     Guild: GatewayIntentBits[];
@@ -12,19 +16,23 @@ declare const CustomPartials: {
     All: Partials[];
 };
 
+type FindChannelFilter<T extends ChannelType> = (channel: GetChannelType<T>) => boolean;
 type GetChannelType<Type extends ChannelType> = Extract<NonNullable<CommandInteractionOption<"cached">["channel"]>, {
     type: Type extends ChannelType.PublicThread | ChannelType.AnnouncementThread ? ChannelType.PublicThread | ChannelType.AnnouncementThread : Type;
 }>;
 declare function findChannel<Type extends Exclude<ChannelType, ChannelType.DM> = ChannelType.GuildText>(guild: Guild, type?: Type): {
-    byName(name: string): GetChannelType<Type> | undefined;
+    byName(name: string, filter?: FindChannelFilter<Type>): GetChannelType<Type> | undefined;
     byId(id: string): GetChannelType<Type> | undefined;
+    byFilter(filter: FindChannelFilter<Type>): discord_js.GuildBasedChannel | undefined;
     inCategoryId(id: string): {
-        byName(name: string): GetChannelType<Type> | undefined;
-        byId(id: string): GetChannelType<Type> | undefined;
+        byName(name: string, filter?: FindChannelFilter<Type>): GetChannelType<Type> | undefined;
+        byId(id: string, filter?: FindChannelFilter<Type>): GetChannelType<Type> | undefined;
+        byFilter(filter: FindChannelFilter<Type>): discord_js.GuildBasedChannel | undefined;
     };
     inCategoryName(name: string): {
-        byName(name: string): GetChannelType<Type> | undefined;
-        byId(id: string): GetChannelType<Type> | undefined;
+        byName(name: string, filter?: FindChannelFilter<Type>): GetChannelType<Type> | undefined;
+        byId(id: string, filter?: FindChannelFilter<Type>): GetChannelType<Type> | undefined;
+        byFilter(filter: FindChannelFilter<Type>): discord_js.GuildBasedChannel | undefined;
     };
 };
 
@@ -88,33 +96,55 @@ interface CreateEmbedFooterOptions {
 }
 declare function createEmbedFooter(options: CreateEmbedFooterOptions): EmbedFooterData | undefined;
 type EmbedAssetOptions = Omit<EmbedAssetData, "url">;
-type AssetSource = string | null | Attachment | AttachmentBuilder;
-declare function createEmbedAsset(source?: AssetSource, options?: EmbedAssetOptions): EmbedAssetData | undefined;
-type EmbedColor = ColorResolvable | (string & {});
-interface BaseEmbedField {
+type AssetSource = string | Attachment | AttachmentBuilder | EmbedAssetData | undefined | null;
+declare function createEmbedAsset(source: AssetSource, options?: EmbedAssetOptions): EmbedAssetData | undefined;
+type EmbedBuilderPlusAssetData = AssetSource;
+type EmbedBuilderPlusColorData = string & {} | ColorResolvable | null;
+type EmbedBuilderPlusFieldData = {
     name: string;
     value: string;
     inline?: boolean;
-}
-interface BaseEmbedData {
-    title?: string;
-    color?: EmbedColor;
-    description?: string;
+};
+type EmbedBuilderPlusFooterData = {
+    text?: string | null;
+    iconURL?: string | null;
+};
+type EmbedBuilderPlusAuthorData = {
+    name: string;
     url?: string;
-    timestamp?: string | number | Date;
-    footer?: EmbedFooterData;
-    image?: EmbedAssetData;
-    thumbnail?: EmbedAssetData;
-    author?: EmbedAuthorData;
-    fields?: BaseEmbedField[];
+    iconURL?: string;
+};
+interface EmbedBuilderPlusOptions {
+    extend?: Omit<EmbedBuilderPlusData, keyof EmbedBuilderPlusOptions> | EmbedData | APIEmbed | Embed;
+    mergeFields?: boolean;
 }
-interface CreateEmbedOptions extends BaseEmbedData {
-    extend?: BaseEmbedData;
-    modify?: {
-        fields?(fields: BaseEmbedField[]): BaseEmbedField[];
-    };
+interface EmbedBuilderPlusData extends EmbedBuilderPlusOptions {
+    title?: string | null;
+    color?: EmbedBuilderPlusColorData | null;
+    description?: string | null;
+    url?: string | null;
+    thumbnail?: EmbedBuilderPlusAssetData | null;
+    image?: EmbedBuilderPlusAssetData | null;
+    fields?: Partial<EmbedBuilderPlusFieldData>[] | null;
+    timestamp?: string | number | Date | null;
+    footer?: EmbedBuilderPlusFooterData;
+    author?: EmbedBuilderPlusAuthorData;
+}
+declare class EmbedBuilderPlus extends EmbedBuilder {
+    constructor(data: EmbedBuilderPlusData);
+    has(property: keyof Omit<EmbedBuilderPlusData, keyof EmbedBuilderPlusOptions>): boolean;
+    toArray(): this[];
+    toString(space?: number): string;
+    updateField(index: number, field: Partial<EmbedBuilderPlusFieldData>): this;
+    deleteField(index: number): this;
+    popField(): discord_js.APIEmbedField | undefined;
+    setAsset(asset: "thumbnail" | "image", source: EmbedBuilderPlusAssetData): this;
+    get fieldsLength(): number;
+    get fields(): discord_js.APIEmbedField[];
+    createFromThis(data?: EmbedBuilderPlusData): EmbedBuilderPlus;
 }
-declare function createEmbed(options: CreateEmbedOptions): EmbedBuilder;
+type EmbedPropery<T extends keyof EmbedBuilderPlusData> = EmbedBuilderPlusData[T];
+declare function createEmbed(data: EmbedBuilderPlusData): EmbedBuilderPlus;
 
 type FindEmojiFilter = (emoji: GuildEmoji) => boolean;
 declare function findEmoji(guildOrClient: Guild | Client): {
@@ -154,4 +184,4 @@ declare function findRole(guild: Guild): {
     byFilter(filter: FindRoleFilter): Role | undefined;
 };
 
-export { type BaseEmbedData, CustomItents, CustomPartials, createComponentsManager, createEmbed, createEmbedAsset, createEmbedAuthor, createEmbedFooter, createLinkButton, createModalInput, createRow, findChannel, findCommand, findEmoji, findMember, findMessage, findRole, formatedMention };
+export { CustomItents, CustomPartials, EmbedBuilderPlus, type EmbedPropery, chars, createComponentsManager, createEmbed, createEmbedAsset, createEmbedAuthor, createEmbedFooter, createLinkButton, createModalInput, createRow, findChannel, findCommand, findEmoji, findMember, findMessage, findRole, formatedMention };

package/dist/index.d.mts

@@ -1,7 +1,11 @@
 import * as discord_js from 'discord.js';
-import { GatewayIntentBits, Partials, ChannelType, Guild, CommandInteractionOption, Client, ApplicationCommand, AnyComponentBuilder, ActionRowBuilder, TextInputBuilder, ButtonBuilder, ActionRow, MessageActionRowComponent, TextInputComponentData, LinkButtonComponentData, ButtonComponent, StringSelectMenuComponent, UserSelectMenuComponent, ChannelSelectMenuComponent, RoleSelectMenuComponent, MentionableSelectMenuComponent, EmbedAuthorData, EmbedFooterData, EmbedAssetData, EmbedBuilder, User, ImageURLOptions, Attachment, AttachmentBuilder, ColorResolvable, GuildEmoji, GuildBasedChannel, Role, GuildMember, GuildTextBasedChannel, Message } from 'discord.js';
+import { GatewayIntentBits, Partials, ChannelType, Guild, CommandInteractionOption, Client, ApplicationCommand, AnyComponentBuilder, ActionRowBuilder, TextInputBuilder, ButtonBuilder, ActionRow, MessageActionRowComponent, TextInputComponentData, LinkButtonComponentData, ButtonComponent, StringSelectMenuComponent, UserSelectMenuComponent, ChannelSelectMenuComponent, RoleSelectMenuComponent, MentionableSelectMenuComponent, EmbedAuthorData, EmbedFooterData, EmbedAssetData, EmbedBuilder, User, ImageURLOptions, Attachment, AttachmentBuilder, EmbedData, APIEmbed, Embed, ColorResolvable, GuildEmoji, GuildBasedChannel, Role, GuildMember, GuildTextBasedChannel, Message } from 'discord.js';
 export * from '@magicyan/core';
 
+declare const chars: {
+    invisible: string;
+};
+
 declare const CustomItents: {
     Messages: GatewayIntentBits[];
     Guild: GatewayIntentBits[];
@@ -12,19 +16,23 @@ declare const CustomPartials: {
     All: Partials[];
 };
 
+type FindChannelFilter<T extends ChannelType> = (channel: GetChannelType<T>) => boolean;
 type GetChannelType<Type extends ChannelType> = Extract<NonNullable<CommandInteractionOption<"cached">["channel"]>, {
     type: Type extends ChannelType.PublicThread | ChannelType.AnnouncementThread ? ChannelType.PublicThread | ChannelType.AnnouncementThread : Type;
 }>;
 declare function findChannel<Type extends Exclude<ChannelType, ChannelType.DM> = ChannelType.GuildText>(guild: Guild, type?: Type): {
-    byName(name: string): GetChannelType<Type> | undefined;
+    byName(name: string, filter?: FindChannelFilter<Type>): GetChannelType<Type> | undefined;
     byId(id: string): GetChannelType<Type> | undefined;
+    byFilter(filter: FindChannelFilter<Type>): discord_js.GuildBasedChannel | undefined;
     inCategoryId(id: string): {
-        byName(name: string): GetChannelType<Type> | undefined;
-        byId(id: string): GetChannelType<Type> | undefined;
+        byName(name: string, filter?: FindChannelFilter<Type>): GetChannelType<Type> | undefined;
+        byId(id: string, filter?: FindChannelFilter<Type>): GetChannelType<Type> | undefined;
+        byFilter(filter: FindChannelFilter<Type>): discord_js.GuildBasedChannel | undefined;
     };
     inCategoryName(name: string): {
-        byName(name: string): GetChannelType<Type> | undefined;
-        byId(id: string): GetChannelType<Type> | undefined;
+        byName(name: string, filter?: FindChannelFilter<Type>): GetChannelType<Type> | undefined;
+        byId(id: string, filter?: FindChannelFilter<Type>): GetChannelType<Type> | undefined;
+        byFilter(filter: FindChannelFilter<Type>): discord_js.GuildBasedChannel | undefined;
     };
 };
 
@@ -88,33 +96,55 @@ interface CreateEmbedFooterOptions {
 }
 declare function createEmbedFooter(options: CreateEmbedFooterOptions): EmbedFooterData | undefined;
 type EmbedAssetOptions = Omit<EmbedAssetData, "url">;
-type AssetSource = string | null | Attachment | AttachmentBuilder;
-declare function createEmbedAsset(source?: AssetSource, options?: EmbedAssetOptions): EmbedAssetData | undefined;
-type EmbedColor = ColorResolvable | (string & {});
-interface BaseEmbedField {
+type AssetSource = string | Attachment | AttachmentBuilder | EmbedAssetData | undefined | null;
+declare function createEmbedAsset(source: AssetSource, options?: EmbedAssetOptions): EmbedAssetData | undefined;
+type EmbedBuilderPlusAssetData = AssetSource;
+type EmbedBuilderPlusColorData = string & {} | ColorResolvable | null;
+type EmbedBuilderPlusFieldData = {
     name: string;
     value: string;
     inline?: boolean;
-}
-interface BaseEmbedData {
-    title?: string;
-    color?: EmbedColor;
-    description?: string;
+};
+type EmbedBuilderPlusFooterData = {
+    text?: string | null;
+    iconURL?: string | null;
+};
+type EmbedBuilderPlusAuthorData = {
+    name: string;
     url?: string;
-    timestamp?: string | number | Date;
-    footer?: EmbedFooterData;
-    image?: EmbedAssetData;
-    thumbnail?: EmbedAssetData;
-    author?: EmbedAuthorData;
-    fields?: BaseEmbedField[];
+    iconURL?: string;
+};
+interface EmbedBuilderPlusOptions {
+    extend?: Omit<EmbedBuilderPlusData, keyof EmbedBuilderPlusOptions> | EmbedData | APIEmbed | Embed;
+    mergeFields?: boolean;
 }
-interface CreateEmbedOptions extends BaseEmbedData {
-    extend?: BaseEmbedData;
-    modify?: {
-        fields?(fields: BaseEmbedField[]): BaseEmbedField[];
-    };
+interface EmbedBuilderPlusData extends EmbedBuilderPlusOptions {
+    title?: string | null;
+    color?: EmbedBuilderPlusColorData | null;
+    description?: string | null;
+    url?: string | null;
+    thumbnail?: EmbedBuilderPlusAssetData | null;
+    image?: EmbedBuilderPlusAssetData | null;
+    fields?: Partial<EmbedBuilderPlusFieldData>[] | null;
+    timestamp?: string | number | Date | null;
+    footer?: EmbedBuilderPlusFooterData;
+    author?: EmbedBuilderPlusAuthorData;
+}
+declare class EmbedBuilderPlus extends EmbedBuilder {
+    constructor(data: EmbedBuilderPlusData);
+    has(property: keyof Omit<EmbedBuilderPlusData, keyof EmbedBuilderPlusOptions>): boolean;
+    toArray(): this[];
+    toString(space?: number): string;
+    updateField(index: number, field: Partial<EmbedBuilderPlusFieldData>): this;
+    deleteField(index: number): this;
+    popField(): discord_js.APIEmbedField | undefined;
+    setAsset(asset: "thumbnail" | "image", source: EmbedBuilderPlusAssetData): this;
+    get fieldsLength(): number;
+    get fields(): discord_js.APIEmbedField[];
+    createFromThis(data?: EmbedBuilderPlusData): EmbedBuilderPlus;
 }
-declare function createEmbed(options: CreateEmbedOptions): EmbedBuilder;
+type EmbedPropery<T extends keyof EmbedBuilderPlusData> = EmbedBuilderPlusData[T];
+declare function createEmbed(data: EmbedBuilderPlusData): EmbedBuilderPlus;
 
 type FindEmojiFilter = (emoji: GuildEmoji) => boolean;
 declare function findEmoji(guildOrClient: Guild | Client): {
@@ -154,4 +184,4 @@ declare function findRole(guild: Guild): {
     byFilter(filter: FindRoleFilter): Role | undefined;
 };
 
-export { type BaseEmbedData, CustomItents, CustomPartials, createComponentsManager, createEmbed, createEmbedAsset, createEmbedAuthor, createEmbedFooter, createLinkButton, createModalInput, createRow, findChannel, findCommand, findEmoji, findMember, findMessage, findRole, formatedMention };
+export { CustomItents, CustomPartials, EmbedBuilderPlus, type EmbedPropery, chars, createComponentsManager, createEmbed, createEmbedAsset, createEmbedAuthor, createEmbedFooter, createLinkButton, createModalInput, createRow, findChannel, findCommand, findEmoji, findMember, findMessage, findRole, formatedMention };

package/dist/index.d.ts

@@ -1,7 +1,11 @@
 import * as discord_js from 'discord.js';
-import { GatewayIntentBits, Partials, ChannelType, Guild, CommandInteractionOption, Client, ApplicationCommand, AnyComponentBuilder, ActionRowBuilder, TextInputBuilder, ButtonBuilder, ActionRow, MessageActionRowComponent, TextInputComponentData, LinkButtonComponentData, ButtonComponent, StringSelectMenuComponent, UserSelectMenuComponent, ChannelSelectMenuComponent, RoleSelectMenuComponent, MentionableSelectMenuComponent, EmbedAuthorData, EmbedFooterData, EmbedAssetData, EmbedBuilder, User, ImageURLOptions, Attachment, AttachmentBuilder, ColorResolvable, GuildEmoji, GuildBasedChannel, Role, GuildMember, GuildTextBasedChannel, Message } from 'discord.js';
+import { GatewayIntentBits, Partials, ChannelType, Guild, CommandInteractionOption, Client, ApplicationCommand, AnyComponentBuilder, ActionRowBuilder, TextInputBuilder, ButtonBuilder, ActionRow, MessageActionRowComponent, TextInputComponentData, LinkButtonComponentData, ButtonComponent, StringSelectMenuComponent, UserSelectMenuComponent, ChannelSelectMenuComponent, RoleSelectMenuComponent, MentionableSelectMenuComponent, EmbedAuthorData, EmbedFooterData, EmbedAssetData, EmbedBuilder, User, ImageURLOptions, Attachment, AttachmentBuilder, EmbedData, APIEmbed, Embed, ColorResolvable, GuildEmoji, GuildBasedChannel, Role, GuildMember, GuildTextBasedChannel, Message } from 'discord.js';
 export * from '@magicyan/core';
 
+declare const chars: {
+    invisible: string;
+};
+
 declare const CustomItents: {
     Messages: GatewayIntentBits[];
     Guild: GatewayIntentBits[];
@@ -12,19 +16,23 @@ declare const CustomPartials: {
     All: Partials[];
 };
 
+type FindChannelFilter<T extends ChannelType> = (channel: GetChannelType<T>) => boolean;
 type GetChannelType<Type extends ChannelType> = Extract<NonNullable<CommandInteractionOption<"cached">["channel"]>, {
     type: Type extends ChannelType.PublicThread | ChannelType.AnnouncementThread ? ChannelType.PublicThread | ChannelType.AnnouncementThread : Type;
 }>;
 declare function findChannel<Type extends Exclude<ChannelType, ChannelType.DM> = ChannelType.GuildText>(guild: Guild, type?: Type): {
-    byName(name: string): GetChannelType<Type> | undefined;
+    byName(name: string, filter?: FindChannelFilter<Type>): GetChannelType<Type> | undefined;
     byId(id: string): GetChannelType<Type> | undefined;
+    byFilter(filter: FindChannelFilter<Type>): discord_js.GuildBasedChannel | undefined;
     inCategoryId(id: string): {
-        byName(name: string): GetChannelType<Type> | undefined;
-        byId(id: string): GetChannelType<Type> | undefined;
+        byName(name: string, filter?: FindChannelFilter<Type>): GetChannelType<Type> | undefined;
+        byId(id: string, filter?: FindChannelFilter<Type>): GetChannelType<Type> | undefined;
+        byFilter(filter: FindChannelFilter<Type>): discord_js.GuildBasedChannel | undefined;
     };
     inCategoryName(name: string): {
-        byName(name: string): GetChannelType<Type> | undefined;
-        byId(id: string): GetChannelType<Type> | undefined;
+        byName(name: string, filter?: FindChannelFilter<Type>): GetChannelType<Type> | undefined;
+        byId(id: string, filter?: FindChannelFilter<Type>): GetChannelType<Type> | undefined;
+        byFilter(filter: FindChannelFilter<Type>): discord_js.GuildBasedChannel | undefined;
     };
 };
 
@@ -88,33 +96,55 @@ interface CreateEmbedFooterOptions {
 }
 declare function createEmbedFooter(options: CreateEmbedFooterOptions): EmbedFooterData | undefined;
 type EmbedAssetOptions = Omit<EmbedAssetData, "url">;
-type AssetSource = string | null | Attachment | AttachmentBuilder;
-declare function createEmbedAsset(source?: AssetSource, options?: EmbedAssetOptions): EmbedAssetData | undefined;
-type EmbedColor = ColorResolvable | (string & {});
-interface BaseEmbedField {
+type AssetSource = string | Attachment | AttachmentBuilder | EmbedAssetData | undefined | null;
+declare function createEmbedAsset(source: AssetSource, options?: EmbedAssetOptions): EmbedAssetData | undefined;
+type EmbedBuilderPlusAssetData = AssetSource;
+type EmbedBuilderPlusColorData = string & {} | ColorResolvable | null;
+type EmbedBuilderPlusFieldData = {
     name: string;
     value: string;
     inline?: boolean;
-}
-interface BaseEmbedData {
-    title?: string;
-    color?: EmbedColor;
-    description?: string;
+};
+type EmbedBuilderPlusFooterData = {
+    text?: string | null;
+    iconURL?: string | null;
+};
+type EmbedBuilderPlusAuthorData = {
+    name: string;
     url?: string;
-    timestamp?: string | number | Date;
-    footer?: EmbedFooterData;
-    image?: EmbedAssetData;
-    thumbnail?: EmbedAssetData;
-    author?: EmbedAuthorData;
-    fields?: BaseEmbedField[];
+    iconURL?: string;
+};
+interface EmbedBuilderPlusOptions {
+    extend?: Omit<EmbedBuilderPlusData, keyof EmbedBuilderPlusOptions> | EmbedData | APIEmbed | Embed;
+    mergeFields?: boolean;
 }
-interface CreateEmbedOptions extends BaseEmbedData {
-    extend?: BaseEmbedData;
-    modify?: {
-        fields?(fields: BaseEmbedField[]): BaseEmbedField[];
-    };
+interface EmbedBuilderPlusData extends EmbedBuilderPlusOptions {
+    title?: string | null;
+    color?: EmbedBuilderPlusColorData | null;
+    description?: string | null;
+    url?: string | null;
+    thumbnail?: EmbedBuilderPlusAssetData | null;
+    image?: EmbedBuilderPlusAssetData | null;
+    fields?: Partial<EmbedBuilderPlusFieldData>[] | null;
+    timestamp?: string | number | Date | null;
+    footer?: EmbedBuilderPlusFooterData;
+    author?: EmbedBuilderPlusAuthorData;
+}
+declare class EmbedBuilderPlus extends EmbedBuilder {
+    constructor(data: EmbedBuilderPlusData);
+    has(property: keyof Omit<EmbedBuilderPlusData, keyof EmbedBuilderPlusOptions>): boolean;
+    toArray(): this[];
+    toString(space?: number): string;
+    updateField(index: number, field: Partial<EmbedBuilderPlusFieldData>): this;
+    deleteField(index: number): this;
+    popField(): discord_js.APIEmbedField | undefined;
+    setAsset(asset: "thumbnail" | "image", source: EmbedBuilderPlusAssetData): this;
+    get fieldsLength(): number;
+    get fields(): discord_js.APIEmbedField[];
+    createFromThis(data?: EmbedBuilderPlusData): EmbedBuilderPlus;
 }
-declare function createEmbed(options: CreateEmbedOptions): EmbedBuilder;
+type EmbedPropery<T extends keyof EmbedBuilderPlusData> = EmbedBuilderPlusData[T];
+declare function createEmbed(data: EmbedBuilderPlusData): EmbedBuilderPlus;
 
 type FindEmojiFilter = (emoji: GuildEmoji) => boolean;
 declare function findEmoji(guildOrClient: Guild | Client): {
@@ -154,4 +184,4 @@ declare function findRole(guild: Guild): {
     byFilter(filter: FindRoleFilter): Role | undefined;
 };
 
-export { type BaseEmbedData, CustomItents, CustomPartials, createComponentsManager, createEmbed, createEmbedAsset, createEmbedAuthor, createEmbedFooter, createLinkButton, createModalInput, createRow, findChannel, findCommand, findEmoji, findMember, findMessage, findRole, formatedMention };
+export { CustomItents, CustomPartials, EmbedBuilderPlus, type EmbedPropery, chars, createComponentsManager, createEmbed, createEmbedAsset, createEmbedAuthor, createEmbedFooter, createLinkButton, createModalInput, createRow, findChannel, findCommand, findEmoji, findMember, findMessage, findRole, formatedMention };

package/dist/index.mjs

@@ -1,8 +1,9 @@
+export { chars } from './constants/chars.mjs';
 export { CustomItents, CustomPartials } from './constants/client.mjs';
 export { findChannel } from './functions/channels.mjs';
 export { findCommand } from './functions/commands.mjs';
 export { createComponentsManager, createLinkButton, createModalInput, createRow } from './functions/components.mjs';
-export { createEmbed, createEmbedAsset, createEmbedAuthor, createEmbedFooter } from './functions/embeds.mjs';
+export { EmbedBuilderPlus, createEmbed, createEmbedAsset, createEmbedAuthor, createEmbedFooter } from './functions/embeds.mjs';
 export { findEmoji } from './functions/emojis.mjs';
 export { formatedMention } from './functions/format.mjs';
 export { findMember } from './functions/members.mjs';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@magicyan/discord",
-  "version": "1.0.18",
+  "version": "1.0.20",
   "description": "Simple functions to facilitate discord bot development",
   "license": "MIT",
   "type": "module",
@@ -39,7 +39,7 @@
     "unbuild": "^2.0.0"
   },
   "dependencies": {
-    "@magicyan/core": "^1.0.16"
+    "@magicyan/core": "^1.0.17"
   },
   "peerDependencies": {
     "discord.js": "^14.14.1"