@magicyan/discord 1.0.24 → 1.0.25

package/dist/functions/components.cjs

@@ -27,7 +27,7 @@ function createComponentsManager(components) {
     (row) => row.components.filter((c) => c.type === discord_js.ComponentType.RoleSelect)
   );
   const mentionableSelects = components.flatMap(
-    (row) => row.components.filter((c) => c.type === discord_js.ComponentType.Button)
+    (row) => row.components.filter((c) => c.type === discord_js.ComponentType.MentionableSelect)
   );
   return {
     getButton(customId) {

package/dist/functions/components.mjs

@@ -25,7 +25,7 @@ function createComponentsManager(components) {
     (row) => row.components.filter((c) => c.type === ComponentType.RoleSelect)
   );
   const mentionableSelects = components.flatMap(
-    (row) => row.components.filter((c) => c.type === ComponentType.Button)
+    (row) => row.components.filter((c) => c.type === ComponentType.MentionableSelect)
   );
   return {
     getButton(customId) {

package/dist/functions/embeds/author.cjs

@@ -1,7 +1,7 @@
 'use strict';
 
 function createEmbedAuthor(options) {
-  const { prefix, suffix, url, iconURL } = options;
+  const { prefix = "", suffix = "", url, iconURL } = options;
   const { size = 512, extension, forceStatic } = options;
   const avatarOptions = { size, extension, forceStatic };
   if ("member" in options) {

package/dist/functions/embeds/author.mjs

@@ -1,5 +1,5 @@
 function createEmbedAuthor(options) {
-  const { prefix, suffix, url, iconURL } = options;
+  const { prefix = "", suffix = "", url, iconURL } = options;
   const { size = 512, extension, forceStatic } = options;
   const avatarOptions = { size, extension, forceStatic };
   if ("member" in options) {

package/dist/functions/embeds/embedplus.cjs

@@ -4,36 +4,44 @@ const discord_js = require('discord.js');
 const chars = require('../../constants/chars.cjs');
 const assets = require('./assets.cjs');
 const footer = require('./footer.cjs');
+const fields = require('./fields.cjs');
 
+var __defProp = Object.defineProperty;
+var __defNormalProp = (obj, key, value) => key in obj ? __defProp(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
+var __publicField = (obj, key, value) => {
+  __defNormalProp(obj, typeof key !== "symbol" ? key + "" : key, value);
+  return value;
+};
 class EmbedPlusBuilder extends discord_js.EmbedBuilder {
   constructor(data) {
     const extendsEmbed = data.extends ? new EmbedPlusBuilder(
       data.extends instanceof discord_js.Embed || data.extends instanceof discord_js.EmbedBuilder ? data.extends.data : data.extends
     ).data : {};
-    const { fields: extendsFields, ...exetendData } = extendsEmbed;
-    const fields = (data.mergeFields ? [extendsFields ?? [], data.fields ?? []].flat() : data.fields ?? extendsFields ?? []).map(({ name = chars.chars.invisible, value = chars.chars.invisible, inline }) => ({
+    const { fields: extendsFields, ...extendData } = extendsEmbed;
+    const { mergeFields = true } = data;
+    const fields$1 = (mergeFields ? [extendsFields ?? [], data.fields ?? []].flat() : data.fields ?? extendsFields ?? []).map(({ name = chars.chars.invisible, value = chars.chars.invisible, inline }) => ({
       name,
       value,
       inline
     }));
-    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: footer.createEmbedFooter(data.footer) } : {},
-      ...data.author ? { author: data.author } : {},
-      ...data.image ? { image: assets.createEmbedAsset(data.image) } : {},
-      ...data.thumbnail ? { thumbnail: assets.createEmbedAsset(data.thumbnail) } : {},
-      ...fields.length > 0 ? { fields } : {}
-    });
-    if (data.timestamp)
+    const builderData = Object.assign({}, extendData, data, { fields: fields$1 });
+    const { color, footer: footer$1, image, thumbnail, timestamp } = data;
+    if (footer$1)
+      Object.assign(builderData, { footer: footer.createEmbedFooter(footer$1) });
+    if (image)
+      Object.assign(builderData, { image: assets.createEmbedAsset(image) });
+    if (thumbnail)
+      Object.assign(builderData, { thumbnail: assets.createEmbedAsset(thumbnail) });
+    const embed = new discord_js.EmbedBuilder(builderData);
+    if (timestamp)
       embed.setTimestamp(
-        typeof data.timestamp === "string" ? new Date(data.timestamp) : data.timestamp
+        typeof timestamp === "string" ? new Date(timestamp) : timestamp
       );
-    if (data.color)
-      embed.setColor(data.color);
+    if (color)
+      embed.setColor(color);
     super(embed.data);
+    __publicField(this, "fields");
+    this.fields = new fields.EmbedPlusField(this);
   }
   has(property) {
     return Boolean(this.data[property]);
@@ -44,31 +52,6 @@ class EmbedPlusBuilder extends discord_js.EmbedBuilder {
   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) {
     const assetData = assets.createEmbedAsset(source);
     if (!assetData?.url)
@@ -76,16 +59,16 @@ class EmbedPlusBuilder extends discord_js.EmbedBuilder {
     asset === "image" ? this.setImage(assetData.url) : this.setThumbnail(assetData.url);
     return this;
   }
-  get fieldsLength() {
-    return this.data.fields?.length ?? 0;
+  static fromInteraction(interaction, index = 0, data = {}) {
+    return EmbedPlusBuilder.fromMessage(interaction.message, index, data);
   }
-  get fields() {
-    return this.data.fields ?? [];
+  static fromMessage(message, index = 0, data = {}) {
+    return new EmbedPlusBuilder(Object.assign({ extends: message.embeds[index] }, data));
   }
 }
 function createEmbed(options) {
-  const { array = false, ...data } = options;
-  const embed = new EmbedPlusBuilder(data);
+  const { array = false, interaction, ...data } = options;
+  const embed = interaction ? EmbedPlusBuilder.fromInteraction(interaction, 0, data) : new EmbedPlusBuilder(data);
   return array ? [embed] : embed;
 }
 

package/dist/functions/embeds/embedplus.mjs

@@ -2,36 +2,44 @@ import { EmbedBuilder, Embed } from 'discord.js';
 import { chars } from '../../constants/chars.mjs';
 import { createEmbedAsset } from './assets.mjs';
 import { createEmbedFooter } from './footer.mjs';
+import { EmbedPlusField } from './fields.mjs';
 
+var __defProp = Object.defineProperty;
+var __defNormalProp = (obj, key, value) => key in obj ? __defProp(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
+var __publicField = (obj, key, value) => {
+  __defNormalProp(obj, typeof key !== "symbol" ? key + "" : key, value);
+  return value;
+};
 class EmbedPlusBuilder extends EmbedBuilder {
   constructor(data) {
     const extendsEmbed = data.extends ? new EmbedPlusBuilder(
       data.extends instanceof Embed || data.extends instanceof EmbedBuilder ? data.extends.data : data.extends
     ).data : {};
-    const { fields: extendsFields, ...exetendData } = extendsEmbed;
-    const fields = (data.mergeFields ? [extendsFields ?? [], data.fields ?? []].flat() : data.fields ?? extendsFields ?? []).map(({ name = chars.invisible, value = chars.invisible, inline }) => ({
+    const { fields: extendsFields, ...extendData } = extendsEmbed;
+    const { mergeFields = true } = data;
+    const fields = (mergeFields ? [extendsFields ?? [], data.fields ?? []].flat() : data.fields ?? extendsFields ?? []).map(({ name = chars.invisible, value = chars.invisible, inline }) => ({
       name,
       value,
       inline
     }));
-    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)
+    const builderData = Object.assign({}, extendData, data, { fields });
+    const { color, footer, image, thumbnail, timestamp } = data;
+    if (footer)
+      Object.assign(builderData, { footer: createEmbedFooter(footer) });
+    if (image)
+      Object.assign(builderData, { image: createEmbedAsset(image) });
+    if (thumbnail)
+      Object.assign(builderData, { thumbnail: createEmbedAsset(thumbnail) });
+    const embed = new EmbedBuilder(builderData);
+    if (timestamp)
       embed.setTimestamp(
-        typeof data.timestamp === "string" ? new Date(data.timestamp) : data.timestamp
+        typeof timestamp === "string" ? new Date(timestamp) : timestamp
       );
-    if (data.color)
-      embed.setColor(data.color);
+    if (color)
+      embed.setColor(color);
     super(embed.data);
+    __publicField(this, "fields");
+    this.fields = new EmbedPlusField(this);
   }
   has(property) {
     return Boolean(this.data[property]);
@@ -42,31 +50,6 @@ class EmbedPlusBuilder extends EmbedBuilder {
   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) {
     const assetData = createEmbedAsset(source);
     if (!assetData?.url)
@@ -74,16 +57,16 @@ class EmbedPlusBuilder extends EmbedBuilder {
     asset === "image" ? this.setImage(assetData.url) : this.setThumbnail(assetData.url);
     return this;
   }
-  get fieldsLength() {
-    return this.data.fields?.length ?? 0;
+  static fromInteraction(interaction, index = 0, data = {}) {
+    return EmbedPlusBuilder.fromMessage(interaction.message, index, data);
   }
-  get fields() {
-    return this.data.fields ?? [];
+  static fromMessage(message, index = 0, data = {}) {
+    return new EmbedPlusBuilder(Object.assign({ extends: message.embeds[index] }, data));
   }
 }
 function createEmbed(options) {
-  const { array = false, ...data } = options;
-  const embed = new EmbedPlusBuilder(data);
+  const { array = false, interaction, ...data } = options;
+  const embed = interaction ? EmbedPlusBuilder.fromInteraction(interaction, 0, data) : new EmbedPlusBuilder(data);
   return array ? [embed] : embed;
 }
 

package/dist/functions/embeds/fields.cjs

@@ -0,0 +1,93 @@
+'use strict';
+
+var __defProp = Object.defineProperty;
+var __defNormalProp = (obj, key, value) => key in obj ? __defProp(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
+var __publicField = (obj, key, value) => {
+  __defNormalProp(obj, typeof key !== "symbol" ? key + "" : key, value);
+  return value;
+};
+class EmbedPlusField {
+  constructor(embed) {
+    __publicField(this, "embed");
+    this.embed = embed;
+  }
+  set fields(fields) {
+    this.embed.setFields(fields);
+  }
+  get fields() {
+    return this.embed.data.fields ?? [];
+  }
+  [Symbol.iterator]() {
+    let pointer = 0;
+    const fields = this.fields;
+    return {
+      next() {
+        return {
+          done: pointer >= fields.length,
+          value: fields[pointer++] ?? null
+        };
+      }
+    };
+  }
+  get length() {
+    return this.fields.length;
+  }
+  get record() {
+    return this.fields.reduce(
+      (record, { name, value }) => Object.assign(record, { [name]: value }),
+      {}
+    );
+  }
+  get(query) {
+    const isIndex = typeof query == "number";
+    if (isIndex)
+      return this.fields[query];
+    return this.fields.find((f) => f.name === query);
+  }
+  find(predicate) {
+    return this.fields.find(predicate);
+  }
+  push(...fields) {
+    this.embed.addFields(fields);
+  }
+  set(...fields) {
+    this.embed.setFields(fields);
+  }
+  update(predicate, field) {
+    const index = this.getPredicateIndex(predicate);
+    if (index == -1)
+      return false;
+    const embedField = this.get(index);
+    if (!embedField)
+      return false;
+    this.embed.spliceFields(index, 1, Object.assign(embedField, field));
+    return true;
+  }
+  delete(predicate) {
+    const index = this.getPredicateIndex(predicate);
+    if (index == -1)
+      return false;
+    const embedField = this.get(index);
+    if (!embedField)
+      return false;
+    this.embed.spliceFields(index, 1);
+    return true;
+  }
+  toArray() {
+    return Array.from(this);
+  }
+  getPredicateIndex(predicate) {
+    switch (typeof predicate) {
+      case "function":
+        return this.fields.findIndex(predicate);
+      case "string":
+        return this.fields.findIndex((f) => f.name == predicate);
+      case "number":
+        return predicate;
+      default:
+        return -1;
+    }
+  }
+}
+
+exports.EmbedPlusField = EmbedPlusField;

package/dist/functions/embeds/fields.mjs

@@ -0,0 +1,91 @@
+var __defProp = Object.defineProperty;
+var __defNormalProp = (obj, key, value) => key in obj ? __defProp(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
+var __publicField = (obj, key, value) => {
+  __defNormalProp(obj, typeof key !== "symbol" ? key + "" : key, value);
+  return value;
+};
+class EmbedPlusField {
+  constructor(embed) {
+    __publicField(this, "embed");
+    this.embed = embed;
+  }
+  set fields(fields) {
+    this.embed.setFields(fields);
+  }
+  get fields() {
+    return this.embed.data.fields ?? [];
+  }
+  [Symbol.iterator]() {
+    let pointer = 0;
+    const fields = this.fields;
+    return {
+      next() {
+        return {
+          done: pointer >= fields.length,
+          value: fields[pointer++] ?? null
+        };
+      }
+    };
+  }
+  get length() {
+    return this.fields.length;
+  }
+  get record() {
+    return this.fields.reduce(
+      (record, { name, value }) => Object.assign(record, { [name]: value }),
+      {}
+    );
+  }
+  get(query) {
+    const isIndex = typeof query == "number";
+    if (isIndex)
+      return this.fields[query];
+    return this.fields.find((f) => f.name === query);
+  }
+  find(predicate) {
+    return this.fields.find(predicate);
+  }
+  push(...fields) {
+    this.embed.addFields(fields);
+  }
+  set(...fields) {
+    this.embed.setFields(fields);
+  }
+  update(predicate, field) {
+    const index = this.getPredicateIndex(predicate);
+    if (index == -1)
+      return false;
+    const embedField = this.get(index);
+    if (!embedField)
+      return false;
+    this.embed.spliceFields(index, 1, Object.assign(embedField, field));
+    return true;
+  }
+  delete(predicate) {
+    const index = this.getPredicateIndex(predicate);
+    if (index == -1)
+      return false;
+    const embedField = this.get(index);
+    if (!embedField)
+      return false;
+    this.embed.spliceFields(index, 1);
+    return true;
+  }
+  toArray() {
+    return Array.from(this);
+  }
+  getPredicateIndex(predicate) {
+    switch (typeof predicate) {
+      case "function":
+        return this.fields.findIndex(predicate);
+      case "string":
+        return this.fields.findIndex((f) => f.name == predicate);
+      case "number":
+        return predicate;
+      default:
+        return -1;
+    }
+  }
+}
+
+export { EmbedPlusField };

package/dist/functions/members.cjs

@@ -1,24 +1,25 @@
 'use strict';
 
 function findMember(guild) {
+  const cache = guild.members.cache;
   return {
     byGlobalName(globalName, and = () => true) {
-      return guild.members.cache.find((member) => member.user.globalName == globalName && and(member));
+      return cache.find((member) => member.user.globalName == globalName && and(member));
     },
     byNickname(nickname, and = () => true) {
-      return guild.members.cache.find((member) => member.nickname && member.nickname == nickname && and(member));
+      return cache.find((member) => member.nickname && member.nickname == nickname && and(member));
     },
     byUsername(username, and = () => true) {
-      return guild.members.cache.find((member) => member.user.username === username && and(member));
+      return cache.find((member) => member.user.username === username && and(member));
     },
     byDisplayName(displayName, and = () => true) {
-      return guild.members.cache.find((member) => member.displayName === displayName && and(member));
+      return cache.find((member) => member.displayName === displayName && and(member));
     },
     byId(id) {
-      return guild.members.cache.get(id);
+      return cache.get(id);
     },
     byFilter(filter) {
-      return guild.members.cache.find(filter);
+      return cache.find(filter);
     }
   };
 }

package/dist/functions/members.mjs

@@ -1,22 +1,23 @@
 function findMember(guild) {
+  const cache = guild.members.cache;
   return {
     byGlobalName(globalName, and = () => true) {
-      return guild.members.cache.find((member) => member.user.globalName == globalName && and(member));
+      return cache.find((member) => member.user.globalName == globalName && and(member));
     },
     byNickname(nickname, and = () => true) {
-      return guild.members.cache.find((member) => member.nickname && member.nickname == nickname && and(member));
+      return cache.find((member) => member.nickname && member.nickname == nickname && and(member));
     },
     byUsername(username, and = () => true) {
-      return guild.members.cache.find((member) => member.user.username === username && and(member));
+      return cache.find((member) => member.user.username === username && and(member));
     },
     byDisplayName(displayName, and = () => true) {
-      return guild.members.cache.find((member) => member.displayName === displayName && and(member));
+      return cache.find((member) => member.displayName === displayName && and(member));
     },
     byId(id) {
-      return guild.members.cache.get(id);
+      return cache.get(id);
     },
     byFilter(filter) {
-      return guild.members.cache.find(filter);
+      return cache.find(filter);
     }
   };
 }

package/dist/functions/modals.cjs

@@ -8,7 +8,7 @@ function createModalInput(data) {
 }
 function createModalFields(data) {
   return Object.entries(data).map(
-    ([customId, data2]) => createModalInput({ customId, ...data2 })
+    ([customId, data2]) => createModalInput(Object.assign({ customId }, data2))
   );
 }
 

package/dist/functions/modals.mjs

@@ -6,7 +6,7 @@ function createModalInput(data) {
 }
 function createModalFields(data) {
   return Object.entries(data).map(
-    ([customId, data2]) => createModalInput({ customId, ...data2 })
+    ([customId, data2]) => createModalInput(Object.assign({ customId }, data2))
   );
 }
 

package/dist/index.d.cts

@@ -1,5 +1,5 @@
 import * as discord_js from 'discord.js';
-import { GatewayIntentBits, Partials, ChannelType, Guild, CommandInteractionOption, Client, ApplicationCommand, AnyComponentBuilder, ActionRowBuilder, ButtonBuilder, ActionRow, MessageActionRowComponent, LinkButtonComponentData, ButtonComponent, StringSelectMenuComponent, UserSelectMenuComponent, ChannelSelectMenuComponent, RoleSelectMenuComponent, MentionableSelectMenuComponent, TextInputBuilder, TextInputComponentData, GuildEmoji, GuildBasedChannel, Role, User, GuildMember, GuildTextBasedChannel, Message, Attachment, AttachmentBuilder, EmbedAssetData, EmbedAuthorData, ImageURLOptions, EmbedBuilder, EmbedData, APIEmbed, Embed, ColorResolvable, EmbedFooterData } from 'discord.js';
+import { GatewayIntentBits, Partials, ChannelType, Guild, CommandInteractionOption, Client, ApplicationCommand, AnyComponentBuilder, ActionRowBuilder, ButtonBuilder, ActionRow, MessageActionRowComponent, LinkButtonComponentData, ButtonComponent, StringSelectMenuComponent, UserSelectMenuComponent, ChannelSelectMenuComponent, RoleSelectMenuComponent, MentionableSelectMenuComponent, TextInputBuilder, TextInputComponentData, GuildEmoji, GuildBasedChannel, Role, User, GuildMember, GuildTextBasedChannel, Message, Attachment, AttachmentBuilder, EmbedAssetData, EmbedAuthorData, ImageURLOptions, EmbedFooterData, APIEmbed, Embed, EmbedBuilder, EmbedData, ColorResolvable } from 'discord.js';
 export * from '@magicyan/core';
 
 declare const chars: {
@@ -163,9 +163,9 @@ declare function findRole(guild: Guild): {
  */
 declare function extractMentionId(mention: string): string | null;
 
+type EmbedPlusAssetData = string | Attachment | AttachmentBuilder | EmbedAssetData | undefined | null;
 type EmbedAssetOptions = Omit<EmbedAssetData, "url">;
-type AssetSource = string | Attachment | AttachmentBuilder | EmbedAssetData | undefined | null;
-declare function createEmbedAsset(source: AssetSource, options?: EmbedAssetOptions): EmbedAssetData | undefined;
+declare function createEmbedAsset(source: EmbedPlusAssetData, options?: EmbedAssetOptions): EmbedAssetData | undefined;
 
 interface UserAuthorOption {
     user: User;
@@ -184,17 +184,48 @@ type CreateEmbedAuthorOptions = AuthorOption & ImageURLOptions & {
 };
 declare function createEmbedAuthor(options: CreateEmbedAuthorOptions): EmbedAuthorData;
 
-type EmbedPlusAssetData = AssetSource;
-type EmbedPlusColorData = string & {} | ColorResolvable | null;
+type EmbedPlusFooterData = {
+    text?: string | null;
+    iconURL?: string | null;
+};
+declare function createEmbedFooter(options: EmbedPlusFooterData): EmbedFooterData | undefined;
+
 type EmbedPlusFieldData = {
     name: string;
     value: string;
     inline?: boolean;
 };
-type EmbedPlusFooterData = {
-    text?: string | null;
-    iconURL?: string | null;
-};
+type FieldPredicate = (field: EmbedPlusFieldData, index: number, obj: EmbedPlusFieldData[]) => boolean;
+declare class EmbedPlusField {
+    private embed;
+    private set fields(value);
+    private get fields();
+    constructor(embed: EmbedPlusBuilder);
+    [Symbol.iterator](): {
+        next(): IteratorResult<EmbedPlusFieldData>;
+    };
+    get length(): number;
+    get record(): Record<string, string>;
+    /**
+     * Get a filed by index
+     * @param name Field name
+     */
+    get(name: string): EmbedPlusFieldData | undefined;
+    /**
+     * Get a field by name
+     * @param index Field index
+     */
+    get(index: number): EmbedPlusFieldData | undefined;
+    find(predicate: FieldPredicate): EmbedPlusFieldData | undefined;
+    push(...fields: EmbedPlusFieldData[]): void;
+    set(...fields: EmbedPlusFieldData[]): void;
+    update(predicate: string | number | FieldPredicate, field: Partial<EmbedPlusFieldData>): boolean;
+    delete(predicate: number | FieldPredicate): boolean;
+    toArray(): EmbedPlusFieldData[];
+    private getPredicateIndex;
+}
+
+type EmbedPlusColorData = string & {} | ColorResolvable | null;
 type EmbedPlusAuthorData = {
     name: string;
     url?: string;
@@ -205,40 +236,40 @@ interface EmbedPlusData {
     color?: EmbedPlusColorData | null;
     description?: string | null;
     url?: string | null;
-    thumbnail?: EmbedPlusAssetData | null;
-    image?: EmbedPlusAssetData | null;
+    thumbnail?: EmbedPlusAssetData;
+    image?: EmbedPlusAssetData;
     fields?: Partial<EmbedPlusFieldData>[] | null;
     timestamp?: string | number | Date | null;
     footer?: EmbedPlusFooterData;
     author?: EmbedPlusAuthorData;
 }
+type AnyEmbed = APIEmbed | Embed | EmbedBuilder | EmbedData;
+interface MessageWithEmbeds {
+    embeds: Array<Embed>;
+}
+interface InteractionWithEmbeds {
+    message: MessageWithEmbeds;
+}
 interface EmbedPlusOptions extends EmbedPlusData {
-    extends?: Omit<EmbedPlusData, keyof EmbedPlusOptions> | EmbedData | APIEmbed | Embed;
+    extends?: Omit<EmbedPlusData, keyof EmbedPlusOptions> | AnyEmbed;
     mergeFields?: boolean;
 }
 declare class EmbedPlusBuilder extends EmbedBuilder {
+    fields: EmbedPlusField;
     constructor(data: EmbedPlusOptions);
     has(property: keyof Omit<EmbedPlusData, keyof EmbedPlusOptions>): boolean;
-    toArray(): this[];
+    toArray(): EmbedPlusBuilder[];
     toString(space?: number): string;
-    updateField(index: number, field: Partial<EmbedPlusFieldData>): this;
-    deleteField(index: number): this;
-    popField(): discord_js.APIEmbedField | undefined;
     setAsset(asset: "thumbnail" | "image", source: EmbedPlusAssetData): this;
-    get fieldsLength(): number;
-    get fields(): discord_js.APIEmbedField[];
+    static fromInteraction(interaction: InteractionWithEmbeds, index?: number, data?: EmbedPlusData): EmbedPlusBuilder;
+    static fromMessage(message: MessageWithEmbeds, index?: number, data?: EmbedPlusData): EmbedPlusBuilder;
 }
 type EmbedPlusProperty<P extends keyof EmbedPlusData> = EmbedPlusData[P];
 interface CreateEmbedOptions<B extends boolean> extends EmbedPlusOptions {
     array?: B;
+    interaction?: InteractionWithEmbeds;
 }
 type CreateEmbedReturn<B> = undefined extends B ? EmbedPlusBuilder : false extends B ? EmbedPlusBuilder : EmbedPlusBuilder[];
 declare function createEmbed<B extends boolean>(options: CreateEmbedOptions<B>): CreateEmbedReturn<B>;
 
-interface CreateEmbedFooterOptions {
-    text?: string | null;
-    iconURL?: string | null;
-}
-declare function createEmbedFooter(options: CreateEmbedFooterOptions): EmbedFooterData | undefined;
-
-export { type AssetSource, CustomItents, CustomPartials, EmbedPlusBuilder, type EmbedPlusProperty, chars, createComponentsManager, createEmbed, createEmbedAsset, createEmbedAuthor, createEmbedFooter, createLinkButton, createModalFields, createModalInput, createRow, extractMentionId, findChannel, findCommand, findEmoji, findMember, findMessage, findRole, formatedMention, getChannelUrlInfo, getMessageUrlInfo, setMobileStatus };
+export { type AnyEmbed, CustomItents, CustomPartials, type EmbedPlusAssetData, EmbedPlusBuilder, type EmbedPlusData, type EmbedPlusFooterData, type EmbedPlusProperty, chars, createComponentsManager, createEmbed, createEmbedAsset, createEmbedAuthor, createEmbedFooter, createLinkButton, createModalFields, createModalInput, createRow, extractMentionId, findChannel, findCommand, findEmoji, findMember, findMessage, findRole, formatedMention, getChannelUrlInfo, getMessageUrlInfo, setMobileStatus };

package/dist/index.d.mts

@@ -1,5 +1,5 @@
 import * as discord_js from 'discord.js';
-import { GatewayIntentBits, Partials, ChannelType, Guild, CommandInteractionOption, Client, ApplicationCommand, AnyComponentBuilder, ActionRowBuilder, ButtonBuilder, ActionRow, MessageActionRowComponent, LinkButtonComponentData, ButtonComponent, StringSelectMenuComponent, UserSelectMenuComponent, ChannelSelectMenuComponent, RoleSelectMenuComponent, MentionableSelectMenuComponent, TextInputBuilder, TextInputComponentData, GuildEmoji, GuildBasedChannel, Role, User, GuildMember, GuildTextBasedChannel, Message, Attachment, AttachmentBuilder, EmbedAssetData, EmbedAuthorData, ImageURLOptions, EmbedBuilder, EmbedData, APIEmbed, Embed, ColorResolvable, EmbedFooterData } from 'discord.js';
+import { GatewayIntentBits, Partials, ChannelType, Guild, CommandInteractionOption, Client, ApplicationCommand, AnyComponentBuilder, ActionRowBuilder, ButtonBuilder, ActionRow, MessageActionRowComponent, LinkButtonComponentData, ButtonComponent, StringSelectMenuComponent, UserSelectMenuComponent, ChannelSelectMenuComponent, RoleSelectMenuComponent, MentionableSelectMenuComponent, TextInputBuilder, TextInputComponentData, GuildEmoji, GuildBasedChannel, Role, User, GuildMember, GuildTextBasedChannel, Message, Attachment, AttachmentBuilder, EmbedAssetData, EmbedAuthorData, ImageURLOptions, EmbedFooterData, APIEmbed, Embed, EmbedBuilder, EmbedData, ColorResolvable } from 'discord.js';
 export * from '@magicyan/core';
 
 declare const chars: {
@@ -163,9 +163,9 @@ declare function findRole(guild: Guild): {
  */
 declare function extractMentionId(mention: string): string | null;
 
+type EmbedPlusAssetData = string | Attachment | AttachmentBuilder | EmbedAssetData | undefined | null;
 type EmbedAssetOptions = Omit<EmbedAssetData, "url">;
-type AssetSource = string | Attachment | AttachmentBuilder | EmbedAssetData | undefined | null;
-declare function createEmbedAsset(source: AssetSource, options?: EmbedAssetOptions): EmbedAssetData | undefined;
+declare function createEmbedAsset(source: EmbedPlusAssetData, options?: EmbedAssetOptions): EmbedAssetData | undefined;
 
 interface UserAuthorOption {
     user: User;
@@ -184,17 +184,48 @@ type CreateEmbedAuthorOptions = AuthorOption & ImageURLOptions & {
 };
 declare function createEmbedAuthor(options: CreateEmbedAuthorOptions): EmbedAuthorData;
 
-type EmbedPlusAssetData = AssetSource;
-type EmbedPlusColorData = string & {} | ColorResolvable | null;
+type EmbedPlusFooterData = {
+    text?: string | null;
+    iconURL?: string | null;
+};
+declare function createEmbedFooter(options: EmbedPlusFooterData): EmbedFooterData | undefined;
+
 type EmbedPlusFieldData = {
     name: string;
     value: string;
     inline?: boolean;
 };
-type EmbedPlusFooterData = {
-    text?: string | null;
-    iconURL?: string | null;
-};
+type FieldPredicate = (field: EmbedPlusFieldData, index: number, obj: EmbedPlusFieldData[]) => boolean;
+declare class EmbedPlusField {
+    private embed;
+    private set fields(value);
+    private get fields();
+    constructor(embed: EmbedPlusBuilder);
+    [Symbol.iterator](): {
+        next(): IteratorResult<EmbedPlusFieldData>;
+    };
+    get length(): number;
+    get record(): Record<string, string>;
+    /**
+     * Get a filed by index
+     * @param name Field name
+     */
+    get(name: string): EmbedPlusFieldData | undefined;
+    /**
+     * Get a field by name
+     * @param index Field index
+     */
+    get(index: number): EmbedPlusFieldData | undefined;
+    find(predicate: FieldPredicate): EmbedPlusFieldData | undefined;
+    push(...fields: EmbedPlusFieldData[]): void;
+    set(...fields: EmbedPlusFieldData[]): void;
+    update(predicate: string | number | FieldPredicate, field: Partial<EmbedPlusFieldData>): boolean;
+    delete(predicate: number | FieldPredicate): boolean;
+    toArray(): EmbedPlusFieldData[];
+    private getPredicateIndex;
+}
+
+type EmbedPlusColorData = string & {} | ColorResolvable | null;
 type EmbedPlusAuthorData = {
     name: string;
     url?: string;
@@ -205,40 +236,40 @@ interface EmbedPlusData {
     color?: EmbedPlusColorData | null;
     description?: string | null;
     url?: string | null;
-    thumbnail?: EmbedPlusAssetData | null;
-    image?: EmbedPlusAssetData | null;
+    thumbnail?: EmbedPlusAssetData;
+    image?: EmbedPlusAssetData;
     fields?: Partial<EmbedPlusFieldData>[] | null;
     timestamp?: string | number | Date | null;
     footer?: EmbedPlusFooterData;
     author?: EmbedPlusAuthorData;
 }
+type AnyEmbed = APIEmbed | Embed | EmbedBuilder | EmbedData;
+interface MessageWithEmbeds {
+    embeds: Array<Embed>;
+}
+interface InteractionWithEmbeds {
+    message: MessageWithEmbeds;
+}
 interface EmbedPlusOptions extends EmbedPlusData {
-    extends?: Omit<EmbedPlusData, keyof EmbedPlusOptions> | EmbedData | APIEmbed | Embed;
+    extends?: Omit<EmbedPlusData, keyof EmbedPlusOptions> | AnyEmbed;
     mergeFields?: boolean;
 }
 declare class EmbedPlusBuilder extends EmbedBuilder {
+    fields: EmbedPlusField;
     constructor(data: EmbedPlusOptions);
     has(property: keyof Omit<EmbedPlusData, keyof EmbedPlusOptions>): boolean;
-    toArray(): this[];
+    toArray(): EmbedPlusBuilder[];
     toString(space?: number): string;
-    updateField(index: number, field: Partial<EmbedPlusFieldData>): this;
-    deleteField(index: number): this;
-    popField(): discord_js.APIEmbedField | undefined;
     setAsset(asset: "thumbnail" | "image", source: EmbedPlusAssetData): this;
-    get fieldsLength(): number;
-    get fields(): discord_js.APIEmbedField[];
+    static fromInteraction(interaction: InteractionWithEmbeds, index?: number, data?: EmbedPlusData): EmbedPlusBuilder;
+    static fromMessage(message: MessageWithEmbeds, index?: number, data?: EmbedPlusData): EmbedPlusBuilder;
 }
 type EmbedPlusProperty<P extends keyof EmbedPlusData> = EmbedPlusData[P];
 interface CreateEmbedOptions<B extends boolean> extends EmbedPlusOptions {
     array?: B;
+    interaction?: InteractionWithEmbeds;
 }
 type CreateEmbedReturn<B> = undefined extends B ? EmbedPlusBuilder : false extends B ? EmbedPlusBuilder : EmbedPlusBuilder[];
 declare function createEmbed<B extends boolean>(options: CreateEmbedOptions<B>): CreateEmbedReturn<B>;
 
-interface CreateEmbedFooterOptions {
-    text?: string | null;
-    iconURL?: string | null;
-}
-declare function createEmbedFooter(options: CreateEmbedFooterOptions): EmbedFooterData | undefined;
-
-export { type AssetSource, CustomItents, CustomPartials, EmbedPlusBuilder, type EmbedPlusProperty, chars, createComponentsManager, createEmbed, createEmbedAsset, createEmbedAuthor, createEmbedFooter, createLinkButton, createModalFields, createModalInput, createRow, extractMentionId, findChannel, findCommand, findEmoji, findMember, findMessage, findRole, formatedMention, getChannelUrlInfo, getMessageUrlInfo, setMobileStatus };
+export { type AnyEmbed, CustomItents, CustomPartials, type EmbedPlusAssetData, EmbedPlusBuilder, type EmbedPlusData, type EmbedPlusFooterData, type EmbedPlusProperty, chars, createComponentsManager, createEmbed, createEmbedAsset, createEmbedAuthor, createEmbedFooter, createLinkButton, createModalFields, createModalInput, createRow, extractMentionId, findChannel, findCommand, findEmoji, findMember, findMessage, findRole, formatedMention, getChannelUrlInfo, getMessageUrlInfo, setMobileStatus };

package/dist/index.d.ts

@@ -1,5 +1,5 @@
 import * as discord_js from 'discord.js';
-import { GatewayIntentBits, Partials, ChannelType, Guild, CommandInteractionOption, Client, ApplicationCommand, AnyComponentBuilder, ActionRowBuilder, ButtonBuilder, ActionRow, MessageActionRowComponent, LinkButtonComponentData, ButtonComponent, StringSelectMenuComponent, UserSelectMenuComponent, ChannelSelectMenuComponent, RoleSelectMenuComponent, MentionableSelectMenuComponent, TextInputBuilder, TextInputComponentData, GuildEmoji, GuildBasedChannel, Role, User, GuildMember, GuildTextBasedChannel, Message, Attachment, AttachmentBuilder, EmbedAssetData, EmbedAuthorData, ImageURLOptions, EmbedBuilder, EmbedData, APIEmbed, Embed, ColorResolvable, EmbedFooterData } from 'discord.js';
+import { GatewayIntentBits, Partials, ChannelType, Guild, CommandInteractionOption, Client, ApplicationCommand, AnyComponentBuilder, ActionRowBuilder, ButtonBuilder, ActionRow, MessageActionRowComponent, LinkButtonComponentData, ButtonComponent, StringSelectMenuComponent, UserSelectMenuComponent, ChannelSelectMenuComponent, RoleSelectMenuComponent, MentionableSelectMenuComponent, TextInputBuilder, TextInputComponentData, GuildEmoji, GuildBasedChannel, Role, User, GuildMember, GuildTextBasedChannel, Message, Attachment, AttachmentBuilder, EmbedAssetData, EmbedAuthorData, ImageURLOptions, EmbedFooterData, APIEmbed, Embed, EmbedBuilder, EmbedData, ColorResolvable } from 'discord.js';
 export * from '@magicyan/core';
 
 declare const chars: {
@@ -163,9 +163,9 @@ declare function findRole(guild: Guild): {
  */
 declare function extractMentionId(mention: string): string | null;
 
+type EmbedPlusAssetData = string | Attachment | AttachmentBuilder | EmbedAssetData | undefined | null;
 type EmbedAssetOptions = Omit<EmbedAssetData, "url">;
-type AssetSource = string | Attachment | AttachmentBuilder | EmbedAssetData | undefined | null;
-declare function createEmbedAsset(source: AssetSource, options?: EmbedAssetOptions): EmbedAssetData | undefined;
+declare function createEmbedAsset(source: EmbedPlusAssetData, options?: EmbedAssetOptions): EmbedAssetData | undefined;
 
 interface UserAuthorOption {
     user: User;
@@ -184,17 +184,48 @@ type CreateEmbedAuthorOptions = AuthorOption & ImageURLOptions & {
 };
 declare function createEmbedAuthor(options: CreateEmbedAuthorOptions): EmbedAuthorData;
 
-type EmbedPlusAssetData = AssetSource;
-type EmbedPlusColorData = string & {} | ColorResolvable | null;
+type EmbedPlusFooterData = {
+    text?: string | null;
+    iconURL?: string | null;
+};
+declare function createEmbedFooter(options: EmbedPlusFooterData): EmbedFooterData | undefined;
+
 type EmbedPlusFieldData = {
     name: string;
     value: string;
     inline?: boolean;
 };
-type EmbedPlusFooterData = {
-    text?: string | null;
-    iconURL?: string | null;
-};
+type FieldPredicate = (field: EmbedPlusFieldData, index: number, obj: EmbedPlusFieldData[]) => boolean;
+declare class EmbedPlusField {
+    private embed;
+    private set fields(value);
+    private get fields();
+    constructor(embed: EmbedPlusBuilder);
+    [Symbol.iterator](): {
+        next(): IteratorResult<EmbedPlusFieldData>;
+    };
+    get length(): number;
+    get record(): Record<string, string>;
+    /**
+     * Get a filed by index
+     * @param name Field name
+     */
+    get(name: string): EmbedPlusFieldData | undefined;
+    /**
+     * Get a field by name
+     * @param index Field index
+     */
+    get(index: number): EmbedPlusFieldData | undefined;
+    find(predicate: FieldPredicate): EmbedPlusFieldData | undefined;
+    push(...fields: EmbedPlusFieldData[]): void;
+    set(...fields: EmbedPlusFieldData[]): void;
+    update(predicate: string | number | FieldPredicate, field: Partial<EmbedPlusFieldData>): boolean;
+    delete(predicate: number | FieldPredicate): boolean;
+    toArray(): EmbedPlusFieldData[];
+    private getPredicateIndex;
+}
+
+type EmbedPlusColorData = string & {} | ColorResolvable | null;
 type EmbedPlusAuthorData = {
     name: string;
     url?: string;
@@ -205,40 +236,40 @@ interface EmbedPlusData {
     color?: EmbedPlusColorData | null;
     description?: string | null;
     url?: string | null;
-    thumbnail?: EmbedPlusAssetData | null;
-    image?: EmbedPlusAssetData | null;
+    thumbnail?: EmbedPlusAssetData;
+    image?: EmbedPlusAssetData;
     fields?: Partial<EmbedPlusFieldData>[] | null;
     timestamp?: string | number | Date | null;
     footer?: EmbedPlusFooterData;
     author?: EmbedPlusAuthorData;
 }
+type AnyEmbed = APIEmbed | Embed | EmbedBuilder | EmbedData;
+interface MessageWithEmbeds {
+    embeds: Array<Embed>;
+}
+interface InteractionWithEmbeds {
+    message: MessageWithEmbeds;
+}
 interface EmbedPlusOptions extends EmbedPlusData {
-    extends?: Omit<EmbedPlusData, keyof EmbedPlusOptions> | EmbedData | APIEmbed | Embed;
+    extends?: Omit<EmbedPlusData, keyof EmbedPlusOptions> | AnyEmbed;
     mergeFields?: boolean;
 }
 declare class EmbedPlusBuilder extends EmbedBuilder {
+    fields: EmbedPlusField;
     constructor(data: EmbedPlusOptions);
     has(property: keyof Omit<EmbedPlusData, keyof EmbedPlusOptions>): boolean;
-    toArray(): this[];
+    toArray(): EmbedPlusBuilder[];
     toString(space?: number): string;
-    updateField(index: number, field: Partial<EmbedPlusFieldData>): this;
-    deleteField(index: number): this;
-    popField(): discord_js.APIEmbedField | undefined;
     setAsset(asset: "thumbnail" | "image", source: EmbedPlusAssetData): this;
-    get fieldsLength(): number;
-    get fields(): discord_js.APIEmbedField[];
+    static fromInteraction(interaction: InteractionWithEmbeds, index?: number, data?: EmbedPlusData): EmbedPlusBuilder;
+    static fromMessage(message: MessageWithEmbeds, index?: number, data?: EmbedPlusData): EmbedPlusBuilder;
 }
 type EmbedPlusProperty<P extends keyof EmbedPlusData> = EmbedPlusData[P];
 interface CreateEmbedOptions<B extends boolean> extends EmbedPlusOptions {
     array?: B;
+    interaction?: InteractionWithEmbeds;
 }
 type CreateEmbedReturn<B> = undefined extends B ? EmbedPlusBuilder : false extends B ? EmbedPlusBuilder : EmbedPlusBuilder[];
 declare function createEmbed<B extends boolean>(options: CreateEmbedOptions<B>): CreateEmbedReturn<B>;
 
-interface CreateEmbedFooterOptions {
-    text?: string | null;
-    iconURL?: string | null;
-}
-declare function createEmbedFooter(options: CreateEmbedFooterOptions): EmbedFooterData | undefined;
-
-export { type AssetSource, CustomItents, CustomPartials, EmbedPlusBuilder, type EmbedPlusProperty, chars, createComponentsManager, createEmbed, createEmbedAsset, createEmbedAuthor, createEmbedFooter, createLinkButton, createModalFields, createModalInput, createRow, extractMentionId, findChannel, findCommand, findEmoji, findMember, findMessage, findRole, formatedMention, getChannelUrlInfo, getMessageUrlInfo, setMobileStatus };
+export { type AnyEmbed, CustomItents, CustomPartials, type EmbedPlusAssetData, EmbedPlusBuilder, type EmbedPlusData, type EmbedPlusFooterData, type EmbedPlusProperty, chars, createComponentsManager, createEmbed, createEmbedAsset, createEmbedAuthor, createEmbedFooter, createLinkButton, createModalFields, createModalInput, createRow, extractMentionId, findChannel, findCommand, findEmoji, findMember, findMessage, findRole, formatedMention, getChannelUrlInfo, getMessageUrlInfo, setMobileStatus };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@magicyan/discord",
-  "version": "1.0.24",
+  "version": "1.0.25",
   "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.17"
+    "@magicyan/core": "^1.0.18"
   },
   "peerDependencies": {
     "discord.js": "^14.14.1"