@magicyan/discord 1.0.19 → 1.0.21

package/dist/functions/embeds.cjs

@@ -1,8 +1,8 @@
 'use strict';
 
-const core = require('@magicyan/core');
 const discord_js = require('discord.js');
 const chars = require('../constants/chars.cjs');
+const core = require('@magicyan/core');
 
 function createEmbedAuthor(options) {
   const {
@@ -35,7 +35,7 @@ function createEmbedAsset(source, options) {
 }
 class EmbedBuilderPlus extends discord_js.EmbedBuilder {
   constructor(data) {
-    const fields = (data.mergeFields ? [data.extend?.fields ?? [], data.fields ?? []].flat() : data.fields ?? []).map(({ name = chars.chars.invisible, value = chars.chars.invisible, inline }) => ({
+    const fields = (data.mergeFields ? [data.extend?.fields ?? [], data.fields ?? []].flat() : data.fields ?? data.extend?.fields ?? []).map(({ name = chars.chars.invisible, value = chars.chars.invisible, inline }) => ({
       name,
       value,
       inline
@@ -64,7 +64,7 @@ class EmbedBuilderPlus extends discord_js.EmbedBuilder {
     super(embed.data);
   }
   has(property) {
-    return Object.hasOwn(this, property);
+    return Boolean(this.data[property]);
   }
   toArray() {
     return [this];

package/dist/functions/embeds.mjs

@@ -1,6 +1,6 @@
-import { notFound } from '@magicyan/core';
 import { Attachment, AttachmentBuilder, EmbedBuilder, Embed } from 'discord.js';
 import { chars } from '../constants/chars.mjs';
+import { notFound } from '@magicyan/core';
 
 function createEmbedAuthor(options) {
   const {
@@ -33,7 +33,7 @@ function createEmbedAsset(source, options) {
 }
 class EmbedBuilderPlus extends EmbedBuilder {
   constructor(data) {
-    const fields = (data.mergeFields ? [data.extend?.fields ?? [], data.fields ?? []].flat() : data.fields ?? []).map(({ name = chars.invisible, value = chars.invisible, inline }) => ({
+    const fields = (data.mergeFields ? [data.extend?.fields ?? [], data.fields ?? []].flat() : data.fields ?? data.extend?.fields ?? []).map(({ name = chars.invisible, value = chars.invisible, inline }) => ({
       name,
       value,
       inline
@@ -62,7 +62,7 @@ class EmbedBuilderPlus extends EmbedBuilder {
     super(embed.data);
   }
   has(property) {
-    return Object.hasOwn(this, property);
+    return Boolean(this.data[property]);
   }
   toArray() {
     return [this];

package/dist/functions/message.cjs

@@ -5,6 +5,23 @@ const core = require('@magicyan/core');
 function findMessage(channel) {
   const messages = channel.messages.cache;
   return {
+    async all(limit = Infinity) {
+      const messages2 = [];
+      let lastMessageId;
+      while (true) {
+        const fetched = await channel.messages.fetch({ limit: 100, before: lastMessageId });
+        messages2.push(...fetched.values());
+        lastMessageId = fetched.lastKey();
+        if (fetched.size < 100 || messages2.length >= limit)
+          break;
+      }
+      if (limit < messages2.length) {
+        const sliced = messages2.slice(0, limit);
+        messages2.length = 0;
+        messages2.push(...sliced);
+      }
+      return messages2;
+    },
     byId(id) {
       return messages.get(id);
     },

package/dist/functions/message.mjs

@@ -3,6 +3,23 @@ import { equalsIgnoreCase, includesIgnoreCase } from '@magicyan/core';
 function findMessage(channel) {
   const messages = channel.messages.cache;
   return {
+    async all(limit = Infinity) {
+      const messages2 = [];
+      let lastMessageId;
+      while (true) {
+        const fetched = await channel.messages.fetch({ limit: 100, before: lastMessageId });
+        messages2.push(...fetched.values());
+        lastMessageId = fetched.lastKey();
+        if (fetched.size < 100 || messages2.length >= limit)
+          break;
+      }
+      if (limit < messages2.length) {
+        const sliced = messages2.slice(0, limit);
+        messages2.length = 0;
+        messages2.push(...sliced);
+      }
+      return messages2;
+    },
     byId(id) {
       return messages.get(id);
     },

package/dist/index.d.cts

@@ -167,6 +167,7 @@ declare function findMember(guild: Guild): {
 
 type FindMessageFilter = (role: Message<true>) => boolean;
 declare function findMessage(channel: GuildTextBasedChannel): {
+    all(limit?: number): Promise<Message<boolean>[]>;
     byId(id: string): Message<true> | undefined;
     byContent(): {
         equals(content: string, ignoreCase?: boolean): Message<true> | undefined;

package/dist/index.d.mts

@@ -167,6 +167,7 @@ declare function findMember(guild: Guild): {
 
 type FindMessageFilter = (role: Message<true>) => boolean;
 declare function findMessage(channel: GuildTextBasedChannel): {
+    all(limit?: number): Promise<Message<boolean>[]>;
     byId(id: string): Message<true> | undefined;
     byContent(): {
         equals(content: string, ignoreCase?: boolean): Message<true> | undefined;

package/dist/index.d.ts

@@ -167,6 +167,7 @@ declare function findMember(guild: Guild): {
 
 type FindMessageFilter = (role: Message<true>) => boolean;
 declare function findMessage(channel: GuildTextBasedChannel): {
+    all(limit?: number): Promise<Message<boolean>[]>;
     byId(id: string): Message<true> | undefined;
     byContent(): {
         equals(content: string, ignoreCase?: boolean): Message<true> | undefined;

package/package.json

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