@magicyan/discord 1.1.3 → 1.2.1

package/dist/functions/components.cjs

@@ -6,8 +6,7 @@ function createRow(...components) {
   return new discord_js.ActionRowBuilder({ components });
 }
 function createLinkButton(data) {
-  if (!data.label)
-    data.label = data.url;
+  data.label ?? (data.label = data.url);
   return new discord_js.ButtonBuilder({ style: discord_js.ButtonStyle.Link, ...data });
 }
 

package/dist/functions/components.mjs

@@ -4,8 +4,7 @@ function createRow(...components) {
   return new ActionRowBuilder({ components });
 }
 function createLinkButton(data) {
-  if (!data.label)
-    data.label = data.url;
+  data.label ?? (data.label = data.url);
   return new ButtonBuilder({ style: ButtonStyle.Link, ...data });
 }
 

package/dist/functions/embeds/assets.cjs

@@ -2,12 +2,12 @@
 
 const discord_js = require('discord.js');
 
-function createEmbedAsset(source, options) {
+function createEmbedAsset(source, options = {}) {
   if (source instanceof discord_js.Attachment || source instanceof discord_js.AttachmentBuilder) {
     return { url: `attachment://${source.name}`, ...options };
   }
   if (source && typeof source === "object" && "url" in source) {
-    return Object.assign(source, options ?? (options = {}));
+    return Object.assign(source, options);
   }
   return source ? Object.assign({ url: source }, options) : void 0;
 }

package/dist/functions/embeds/assets.mjs

@@ -1,11 +1,11 @@
 import { Attachment, AttachmentBuilder } from 'discord.js';
 
-function createEmbedAsset(source, options) {
+function createEmbedAsset(source, options = {}) {
   if (source instanceof Attachment || source instanceof AttachmentBuilder) {
     return { url: `attachment://${source.name}`, ...options };
   }
   if (source && typeof source === "object" && "url" in source) {
-    return Object.assign(source, options ?? (options = {}));
+    return Object.assign(source, options);
   }
   return source ? Object.assign({ url: source }, options) : void 0;
 }

package/dist/functions/embeds/author.cjs

@@ -27,7 +27,7 @@ function createEmbedAuthor(type, options) {
       break;
     }
   }
-  return { name: `${prefix}${name}${suffix}`, url: url ?? void 0, iconURL };
+  return { name: `${prefix}${name}${suffix}`, url: url?.toString(), iconURL };
 }
 
 exports.createEmbedAuthor = createEmbedAuthor;

package/dist/functions/embeds/author.mjs

@@ -25,7 +25,7 @@ function createEmbedAuthor(type, options) {
       break;
     }
   }
-  return { name: `${prefix}${name}${suffix}`, url: url ?? void 0, iconURL };
+  return { name: `${prefix}${name}${suffix}`, url: url?.toString(), iconURL };
 }
 
 export { createEmbedAuthor };

package/dist/functions/embeds/footer.cjs

@@ -5,7 +5,7 @@ const chars = require('../../constants/chars.cjs');
 
 function createEmbedFooter(options) {
   const { text, iconURL } = options;
-  return !text && !iconURL ? void 0 : { text: text ?? chars.chars.invisible, iconURL: core.notFound(iconURL) };
+  return !text && !iconURL ? void 0 : { text: text || chars.chars.invisible, iconURL: core.notFound(iconURL) };
 }
 
 exports.createEmbedFooter = createEmbedFooter;

package/dist/functions/embeds/footer.mjs

@@ -3,7 +3,7 @@ import { chars } from '../../constants/chars.mjs';
 
 function createEmbedFooter(options) {
   const { text, iconURL } = options;
-  return !text && !iconURL ? void 0 : { text: text ?? chars.invisible, iconURL: notFound(iconURL) };
+  return !text && !iconURL ? void 0 : { text: text || chars.invisible, iconURL: notFound(iconURL) };
 }
 
 export { createEmbedFooter };

package/dist/functions/modals.cjs

@@ -17,7 +17,7 @@ function modalFieldsToRecord(fields) {
     data,
     { [customId]: value }
   );
-  const modalFields = "fields" in fields ? fields.fields : fields;
+  const modalFields = fields instanceof discord_js.ModalSubmitInteraction ? fields.fields.fields : "fields" in fields ? fields.fields : fields;
   return modalFields.reduce(reduceFunction, {});
 }
 

package/dist/functions/modals.mjs

@@ -1,4 +1,4 @@
-import { TextInputStyle, TextInputBuilder } from 'discord.js';
+import { TextInputStyle, TextInputBuilder, ModalSubmitInteraction } from 'discord.js';
 import { createRow } from './components.mjs';
 
 function createModalInput(data) {
@@ -15,7 +15,7 @@ function modalFieldsToRecord(fields) {
     data,
     { [customId]: value }
   );
-  const modalFields = "fields" in fields ? fields.fields : fields;
+  const modalFields = fields instanceof ModalSubmitInteraction ? fields.fields.fields : "fields" in fields ? fields.fields : fields;
   return modalFields.reduce(reduceFunction, {});
 }
 

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, 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, ModalSubmitInteraction, ModalSubmitFields, Collection, TextInputComponent, TextInputStyle, TextInputComponentData, GuildEmoji, GuildTextBasedChannel, Message, Role } from 'discord.js';
 export * from '@magicyan/core';
 
 declare const chars: {
@@ -22,13 +22,14 @@ type EmbedPlusAssetData = string | Attachment | AttachmentBuilder | EmbedAssetDa
 type EmbedAssetOptions = Omit<EmbedAssetData, "url">;
 declare function createEmbedAsset(source: EmbedPlusAssetData, options?: EmbedAssetOptions): EmbedAssetData | undefined;
 
+type IdentityProperty = "username" | "displayName" | "id" | "globalName" | "nickname";
 interface MemberAuthor {
     type: GuildMember;
-    property?: "username" | "displayName" | "id" | "globalName" | "nickname";
+    property?: IdentityProperty;
 }
 interface UserAuthor {
     type: User | ClientUser;
-    property?: "username" | "displayName" | "id" | "globalName";
+    property?: Exclude<IdentityProperty, "nickname">;
 }
 interface GuildAuthor {
     type: Guild;
@@ -154,8 +155,8 @@ type ImageFileExtention = "png" | "jpg" | "gif" | "webp";
 type ImageElementProperty = "author" | "thumbnail" | "image" | "footer";
 interface CreateEmbedFilesOptions {
     ignore?: ImageElementProperty[];
-    extentions?: Record<ImageElementProperty, ImageFileExtention>;
-    names?: Record<ImageElementProperty, string>;
+    extentions?: Partial<Record<ImageElementProperty, ImageFileExtention>>;
+    names?: Partial<Record<ImageElementProperty, string>>;
 }
 /**
  * Turns any embed image url into an attachment and returns an attachment array
@@ -213,16 +214,14 @@ declare function commandMention(command: CommandMentionData, group?: string, sub
 declare function commandMention(command: CommandMentionData, subcommand?: string): string;
 
 type TextInputData = Omit<TextInputComponentData, "type">;
-interface ModalFieldData extends Omit<TextInputData, "customId" | "style"> {
+interface ModalFieldData extends Omit<TextInputData, "style"> {
     style?: TextInputStyle;
 }
-declare function createModalInput(data: ModalFieldData & {
-    customId: string;
-}): ActionRowBuilder<TextInputBuilder>;
-type ModalFieldsData = Record<string, ModalFieldData>;
+declare function createModalInput(data: ModalFieldData): ActionRowBuilder<TextInputBuilder>;
+type ModalFieldsData = Record<string, Omit<ModalFieldData, "customId">>;
 declare function createModalFields(data: ModalFieldsData): ActionRowBuilder<TextInputBuilder>[];
 type ModalFieldsRecord<K extends string> = Record<K, string>;
-declare function modalFieldsToRecord<K extends string = string>(fields: ModalSubmitFields | Collection<string, TextInputComponent>): ModalFieldsRecord<K>;
+declare function modalFieldsToRecord<K extends string = string>(fields: ModalSubmitInteraction | ModalSubmitFields | Collection<string, TextInputComponent>): ModalFieldsRecord<K>;
 
 type FindEmojiFilter = (emoji: GuildEmoji) => boolean;
 declare function findEmoji(guildOrClient: Guild | Client): {

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, 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, ModalSubmitInteraction, ModalSubmitFields, Collection, TextInputComponent, TextInputStyle, TextInputComponentData, GuildEmoji, GuildTextBasedChannel, Message, Role } from 'discord.js';
 export * from '@magicyan/core';
 
 declare const chars: {
@@ -22,13 +22,14 @@ type EmbedPlusAssetData = string | Attachment | AttachmentBuilder | EmbedAssetDa
 type EmbedAssetOptions = Omit<EmbedAssetData, "url">;
 declare function createEmbedAsset(source: EmbedPlusAssetData, options?: EmbedAssetOptions): EmbedAssetData | undefined;
 
+type IdentityProperty = "username" | "displayName" | "id" | "globalName" | "nickname";
 interface MemberAuthor {
     type: GuildMember;
-    property?: "username" | "displayName" | "id" | "globalName" | "nickname";
+    property?: IdentityProperty;
 }
 interface UserAuthor {
     type: User | ClientUser;
-    property?: "username" | "displayName" | "id" | "globalName";
+    property?: Exclude<IdentityProperty, "nickname">;
 }
 interface GuildAuthor {
     type: Guild;
@@ -154,8 +155,8 @@ type ImageFileExtention = "png" | "jpg" | "gif" | "webp";
 type ImageElementProperty = "author" | "thumbnail" | "image" | "footer";
 interface CreateEmbedFilesOptions {
     ignore?: ImageElementProperty[];
-    extentions?: Record<ImageElementProperty, ImageFileExtention>;
-    names?: Record<ImageElementProperty, string>;
+    extentions?: Partial<Record<ImageElementProperty, ImageFileExtention>>;
+    names?: Partial<Record<ImageElementProperty, string>>;
 }
 /**
  * Turns any embed image url into an attachment and returns an attachment array
@@ -213,16 +214,14 @@ declare function commandMention(command: CommandMentionData, group?: string, sub
 declare function commandMention(command: CommandMentionData, subcommand?: string): string;
 
 type TextInputData = Omit<TextInputComponentData, "type">;
-interface ModalFieldData extends Omit<TextInputData, "customId" | "style"> {
+interface ModalFieldData extends Omit<TextInputData, "style"> {
     style?: TextInputStyle;
 }
-declare function createModalInput(data: ModalFieldData & {
-    customId: string;
-}): ActionRowBuilder<TextInputBuilder>;
-type ModalFieldsData = Record<string, ModalFieldData>;
+declare function createModalInput(data: ModalFieldData): ActionRowBuilder<TextInputBuilder>;
+type ModalFieldsData = Record<string, Omit<ModalFieldData, "customId">>;
 declare function createModalFields(data: ModalFieldsData): ActionRowBuilder<TextInputBuilder>[];
 type ModalFieldsRecord<K extends string> = Record<K, string>;
-declare function modalFieldsToRecord<K extends string = string>(fields: ModalSubmitFields | Collection<string, TextInputComponent>): ModalFieldsRecord<K>;
+declare function modalFieldsToRecord<K extends string = string>(fields: ModalSubmitInteraction | ModalSubmitFields | Collection<string, TextInputComponent>): ModalFieldsRecord<K>;
 
 type FindEmojiFilter = (emoji: GuildEmoji) => boolean;
 declare function findEmoji(guildOrClient: Guild | Client): {

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, 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, ModalSubmitInteraction, ModalSubmitFields, Collection, TextInputComponent, TextInputStyle, TextInputComponentData, GuildEmoji, GuildTextBasedChannel, Message, Role } from 'discord.js';
 export * from '@magicyan/core';
 
 declare const chars: {
@@ -22,13 +22,14 @@ type EmbedPlusAssetData = string | Attachment | AttachmentBuilder | EmbedAssetDa
 type EmbedAssetOptions = Omit<EmbedAssetData, "url">;
 declare function createEmbedAsset(source: EmbedPlusAssetData, options?: EmbedAssetOptions): EmbedAssetData | undefined;
 
+type IdentityProperty = "username" | "displayName" | "id" | "globalName" | "nickname";
 interface MemberAuthor {
     type: GuildMember;
-    property?: "username" | "displayName" | "id" | "globalName" | "nickname";
+    property?: IdentityProperty;
 }
 interface UserAuthor {
     type: User | ClientUser;
-    property?: "username" | "displayName" | "id" | "globalName";
+    property?: Exclude<IdentityProperty, "nickname">;
 }
 interface GuildAuthor {
     type: Guild;
@@ -154,8 +155,8 @@ type ImageFileExtention = "png" | "jpg" | "gif" | "webp";
 type ImageElementProperty = "author" | "thumbnail" | "image" | "footer";
 interface CreateEmbedFilesOptions {
     ignore?: ImageElementProperty[];
-    extentions?: Record<ImageElementProperty, ImageFileExtention>;
-    names?: Record<ImageElementProperty, string>;
+    extentions?: Partial<Record<ImageElementProperty, ImageFileExtention>>;
+    names?: Partial<Record<ImageElementProperty, string>>;
 }
 /**
  * Turns any embed image url into an attachment and returns an attachment array
@@ -213,16 +214,14 @@ declare function commandMention(command: CommandMentionData, group?: string, sub
 declare function commandMention(command: CommandMentionData, subcommand?: string): string;
 
 type TextInputData = Omit<TextInputComponentData, "type">;
-interface ModalFieldData extends Omit<TextInputData, "customId" | "style"> {
+interface ModalFieldData extends Omit<TextInputData, "style"> {
     style?: TextInputStyle;
 }
-declare function createModalInput(data: ModalFieldData & {
-    customId: string;
-}): ActionRowBuilder<TextInputBuilder>;
-type ModalFieldsData = Record<string, ModalFieldData>;
+declare function createModalInput(data: ModalFieldData): ActionRowBuilder<TextInputBuilder>;
+type ModalFieldsData = Record<string, Omit<ModalFieldData, "customId">>;
 declare function createModalFields(data: ModalFieldsData): ActionRowBuilder<TextInputBuilder>[];
 type ModalFieldsRecord<K extends string> = Record<K, string>;
-declare function modalFieldsToRecord<K extends string = string>(fields: ModalSubmitFields | Collection<string, TextInputComponent>): ModalFieldsRecord<K>;
+declare function modalFieldsToRecord<K extends string = string>(fields: ModalSubmitInteraction | ModalSubmitFields | Collection<string, TextInputComponent>): ModalFieldsRecord<K>;
 
 type FindEmojiFilter = (emoji: GuildEmoji) => boolean;
 declare function findEmoji(guildOrClient: Guild | Client): {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@magicyan/discord",
-  "version": "1.1.3",
+  "version": "1.2.1",
   "description": "Simple functions to facilitate discord bot development",
   "license": "MIT",
   "type": "module",
@@ -35,13 +35,13 @@
     "dev": "tsx --env-file .env playground/index.ts"
   },
   "devDependencies": {
-    "tsx": "^4.10.0",
+    "tsx": "^4.19.1",
     "unbuild": "^2.0.0"
   },
   "dependencies": {
-    "@magicyan/core": "^1.0.19"
+    "@magicyan/core": "^1.0.20"
   },
   "peerDependencies": {
-    "discord.js": "^14.15.2"
+    "discord.js": "^14.16.3"
   }
-}
+}