@magicyan/discord 1.5.1 → 1.5.3

package/dist/constants/client.cjs

@@ -6,6 +6,7 @@ const Messages = [
   discord_js.IntentsBitField.Flags.DirectMessagePolls,
   discord_js.IntentsBitField.Flags.DirectMessageReactions,
   discord_js.IntentsBitField.Flags.DirectMessageTyping,
+  discord_js.IntentsBitField.Flags.DirectMessages,
   discord_js.IntentsBitField.Flags.MessageContent,
   discord_js.IntentsBitField.Flags.GuildMessages,
   discord_js.IntentsBitField.Flags.GuildMessageReactions,

package/dist/constants/client.mjs

@@ -4,6 +4,7 @@ const Messages = [
   IntentsBitField.Flags.DirectMessagePolls,
   IntentsBitField.Flags.DirectMessageReactions,
   IntentsBitField.Flags.DirectMessageTyping,
+  IntentsBitField.Flags.DirectMessages,
   IntentsBitField.Flags.MessageContent,
   IntentsBitField.Flags.GuildMessages,
   IntentsBitField.Flags.GuildMessageReactions,

package/dist/functions/components/container.cjs

@@ -7,7 +7,8 @@ const message = require('../../guards/message.cjs');
 
 class ContainerPlusBuilder extends discord_js.ContainerBuilder {
   constructor(data) {
-    const constructorData = core.isDefined(data?.from) ? message.isMessage(data.from) ? data.from.components.filter((v) => v.type === discord_js.ComponentType.Container).at(data.fromIndex ?? 0)?.toJSON() ?? {} : data.from.toJSON() : {};
+    const extractData = (message) => message.components.filter((v) => v.type === discord_js.ComponentType.Container).at(data?.fromIndex ?? 0)?.toJSON() ?? {};
+    const constructorData = core.isDefined(data?.from) ? "message" in data.from ? extractData(data.from.message) : message.isMessage(data.from) ? extractData(data.from) : data.from.toJSON() : {};
     if (core.isDefined(data?.accentColor)) {
       constructorData.accent_color = discord_js.resolveColor(
         data.accentColor

package/dist/functions/components/container.mjs

@@ -1,11 +1,12 @@
 import { isDefined } from '@magicyan/core';
-import { ContainerBuilder, ComponentType, resolveColor } from 'discord.js';
+import { ContainerBuilder, resolveColor, ComponentType } from 'discord.js';
 import { createComponents } from './components.mjs';
 import { isMessage } from '../../guards/message.mjs';
 
 class ContainerPlusBuilder extends ContainerBuilder {
   constructor(data) {
-    const constructorData = isDefined(data?.from) ? isMessage(data.from) ? data.from.components.filter((v) => v.type === ComponentType.Container).at(data.fromIndex ?? 0)?.toJSON() ?? {} : data.from.toJSON() : {};
+    const extractData = (message) => message.components.filter((v) => v.type === ComponentType.Container).at(data?.fromIndex ?? 0)?.toJSON() ?? {};
+    const constructorData = isDefined(data?.from) ? "message" in data.from ? extractData(data.from.message) : isMessage(data.from) ? extractData(data.from) : data.from.toJSON() : {};
     if (isDefined(data?.accentColor)) {
       constructorData.accent_color = resolveColor(
         data.accentColor

package/dist/functions/embeds/embedplus.cjs

@@ -3,7 +3,6 @@
 const core = require('@magicyan/core');
 const discord_js = require('discord.js');
 const chars = require('../../constants/chars.cjs');
-const colors = require('../../constants/colors.cjs');
 const assets = require('./assets.cjs');
 const fields = require('./fields.cjs');
 const footer = require('./footer.cjs');
@@ -69,7 +68,7 @@ class EmbedPlusBuilder extends discord_js.EmbedBuilder {
   }
   setColor(color) {
     if (color === null) {
-      super.setColor(colors.colors.embedbg);
+      super.setColor("#2B2D31");
     } else if (typeof color === "number") {
       this.update({ color });
     } else {

package/dist/functions/embeds/embedplus.mjs

@@ -1,7 +1,6 @@
 import { brBuilder } from '@magicyan/core';
 import { EmbedBuilder, AttachmentBuilder } from 'discord.js';
 import { chars } from '../../constants/chars.mjs';
-import { colors } from '../../constants/colors.mjs';
 import { createEmbedAsset } from './assets.mjs';
 import { EmbedPlusFields } from './fields.mjs';
 import { createEmbedFooter } from './footer.mjs';
@@ -67,7 +66,7 @@ class EmbedPlusBuilder extends EmbedBuilder {
   }
   setColor(color) {
     if (color === null) {
-      super.setColor(colors.embedbg);
+      super.setColor("#2B2D31");
     } else if (typeof color === "number") {
       this.update({ color });
     } else {

package/dist/functions/modals.cjs

@@ -13,9 +13,11 @@ function createModalFields(data) {
   );
 }
 function modalFieldsToRecord(fields) {
-  const reduceFunction = (data, { customId, value }) => ({ ...data, [customId]: value });
   const modalFields = fields instanceof discord_js.ModalSubmitInteraction ? fields.fields.fields : "fields" in fields ? fields.fields : fields;
-  return modalFields.reduce(reduceFunction, {});
+  return modalFields.reduce((acc, { customId, value }) => {
+    acc[customId] = value;
+    return acc;
+  }, {});
 }
 function createModal(data) {
   return new discord_js.ModalBuilder({

package/dist/functions/modals.mjs

@@ -11,9 +11,11 @@ function createModalFields(data) {
   );
 }
 function modalFieldsToRecord(fields) {
-  const reduceFunction = (data, { customId, value }) => ({ ...data, [customId]: value });
   const modalFields = fields instanceof ModalSubmitInteraction ? fields.fields.fields : "fields" in fields ? fields.fields : fields;
-  return modalFields.reduce(reduceFunction, {});
+  return modalFields.reduce((acc, { customId, value }) => {
+    acc[customId] = value;
+    return acc;
+  }, {});
 }
 function createModal(data) {
   return new ModalBuilder({

package/dist/index.d.cts

@@ -237,10 +237,13 @@ declare function createComponents<IsContainer extends boolean = false, Data exte
 type ContainerColor = (string & {}) | ColorResolvable;
 type ContainerInComponentType = ComponentType.TextDisplay | ComponentType.ActionRow | ComponentType.Section | ComponentType.Separator | ComponentType.MediaGallery | ComponentType.File;
 type ContainerType = ContainerBuilder | ContainerPlusBuilder | ContainerComponent;
+type InteractionWithMessage = {
+    message: Message;
+};
 interface ContainerData extends Omit<ContainerComponentData, "accentColor" | "type" | "components"> {
     accentColor?: ContainerColor | null;
     components?: ComponentData[];
-    from?: ContainerType | Message;
+    from?: ContainerType | Message | InteractionWithMessage;
     fromIndex?: number;
 }
 declare class ContainerPlusBuilder extends ContainerBuilder {

package/dist/index.d.mts

@@ -237,10 +237,13 @@ declare function createComponents<IsContainer extends boolean = false, Data exte
 type ContainerColor = (string & {}) | ColorResolvable;
 type ContainerInComponentType = ComponentType.TextDisplay | ComponentType.ActionRow | ComponentType.Section | ComponentType.Separator | ComponentType.MediaGallery | ComponentType.File;
 type ContainerType = ContainerBuilder | ContainerPlusBuilder | ContainerComponent;
+type InteractionWithMessage = {
+    message: Message;
+};
 interface ContainerData extends Omit<ContainerComponentData, "accentColor" | "type" | "components"> {
     accentColor?: ContainerColor | null;
     components?: ComponentData[];
-    from?: ContainerType | Message;
+    from?: ContainerType | Message | InteractionWithMessage;
     fromIndex?: number;
 }
 declare class ContainerPlusBuilder extends ContainerBuilder {

package/dist/index.d.ts

@@ -237,10 +237,13 @@ declare function createComponents<IsContainer extends boolean = false, Data exte
 type ContainerColor = (string & {}) | ColorResolvable;
 type ContainerInComponentType = ComponentType.TextDisplay | ComponentType.ActionRow | ComponentType.Section | ComponentType.Separator | ComponentType.MediaGallery | ComponentType.File;
 type ContainerType = ContainerBuilder | ContainerPlusBuilder | ContainerComponent;
+type InteractionWithMessage = {
+    message: Message;
+};
 interface ContainerData extends Omit<ContainerComponentData, "accentColor" | "type" | "components"> {
     accentColor?: ContainerColor | null;
     components?: ComponentData[];
-    from?: ContainerType | Message;
+    from?: ContainerType | Message | InteractionWithMessage;
     fromIndex?: number;
 }
 declare class ContainerPlusBuilder extends ContainerBuilder {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@magicyan/discord",
-  "version": "1.5.1",
+  "version": "1.5.3",
   "description": "Simple functions to facilitate discord bot development",
   "license": "MIT",
   "type": "module",
@@ -39,7 +39,7 @@
     "test": "vitest"
   },
   "peerDependencies": {
-    "discord.js": "^14.19.3"
+    "discord.js": "^14.22.1"
   },
   "devDependencies": {
     "@magicyan/config": "*",
@@ -49,6 +49,6 @@
     "vitest": "^2.1.9"
   },
   "dependencies": {
-    "@magicyan/core": "^1.1.1"
+    "@magicyan/core": "^1.1.4"
   }
 }

package/dist/constants/colors.cjs

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

package/dist/constants/colors.mjs

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