seyfert 4.5.0 → 5.0.0

package/lib/commands/handler.js

@@ -21,15 +21,41 @@ class CommandHandler extends common_1.BaseHandler {
         this.client = client;
     }
     async reload(resolve) {
-        if ((0, common_1.isCloudfareWorker)()) {
+        if ((0, common_1.isCloudflareWorker)()) {
             throw new common_1.SeyfertError('RELOAD_NOT_SUPPORTED', {
                 metadata: { detail: 'Reload in Cloudflare worker is not supported' },
             });
         }
-        if (typeof resolve === 'string') {
-            return this.values.find(x => x.name === resolve)?.reload();
+        const command = typeof resolve === 'string' ? this.values.find(x => x.name === resolve) : resolve;
+        if (!command?.__filePath)
+            return null;
+        delete require.cache[command.__filePath];
+        const imported = await (0, common_1.magicImport)(command.__filePath).then(x => x.default ?? x);
+        const options = this.client.createPluginCommandLoadOptions?.() ?? {};
+        const commandInstance = this.onCommand(imported, options.create);
+        if (!commandInstance || commandInstance instanceof chat_1.SubCommand)
+            return null;
+        commandInstance.__filePath = command.__filePath;
+        let prepared = this.prepareCommand(commandInstance);
+        if (!prepared)
+            return null;
+        const wrapped = options.transform?.(prepared) ?? prepared;
+        if (!wrapped)
+            return null;
+        if (wrapped !== prepared) {
+            wrapped.__filePath ??= command.__filePath;
+            prepared = this.prepareCommand(wrapped);
+            if (!prepared)
+                return null;
         }
-        return resolve.reload();
+        const index = this.values.indexOf(command);
+        if ('handler' in prepared && prepared.handler) {
+            this.entryPoint = prepared;
+        }
+        else if (index >= 0) {
+            this.values[index] = prepared;
+        }
+        return prepared;
     }
     async reloadAll(stopIfFail = true) {
         for (const command of this.values) {
@@ -65,7 +91,7 @@ class CommandHandler extends common_1.BaseHandler {
         }
         return false;
     }
-    shoudUploadChoices(option, cached) {
+    shouldUploadChoices(option, cached) {
         const optionChoiceable = option;
         const cachedChoiceable = cached;
         if (!(optionChoiceable.choices?.length && cachedChoiceable.choices?.length))
@@ -98,7 +124,7 @@ class CommandHandler extends common_1.BaseHandler {
                 return (option.min_length !== cached.min_length ||
                     option.max_length !== cached.max_length ||
                     !!option.autocomplete !== !!cached.autocomplete ||
-                    this.shoudUploadChoices(option, cached));
+                    this.shouldUploadChoices(option, cached));
             case types_1.ApplicationCommandOptionType.Channel:
                 {
                     if (option.channel_types?.length !== cached.channel_types?.length)
@@ -134,7 +160,7 @@ class CommandHandler extends common_1.BaseHandler {
                 return (option.min_value !== cached.min_value ||
                     option.max_value !== cached.max_value ||
                     !!option.autocomplete !== !!cached.autocomplete ||
-                    this.shoudUploadChoices(option, cached));
+                    this.shouldUploadChoices(option, cached));
             case types_1.ApplicationCommandOptionType.Attachment:
             case types_1.ApplicationCommandOptionType.Boolean:
             case types_1.ApplicationCommandOptionType.Mentionable:
@@ -221,35 +247,77 @@ class CommandHandler extends common_1.BaseHandler {
         }
         return false;
     }
-    set(commands) {
+    prepareCommand(commandInstance) {
+        if (commandInstance instanceof chat_1.SubCommand)
+            return false;
+        commandInstance.props ??= this.client.options.commands?.defaults?.props ?? {};
+        const isCommand = this.stablishCommandDefaults(commandInstance);
+        if (isCommand) {
+            for (const option of isCommand.options ?? []) {
+                if (option instanceof chat_1.SubCommand)
+                    this.stablishSubCommandDefaults(isCommand, option);
+            }
+            this.checkSubCommandsLimit(isCommand);
+        }
+        else
+            this.stablishContextCommandDefaults(commandInstance);
+        this.parseLocales(commandInstance);
+        return commandInstance;
+    }
+    checkSubCommandsLimit(command) {
+        const counts = {};
+        for (const option of command.options ?? []) {
+            if (!(option instanceof chat_1.SubCommand))
+                continue;
+            const group = option.group ?? '';
+            counts[group] = (counts[group] ?? 0) + 1;
+        }
+        for (const group in counts) {
+            if (counts[group] > 25) {
+                this.logger.warn(`Command "${command.name}"${group ? ` group "${group}"` : ''} has ${counts[group]} subcommands, exceeding Discord's limit of 25.`);
+            }
+        }
+    }
+    normalizeLoadOptions(options) {
+        return typeof options === 'function' ? { transform: options } : (options ?? {});
+    }
+    set(commands, optionsOrTransform) {
+        const options = this.normalizeLoadOptions(optionsOrTransform);
+        const added = [];
         this.values ??= [];
         for (const command of commands) {
             let commandInstance;
             try {
-                commandInstance = this.onCommand(command);
+                commandInstance = this.onCommand(command, options.create);
                 if (!commandInstance)
                     continue;
             }
             catch (e) {
-                this.logger.warn(`${command.name} ins't a resolvable command`);
+                this.logger.warn(`${command.name} isn't a resolvable command`);
                 this.logger.error(e);
                 continue;
             }
-            commandInstance.props = this.client.options.commands?.defaults?.props ?? {};
-            const isCommand = this.stablishCommandDefaults(commandInstance);
-            if (isCommand) {
-                for (const option of commandInstance.options ?? []) {
-                    if (option instanceof chat_1.SubCommand)
-                        this.stablishSubCommandDefaults(commandInstance, option);
-                }
+            const prepared = this.prepareCommand(commandInstance);
+            if (!prepared)
+                continue;
+            const wrapped = options.transform?.(prepared) ?? prepared;
+            if (!wrapped)
+                continue;
+            commandInstance = wrapped === prepared ? prepared : this.prepareCommand(wrapped);
+            if (!commandInstance)
+                continue;
+            if ('handler' in commandInstance && commandInstance.handler) {
+                this.entryPoint = commandInstance;
+                added.push(commandInstance);
+            }
+            else {
+                this.values.push(commandInstance);
+                added.push(commandInstance);
             }
-            else
-                this.stablishContextCommandDefaults(commandInstance);
-            this.parseLocales(commandInstance);
-            this.values.push(commandInstance);
         }
+        return added;
     }
-    async load(commandsDir, client) {
+    async load(commandsDir, client, options = {}) {
         const result = await this.loadFilesK(await this.getFiles(commandsDir));
         this.values = [];
         for (const { commands, file } of result.map(x => ({ commands: this.onFile(x.file), file: x }))) {
@@ -258,7 +326,7 @@ class CommandHandler extends common_1.BaseHandler {
             for (const command of commands) {
                 let commandInstance;
                 try {
-                    commandInstance = this.onCommand(command);
+                    commandInstance = this.onCommand(command, options.create);
                     if (!commandInstance)
                         continue;
                 }
@@ -288,9 +356,10 @@ class CommandHandler extends common_1.BaseHandler {
                                 continue;
                             }
                             try {
+                                const relativePath = option.split(process.cwd()).slice(1).join(process.cwd());
                                 const fileSubCommands = this.onFile(result.find(x => x.path === option).file);
                                 if (!fileSubCommands) {
-                                    this.logger.warn(`SubCommand returned (${fileSubCommands}) ignoring.`);
+                                    this.logger.warn(`Command "${commandInstance.name}": no default export found in "${relativePath}", ignoring it as a SubCommand.`);
                                     continue;
                                 }
                                 for (const fileSubCommand of fileSubCommands) {
@@ -300,7 +369,7 @@ class CommandHandler extends common_1.BaseHandler {
                                         commandInstance.options.push(subCommand);
                                     }
                                     else {
-                                        this.logger.warn(subCommand ? 'SubCommand expected' : 'Invalid SubCommand', subCommand);
+                                        this.logger.warn(`Command "${commandInstance.name}": expected a SubCommand from "${relativePath}", got (${subCommand}); ignoring it.`, subCommand);
                                     }
                                 }
                             }
@@ -316,6 +385,26 @@ class CommandHandler extends common_1.BaseHandler {
                 }
                 this.stablishContextCommandDefaults(commandInstance);
                 this.parseLocales(commandInstance);
+                const wrapped = options.transform?.(commandInstance) ?? commandInstance;
+                if (!wrapped)
+                    continue;
+                if (wrapped !== commandInstance) {
+                    commandInstance = wrapped;
+                    commandInstance.__filePath ??= file.path;
+                    commandInstance.props ??= client.options.commands?.defaults?.props ?? {};
+                    const wrappedCommand = this.stablishCommandDefaults(commandInstance);
+                    if (wrappedCommand) {
+                        commandInstance = wrappedCommand;
+                        for (const option of commandInstance.options ?? []) {
+                            if (option instanceof chat_1.SubCommand)
+                                this.stablishSubCommandDefaults(commandInstance, option);
+                        }
+                    }
+                    this.stablishContextCommandDefaults(commandInstance);
+                    this.parseLocales(commandInstance);
+                }
+                if (commandInstance instanceof chat_1.Command)
+                    this.checkSubCommandsLimit(commandInstance);
                 if ('handler' in commandInstance && commandInstance.handler) {
                     this.entryPoint = commandInstance;
                 }
@@ -338,7 +427,7 @@ class CommandHandler extends common_1.BaseHandler {
                     this.parseSubCommandLocales(option);
                     continue;
                 }
-                this.parseCommandOptionLocales(option);
+                this.parseCommandOptionLocales(option, command.name);
             }
         }
         if (command instanceof chat_1.SubCommand) {
@@ -346,62 +435,67 @@ class CommandHandler extends common_1.BaseHandler {
         }
         return command;
     }
+    getLocales(locale) {
+        const locales = [...(this.client.langs.aliases.find(x => x[0] === locale)?.[1] ?? [])];
+        if (Object.values(types_1.Locale).includes(locale) && !locales.includes(locale)) {
+            locales.push(locale);
+        }
+        return locales;
+    }
+    getLocaleKey(locale, key, context) {
+        const value = this.client.langs.getKey(locale, key);
+        if (typeof value === 'undefined') {
+            this.logger.warn(`Locale key "${key}" resolved to nothing for ${context} in locale "${locale}".`);
+        }
+        return value;
+    }
     parseGlobalLocales(command) {
         if (command.__t) {
             command.name_localizations ??= {};
             command.description_localizations ??= {};
             for (const locale of Object.keys(this.client.langs.values)) {
-                const locales = this.client.langs.aliases.find(x => x[0] === locale)?.[1] ?? [];
-                if (Object.values(types_1.Locale).includes(locale))
-                    locales.push(locale);
+                const locales = this.getLocales(locale);
                 if (command.__t.name) {
-                    for (const i of locales) {
-                        const valueName = this.client.langs.getKey(locale, command.__t.name);
-                        if (valueName)
+                    const valueName = this.getLocaleKey(locale, command.__t.name, `command "${command.name}" name`);
+                    if (valueName)
+                        for (const i of locales)
                             command.name_localizations[i] = valueName;
-                    }
                 }
                 if (command.__t.description) {
-                    for (const i of locales) {
-                        const valueKey = this.client.langs.getKey(locale, command.__t.description);
-                        if (valueKey)
+                    const valueKey = this.getLocaleKey(locale, command.__t.description, `command "${command.name}" description`);
+                    if (valueKey)
+                        for (const i of locales)
                             command.description_localizations[i] = valueKey;
-                    }
                 }
             }
         }
     }
-    parseCommandOptionLocales(option) {
+    parseCommandOptionLocales(option, commandName = 'unknown') {
         option.name_localizations ??= {};
         option.description_localizations ??= {};
         for (const locale of Object.keys(this.client.langs.values)) {
-            const locales = this.client.langs.aliases.find(x => x[0] === locale)?.[1] ?? [];
-            if (Object.values(types_1.Locale).includes(locale))
-                locales.push(locale);
+            const locales = this.getLocales(locale);
             if (option.locales?.name) {
-                for (const i of locales) {
-                    const valueName = this.client.langs.getKey(locale, option.locales.name);
-                    if (valueName)
+                const valueName = this.getLocaleKey(locale, option.locales.name, `command "${commandName}" option "${option.name}" name`);
+                if (valueName)
+                    for (const i of locales)
                         option.name_localizations[i] = valueName;
-                }
             }
             if (option.locales?.description) {
-                for (const i of locales) {
-                    const valueKey = this.client.langs.getKey(locale, option.locales.description);
-                    if (valueKey)
+                const valueKey = this.getLocaleKey(locale, option.locales.description, `command "${commandName}" option "${option.name}" description`);
+                if (valueKey)
+                    for (const i of locales)
                         option.description_localizations[i] = valueKey;
-                }
             }
             if ('choices' in option && option.choices?.length) {
                 for (const c of option.choices) {
                     c.name_localizations ??= {};
                     if (!c.locales)
                         continue;
-                    for (const i of locales) {
-                        const valueKey = this.client.langs.getKey(locale, c.locales);
-                        if (valueKey)
+                    const valueKey = this.getLocaleKey(locale, c.locales, `command "${commandName}" option "${option.name}" choice "${c.name}"`);
+                    if (valueKey)
+                        for (const i of locales)
                             c.name_localizations[i] = valueKey;
-                    }
                 }
             }
         }
@@ -409,9 +503,7 @@ class CommandHandler extends common_1.BaseHandler {
     parseCommandLocales(command) {
         command.groups ??= {};
         for (const locale of Object.keys(this.client.langs.values)) {
-            const locales = this.client.langs.aliases.find(x => x[0] === locale)?.[1] ?? [];
-            if (Object.values(types_1.Locale).includes(locale))
-                locales.push(locale);
+            const locales = this.getLocales(locale);
             for (const group in command.__tGroups) {
                 command.groups[group] ??= {
                     defaultDescription: command.__tGroups[group].defaultDescription,
@@ -419,20 +511,16 @@ class CommandHandler extends common_1.BaseHandler {
                     name: [],
                 };
                 if (command.__tGroups[group].name) {
-                    for (const i of locales) {
-                        const valueName = this.client.langs.getKey(locale, command.__tGroups[group].name);
-                        if (valueName) {
+                    const valueName = this.getLocaleKey(locale, command.__tGroups[group].name, `command "${command.name}" group "${group}" name`);
+                    if (valueName)
+                        for (const i of locales)
                             command.groups[group].name.push([i, valueName]);
-                        }
-                    }
                 }
                 if (command.__tGroups[group].description) {
-                    for (const i of locales) {
-                        const valueKey = this.client.langs.getKey(locale, command.__tGroups[group].description);
-                        if (valueKey) {
+                    const valueKey = this.getLocaleKey(locale, command.__tGroups[group].description, `command "${command.name}" group "${group}" description`);
+                    if (valueKey)
+                        for (const i of locales)
                             command.groups[group].description.push([i, valueKey]);
-                        }
-                    }
                 }
             }
         }
@@ -443,7 +531,7 @@ class CommandHandler extends common_1.BaseHandler {
     parseSubCommandLocales(command) {
         this.parseGlobalLocales(command);
         for (const i of command.options ?? []) {
-            this.parseCommandOptionLocales(i);
+            this.parseCommandOptionLocales(i, command.name);
         }
         return command;
     }
@@ -527,8 +615,8 @@ class CommandHandler extends common_1.BaseHandler {
     onFile(file) {
         return file.default ? [file.default] : undefined;
     }
-    onCommand(file) {
-        return new file();
+    onCommand(file, create) {
+        return typeof file === 'function' ? (create?.(file, () => new file()) ?? new file()) : file;
     }
     onSubCommand(file) {
         return new file();

package/lib/commands/index.d.ts

@@ -7,4 +7,5 @@ export * from './applications/menucontext';
 export * from './applications/options';
 export * from './applications/shared';
 export * from './decorators';
+export type { CommandFromContent } from './handle';
 export * from './optionresolver';

package/lib/commands/optionresolver.d.ts

@@ -1,6 +1,6 @@
 import { Attachment } from '../builders';
 import { type GuildMemberStructure, type GuildRoleStructure, type InteractionGuildMemberStructure, type UserStructure } from '../client/transformers';
-import { type MakeRequired } from '../common';
+import { type MakePresent } from '../common';
 import { type AllChannels } from '../structures';
 import { type APIApplicationCommandInteractionDataOption, type APIAttachment, type APIGuildMember, type APIInteractionDataResolvedChannel, type APIInteractionGuildMember, type APIRole, type APIUser, ApplicationCommandOptionType } from '../types';
 import type { Command, CommandAutocompleteOption, SubCommand } from './applications/chat';
@@ -49,7 +49,7 @@ export interface OptionResolved {
     role?: GuildRoleStructure;
     focused?: boolean;
 }
-export type OptionResolvedWithValue = MakeRequired<Pick<OptionResolved, 'name' | 'value' | 'focused'>, 'value'> & {
+export type OptionResolvedWithValue = MakePresent<Pick<OptionResolved, 'name' | 'value' | 'focused'>, 'value'> & {
     type: ApplicationCommandOptionType.Boolean | ApplicationCommandOptionType.Integer | ApplicationCommandOptionType.Number | ApplicationCommandOptionType.String;
 };
 export type OptionResolvedWithProp = Exclude<OptionResolved, {

package/lib/common/it/colors.js

@@ -66,12 +66,22 @@ function getColorEnabled() {
  * @param open
  * @param close
  */
+const codeCache = new Map();
 function code(open, close) {
-    return {
+    const createCode = () => ({
         open: `\x1b[${open.join(';')}m`,
         close: `\x1b[${close}m`,
         regexp: new RegExp(`\\x1b\\[${close}m`, 'g'),
-    };
+    });
+    if ((open[0] === 38 || open[0] === 48) && open[1] === 2)
+        return createCode();
+    const key = `${open.join(';')};${close}`;
+    let cached = codeCache.get(key);
+    if (!cached) {
+        cached = createCode();
+        codeCache.set(key, cached);
+    }
+    return cached;
 }
 /**
  * Applies color and background based on color code and its associated text

package/lib/common/it/error.d.ts

@@ -31,6 +31,10 @@ export declare class SeyfertError extends Error {
      * Optional contextual data attached to the error.
      */
     metadata?: Record<string, unknown>;
+    static is(error: unknown): error is SeyfertError;
+    static is<C extends SeyfertErrorCode>(error: unknown, code: C): error is SeyfertError & {
+        code: C;
+    };
     /**
      * Creates a SeyfertError instance.
      *
@@ -66,6 +70,7 @@ export declare const SeyfertErrorMessages: {
     INVALID_TOKEN: string;
     FUNCTION_NOT_IMPLEMENTED: string;
     NO_SEYFERT_CONFIG: string;
+    SEYFERT_CONFIG_LOAD_ERROR: string;
     BAD_OPTION: string;
     INVALID_EMOJI: string;
     EMOJI_NOT_RESOLVABLE: string;
@@ -77,16 +82,20 @@ export declare const SeyfertErrorMessages: {
     UNDEFINED_LOCALE: string;
     INTERACTION_ALREADY_REPLIED: string;
     CANNOT_USE_REPLY: string;
+    CANNOT_USE_MODAL: string;
     RELOAD_NOT_SUPPORTED: string;
     API_WORKER_PROXY_PARENT_REQUIRED: string;
     WORKER_TIMEOUT: string;
     WORKER_THREADS_REQUIRED: string;
+    PLUGIN_FAILED: string;
+    PLUGIN_TEARDOWN_FAILED: string;
     WORKER_AND_SHARD_ID_REQUIRED: string;
     WORKER_NOT_FOUND: string;
     INVALID_SHARD_ID: string;
     INVALID_WORKER_REQUEST: string;
     CANNOT_OVERRIDE_EXISTING_SHARD: string;
     INVALID_SEC_WEBSOCKET_ACCEPT_HEADER: string;
+    REQUEST_GUILD_MEMBERS_TIMEOUT: string;
     CACHE_TIMEOUT: string;
     CACHE_USERS_DISABLED: string;
     CACHE_MEMBERS_DISABLED: string;

package/lib/common/it/error.js

@@ -35,6 +35,9 @@ class SeyfertError extends Error {
      * Optional contextual data attached to the error.
      */
     metadata;
+    static is(error, code) {
+        return error instanceof SeyfertError && (code === undefined || error.code === code);
+    }
     /**
      * Creates a SeyfertError instance.
      *
@@ -79,6 +82,7 @@ exports.SeyfertErrorMessages = {
     INVALID_TOKEN: 'Invalid token.',
     FUNCTION_NOT_IMPLEMENTED: 'Function not implemented.',
     NO_SEYFERT_CONFIG: 'No seyfert.config file found.',
+    SEYFERT_CONFIG_LOAD_ERROR: 'Failed to load seyfert.config file.',
     BAD_OPTION: 'Bad option.',
     INVALID_EMOJI: 'Invalid emoji.',
     EMOJI_NOT_RESOLVABLE: 'Emoji not resolvable.',
@@ -90,16 +94,20 @@ exports.SeyfertErrorMessages = {
     UNDEFINED_LOCALE: 'Undefined locale.',
     INTERACTION_ALREADY_REPLIED: 'Interaction already replied.',
     CANNOT_USE_REPLY: 'Cannot use reply in this interaction.',
+    CANNOT_USE_MODAL: 'Cannot use modal without an interaction.',
     RELOAD_NOT_SUPPORTED: 'Reload in Cloudflare worker is not supported.',
     API_WORKER_PROXY_PARENT_REQUIRED: 'Cannot use workerProxy without a parent.',
     WORKER_TIMEOUT: 'Worker request timed out.',
     WORKER_THREADS_REQUIRED: 'worker_threads is required for this operation.',
+    PLUGIN_FAILED: 'Plugin failed.',
+    PLUGIN_TEARDOWN_FAILED: 'Plugin teardown failed.',
     WORKER_AND_SHARD_ID_REQUIRED: 'workerId and shardId are required.',
     WORKER_NOT_FOUND: 'Worker not found.',
     INVALID_SHARD_ID: 'Invalid shardId.',
     INVALID_WORKER_REQUEST: 'Invalid request from unavailable worker.',
     CANNOT_OVERRIDE_EXISTING_SHARD: 'Cannot override existing shard.',
     INVALID_SEC_WEBSOCKET_ACCEPT_HEADER: 'Invalid sec-websocket-accept header.',
+    REQUEST_GUILD_MEMBERS_TIMEOUT: 'Request guild members timed out, 30s without receiving a chunk.',
     CACHE_TIMEOUT: 'Cache request timed out.',
     CACHE_USERS_DISABLED: 'Users cache is disabled.',
     CACHE_MEMBERS_DISABLED: 'Members cache is disabled.',

package/lib/common/it/fake-promise.d.ts

@@ -0,0 +1,4 @@
+export type FakePromiseResult<T> = {
+    then<R>(callback: (arg: Awaited<T>) => R): R;
+};
+export declare function fakePromise<T = unknown | Promise<unknown>>(value: T): FakePromiseResult<T>;

package/lib/common/it/fake-promise.js

@@ -0,0 +1,10 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.fakePromise = fakePromise;
+function fakePromise(value) {
+    if (value instanceof Promise)
+        return value;
+    return {
+        then: callback => callback(value),
+    };
+}

package/lib/common/it/formatter.d.ts

@@ -11,7 +11,7 @@ export type OAuth2URLOptions = {
     /**
      * Permissions to be granted to the application.
      */
-    permissions: BitFieldResolvable<typeof PermissionFlagsBits>;
+    permissions?: BitFieldResolvable<typeof PermissionFlagsBits>;
     /**
      * Whether guild select must be disabled in oauth2 interface.
      */
@@ -87,11 +87,15 @@ export declare enum TimestampStyle {
 /**
  * Represents a message link.
  */
-type MessageLink = `https://discord.com/channels/${string}/${string}/${string}`;
+export type MessageLink = `https://discord.com/channels/${string}/${string}/${string}`;
+/**
+ * Represents a channel link.
+ */
+export type ChannelLink = `https://discord.com/channels/${string}/${string}`;
 /**
  * Represents a timestamp.
  */
-type Timestamp = `<t:${number}:${TimestampStyle}>`;
+export type Timestamp = `<t:${number}:${TimestampStyle}>`;
 /**
  * Represents a formatter utility for formatting content.
  */
@@ -151,13 +155,13 @@ export declare const Formatter: {
      * @param content The content to format.
      * @returns The formatted content.
      */
-    blockQuote(content: string): string;
+    blockQuote(content: string): `>>> ${string}`;
     /**
      * Formats content into a quote.
      * @param content The content to format.
      * @returns The formatted content.
      */
-    quote(content: string): string;
+    quote(content: string): `> ${string}`;
     /**
      * Formats a message link.
      * @param guildId The ID of the guild.
@@ -182,11 +186,11 @@ export declare const Formatter: {
     list(items: string[], ordered?: boolean): string;
     /**
      * Formats the given timestamp into discord unix timestamp format.
-     * @param timestamp The timestamp to format.
-     * @param style The style of the timestamp. Defaults to 't'.
+     * @param timestamp The Date or unix millisecond timestamp to format.
+     * @param style The style of the timestamp. Defaults to 'R'.
      * @returns The formatted timestamp.
      */
-    timestamp(timestamp: Date, style?: TimestampStyle): Timestamp;
+    timestamp(timestamp: Date | number, style?: TimestampStyle): Timestamp;
     /**
      * Formats a user mention.
      * @param userId The ID of the user to mention.
@@ -211,14 +215,14 @@ export declare const Formatter: {
      * @param animated Whether the emoji is animated. Defaults to false.
      * @returns The formatted emoji.
      */
-    emojiMention(emojiId: string, name: string | null, animated?: boolean): string;
+    emojiMention(emojiId: string, name: string | null, animated?: boolean): `<${"a" | ""}:${string}:${string}>`;
     /**
      * Formats a channel link.
      * @param channelId The ID of the channel.
      * @param guildId The ID of the guild. Defaults to '@me'.
      * @returns The formatted channel link.
      */
-    channelLink(channelId: string, guildId?: string): string;
+    channelLink(channelId: string, guildId?: string): ChannelLink;
     /**
      * Forms a oauth2 invite link for the bot.
      * @param applicationId The ID of the application.
@@ -229,4 +233,3 @@ export declare const Formatter: {
      */
     generateOAuth2URL(applicationId: string, { scopes, permissions, disableGuildSelect }: OAuth2URLOptions): string;
 };
-export {};

package/lib/common/it/formatter.js

@@ -191,12 +191,13 @@ exports.Formatter = {
     },
     /**
      * Formats the given timestamp into discord unix timestamp format.
-     * @param timestamp The timestamp to format.
-     * @param style The style of the timestamp. Defaults to 't'.
+     * @param timestamp The Date or unix millisecond timestamp to format.
+     * @param style The style of the timestamp. Defaults to 'R'.
      * @returns The formatted timestamp.
      */
     timestamp(timestamp, style = TimestampStyle.RelativeTime) {
-        return `<t:${Math.floor(timestamp.getTime() / 1000)}:${style}>`;
+        const timestampSeconds = typeof timestamp === 'number' ? Math.floor(timestamp / 1000) : Math.floor(timestamp.getTime() / 1000);
+        return `<t:${timestampSeconds}:${style}>`;
     },
     /**
      * Formats a user mention.

package/lib/common/it/logger.d.ts

@@ -30,6 +30,7 @@ export declare class Logger {
     /**
      * The custom callback function for logging.
      */
+    private static __memoryCache;
     private static __callback;
     /**
      * Allows customization of the logging behavior by providing a custom callback function.
@@ -38,8 +39,13 @@ export declare class Logger {
      * Logger.customize((logger, level, args) => {
      *     // Custom logging implementation
      * });
+     * @returns A disposer that restores the previous callback (no-op if a newer one replaced it).
      */
-    static customize(cb: CustomizeLoggerCallback): void;
+    static customize(cb: CustomizeLoggerCallback): () => void;
+    /**
+     * Returns the current logging callback, so a customizer can chain the previous one.
+     */
+    static getCustomizer(): CustomizeLoggerCallback;
     /**
      * Customizes the logging filename by providing a callback function.
      * The callback receives the logger instance and should return the desired filename.