@spatulox/simplediscordbot 1.1.0 → 1.1.1

package/dist/index.d.mts

@@ -341,6 +341,7 @@ declare abstract class BasicUserManager {
 }
 
 declare class GuildUserManager extends BasicUserManager {
+    static find(userId: string, guild: Guild | string): Promise<GuildMember | null>;
     static rename(member: GuildMember, nickname: string, maxAttempts?: number): Promise<boolean>;
     /**
      * Check if user is banned from guild
@@ -528,7 +529,7 @@ declare class GuildManager {
     static readonly channel: typeof GuildChannelList;
     static readonly invite: typeof InviteManager;
     static list(): Guild[];
-    static find(guild_id: string): Promise<Guild | null>;
+    static find(guild_id: string): Promise<Guild>;
     /**
      * Search channel by ID (TextChannel, DMChannel, ThreadChannel)
      */

package/dist/index.d.ts

@@ -341,6 +341,7 @@ declare abstract class BasicUserManager {
 }
 
 declare class GuildUserManager extends BasicUserManager {
+    static find(userId: string, guild: Guild | string): Promise<GuildMember | null>;
     static rename(member: GuildMember, nickname: string, maxAttempts?: number): Promise<boolean>;
     /**
      * Check if user is banned from guild
@@ -528,7 +529,7 @@ declare class GuildManager {
     static readonly channel: typeof GuildChannelList;
     static readonly invite: typeof InviteManager;
     static list(): Guild[];
-    static find(guild_id: string): Promise<Guild | null>;
+    static find(guild_id: string): Promise<Guild>;
     /**
      * Search channel by ID (TextChannel, DMChannel, ThreadChannel)
      */

package/dist/index.js

@@ -1559,7 +1559,7 @@ var ReactionManager = class {
 };
 
 // src/manager/guild/GuildManager.ts
-var import_discord13 = require("discord.js");
+var import_discord14 = require("discord.js");
 
 // src/manager/direct/BasicUserManager.ts
 var import_discord8 = require("discord.js");
@@ -1634,9 +1634,22 @@ var BasicUserManager = class {
 };
 
 // src/manager/guild/GuildUserManager.ts
+var import_discord9 = require("discord.js");
 var import_promises2 = require("timers/promises");
 var MAX_NICKNAME_LENGTH = 32;
 var GuildUserManager = class extends BasicUserManager {
+  static async find(userId, guild) {
+    try {
+      if (guild instanceof import_discord9.Guild) {
+        return await guild.members.fetch(userId);
+      } else {
+        return await (await GuildManager.find(guild)).members.fetch(userId);
+      }
+    } catch (error) {
+      Log.error(`UserManager: Member ${userId} not found`);
+      return null;
+    }
+  }
   static async rename(member, nickname, maxAttempts = 3) {
     if (nickname.length > MAX_NICKNAME_LENGTH) {
       nickname = nickname.slice(0, MAX_NICKNAME_LENGTH);
@@ -1925,15 +1938,15 @@ var RoleManager = class {
 };
 
 // src/manager/guild/ChannelManager/ForumChannelManager.ts
-var import_discord9 = require("discord.js");
+var import_discord10 = require("discord.js");
 var ForumChannelManager = class extends GuildChannelManager {
   static async findInGuild(guildId, channelId) {
     const channel = await super.findInGuild(guildId, channelId);
-    return channel instanceof import_discord9.ForumChannel ? channel : null;
+    return channel instanceof import_discord10.ForumChannel ? channel : null;
   }
   static async find(channelId) {
     const channel = await super.find(channelId);
-    return channel instanceof import_discord9.ForumChannel ? channel : null;
+    return channel instanceof import_discord10.ForumChannel ? channel : null;
   }
   static findAll(guildId) {
     const guild = Bot.client.guilds.cache.get(guildId);
@@ -1941,27 +1954,27 @@ var ForumChannelManager = class extends GuildChannelManager {
       Log.warn(`Guild ${guildId} not found`);
       return [];
     }
-    return Array.from(guild.channels.cache.values()).filter((c) => c instanceof import_discord9.ForumChannel);
+    return Array.from(guild.channels.cache.values()).filter((c) => c instanceof import_discord10.ForumChannel);
   }
   static async create(guildId, name, options) {
     return await super._create(guildId, {
       name,
-      type: import_discord9.ChannelType.GuildForum,
+      type: import_discord10.ChannelType.GuildForum,
       ...options
     });
   }
 };
 
 // src/manager/guild/ChannelManager/NewsChannelManager.ts
-var import_discord10 = require("discord.js");
+var import_discord11 = require("discord.js");
 var NewsChannelManager = class extends GuildChannelManager {
   static async findInGuild(guildId, channelId) {
     const channel = await super.findInGuild(guildId, channelId);
-    return channel instanceof import_discord10.NewsChannel ? channel : null;
+    return channel instanceof import_discord11.NewsChannel ? channel : null;
   }
   static async find(channelId) {
     const channel = await super.find(channelId);
-    return channel instanceof import_discord10.NewsChannel ? channel : null;
+    return channel instanceof import_discord11.NewsChannel ? channel : null;
   }
   static findAll(guildId) {
     const guild = Bot.client.guilds.cache.get(guildId);
@@ -1969,27 +1982,27 @@ var NewsChannelManager = class extends GuildChannelManager {
       Log.warn(`Guild ${guildId} not found`);
       return [];
     }
-    return Array.from(guild.channels.cache.values()).filter((c) => c instanceof import_discord10.NewsChannel);
+    return Array.from(guild.channels.cache.values()).filter((c) => c instanceof import_discord11.NewsChannel);
   }
   static async create(guildId, name, options) {
     return await super._create(guildId, {
       name,
-      type: import_discord10.ChannelType.GuildAnnouncement,
+      type: import_discord11.ChannelType.GuildAnnouncement,
       ...options
     });
   }
 };
 
 // src/manager/guild/ChannelManager/StageChannelManager.ts
-var import_discord11 = require("discord.js");
+var import_discord12 = require("discord.js");
 var StageChannelManager = class extends GuildChannelManager {
   static async findInGuild(guildId, channelId) {
     const channel = await super.findInGuild(guildId, channelId);
-    return channel instanceof import_discord11.StageChannel ? channel : null;
+    return channel instanceof import_discord12.StageChannel ? channel : null;
   }
   static async find(channelId) {
     const channel = await super.find(channelId);
-    return channel instanceof import_discord11.StageChannel ? channel : null;
+    return channel instanceof import_discord12.StageChannel ? channel : null;
   }
   static findAll(guildId) {
     const guild = Bot.client.guilds.cache.get(guildId);
@@ -1997,12 +2010,12 @@ var StageChannelManager = class extends GuildChannelManager {
       Log.warn(`Guild ${guildId} not found`);
       return [];
     }
-    return Array.from(guild.channels.cache.values()).filter((c) => c instanceof import_discord11.StageChannel);
+    return Array.from(guild.channels.cache.values()).filter((c) => c instanceof import_discord12.StageChannel);
   }
   static async create(guildId, name, options) {
     return await super._create(guildId, {
       name,
-      type: import_discord11.ChannelType.GuildStageVoice,
+      type: import_discord12.ChannelType.GuildStageVoice,
       ...options
     });
   }
@@ -2050,7 +2063,7 @@ var ThreadChannelManager = class {
 };
 
 // src/manager/guild/ChannelManager/GuildVoiceChannelManager.ts
-var import_discord12 = require("discord.js");
+var import_discord13 = require("discord.js");
 var GuildVoiceChannelManager = class extends GuildChannelManager {
   static async findInGuild(guildId, channelId) {
     const channel = await super.findInGuild(guildId, channelId);
@@ -2066,12 +2079,12 @@ var GuildVoiceChannelManager = class extends GuildChannelManager {
       Log.warn(`Guild ${guildId} not found`);
       return [];
     }
-    return Array.from(guild.channels.cache.values()).filter((c) => c instanceof import_discord12.VoiceChannel);
+    return Array.from(guild.channels.cache.values()).filter((c) => c instanceof import_discord13.VoiceChannel);
   }
   static async create(guildId, name, options) {
     return await super._create(guildId, {
       name,
-      type: import_discord12.ChannelType.GuildVoice,
+      type: import_discord13.ChannelType.GuildVoice,
       ...options
     });
   }
@@ -2153,14 +2166,7 @@ var GuildManager = class {
     return Array.from(Bot.client.guilds.cache.values());
   }
   static async find(guild_id) {
-    try {
-      const cached = Bot.client.guilds.cache.get(guild_id);
-      if (cached) return cached;
-      return await Bot.client.guilds.fetch(guild_id);
-    } catch (error) {
-      Log.error(`GuildManager: Guild ${guild_id} : ${error} `);
-      return null;
-    }
+    return await Bot.client.guilds.fetch(guild_id);
   }
   /**
    * Search channel by ID (TextChannel, DMChannel, ThreadChannel)
@@ -2199,7 +2205,7 @@ var GuildManager = class {
    */
   static async fetchAllMembers(guildId, MAX_ATTEMPTS = 3, RETRY_DELAY = Time.minute.MIN_05.toMilliseconds()) {
     let guild;
-    if (guildId instanceof import_discord13.Guild) {
+    if (guildId instanceof import_discord14.Guild) {
       guild = guildId;
     } else {
       let tmp = Bot.client.guilds.cache.get(guildId);
@@ -2252,10 +2258,10 @@ var GuildManager = class {
       if (!toChannel) {
         throw new Error(`To channel ${toChannelId} not found`);
       }
-      if (!(fromChannel instanceof import_discord13.VoiceChannel || fromChannel instanceof import_discord13.StageChannel)) {
+      if (!(fromChannel instanceof import_discord14.VoiceChannel || fromChannel instanceof import_discord14.StageChannel)) {
         throw new Error(`From channel ${fromChannelId} is not a voice/stage channel`);
       }
-      if (!(toChannel instanceof import_discord13.VoiceChannel || toChannel instanceof import_discord13.StageChannel)) {
+      if (!(toChannel instanceof import_discord14.VoiceChannel || toChannel instanceof import_discord14.StageChannel)) {
         throw new Error(`To channel ${toChannelId} is not a voice/stage channel`);
       }
       if (member.voice.channelId !== fromChannelId) {
@@ -2292,7 +2298,7 @@ var UserManager = class extends BasicUserManager {
 };
 
 // src/manager/interactions/ModalManager.ts
-var import_discord14 = require("discord.js");
+var import_discord15 = require("discord.js");
 var ModalManager = class _ModalManager {
   /**
    * Load modal from JSON file and return ModalBuilder
@@ -2318,17 +2324,17 @@ var ModalManager = class _ModalManager {
     }
   }
   static jsonToBuilder(json) {
-    const modal = new import_discord14.ModalBuilder().setCustomId(json.customId).setTitle(json.title.slice(0, 45));
+    const modal = new import_discord15.ModalBuilder().setCustomId(json.customId).setTitle(json.title.slice(0, 45));
     const actionRows = [];
     for (const fieldJson of json.fields) {
       const input = this.fieldJsonToInput(fieldJson);
-      const row = new import_discord14.ActionRowBuilder().addComponents(input);
+      const row = new import_discord15.ActionRowBuilder().addComponents(input);
       actionRows.push(row);
     }
     return modal.addComponents(...actionRows);
   }
   static fieldJsonToInput(fieldJson) {
-    const input = new import_discord14.TextInputBuilder().setCustomId(fieldJson.customId).setLabel(fieldJson.title.slice(0, 45)).setPlaceholder(fieldJson.placeholder || "Enter value...").setRequired(fieldJson.required !== false).setMinLength(fieldJson.minLength || 0).setMaxLength(fieldJson.maxLength || 400);
+    const input = new import_discord15.TextInputBuilder().setCustomId(fieldJson.customId).setLabel(fieldJson.title.slice(0, 45)).setPlaceholder(fieldJson.placeholder || "Enter value...").setRequired(fieldJson.required !== false).setMinLength(fieldJson.minLength || 0).setMaxLength(fieldJson.maxLength || 400);
     const style = fieldJson.style;
     if (typeof style === "number") {
       input.setStyle(style);
@@ -2337,13 +2343,13 @@ var ModalManager = class _ModalManager {
         case "Number":
         case "Phone":
         case "Date":
-          input.setStyle(import_discord14.TextInputStyle.Short);
+          input.setStyle(import_discord15.TextInputStyle.Short);
           input.setPlaceholder(
             style === "Number" ? "123" : style === "Phone" ? "+33 6 12 34 56 78" : "2024-02-05"
           );
           break;
         default:
-          input.setStyle(import_discord14.TextInputStyle.Short);
+          input.setStyle(import_discord15.TextInputStyle.Short);
       }
     }
     return input;
@@ -2379,13 +2385,13 @@ var ModalManager = class _ModalManager {
 };
 
 // src/manager/interactions/SelectMenuManager.ts
-var import_discord15 = require("discord.js");
+var import_discord16 = require("discord.js");
 var SelectMenuManager = class {
   /**
    * Creates base StringSelectMenu - SIMPLE API !
    */
   static create(customId, placeholder = "Select an option...") {
-    return new import_discord15.StringSelectMenuBuilder().setCustomId(customId).setPlaceholder(placeholder).setMinValues(1).setMaxValues(1);
+    return new import_discord16.StringSelectMenuBuilder().setCustomId(customId).setPlaceholder(placeholder).setMinValues(1).setMaxValues(1);
   }
   /**
    * Quick StringSelectMenu
@@ -2403,10 +2409,10 @@ var SelectMenuManager = class {
    * Pagination menu
    */
   static paginated(customId, options, pageSize = 25) {
-    const row = new import_discord15.ActionRowBuilder();
+    const row = new import_discord16.ActionRowBuilder();
     for (let i = 0; i < options.length; i += pageSize) {
       const pageOptions = options.slice(i, i + pageSize);
-      const menu = new import_discord15.StringSelectMenuBuilder().setCustomId(`${customId}_page_${Math.floor(i / pageSize)}`).setPlaceholder(`Page ${Math.floor(i / pageSize) + 1}`).addOptions(pageOptions.map((opt) => {
+      const menu = new import_discord16.StringSelectMenuBuilder().setCustomId(`${customId}_page_${Math.floor(i / pageSize)}`).setPlaceholder(`Page ${Math.floor(i / pageSize) + 1}`).addOptions(pageOptions.map((opt) => {
         return this.option(opt);
       }));
       row.addComponents(menu);
@@ -2417,25 +2423,25 @@ var SelectMenuManager = class {
    * User Select Menu (Components V2)
    */
   static users(customId, placeholder = "Select users...") {
-    return new import_discord15.UserSelectMenuBuilder().setCustomId(customId).setPlaceholder(placeholder).setMinValues(1).setMaxValues(25);
+    return new import_discord16.UserSelectMenuBuilder().setCustomId(customId).setPlaceholder(placeholder).setMinValues(1).setMaxValues(25);
   }
   /**
    * Role Select Menu (Components V2)
    */
   static roles(customId, placeholder = "Select roles...") {
-    return new import_discord15.RoleSelectMenuBuilder().setCustomId(customId).setPlaceholder(placeholder).setMinValues(1).setMaxValues(25);
+    return new import_discord16.RoleSelectMenuBuilder().setCustomId(customId).setPlaceholder(placeholder).setMinValues(1).setMaxValues(25);
   }
   /**
    * Mentionable Select Menu (Components V2)
    */
   static mentionables(customId, placeholder = "Select users/roles...") {
-    return new import_discord15.MentionableSelectMenuBuilder().setCustomId(customId).setPlaceholder(placeholder).setMinValues(1).setMaxValues(25);
+    return new import_discord16.MentionableSelectMenuBuilder().setCustomId(customId).setPlaceholder(placeholder).setMinValues(1).setMaxValues(25);
   }
   /**
    * Channel Select Menu (Components V2)
    */
   static channels(customId, placeholder = "Select channels...", channelTypes = []) {
-    return new import_discord15.ChannelSelectMenuBuilder().setCustomId(customId).setPlaceholder(placeholder).setMinValues(1).setMaxValues(25).setChannelTypes(...channelTypes);
+    return new import_discord16.ChannelSelectMenuBuilder().setCustomId(customId).setPlaceholder(placeholder).setMinValues(1).setMaxValues(25).setChannelTypes(...channelTypes);
   }
   static option(option) {
     if (Array.isArray(option)) {
@@ -2444,7 +2450,7 @@ var SelectMenuManager = class {
     return this._createOption(option);
   }
   static _createOption(option) {
-    const builder = new import_discord15.StringSelectMenuOptionBuilder().setLabel(option.label).setValue(option.value);
+    const builder = new import_discord16.StringSelectMenuOptionBuilder().setLabel(option.label).setValue(option.value);
     option.description && builder.setDescription(option.description);
     option.emoji && builder.setEmoji(option.emoji);
     return builder;
@@ -2465,7 +2471,7 @@ var SelectMenuManager = class {
    * ActionRow
    */
   static row(component) {
-    return new import_discord15.ActionRowBuilder().addComponents(component);
+    return new import_discord16.ActionRowBuilder().addComponents(component);
   }
   /**
    * Rows multiples (5 max)
@@ -2518,7 +2524,7 @@ var SimpleMutex = class {
 // package.json
 var package_default = {
   name: "@spatulox/simplediscordbot",
-  version: "1.0.42",
+  version: "1.1.0",
   author: "Spatulox",
   description: "Simple discord bot framework to set up a bot under 30 secondes",
   exports: {

package/dist/index.mjs

@@ -1520,7 +1520,11 @@ var ReactionManager = class {
 };
 
 // src/manager/guild/GuildManager.ts
-import { Guild as Guild2, StageChannel as StageChannel2, VoiceChannel as VoiceChannel2 } from "discord.js";
+import {
+  Guild as Guild3,
+  VoiceChannel as VoiceChannel2,
+  StageChannel as StageChannel2
+} from "discord.js";
 
 // src/manager/direct/BasicUserManager.ts
 import { GuildMember as GuildMember2 } from "discord.js";
@@ -1595,9 +1599,22 @@ var BasicUserManager = class {
 };
 
 // src/manager/guild/GuildUserManager.ts
+import { Guild as Guild2 } from "discord.js";
 import { setTimeout as setTimeout2 } from "timers/promises";
 var MAX_NICKNAME_LENGTH = 32;
 var GuildUserManager = class extends BasicUserManager {
+  static async find(userId, guild) {
+    try {
+      if (guild instanceof Guild2) {
+        return await guild.members.fetch(userId);
+      } else {
+        return await (await GuildManager.find(guild)).members.fetch(userId);
+      }
+    } catch (error) {
+      Log.error(`UserManager: Member ${userId} not found`);
+      return null;
+    }
+  }
   static async rename(member, nickname, maxAttempts = 3) {
     if (nickname.length > MAX_NICKNAME_LENGTH) {
       nickname = nickname.slice(0, MAX_NICKNAME_LENGTH);
@@ -2114,14 +2131,7 @@ var GuildManager = class {
     return Array.from(Bot.client.guilds.cache.values());
   }
   static async find(guild_id) {
-    try {
-      const cached = Bot.client.guilds.cache.get(guild_id);
-      if (cached) return cached;
-      return await Bot.client.guilds.fetch(guild_id);
-    } catch (error) {
-      Log.error(`GuildManager: Guild ${guild_id} : ${error} `);
-      return null;
-    }
+    return await Bot.client.guilds.fetch(guild_id);
   }
   /**
    * Search channel by ID (TextChannel, DMChannel, ThreadChannel)
@@ -2160,7 +2170,7 @@ var GuildManager = class {
    */
   static async fetchAllMembers(guildId, MAX_ATTEMPTS = 3, RETRY_DELAY = Time.minute.MIN_05.toMilliseconds()) {
     let guild;
-    if (guildId instanceof Guild2) {
+    if (guildId instanceof Guild3) {
       guild = guildId;
     } else {
       let tmp = Bot.client.guilds.cache.get(guildId);
@@ -2492,7 +2502,7 @@ var SimpleMutex = class {
 // package.json
 var package_default = {
   name: "@spatulox/simplediscordbot",
-  version: "1.0.42",
+  version: "1.1.0",
   author: "Spatulox",
   description: "Simple discord bot framework to set up a bot under 30 secondes",
   exports: {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@spatulox/simplediscordbot",
-  "version": "1.1.0",
+  "version": "1.1.1",
   "author": "Spatulox",
   "description": "Simple discord bot framework to set up a bot under 30 secondes",
   "exports": {