@magicyan/discord 1.0.34 → 1.1.0

package/dist/constants/colors.cjs

@@ -0,0 +1,7 @@
+'use strict';
+
+const colors = {
+  embedbg: "#2B2D31"
+};
+
+exports.colors = colors;

package/dist/constants/colors.mjs

@@ -0,0 +1,5 @@
+const colors = {
+  embedbg: "#2B2D31"
+};
+
+export { colors };

package/dist/functions/commands.cjs

@@ -16,28 +16,16 @@ function findCommand(guildOrClient) {
     }
   };
 }
-function createCommandOptions(options) {
-  return Object.entries(options).map(
-    ([name, data]) => Object.assign(data, { name })
-  );
-}
-function createSubCommands(subcommands) {
-  return Object.entries(subcommands).map(([name, data]) => {
-    if (data.options)
-      Object.assign(data, {
-        options: createCommandOptions(data.options)
-      });
-    return Object.assign(data, { name, type: discord_js.ApplicationCommandOptionType.Subcommand });
-  });
-}
-function createSubCommandsGroups(groups) {
-  return Object.entries(groups).map(([name, data]) => {
-    const options = createSubCommands(data.subcommands);
-    return Object.assign(data, { name, type: discord_js.ApplicationCommandOptionType.SubcommandGroup, options });
-  });
+function commandMention(command, a, b) {
+  const args = [command.name, command.id];
+  if (a && b) {
+    args.splice(1, 0, a, b);
+  }
+  if (a && !b) {
+    args.splice(1, 0, a);
+  }
+  return discord_js.chatInputApplicationCommandMention(...args);
 }
 
-exports.createCommandOptions = createCommandOptions;
-exports.createSubCommands = createSubCommands;
-exports.createSubCommandsGroups = createSubCommandsGroups;
+exports.commandMention = commandMention;
 exports.findCommand = findCommand;

package/dist/functions/commands.mjs

@@ -1,4 +1,4 @@
-import { Client, ApplicationCommandOptionType } from 'discord.js';
+import { Client, chatInputApplicationCommandMention } from 'discord.js';
 
 function findCommand(guildOrClient) {
   const commands = guildOrClient instanceof Client ? guildOrClient.application.commands.cache : guildOrClient.commands.cache;
@@ -14,25 +14,15 @@ function findCommand(guildOrClient) {
     }
   };
 }
-function createCommandOptions(options) {
-  return Object.entries(options).map(
-    ([name, data]) => Object.assign(data, { name })
-  );
-}
-function createSubCommands(subcommands) {
-  return Object.entries(subcommands).map(([name, data]) => {
-    if (data.options)
-      Object.assign(data, {
-        options: createCommandOptions(data.options)
-      });
-    return Object.assign(data, { name, type: ApplicationCommandOptionType.Subcommand });
-  });
-}
-function createSubCommandsGroups(groups) {
-  return Object.entries(groups).map(([name, data]) => {
-    const options = createSubCommands(data.subcommands);
-    return Object.assign(data, { name, type: ApplicationCommandOptionType.SubcommandGroup, options });
-  });
+function commandMention(command, a, b) {
+  const args = [command.name, command.id];
+  if (a && b) {
+    args.splice(1, 0, a, b);
+  }
+  if (a && !b) {
+    args.splice(1, 0, a);
+  }
+  return chatInputApplicationCommandMention(...args);
 }
 
-export { createCommandOptions, createSubCommands, createSubCommandsGroups, findCommand };
+export { commandMention, findCommand };

package/dist/functions/embeds/embedplus.cjs

@@ -5,6 +5,7 @@ const assets = require('./assets.cjs');
 const fields = require('./fields.cjs');
 const footer = require('./footer.cjs');
 const chars = require('../../constants/chars.cjs');
+const colors = require('../../constants/colors.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;
@@ -36,8 +37,7 @@ class EmbedPlusBuilder extends discord_js.EmbedBuilder {
       embed.setTimestamp(
         typeof timestamp === "string" ? new Date(timestamp) : timestamp
       );
-    if (color)
-      embed.setColor(color);
+    embed.setColor(color || colors.colors.embedbg);
     super(embed.data);
     __publicField(this, "fields");
     this.fields = new fields.EmbedPlusFields(this);
@@ -62,7 +62,7 @@ class EmbedPlusBuilder extends discord_js.EmbedBuilder {
   }
   setBorderColor(color) {
     if (color === null) {
-      this.setColor("#2B2D31");
+      this.setColor(colors.colors.embedbg);
     } else if (typeof color === "number") {
       this.update({ color });
     } else {
@@ -100,17 +100,11 @@ class EmbedPlusBuilder extends discord_js.EmbedBuilder {
     }
     return this;
   }
-  static fromInteraction(interaction, index = 0, data = {}) {
-    return EmbedPlusBuilder.fromMessage(interaction.message, index, data);
-  }
-  static fromMessage(message, index = 0, data = {}) {
-    return new EmbedPlusBuilder(Object.assign({ extends: message.embeds[index] }, data));
-  }
 }
 function createEmbed(options) {
   const { array = false, from, fromIndex = 0, ...data } = options;
-  const embed = from ? "message" in from ? EmbedPlusBuilder.fromInteraction(from, fromIndex, data) : EmbedPlusBuilder.fromMessage(from, fromIndex, data) : new EmbedPlusBuilder(data);
-  return array ? [embed] : embed;
+  const fromEmbeds = from ? "message" in from ? from.message.embeds : from.embeds : [];
+  return array ? from && fromEmbeds.length > 0 ? fromEmbeds.map((embed) => new EmbedPlusBuilder({ extends: embed })) : [new EmbedPlusBuilder(data)] : from && fromEmbeds.length > 0 ? new EmbedPlusBuilder({ extends: fromEmbeds[fromIndex], ...data }) : new EmbedPlusBuilder(data);
 }
 
 exports.EmbedPlusBuilder = EmbedPlusBuilder;

package/dist/functions/embeds/embedplus.mjs

@@ -3,6 +3,7 @@ import { createEmbedAsset } from './assets.mjs';
 import { EmbedPlusFields } from './fields.mjs';
 import { createEmbedFooter } from './footer.mjs';
 import { chars } from '../../constants/chars.mjs';
+import { colors } from '../../constants/colors.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;
@@ -34,8 +35,7 @@ class EmbedPlusBuilder extends EmbedBuilder {
       embed.setTimestamp(
         typeof timestamp === "string" ? new Date(timestamp) : timestamp
       );
-    if (color)
-      embed.setColor(color);
+    embed.setColor(color || colors.embedbg);
     super(embed.data);
     __publicField(this, "fields");
     this.fields = new EmbedPlusFields(this);
@@ -60,7 +60,7 @@ class EmbedPlusBuilder extends EmbedBuilder {
   }
   setBorderColor(color) {
     if (color === null) {
-      this.setColor("#2B2D31");
+      this.setColor(colors.embedbg);
     } else if (typeof color === "number") {
       this.update({ color });
     } else {
@@ -98,17 +98,11 @@ class EmbedPlusBuilder extends EmbedBuilder {
     }
     return this;
   }
-  static fromInteraction(interaction, index = 0, data = {}) {
-    return EmbedPlusBuilder.fromMessage(interaction.message, index, data);
-  }
-  static fromMessage(message, index = 0, data = {}) {
-    return new EmbedPlusBuilder(Object.assign({ extends: message.embeds[index] }, data));
-  }
 }
 function createEmbed(options) {
   const { array = false, from, fromIndex = 0, ...data } = options;
-  const embed = from ? "message" in from ? EmbedPlusBuilder.fromInteraction(from, fromIndex, data) : EmbedPlusBuilder.fromMessage(from, fromIndex, data) : new EmbedPlusBuilder(data);
-  return array ? [embed] : embed;
+  const fromEmbeds = from ? "message" in from ? from.message.embeds : from.embeds : [];
+  return array ? from && fromEmbeds.length > 0 ? fromEmbeds.map((embed) => new EmbedPlusBuilder({ extends: embed })) : [new EmbedPlusBuilder(data)] : from && fromEmbeds.length > 0 ? new EmbedPlusBuilder({ extends: fromEmbeds[fromIndex], ...data }) : new EmbedPlusBuilder(data);
 }
 
 export { EmbedPlusBuilder, createEmbed };

package/dist/functions/embeds/fields.cjs

@@ -51,9 +51,14 @@ class EmbedPlusFields {
   }
   push(...fields) {
     this.embed.addFields(fields.map(this.fieldFormat));
+    return this;
   }
   set(...fields) {
     this.embed.setFields(fields.map(this.fieldFormat));
+    return this;
+  }
+  insert(index, ...fields) {
+    this.fields.splice(index, 0, ...fields.map(this.fieldFormat));
   }
   map(callback) {
     return this.toArray().map(callback);

package/dist/functions/embeds/fields.mjs

@@ -49,9 +49,14 @@ class EmbedPlusFields {
   }
   push(...fields) {
     this.embed.addFields(fields.map(this.fieldFormat));
+    return this;
   }
   set(...fields) {
     this.embed.setFields(fields.map(this.fieldFormat));
+    return this;
+  }
+  insert(index, ...fields) {
+    this.fields.splice(index, 0, ...fields.map(this.fieldFormat));
   }
   map(callback) {
     return this.toArray().map(callback);

package/dist/index.cjs

@@ -35,9 +35,7 @@ exports.createLinkButton = components.createLinkButton;
 exports.createRow = components.createRow;
 exports.findChannel = channels.findChannel;
 exports.getChannelUrlInfo = channels.getChannelUrlInfo;
-exports.createCommandOptions = commands.createCommandOptions;
-exports.createSubCommands = commands.createSubCommands;
-exports.createSubCommandsGroups = commands.createSubCommandsGroups;
+exports.commandMention = commands.commandMention;
 exports.findCommand = commands.findCommand;
 exports.createModalFields = modals.createModalFields;
 exports.createModalInput = modals.createModalInput;

package/dist/index.d.cts

@@ -1,5 +1,5 @@
 import * as discord_js from 'discord.js';
-import { GatewayIntentBits, Partials, Attachment, AttachmentBuilder, EmbedAssetData, Guild, GuildMember, User, ClientUser, ImageURLOptions, EmbedFooterData, ColorResolvable, APIEmbed, Embed, EmbedData, EmbedBuilder, AttachmentData, AnyComponentBuilder, ActionRowBuilder, ButtonBuilder, LinkButtonComponentData, ChannelType, CommandInteractionOption, Client, ApplicationCommand, ApplicationCommandOptionData, ApplicationCommandSubCommandData, ApplicationCommandSubGroupData, TextInputBuilder, ModalSubmitFields, Collection, TextInputComponent, TextInputStyle, TextInputComponentData, GuildEmoji, GuildTextBasedChannel, Message, Role } from 'discord.js';
+import { GatewayIntentBits, Partials, Attachment, AttachmentBuilder, EmbedAssetData, Guild, GuildMember, User, ClientUser, ImageURLOptions, EmbedFooterData, ColorResolvable, APIEmbed, Embed, EmbedData, EmbedBuilder, AttachmentData, AnyComponentBuilder, ActionRowBuilder, ButtonBuilder, LinkButtonComponentData, ChannelType, CommandInteractionOption, Client, ApplicationCommand, TextInputBuilder, ModalSubmitFields, Collection, TextInputComponent, TextInputStyle, TextInputComponentData, GuildEmoji, GuildTextBasedChannel, Message, Role } from 'discord.js';
 export * from '@magicyan/core';
 
 declare const chars: {
@@ -77,8 +77,9 @@ declare class EmbedPlusFields {
      */
     get(index: number): EmbedPlusFieldData | undefined;
     find(predicate: FieldPredicate): EmbedPlusFieldData | undefined;
-    push(...fields: Partial<EmbedPlusFieldData>[]): void;
-    set(...fields: Partial<EmbedPlusFieldData>[]): void;
+    push(...fields: Partial<EmbedPlusFieldData>[]): this;
+    set(...fields: Partial<EmbedPlusFieldData>[]): this;
+    insert(index: number, ...fields: Partial<EmbedPlusFieldData>[]): void;
     map<U>(callback: (value: EmbedPlusFieldData, index: number, array: EmbedPlusFieldData[]) => U): U[];
     update(predicate: string | number | FieldPredicate, field: Partial<EmbedPlusFieldData>): boolean;
     delete(predicate: string | number | FieldPredicate): boolean;
@@ -97,6 +98,7 @@ type EmbedPlusFooterData = {
 };
 declare function createEmbedFooter(options: EmbedPlusFooterData): EmbedFooterData | undefined;
 
+type EmbedPlusBuilderReturn<B> = undefined extends B ? EmbedPlusBuilder : false extends B ? EmbedPlusBuilder : EmbedPlusBuilder[];
 type EmbedPlusColorData = string & {} | ColorResolvable | null;
 type EmbedPlusAuthorData = {
     name: string;
@@ -139,8 +141,6 @@ declare class EmbedPlusBuilder extends EmbedBuilder {
     setBorderColor(color: EmbedPlusColorData | null): this;
     setAsset(asset: "thumbnail" | "image", source: EmbedPlusAssetData): this;
     setElementImageURL(element: "thumbnail" | "image" | "author" | "footer", url: string | null): this;
-    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 {
@@ -148,8 +148,7 @@ interface CreateEmbedOptions<B extends boolean> extends EmbedPlusOptions {
     from?: InteractionWithEmbeds | MessageWithEmbeds;
     fromIndex?: number;
 }
-type CreateEmbedReturn<B> = undefined extends B ? EmbedPlusBuilder : false extends B ? EmbedPlusBuilder : EmbedPlusBuilder[];
-declare function createEmbed<B extends boolean>(options: CreateEmbedOptions<B>): CreateEmbedReturn<B>;
+declare function createEmbed<B extends boolean>(options: CreateEmbedOptions<B>): EmbedPlusBuilderReturn<B>;
 
 type ImageFileExtention = "png" | "jpg" | "gif" | "webp";
 type ImageElementProperty = "author" | "thumbnail" | "image" | "footer";
@@ -205,35 +204,12 @@ declare function findCommand(guildOrClient: Guild | Client<true>): {
         guild: discord_js.GuildResolvable;
     }> | undefined;
 };
-type OmitCommandDataProps = "name" | "options" | "autocomplete" | "type";
-type CommandOption = Exclude<Omit<ApplicationCommandOptionData, "name">, ApplicationCommandSubGroupData | ApplicationCommandSubCommandData>;
-type CommandOptions = Record<string, CommandOption>;
-/**
- * Creates an array of command options, quickly define command options with a record where the key is the option name and the value is the definitions
- * @param groups
- * @returns
- */
-declare function createCommandOptions(options: CommandOptions): ApplicationCommandOptionData[];
-type SubCommand = Omit<ApplicationCommandSubCommandData, OmitCommandDataProps> & {
-    options?: Record<string, CommandOption>;
-};
-type SubCommands = Record<string, SubCommand>;
-/**
- * Create an array of command options, quickly define subcommands with a record where the key is the subcommand name and the value is the definitions
- * @param groups
- * @returns
- */
-declare function createSubCommands(subcommands: SubCommands): ApplicationCommandSubCommandData[];
-type SubCommandGroup = Omit<ApplicationCommandSubGroupData, OmitCommandDataProps> & {
-    subcommands: SubCommands;
-};
-type SubCommandGroups = Record<string, SubCommandGroup>;
-/**
- * Create an array of command options, quickly define groups of subcommands with a record where the key is the group name and the value is the definitions
- * @param groups
- * @returns
- */
-declare function createSubCommandsGroups(groups: SubCommandGroups): ApplicationCommandSubGroupData[];
+interface CommandMentionData {
+    id: string;
+    name: string;
+}
+declare function commandMention(command: CommandMentionData, group?: string, subcommand?: string): string;
+declare function commandMention(command: CommandMentionData, subcommand?: string): string;
 
 type TextInputData = Omit<TextInputComponentData, "type">;
 interface ModalFieldData extends Omit<TextInputData, "customId" | "style"> {
@@ -317,4 +293,4 @@ declare function findRole(guild: Guild): {
  */
 declare function extractMentionId(mention: string): string | null;
 
-export { type AnyEmbedData, CustomItents, CustomPartials, type EmbedPlusAssetData, type EmbedPlusAuthorData, EmbedPlusBuilder, type EmbedPlusColorData, type EmbedPlusData, type EmbedPlusFooterData, type EmbedPlusProperty, chars, createCommandOptions, createEmbed, createEmbedAsset, createEmbedAuthor, createEmbedFiles, createEmbedFooter, createLinkButton, createModalFields, createModalInput, createRow, createSubCommands, createSubCommandsGroups, extractMentionId, findChannel, findCommand, findEmoji, findMember, findMessage, findRole, getChannelUrlInfo, getMessageUrlInfo, modalFieldsToRecord, setMobileStatus };
+export { type AnyEmbedData, CustomItents, CustomPartials, type EmbedPlusAssetData, type EmbedPlusAuthorData, EmbedPlusBuilder, type EmbedPlusColorData, type EmbedPlusData, type EmbedPlusFooterData, type EmbedPlusProperty, chars, commandMention, createEmbed, createEmbedAsset, createEmbedAuthor, createEmbedFiles, createEmbedFooter, createLinkButton, createModalFields, createModalInput, createRow, extractMentionId, findChannel, findCommand, findEmoji, findMember, findMessage, findRole, getChannelUrlInfo, getMessageUrlInfo, modalFieldsToRecord, setMobileStatus };

package/dist/index.d.mts

@@ -1,5 +1,5 @@
 import * as discord_js from 'discord.js';
-import { GatewayIntentBits, Partials, Attachment, AttachmentBuilder, EmbedAssetData, Guild, GuildMember, User, ClientUser, ImageURLOptions, EmbedFooterData, ColorResolvable, APIEmbed, Embed, EmbedData, EmbedBuilder, AttachmentData, AnyComponentBuilder, ActionRowBuilder, ButtonBuilder, LinkButtonComponentData, ChannelType, CommandInteractionOption, Client, ApplicationCommand, ApplicationCommandOptionData, ApplicationCommandSubCommandData, ApplicationCommandSubGroupData, TextInputBuilder, ModalSubmitFields, Collection, TextInputComponent, TextInputStyle, TextInputComponentData, GuildEmoji, GuildTextBasedChannel, Message, Role } from 'discord.js';
+import { GatewayIntentBits, Partials, Attachment, AttachmentBuilder, EmbedAssetData, Guild, GuildMember, User, ClientUser, ImageURLOptions, EmbedFooterData, ColorResolvable, APIEmbed, Embed, EmbedData, EmbedBuilder, AttachmentData, AnyComponentBuilder, ActionRowBuilder, ButtonBuilder, LinkButtonComponentData, ChannelType, CommandInteractionOption, Client, ApplicationCommand, TextInputBuilder, ModalSubmitFields, Collection, TextInputComponent, TextInputStyle, TextInputComponentData, GuildEmoji, GuildTextBasedChannel, Message, Role } from 'discord.js';
 export * from '@magicyan/core';
 
 declare const chars: {
@@ -77,8 +77,9 @@ declare class EmbedPlusFields {
      */
     get(index: number): EmbedPlusFieldData | undefined;
     find(predicate: FieldPredicate): EmbedPlusFieldData | undefined;
-    push(...fields: Partial<EmbedPlusFieldData>[]): void;
-    set(...fields: Partial<EmbedPlusFieldData>[]): void;
+    push(...fields: Partial<EmbedPlusFieldData>[]): this;
+    set(...fields: Partial<EmbedPlusFieldData>[]): this;
+    insert(index: number, ...fields: Partial<EmbedPlusFieldData>[]): void;
     map<U>(callback: (value: EmbedPlusFieldData, index: number, array: EmbedPlusFieldData[]) => U): U[];
     update(predicate: string | number | FieldPredicate, field: Partial<EmbedPlusFieldData>): boolean;
     delete(predicate: string | number | FieldPredicate): boolean;
@@ -97,6 +98,7 @@ type EmbedPlusFooterData = {
 };
 declare function createEmbedFooter(options: EmbedPlusFooterData): EmbedFooterData | undefined;
 
+type EmbedPlusBuilderReturn<B> = undefined extends B ? EmbedPlusBuilder : false extends B ? EmbedPlusBuilder : EmbedPlusBuilder[];
 type EmbedPlusColorData = string & {} | ColorResolvable | null;
 type EmbedPlusAuthorData = {
     name: string;
@@ -139,8 +141,6 @@ declare class EmbedPlusBuilder extends EmbedBuilder {
     setBorderColor(color: EmbedPlusColorData | null): this;
     setAsset(asset: "thumbnail" | "image", source: EmbedPlusAssetData): this;
     setElementImageURL(element: "thumbnail" | "image" | "author" | "footer", url: string | null): this;
-    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 {
@@ -148,8 +148,7 @@ interface CreateEmbedOptions<B extends boolean> extends EmbedPlusOptions {
     from?: InteractionWithEmbeds | MessageWithEmbeds;
     fromIndex?: number;
 }
-type CreateEmbedReturn<B> = undefined extends B ? EmbedPlusBuilder : false extends B ? EmbedPlusBuilder : EmbedPlusBuilder[];
-declare function createEmbed<B extends boolean>(options: CreateEmbedOptions<B>): CreateEmbedReturn<B>;
+declare function createEmbed<B extends boolean>(options: CreateEmbedOptions<B>): EmbedPlusBuilderReturn<B>;
 
 type ImageFileExtention = "png" | "jpg" | "gif" | "webp";
 type ImageElementProperty = "author" | "thumbnail" | "image" | "footer";
@@ -205,35 +204,12 @@ declare function findCommand(guildOrClient: Guild | Client<true>): {
         guild: discord_js.GuildResolvable;
     }> | undefined;
 };
-type OmitCommandDataProps = "name" | "options" | "autocomplete" | "type";
-type CommandOption = Exclude<Omit<ApplicationCommandOptionData, "name">, ApplicationCommandSubGroupData | ApplicationCommandSubCommandData>;
-type CommandOptions = Record<string, CommandOption>;
-/**
- * Creates an array of command options, quickly define command options with a record where the key is the option name and the value is the definitions
- * @param groups
- * @returns
- */
-declare function createCommandOptions(options: CommandOptions): ApplicationCommandOptionData[];
-type SubCommand = Omit<ApplicationCommandSubCommandData, OmitCommandDataProps> & {
-    options?: Record<string, CommandOption>;
-};
-type SubCommands = Record<string, SubCommand>;
-/**
- * Create an array of command options, quickly define subcommands with a record where the key is the subcommand name and the value is the definitions
- * @param groups
- * @returns
- */
-declare function createSubCommands(subcommands: SubCommands): ApplicationCommandSubCommandData[];
-type SubCommandGroup = Omit<ApplicationCommandSubGroupData, OmitCommandDataProps> & {
-    subcommands: SubCommands;
-};
-type SubCommandGroups = Record<string, SubCommandGroup>;
-/**
- * Create an array of command options, quickly define groups of subcommands with a record where the key is the group name and the value is the definitions
- * @param groups
- * @returns
- */
-declare function createSubCommandsGroups(groups: SubCommandGroups): ApplicationCommandSubGroupData[];
+interface CommandMentionData {
+    id: string;
+    name: string;
+}
+declare function commandMention(command: CommandMentionData, group?: string, subcommand?: string): string;
+declare function commandMention(command: CommandMentionData, subcommand?: string): string;
 
 type TextInputData = Omit<TextInputComponentData, "type">;
 interface ModalFieldData extends Omit<TextInputData, "customId" | "style"> {
@@ -317,4 +293,4 @@ declare function findRole(guild: Guild): {
  */
 declare function extractMentionId(mention: string): string | null;
 
-export { type AnyEmbedData, CustomItents, CustomPartials, type EmbedPlusAssetData, type EmbedPlusAuthorData, EmbedPlusBuilder, type EmbedPlusColorData, type EmbedPlusData, type EmbedPlusFooterData, type EmbedPlusProperty, chars, createCommandOptions, createEmbed, createEmbedAsset, createEmbedAuthor, createEmbedFiles, createEmbedFooter, createLinkButton, createModalFields, createModalInput, createRow, createSubCommands, createSubCommandsGroups, extractMentionId, findChannel, findCommand, findEmoji, findMember, findMessage, findRole, getChannelUrlInfo, getMessageUrlInfo, modalFieldsToRecord, setMobileStatus };
+export { type AnyEmbedData, CustomItents, CustomPartials, type EmbedPlusAssetData, type EmbedPlusAuthorData, EmbedPlusBuilder, type EmbedPlusColorData, type EmbedPlusData, type EmbedPlusFooterData, type EmbedPlusProperty, chars, commandMention, createEmbed, createEmbedAsset, createEmbedAuthor, createEmbedFiles, createEmbedFooter, createLinkButton, createModalFields, createModalInput, createRow, extractMentionId, findChannel, findCommand, findEmoji, findMember, findMessage, findRole, getChannelUrlInfo, getMessageUrlInfo, modalFieldsToRecord, setMobileStatus };

package/dist/index.d.ts

@@ -1,5 +1,5 @@
 import * as discord_js from 'discord.js';
-import { GatewayIntentBits, Partials, Attachment, AttachmentBuilder, EmbedAssetData, Guild, GuildMember, User, ClientUser, ImageURLOptions, EmbedFooterData, ColorResolvable, APIEmbed, Embed, EmbedData, EmbedBuilder, AttachmentData, AnyComponentBuilder, ActionRowBuilder, ButtonBuilder, LinkButtonComponentData, ChannelType, CommandInteractionOption, Client, ApplicationCommand, ApplicationCommandOptionData, ApplicationCommandSubCommandData, ApplicationCommandSubGroupData, TextInputBuilder, ModalSubmitFields, Collection, TextInputComponent, TextInputStyle, TextInputComponentData, GuildEmoji, GuildTextBasedChannel, Message, Role } from 'discord.js';
+import { GatewayIntentBits, Partials, Attachment, AttachmentBuilder, EmbedAssetData, Guild, GuildMember, User, ClientUser, ImageURLOptions, EmbedFooterData, ColorResolvable, APIEmbed, Embed, EmbedData, EmbedBuilder, AttachmentData, AnyComponentBuilder, ActionRowBuilder, ButtonBuilder, LinkButtonComponentData, ChannelType, CommandInteractionOption, Client, ApplicationCommand, TextInputBuilder, ModalSubmitFields, Collection, TextInputComponent, TextInputStyle, TextInputComponentData, GuildEmoji, GuildTextBasedChannel, Message, Role } from 'discord.js';
 export * from '@magicyan/core';
 
 declare const chars: {
@@ -77,8 +77,9 @@ declare class EmbedPlusFields {
      */
     get(index: number): EmbedPlusFieldData | undefined;
     find(predicate: FieldPredicate): EmbedPlusFieldData | undefined;
-    push(...fields: Partial<EmbedPlusFieldData>[]): void;
-    set(...fields: Partial<EmbedPlusFieldData>[]): void;
+    push(...fields: Partial<EmbedPlusFieldData>[]): this;
+    set(...fields: Partial<EmbedPlusFieldData>[]): this;
+    insert(index: number, ...fields: Partial<EmbedPlusFieldData>[]): void;
     map<U>(callback: (value: EmbedPlusFieldData, index: number, array: EmbedPlusFieldData[]) => U): U[];
     update(predicate: string | number | FieldPredicate, field: Partial<EmbedPlusFieldData>): boolean;
     delete(predicate: string | number | FieldPredicate): boolean;
@@ -97,6 +98,7 @@ type EmbedPlusFooterData = {
 };
 declare function createEmbedFooter(options: EmbedPlusFooterData): EmbedFooterData | undefined;
 
+type EmbedPlusBuilderReturn<B> = undefined extends B ? EmbedPlusBuilder : false extends B ? EmbedPlusBuilder : EmbedPlusBuilder[];
 type EmbedPlusColorData = string & {} | ColorResolvable | null;
 type EmbedPlusAuthorData = {
     name: string;
@@ -139,8 +141,6 @@ declare class EmbedPlusBuilder extends EmbedBuilder {
     setBorderColor(color: EmbedPlusColorData | null): this;
     setAsset(asset: "thumbnail" | "image", source: EmbedPlusAssetData): this;
     setElementImageURL(element: "thumbnail" | "image" | "author" | "footer", url: string | null): this;
-    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 {
@@ -148,8 +148,7 @@ interface CreateEmbedOptions<B extends boolean> extends EmbedPlusOptions {
     from?: InteractionWithEmbeds | MessageWithEmbeds;
     fromIndex?: number;
 }
-type CreateEmbedReturn<B> = undefined extends B ? EmbedPlusBuilder : false extends B ? EmbedPlusBuilder : EmbedPlusBuilder[];
-declare function createEmbed<B extends boolean>(options: CreateEmbedOptions<B>): CreateEmbedReturn<B>;
+declare function createEmbed<B extends boolean>(options: CreateEmbedOptions<B>): EmbedPlusBuilderReturn<B>;
 
 type ImageFileExtention = "png" | "jpg" | "gif" | "webp";
 type ImageElementProperty = "author" | "thumbnail" | "image" | "footer";
@@ -205,35 +204,12 @@ declare function findCommand(guildOrClient: Guild | Client<true>): {
         guild: discord_js.GuildResolvable;
     }> | undefined;
 };
-type OmitCommandDataProps = "name" | "options" | "autocomplete" | "type";
-type CommandOption = Exclude<Omit<ApplicationCommandOptionData, "name">, ApplicationCommandSubGroupData | ApplicationCommandSubCommandData>;
-type CommandOptions = Record<string, CommandOption>;
-/**
- * Creates an array of command options, quickly define command options with a record where the key is the option name and the value is the definitions
- * @param groups
- * @returns
- */
-declare function createCommandOptions(options: CommandOptions): ApplicationCommandOptionData[];
-type SubCommand = Omit<ApplicationCommandSubCommandData, OmitCommandDataProps> & {
-    options?: Record<string, CommandOption>;
-};
-type SubCommands = Record<string, SubCommand>;
-/**
- * Create an array of command options, quickly define subcommands with a record where the key is the subcommand name and the value is the definitions
- * @param groups
- * @returns
- */
-declare function createSubCommands(subcommands: SubCommands): ApplicationCommandSubCommandData[];
-type SubCommandGroup = Omit<ApplicationCommandSubGroupData, OmitCommandDataProps> & {
-    subcommands: SubCommands;
-};
-type SubCommandGroups = Record<string, SubCommandGroup>;
-/**
- * Create an array of command options, quickly define groups of subcommands with a record where the key is the group name and the value is the definitions
- * @param groups
- * @returns
- */
-declare function createSubCommandsGroups(groups: SubCommandGroups): ApplicationCommandSubGroupData[];
+interface CommandMentionData {
+    id: string;
+    name: string;
+}
+declare function commandMention(command: CommandMentionData, group?: string, subcommand?: string): string;
+declare function commandMention(command: CommandMentionData, subcommand?: string): string;
 
 type TextInputData = Omit<TextInputComponentData, "type">;
 interface ModalFieldData extends Omit<TextInputData, "customId" | "style"> {
@@ -317,4 +293,4 @@ declare function findRole(guild: Guild): {
  */
 declare function extractMentionId(mention: string): string | null;
 
-export { type AnyEmbedData, CustomItents, CustomPartials, type EmbedPlusAssetData, type EmbedPlusAuthorData, EmbedPlusBuilder, type EmbedPlusColorData, type EmbedPlusData, type EmbedPlusFooterData, type EmbedPlusProperty, chars, createCommandOptions, createEmbed, createEmbedAsset, createEmbedAuthor, createEmbedFiles, createEmbedFooter, createLinkButton, createModalFields, createModalInput, createRow, createSubCommands, createSubCommandsGroups, extractMentionId, findChannel, findCommand, findEmoji, findMember, findMessage, findRole, getChannelUrlInfo, getMessageUrlInfo, modalFieldsToRecord, setMobileStatus };
+export { type AnyEmbedData, CustomItents, CustomPartials, type EmbedPlusAssetData, type EmbedPlusAuthorData, EmbedPlusBuilder, type EmbedPlusColorData, type EmbedPlusData, type EmbedPlusFooterData, type EmbedPlusProperty, chars, commandMention, createEmbed, createEmbedAsset, createEmbedAuthor, createEmbedFiles, createEmbedFooter, createLinkButton, createModalFields, createModalInput, createRow, extractMentionId, findChannel, findCommand, findEmoji, findMember, findMessage, findRole, getChannelUrlInfo, getMessageUrlInfo, modalFieldsToRecord, setMobileStatus };

package/dist/index.mjs

@@ -8,7 +8,7 @@ export { createEmbedFooter } from './functions/embeds/footer.mjs';
 export { createEmbedFiles } from './functions/embeds/files.mjs';
 export { createLinkButton, createRow } from './functions/components.mjs';
 export { findChannel, getChannelUrlInfo } from './functions/channels.mjs';
-export { createCommandOptions, createSubCommands, createSubCommandsGroups, findCommand } from './functions/commands.mjs';
+export { commandMention, findCommand } from './functions/commands.mjs';
 export { createModalFields, createModalInput, modalFieldsToRecord } from './functions/modals.mjs';
 export { findEmoji } from './functions/emojis.mjs';
 export { findMember } from './functions/members.mjs';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@magicyan/discord",
-  "version": "1.0.34",
+  "version": "1.1.0",
   "description": "Simple functions to facilitate discord bot development",
   "license": "MIT",
   "type": "module",