@magicyan/discord 1.0.34 → 1.0.35

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/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: {
@@ -205,35 +205,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 +294,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: {
@@ -205,35 +205,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 +294,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: {
@@ -205,35 +205,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 +294,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.0.35",
   "description": "Simple functions to facilitate discord bot development",
   "license": "MIT",
   "type": "module",