@magicyan/discord 1.4.10 → 1.4.11

package/dist/functions/components/buttons.cjs

@@ -3,7 +3,16 @@
 const discord_js = require('discord.js');
 const row = require('./row.cjs');
 
-function createLinkButton(data) {
+function createLinkButton(data, label, emoji) {
+  if (typeof data === "string") {
+    label ?? (label = data);
+    return new discord_js.ButtonBuilder({
+      style: discord_js.ButtonStyle.Link,
+      label,
+      url: data,
+      emoji
+    });
+  }
   data.label ?? (data.label = data.url);
   return new discord_js.ButtonBuilder({ style: discord_js.ButtonStyle.Link, ...data });
 }

package/dist/functions/components/buttons.mjs

@@ -1,7 +1,16 @@
 import { ButtonBuilder, ButtonStyle } from 'discord.js';
 import { createRow } from './row.mjs';
 
-function createLinkButton(data) {
+function createLinkButton(data, label, emoji) {
+  if (typeof data === "string") {
+    label ?? (label = data);
+    return new ButtonBuilder({
+      style: ButtonStyle.Link,
+      label,
+      url: data,
+      emoji
+    });
+  }
   data.label ?? (data.label = data.url);
   return new ButtonBuilder({ style: ButtonStyle.Link, ...data });
 }

package/dist/functions/components/components.cjs

@@ -1,21 +1,18 @@
 'use strict';
 
+const core = require('@magicyan/core');
 const attachment = require('../../guards/attachment.cjs');
 const button = require('../../guards/button.cjs');
 const selectmenu = require('../../guards/selectmenu.cjs');
 const gallery = require('./gallery.cjs');
 const row = require('./row.cjs');
 const text = require('./text.cjs');
-const core = require('@magicyan/core');
 
 function createComponents(...data) {
   return data.flat().filter((value) => core.isDefined(value)).filter((value) => typeof value !== "boolean").map((component) => {
     if (typeof component === "string") {
       return text.createTextDisplay(component);
     }
-    if (Array.isArray(component)) {
-      return row.createRow(...component);
-    }
     if (selectmenu.isAnySelectMenuBuilder(component)) {
       return row.createRow(component);
     }

package/dist/functions/components/components.mjs

@@ -1,19 +1,16 @@
+import { isDefined } from '@magicyan/core';
 import { isAttachment } from '../../guards/attachment.mjs';
 import { isButtonBuilder } from '../../guards/button.mjs';
 import { isAnySelectMenuBuilder } from '../../guards/selectmenu.mjs';
 import { createMediaGallery } from './gallery.mjs';
 import { createRow } from './row.mjs';
 import { createTextDisplay } from './text.mjs';
-import { isDefined } from '@magicyan/core';
 
 function createComponents(...data) {
   return data.flat().filter((value) => isDefined(value)).filter((value) => typeof value !== "boolean").map((component) => {
     if (typeof component === "string") {
       return createTextDisplay(component);
     }
-    if (Array.isArray(component)) {
-      return createRow(...component);
-    }
     if (isAnySelectMenuBuilder(component)) {
       return createRow(component);
     }

package/dist/functions/components/container.cjs

@@ -25,11 +25,6 @@ function createContainer(data, ...items) {
     if (component instanceof discord_js.ActionRowBuilder) {
       container.addActionRowComponents(component);
     }
-    if (Array.isArray(component)) {
-      container.addActionRowComponents(
-        row.createRow(...component)
-      );
-    }
     if (selectmenu.isAnySelectMenuBuilder(component) || component instanceof discord_js.ButtonBuilder) {
       container.addActionRowComponents(
         row.createRow(component)

package/dist/functions/components/container.mjs

@@ -23,11 +23,6 @@ function createContainer(data, ...items) {
     if (component instanceof ActionRowBuilder) {
       container.addActionRowComponents(component);
     }
-    if (Array.isArray(component)) {
-      container.addActionRowComponents(
-        createRow(...component)
-      );
-    }
     if (isAnySelectMenuBuilder(component) || component instanceof ButtonBuilder) {
       container.addActionRowComponents(
         createRow(component)

package/dist/functions/components/gallery.cjs

@@ -2,20 +2,17 @@
 
 const discord_js = require('discord.js');
 const attachment = require('../../guards/attachment.cjs');
+const core = require('@magicyan/core');
 
 function createMediaGallery(...items) {
   const gallery = new discord_js.MediaGalleryBuilder();
-  for (const item of items) {
+  for (const item of items.flat().filter(core.isDefined)) {
     if (typeof item === "string") {
-      gallery.addItems({
-        media: { url: item }
-      });
+      gallery.addItems({ media: { url: item } });
       continue;
     }
     if (attachment.isAttachment(item)) {
-      gallery.addItems({
-        media: { url: `attachment://${item.name}` }
-      });
+      gallery.addItems({ media: { url: `attachment://${item.name}` } });
       continue;
     }
     gallery.addItems(item);

package/dist/functions/components/gallery.mjs

@@ -1,19 +1,16 @@
 import { MediaGalleryBuilder } from 'discord.js';
 import { isAttachment } from '../../guards/attachment.mjs';
+import { isDefined } from '@magicyan/core';
 
 function createMediaGallery(...items) {
   const gallery = new MediaGalleryBuilder();
-  for (const item of items) {
+  for (const item of items.flat().filter(isDefined)) {
     if (typeof item === "string") {
-      gallery.addItems({
-        media: { url: item }
-      });
+      gallery.addItems({ media: { url: item } });
       continue;
     }
     if (isAttachment(item)) {
-      gallery.addItems({
-        media: { url: `attachment://${item.name}` }
-      });
+      gallery.addItems({ media: { url: `attachment://${item.name}` } });
       continue;
     }
     gallery.addItems(item);

package/dist/functions/message.cjs

@@ -40,13 +40,23 @@ function findMessage(channel) {
     }
   };
 }
-function getMessageUrlInfo(url) {
-  const regex = new RegExp(/^https:\/\/discord\.com\/channels\/\d+\/\d+\/\d+$/);
-  if (!regex.test(url))
+function getMessageURLInfo(url) {
+  const match = url.match(/^https:\/\/discord\.com\/channels\/(\d+)\/(\d+)\/(\d+)$/);
+  if (!match)
     return {};
-  const [messageId, channelId, guildId] = url.split("/").reverse();
-  return { messageId, channelId, guildId };
+  const [_, guildId, channelId, messageId] = match;
+  return { guildId, channelId, messageId };
+}
+async function fetchMessageFromURL(gc, url) {
+  const { messageId, channelId } = getMessageURLInfo(url);
+  if (!messageId)
+    return null;
+  const channel = await gc.channels.fetch(channelId).catch(() => null);
+  if (!channel || !("messages" in channel))
+    return null;
+  return channel.messages.fetch(messageId).catch(() => null);
 }
 
+exports.fetchMessageFromURL = fetchMessageFromURL;
 exports.findMessage = findMessage;
-exports.getMessageUrlInfo = getMessageUrlInfo;
+exports.getMessageURLInfo = getMessageURLInfo;

package/dist/functions/message.mjs

@@ -38,12 +38,21 @@ function findMessage(channel) {
     }
   };
 }
-function getMessageUrlInfo(url) {
-  const regex = new RegExp(/^https:\/\/discord\.com\/channels\/\d+\/\d+\/\d+$/);
-  if (!regex.test(url))
+function getMessageURLInfo(url) {
+  const match = url.match(/^https:\/\/discord\.com\/channels\/(\d+)\/(\d+)\/(\d+)$/);
+  if (!match)
     return {};
-  const [messageId, channelId, guildId] = url.split("/").reverse();
-  return { messageId, channelId, guildId };
+  const [_, guildId, channelId, messageId] = match;
+  return { guildId, channelId, messageId };
+}
+async function fetchMessageFromURL(gc, url) {
+  const { messageId, channelId } = getMessageURLInfo(url);
+  if (!messageId)
+    return null;
+  const channel = await gc.channels.fetch(channelId).catch(() => null);
+  if (!channel || !("messages" in channel))
+    return null;
+  return channel.messages.fetch(messageId).catch(() => null);
 }
 
-export { findMessage, getMessageUrlInfo };
+export { fetchMessageFromURL, findMessage, getMessageURLInfo };

package/dist/functions/modals.cjs

@@ -17,7 +17,15 @@ function modalFieldsToRecord(fields) {
   const modalFields = fields instanceof discord_js.ModalSubmitInteraction ? fields.fields.fields : "fields" in fields ? fields.fields : fields;
   return modalFields.reduce(reduceFunction, {});
 }
+function createModal(data) {
+  return new discord_js.ModalBuilder({
+    title: data.title ?? data.customId,
+    customId: data.customId,
+    components: createModalFields(data.components)
+  });
+}
 
+exports.createModal = createModal;
 exports.createModalFields = createModalFields;
 exports.createModalInput = createModalInput;
 exports.modalFieldsToRecord = modalFieldsToRecord;

package/dist/functions/modals.mjs

@@ -1,4 +1,4 @@
-import { TextInputStyle, TextInputBuilder, ModalSubmitInteraction } from 'discord.js';
+import { TextInputStyle, TextInputBuilder, ModalSubmitInteraction, ModalBuilder } from 'discord.js';
 import { createRow } from './components/row.mjs';
 
 function createModalInput(data) {
@@ -15,5 +15,12 @@ function modalFieldsToRecord(fields) {
   const modalFields = fields instanceof ModalSubmitInteraction ? fields.fields.fields : "fields" in fields ? fields.fields : fields;
   return modalFields.reduce(reduceFunction, {});
 }
+function createModal(data) {
+  return new ModalBuilder({
+    title: data.title ?? data.customId,
+    customId: data.customId,
+    components: createModalFields(data.components)
+  });
+}
 
-export { createModalFields, createModalInput, modalFieldsToRecord };
+export { createModal, createModalFields, createModalInput, modalFieldsToRecord };

package/dist/index.cjs

@@ -65,13 +65,15 @@ exports.findChannel = channels.findChannel;
 exports.getChannelUrlInfo = channels.getChannelUrlInfo;
 exports.commandMention = commands.commandMention;
 exports.findCommand = commands.findCommand;
+exports.createModal = modals.createModal;
 exports.createModalFields = modals.createModalFields;
 exports.createModalInput = modals.createModalInput;
 exports.modalFieldsToRecord = modals.modalFieldsToRecord;
 exports.findEmoji = emojis.findEmoji;
 exports.findMember = members.findMember;
+exports.fetchMessageFromURL = message.fetchMessageFromURL;
 exports.findMessage = message.findMessage;
-exports.getMessageUrlInfo = message.getMessageUrlInfo;
+exports.getMessageURLInfo = message.getMessageURLInfo;
 exports.findRole = roles.findRole;
 exports.extractMentionId = regex.extractMentionId;
 exports.createWebhookClient = webhooks.createWebhookClient;

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, ButtonBuilder, ActionRowBuilder, LinkButtonComponentData, AnyComponentBuilder, FileBuilder, APIUnfurledMediaItem, MediaGalleryBuilder, MediaGalleryItemData, SeparatorBuilder, ThumbnailComponentData, ThumbnailBuilder, ButtonComponentData, SectionBuilder, TextDisplayBuilder, MessageActionRowComponentBuilder, ContainerBuilder, ContainerComponentData, ChannelType, CommandInteractionOption, Client, ApplicationCommand, TextInputBuilder, ModalSubmitInteraction, ModalSubmitFields, Collection, TextInputComponent, TextInputStyle, TextInputComponentData, GuildEmoji, GuildTextBasedChannel, Message, Role, WebhookClientOptions, WebhookClient, WebhookClientData, StringSelectMenuBuilder, UserSelectMenuBuilder, RoleSelectMenuBuilder, ChannelSelectMenuBuilder, MentionableSelectMenuBuilder } from 'discord.js';
+import { GatewayIntentBits, Partials, Attachment, AttachmentBuilder, EmbedAssetData, Guild, GuildMember, User, ClientUser, ImageURLOptions, EmbedFooterData, ColorResolvable, APIEmbed, Embed, EmbedData, EmbedBuilder, AttachmentData, ComponentEmojiResolvable, ButtonBuilder, ActionRowBuilder, LinkButtonComponentData, AnyComponentBuilder, FileBuilder, APIUnfurledMediaItem, MediaGalleryItemData, MediaGalleryBuilder, SeparatorBuilder, ThumbnailComponentData, ThumbnailBuilder, ButtonComponentData, SectionBuilder, TextDisplayBuilder, MessageActionRowComponentBuilder, ContainerBuilder, ContainerComponentData, ChannelType, CommandInteractionOption, Client, ApplicationCommand, TextInputBuilder, ModalSubmitInteraction, ModalSubmitFields, Collection, TextInputComponent, ModalBuilder, TextInputStyle, TextInputComponentData, GuildEmoji, GuildTextBasedChannel, Message, Role, WebhookClientOptions, WebhookClient, WebhookClientData, StringSelectMenuBuilder, UserSelectMenuBuilder, RoleSelectMenuBuilder, ChannelSelectMenuBuilder, MentionableSelectMenuBuilder } from 'discord.js';
 export * from '@magicyan/core';
 
 declare const chars: {
@@ -207,6 +207,7 @@ declare function createEmbedFiles(embed: EmbedBuilder, options?: CreateEmbedFile
 
 interface CreateLinkButtonData extends Omit<LinkButtonComponentData, "style" | "type"> {
 }
+declare function createLinkButton(link: string, label?: string, emoji?: ComponentEmojiResolvable): ButtonBuilder;
 declare function createLinkButton(data: CreateLinkButtonData): ButtonBuilder;
 /**
  * Wraps buttons into multiple {@link ActionRowBuilder} instances with a maximum number of buttons per row.
@@ -301,7 +302,7 @@ interface CreateFileOptions extends Omit<APIUnfurledMediaItem, "url"> {
  */
 declare function createFile(source: FileSource, options?: CreateFileOptions): FileBuilder;
 
-type MediaGallerySource = MediaGalleryItemData | string | Attachment | AttachmentBuilder;
+type MediaGallerySource = MediaGalleryItemData | string | Attachment | AttachmentBuilder | null | undefined;
 /**
  * Creates a {@link MediaGalleryBuilder} instance with a collection of media items, which can be images, attachments, or URLs.
  *
@@ -342,7 +343,7 @@ type MediaGallerySource = MediaGalleryItemData | string | Attachment | Attachmen
  * );
  *
  */
-declare function createMediaGallery(...items: MediaGallerySource[]): MediaGalleryBuilder;
+declare function createMediaGallery(...items: (MediaGallerySource | MediaGallerySource[])[]): MediaGalleryBuilder;
 
 interface SeparatorData {
     divider?: boolean;
@@ -546,7 +547,7 @@ type ThumbAreaData = {
 declare function createThumbArea(content: string, thumbnail?: ThumbAreaThumbnail): SectionBuilder | TextDisplayBuilder;
 declare function createThumbArea(data: ThumbAreaData): SectionBuilder | TextDisplayBuilder;
 
-type ComponentData = TextDisplayBuilder | SeparatorBuilder | FileBuilder | SectionBuilder | MediaGalleryBuilder | ActionRowBuilder<MessageActionRowComponentBuilder> | MessageActionRowComponentBuilder[] | MessageActionRowComponentBuilder | Attachment | AttachmentBuilder | string | null | undefined | boolean;
+type ComponentData = TextDisplayBuilder | SeparatorBuilder | FileBuilder | SectionBuilder | MediaGalleryBuilder | ActionRowBuilder<MessageActionRowComponentBuilder> | MessageActionRowComponentBuilder | Attachment | AttachmentBuilder | string | null | undefined | boolean;
 type CreateComponentData = ComponentData | ContainerBuilder;
 declare function createComponents(...data: (CreateComponentData | CreateComponentData[])[]): (SeparatorBuilder | TextDisplayBuilder | FileBuilder | SectionBuilder | MediaGalleryBuilder | ActionRowBuilder<MessageActionRowComponentBuilder> | ContainerBuilder)[];
 
@@ -654,6 +655,12 @@ 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: ModalSubmitInteraction | ModalSubmitFields | Collection<string, TextInputComponent>): ModalFieldsRecord<K>;
+interface CreateModalData {
+    title?: string;
+    customId: string;
+    components: ModalFieldsData;
+}
+declare function createModal(data: CreateModalData): ModalBuilder;
 
 type FindEmojiFilter = (emoji: GuildEmoji) => boolean;
 declare function findEmoji(guildOrClient: Guild | Client): {
@@ -682,12 +689,18 @@ declare function findMessage(channel: GuildTextBasedChannel): {
     };
     byFilter(filter: FindMessageFilter): Message<true> | undefined;
 };
-interface MessageUrlInfo {
-    messageId?: string;
+type MessageURLInfo = {
+    channelId: string;
+    guildId: string;
+    messageId: string;
+} | {
+    messageId?: undefined;
     channelId?: string;
     guildId?: string;
-}
-declare function getMessageUrlInfo(url: string): MessageUrlInfo;
+};
+declare function getMessageURLInfo(url: string): MessageURLInfo;
+declare function fetchMessageFromURL(guild: Guild, url: string): Promise<Message<true> | null>;
+declare function fetchMessageFromURL(client: Client | Client, url: string): Promise<Message | null>;
 
 type FindRoleFilter = (role: Role) => boolean;
 /**
@@ -735,5 +748,5 @@ declare function isAnySelectMenuBuilder(value: unknown): value is AnySelectMenuB
 
 declare function isButtonBuilder(value: unknown): value is ButtonBuilder;
 
-export { CustomItents, CustomPartials, EmbedLimit, EmbedPlusBuilder, Separator, chars, commandMention, createComponents, createContainer, createEmbed, createEmbedAsset, createEmbedAuthor, createEmbedFiles, createEmbedFooter, createFile, createLinkButton, createMediaGallery, createModalFields, createModalInput, createRow, createSection, createSeparator, createTextDisplay, createThumbArea, createThumbnail, createWebhookClient, extractMentionId, findChannel, findCommand, findEmoji, findMember, findMessage, findRole, getChannelUrlInfo, getMessageUrlInfo, isAnySelectMenuBuilder, isAttachment, isButtonBuilder, modalFieldsToRecord, setMobileStatus, wrapButtons };
-export type { AnyEmbedData, AnySelectMenuBuilder, ComponentData, ContainerColor, ContainerData, EmbedPlusAssetData, EmbedPlusAuthorData, EmbedPlusColorData, EmbedPlusData, EmbedPlusFooterData, EmbedPlusProperty, SectionAccessory, SectionAccessoryData, SectionButtonAccessory, SectionData, SectionThumbnailAccessory, SeparatorData, ThumbAreaData, ThumbAreaThumbnail, ThumbnailData };
+export { CustomItents, CustomPartials, EmbedLimit, EmbedPlusBuilder, Separator, chars, commandMention, createComponents, createContainer, createEmbed, createEmbedAsset, createEmbedAuthor, createEmbedFiles, createEmbedFooter, createFile, createLinkButton, createMediaGallery, createModal, createModalFields, createModalInput, createRow, createSection, createSeparator, createTextDisplay, createThumbArea, createThumbnail, createWebhookClient, extractMentionId, fetchMessageFromURL, findChannel, findCommand, findEmoji, findMember, findMessage, findRole, getChannelUrlInfo, getMessageURLInfo, isAnySelectMenuBuilder, isAttachment, isButtonBuilder, modalFieldsToRecord, setMobileStatus, wrapButtons };
+export type { AnyEmbedData, AnySelectMenuBuilder, ComponentData, ContainerColor, ContainerData, CreateComponentData, CreateModalData, EmbedPlusAssetData, EmbedPlusAuthorData, EmbedPlusColorData, EmbedPlusData, EmbedPlusFooterData, EmbedPlusProperty, MediaGallerySource, ModalFieldsData, ModalFieldsRecord, SectionAccessory, SectionAccessoryData, SectionButtonAccessory, SectionData, SectionThumbnailAccessory, SeparatorData, ThumbAreaData, ThumbAreaThumbnail, ThumbnailData };

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, ButtonBuilder, ActionRowBuilder, LinkButtonComponentData, AnyComponentBuilder, FileBuilder, APIUnfurledMediaItem, MediaGalleryBuilder, MediaGalleryItemData, SeparatorBuilder, ThumbnailComponentData, ThumbnailBuilder, ButtonComponentData, SectionBuilder, TextDisplayBuilder, MessageActionRowComponentBuilder, ContainerBuilder, ContainerComponentData, ChannelType, CommandInteractionOption, Client, ApplicationCommand, TextInputBuilder, ModalSubmitInteraction, ModalSubmitFields, Collection, TextInputComponent, TextInputStyle, TextInputComponentData, GuildEmoji, GuildTextBasedChannel, Message, Role, WebhookClientOptions, WebhookClient, WebhookClientData, StringSelectMenuBuilder, UserSelectMenuBuilder, RoleSelectMenuBuilder, ChannelSelectMenuBuilder, MentionableSelectMenuBuilder } from 'discord.js';
+import { GatewayIntentBits, Partials, Attachment, AttachmentBuilder, EmbedAssetData, Guild, GuildMember, User, ClientUser, ImageURLOptions, EmbedFooterData, ColorResolvable, APIEmbed, Embed, EmbedData, EmbedBuilder, AttachmentData, ComponentEmojiResolvable, ButtonBuilder, ActionRowBuilder, LinkButtonComponentData, AnyComponentBuilder, FileBuilder, APIUnfurledMediaItem, MediaGalleryItemData, MediaGalleryBuilder, SeparatorBuilder, ThumbnailComponentData, ThumbnailBuilder, ButtonComponentData, SectionBuilder, TextDisplayBuilder, MessageActionRowComponentBuilder, ContainerBuilder, ContainerComponentData, ChannelType, CommandInteractionOption, Client, ApplicationCommand, TextInputBuilder, ModalSubmitInteraction, ModalSubmitFields, Collection, TextInputComponent, ModalBuilder, TextInputStyle, TextInputComponentData, GuildEmoji, GuildTextBasedChannel, Message, Role, WebhookClientOptions, WebhookClient, WebhookClientData, StringSelectMenuBuilder, UserSelectMenuBuilder, RoleSelectMenuBuilder, ChannelSelectMenuBuilder, MentionableSelectMenuBuilder } from 'discord.js';
 export * from '@magicyan/core';
 
 declare const chars: {
@@ -207,6 +207,7 @@ declare function createEmbedFiles(embed: EmbedBuilder, options?: CreateEmbedFile
 
 interface CreateLinkButtonData extends Omit<LinkButtonComponentData, "style" | "type"> {
 }
+declare function createLinkButton(link: string, label?: string, emoji?: ComponentEmojiResolvable): ButtonBuilder;
 declare function createLinkButton(data: CreateLinkButtonData): ButtonBuilder;
 /**
  * Wraps buttons into multiple {@link ActionRowBuilder} instances with a maximum number of buttons per row.
@@ -301,7 +302,7 @@ interface CreateFileOptions extends Omit<APIUnfurledMediaItem, "url"> {
  */
 declare function createFile(source: FileSource, options?: CreateFileOptions): FileBuilder;
 
-type MediaGallerySource = MediaGalleryItemData | string | Attachment | AttachmentBuilder;
+type MediaGallerySource = MediaGalleryItemData | string | Attachment | AttachmentBuilder | null | undefined;
 /**
  * Creates a {@link MediaGalleryBuilder} instance with a collection of media items, which can be images, attachments, or URLs.
  *
@@ -342,7 +343,7 @@ type MediaGallerySource = MediaGalleryItemData | string | Attachment | Attachmen
  * );
  *
  */
-declare function createMediaGallery(...items: MediaGallerySource[]): MediaGalleryBuilder;
+declare function createMediaGallery(...items: (MediaGallerySource | MediaGallerySource[])[]): MediaGalleryBuilder;
 
 interface SeparatorData {
     divider?: boolean;
@@ -546,7 +547,7 @@ type ThumbAreaData = {
 declare function createThumbArea(content: string, thumbnail?: ThumbAreaThumbnail): SectionBuilder | TextDisplayBuilder;
 declare function createThumbArea(data: ThumbAreaData): SectionBuilder | TextDisplayBuilder;
 
-type ComponentData = TextDisplayBuilder | SeparatorBuilder | FileBuilder | SectionBuilder | MediaGalleryBuilder | ActionRowBuilder<MessageActionRowComponentBuilder> | MessageActionRowComponentBuilder[] | MessageActionRowComponentBuilder | Attachment | AttachmentBuilder | string | null | undefined | boolean;
+type ComponentData = TextDisplayBuilder | SeparatorBuilder | FileBuilder | SectionBuilder | MediaGalleryBuilder | ActionRowBuilder<MessageActionRowComponentBuilder> | MessageActionRowComponentBuilder | Attachment | AttachmentBuilder | string | null | undefined | boolean;
 type CreateComponentData = ComponentData | ContainerBuilder;
 declare function createComponents(...data: (CreateComponentData | CreateComponentData[])[]): (SeparatorBuilder | TextDisplayBuilder | FileBuilder | SectionBuilder | MediaGalleryBuilder | ActionRowBuilder<MessageActionRowComponentBuilder> | ContainerBuilder)[];
 
@@ -654,6 +655,12 @@ 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: ModalSubmitInteraction | ModalSubmitFields | Collection<string, TextInputComponent>): ModalFieldsRecord<K>;
+interface CreateModalData {
+    title?: string;
+    customId: string;
+    components: ModalFieldsData;
+}
+declare function createModal(data: CreateModalData): ModalBuilder;
 
 type FindEmojiFilter = (emoji: GuildEmoji) => boolean;
 declare function findEmoji(guildOrClient: Guild | Client): {
@@ -682,12 +689,18 @@ declare function findMessage(channel: GuildTextBasedChannel): {
     };
     byFilter(filter: FindMessageFilter): Message<true> | undefined;
 };
-interface MessageUrlInfo {
-    messageId?: string;
+type MessageURLInfo = {
+    channelId: string;
+    guildId: string;
+    messageId: string;
+} | {
+    messageId?: undefined;
     channelId?: string;
     guildId?: string;
-}
-declare function getMessageUrlInfo(url: string): MessageUrlInfo;
+};
+declare function getMessageURLInfo(url: string): MessageURLInfo;
+declare function fetchMessageFromURL(guild: Guild, url: string): Promise<Message<true> | null>;
+declare function fetchMessageFromURL(client: Client | Client, url: string): Promise<Message | null>;
 
 type FindRoleFilter = (role: Role) => boolean;
 /**
@@ -735,5 +748,5 @@ declare function isAnySelectMenuBuilder(value: unknown): value is AnySelectMenuB
 
 declare function isButtonBuilder(value: unknown): value is ButtonBuilder;
 
-export { CustomItents, CustomPartials, EmbedLimit, EmbedPlusBuilder, Separator, chars, commandMention, createComponents, createContainer, createEmbed, createEmbedAsset, createEmbedAuthor, createEmbedFiles, createEmbedFooter, createFile, createLinkButton, createMediaGallery, createModalFields, createModalInput, createRow, createSection, createSeparator, createTextDisplay, createThumbArea, createThumbnail, createWebhookClient, extractMentionId, findChannel, findCommand, findEmoji, findMember, findMessage, findRole, getChannelUrlInfo, getMessageUrlInfo, isAnySelectMenuBuilder, isAttachment, isButtonBuilder, modalFieldsToRecord, setMobileStatus, wrapButtons };
-export type { AnyEmbedData, AnySelectMenuBuilder, ComponentData, ContainerColor, ContainerData, EmbedPlusAssetData, EmbedPlusAuthorData, EmbedPlusColorData, EmbedPlusData, EmbedPlusFooterData, EmbedPlusProperty, SectionAccessory, SectionAccessoryData, SectionButtonAccessory, SectionData, SectionThumbnailAccessory, SeparatorData, ThumbAreaData, ThumbAreaThumbnail, ThumbnailData };
+export { CustomItents, CustomPartials, EmbedLimit, EmbedPlusBuilder, Separator, chars, commandMention, createComponents, createContainer, createEmbed, createEmbedAsset, createEmbedAuthor, createEmbedFiles, createEmbedFooter, createFile, createLinkButton, createMediaGallery, createModal, createModalFields, createModalInput, createRow, createSection, createSeparator, createTextDisplay, createThumbArea, createThumbnail, createWebhookClient, extractMentionId, fetchMessageFromURL, findChannel, findCommand, findEmoji, findMember, findMessage, findRole, getChannelUrlInfo, getMessageURLInfo, isAnySelectMenuBuilder, isAttachment, isButtonBuilder, modalFieldsToRecord, setMobileStatus, wrapButtons };
+export type { AnyEmbedData, AnySelectMenuBuilder, ComponentData, ContainerColor, ContainerData, CreateComponentData, CreateModalData, EmbedPlusAssetData, EmbedPlusAuthorData, EmbedPlusColorData, EmbedPlusData, EmbedPlusFooterData, EmbedPlusProperty, MediaGallerySource, ModalFieldsData, ModalFieldsRecord, SectionAccessory, SectionAccessoryData, SectionButtonAccessory, SectionData, SectionThumbnailAccessory, SeparatorData, ThumbAreaData, ThumbAreaThumbnail, ThumbnailData };

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, ButtonBuilder, ActionRowBuilder, LinkButtonComponentData, AnyComponentBuilder, FileBuilder, APIUnfurledMediaItem, MediaGalleryBuilder, MediaGalleryItemData, SeparatorBuilder, ThumbnailComponentData, ThumbnailBuilder, ButtonComponentData, SectionBuilder, TextDisplayBuilder, MessageActionRowComponentBuilder, ContainerBuilder, ContainerComponentData, ChannelType, CommandInteractionOption, Client, ApplicationCommand, TextInputBuilder, ModalSubmitInteraction, ModalSubmitFields, Collection, TextInputComponent, TextInputStyle, TextInputComponentData, GuildEmoji, GuildTextBasedChannel, Message, Role, WebhookClientOptions, WebhookClient, WebhookClientData, StringSelectMenuBuilder, UserSelectMenuBuilder, RoleSelectMenuBuilder, ChannelSelectMenuBuilder, MentionableSelectMenuBuilder } from 'discord.js';
+import { GatewayIntentBits, Partials, Attachment, AttachmentBuilder, EmbedAssetData, Guild, GuildMember, User, ClientUser, ImageURLOptions, EmbedFooterData, ColorResolvable, APIEmbed, Embed, EmbedData, EmbedBuilder, AttachmentData, ComponentEmojiResolvable, ButtonBuilder, ActionRowBuilder, LinkButtonComponentData, AnyComponentBuilder, FileBuilder, APIUnfurledMediaItem, MediaGalleryItemData, MediaGalleryBuilder, SeparatorBuilder, ThumbnailComponentData, ThumbnailBuilder, ButtonComponentData, SectionBuilder, TextDisplayBuilder, MessageActionRowComponentBuilder, ContainerBuilder, ContainerComponentData, ChannelType, CommandInteractionOption, Client, ApplicationCommand, TextInputBuilder, ModalSubmitInteraction, ModalSubmitFields, Collection, TextInputComponent, ModalBuilder, TextInputStyle, TextInputComponentData, GuildEmoji, GuildTextBasedChannel, Message, Role, WebhookClientOptions, WebhookClient, WebhookClientData, StringSelectMenuBuilder, UserSelectMenuBuilder, RoleSelectMenuBuilder, ChannelSelectMenuBuilder, MentionableSelectMenuBuilder } from 'discord.js';
 export * from '@magicyan/core';
 
 declare const chars: {
@@ -207,6 +207,7 @@ declare function createEmbedFiles(embed: EmbedBuilder, options?: CreateEmbedFile
 
 interface CreateLinkButtonData extends Omit<LinkButtonComponentData, "style" | "type"> {
 }
+declare function createLinkButton(link: string, label?: string, emoji?: ComponentEmojiResolvable): ButtonBuilder;
 declare function createLinkButton(data: CreateLinkButtonData): ButtonBuilder;
 /**
  * Wraps buttons into multiple {@link ActionRowBuilder} instances with a maximum number of buttons per row.
@@ -301,7 +302,7 @@ interface CreateFileOptions extends Omit<APIUnfurledMediaItem, "url"> {
  */
 declare function createFile(source: FileSource, options?: CreateFileOptions): FileBuilder;
 
-type MediaGallerySource = MediaGalleryItemData | string | Attachment | AttachmentBuilder;
+type MediaGallerySource = MediaGalleryItemData | string | Attachment | AttachmentBuilder | null | undefined;
 /**
  * Creates a {@link MediaGalleryBuilder} instance with a collection of media items, which can be images, attachments, or URLs.
  *
@@ -342,7 +343,7 @@ type MediaGallerySource = MediaGalleryItemData | string | Attachment | Attachmen
  * );
  *
  */
-declare function createMediaGallery(...items: MediaGallerySource[]): MediaGalleryBuilder;
+declare function createMediaGallery(...items: (MediaGallerySource | MediaGallerySource[])[]): MediaGalleryBuilder;
 
 interface SeparatorData {
     divider?: boolean;
@@ -546,7 +547,7 @@ type ThumbAreaData = {
 declare function createThumbArea(content: string, thumbnail?: ThumbAreaThumbnail): SectionBuilder | TextDisplayBuilder;
 declare function createThumbArea(data: ThumbAreaData): SectionBuilder | TextDisplayBuilder;
 
-type ComponentData = TextDisplayBuilder | SeparatorBuilder | FileBuilder | SectionBuilder | MediaGalleryBuilder | ActionRowBuilder<MessageActionRowComponentBuilder> | MessageActionRowComponentBuilder[] | MessageActionRowComponentBuilder | Attachment | AttachmentBuilder | string | null | undefined | boolean;
+type ComponentData = TextDisplayBuilder | SeparatorBuilder | FileBuilder | SectionBuilder | MediaGalleryBuilder | ActionRowBuilder<MessageActionRowComponentBuilder> | MessageActionRowComponentBuilder | Attachment | AttachmentBuilder | string | null | undefined | boolean;
 type CreateComponentData = ComponentData | ContainerBuilder;
 declare function createComponents(...data: (CreateComponentData | CreateComponentData[])[]): (SeparatorBuilder | TextDisplayBuilder | FileBuilder | SectionBuilder | MediaGalleryBuilder | ActionRowBuilder<MessageActionRowComponentBuilder> | ContainerBuilder)[];
 
@@ -654,6 +655,12 @@ 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: ModalSubmitInteraction | ModalSubmitFields | Collection<string, TextInputComponent>): ModalFieldsRecord<K>;
+interface CreateModalData {
+    title?: string;
+    customId: string;
+    components: ModalFieldsData;
+}
+declare function createModal(data: CreateModalData): ModalBuilder;
 
 type FindEmojiFilter = (emoji: GuildEmoji) => boolean;
 declare function findEmoji(guildOrClient: Guild | Client): {
@@ -682,12 +689,18 @@ declare function findMessage(channel: GuildTextBasedChannel): {
     };
     byFilter(filter: FindMessageFilter): Message<true> | undefined;
 };
-interface MessageUrlInfo {
-    messageId?: string;
+type MessageURLInfo = {
+    channelId: string;
+    guildId: string;
+    messageId: string;
+} | {
+    messageId?: undefined;
     channelId?: string;
     guildId?: string;
-}
-declare function getMessageUrlInfo(url: string): MessageUrlInfo;
+};
+declare function getMessageURLInfo(url: string): MessageURLInfo;
+declare function fetchMessageFromURL(guild: Guild, url: string): Promise<Message<true> | null>;
+declare function fetchMessageFromURL(client: Client | Client, url: string): Promise<Message | null>;
 
 type FindRoleFilter = (role: Role) => boolean;
 /**
@@ -735,5 +748,5 @@ declare function isAnySelectMenuBuilder(value: unknown): value is AnySelectMenuB
 
 declare function isButtonBuilder(value: unknown): value is ButtonBuilder;
 
-export { CustomItents, CustomPartials, EmbedLimit, EmbedPlusBuilder, Separator, chars, commandMention, createComponents, createContainer, createEmbed, createEmbedAsset, createEmbedAuthor, createEmbedFiles, createEmbedFooter, createFile, createLinkButton, createMediaGallery, createModalFields, createModalInput, createRow, createSection, createSeparator, createTextDisplay, createThumbArea, createThumbnail, createWebhookClient, extractMentionId, findChannel, findCommand, findEmoji, findMember, findMessage, findRole, getChannelUrlInfo, getMessageUrlInfo, isAnySelectMenuBuilder, isAttachment, isButtonBuilder, modalFieldsToRecord, setMobileStatus, wrapButtons };
-export type { AnyEmbedData, AnySelectMenuBuilder, ComponentData, ContainerColor, ContainerData, EmbedPlusAssetData, EmbedPlusAuthorData, EmbedPlusColorData, EmbedPlusData, EmbedPlusFooterData, EmbedPlusProperty, SectionAccessory, SectionAccessoryData, SectionButtonAccessory, SectionData, SectionThumbnailAccessory, SeparatorData, ThumbAreaData, ThumbAreaThumbnail, ThumbnailData };
+export { CustomItents, CustomPartials, EmbedLimit, EmbedPlusBuilder, Separator, chars, commandMention, createComponents, createContainer, createEmbed, createEmbedAsset, createEmbedAuthor, createEmbedFiles, createEmbedFooter, createFile, createLinkButton, createMediaGallery, createModal, createModalFields, createModalInput, createRow, createSection, createSeparator, createTextDisplay, createThumbArea, createThumbnail, createWebhookClient, extractMentionId, fetchMessageFromURL, findChannel, findCommand, findEmoji, findMember, findMessage, findRole, getChannelUrlInfo, getMessageURLInfo, isAnySelectMenuBuilder, isAttachment, isButtonBuilder, modalFieldsToRecord, setMobileStatus, wrapButtons };
+export type { AnyEmbedData, AnySelectMenuBuilder, ComponentData, ContainerColor, ContainerData, CreateComponentData, CreateModalData, EmbedPlusAssetData, EmbedPlusAuthorData, EmbedPlusColorData, EmbedPlusData, EmbedPlusFooterData, EmbedPlusProperty, MediaGallerySource, ModalFieldsData, ModalFieldsRecord, SectionAccessory, SectionAccessoryData, SectionButtonAccessory, SectionData, SectionThumbnailAccessory, SeparatorData, ThumbAreaData, ThumbAreaThumbnail, ThumbnailData };

package/dist/index.mjs

@@ -21,10 +21,10 @@ export { createComponents } from './functions/components/components.mjs';
 export { createContainer } from './functions/components/container.mjs';
 export { findChannel, getChannelUrlInfo } from './functions/channels.mjs';
 export { commandMention, findCommand } from './functions/commands.mjs';
-export { createModalFields, createModalInput, modalFieldsToRecord } from './functions/modals.mjs';
+export { createModal, createModalFields, createModalInput, modalFieldsToRecord } from './functions/modals.mjs';
 export { findEmoji } from './functions/emojis.mjs';
 export { findMember } from './functions/members.mjs';
-export { findMessage, getMessageUrlInfo } from './functions/message.mjs';
+export { fetchMessageFromURL, findMessage, getMessageURLInfo } from './functions/message.mjs';
 export { findRole } from './functions/roles.mjs';
 export { extractMentionId } from './functions/regex.mjs';
 export { createWebhookClient } from './functions/webhooks.mjs';

package/package.json

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