seyfert 4.4.1 → 5.0.0

package/lib/common/it/logger.js

@@ -34,12 +34,16 @@ class Logger {
     /**
      * The custom callback function for logging.
      */
+    static __memoryCache = { rss: 0, ts: 0 };
     static __callback = (self, level, args) => {
         const color = Logger.colorFunctions.get(level) ?? Logger.noColor;
-        const memoryData = process.memoryUsage?.();
-        const date = new Date();
+        const now = Date.now();
+        if (now - Logger.__memoryCache.ts > 1000) {
+            Logger.__memoryCache = { rss: process.memoryUsage?.()?.rss ?? 0, ts: now };
+        }
+        const date = new Date(now);
         return [
-            (0, colors_1.brightBlack)(formatMemoryUsage(memoryData?.rss ?? 0)),
+            (0, colors_1.brightBlack)(formatMemoryUsage(Logger.__memoryCache.rss)),
             (0, colors_1.bgBrightWhite)((0, colors_1.black)(`[${date.toLocaleDateString()} ${date.toLocaleTimeString()}]`)),
             color(Logger.prefixes.get(level) ?? 'DEBUG'),
             self.name ? `${self.name} >` : '>',
@@ -53,9 +57,21 @@ 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) {
+        const previous = Logger.__callback;
         Logger.__callback = cb;
+        return () => {
+            if (Logger.__callback === cb)
+                Logger.__callback = previous;
+        };
+    }
+    /**
+     * Returns the current logging callback, so a customizer can chain the previous one.
+     */
+    static getCustomizer() {
+        return Logger.__callback;
     }
     /**
      * Customizes the logging filename by providing a callback function.
@@ -186,15 +202,17 @@ class Logger {
     }
     __write(log) {
         if (this.saveOnFile || Logger.saveOnFile === 'all' || Logger.saveOnFile?.includes(this.name)) {
-            if (!(Logger.createdDir || (0, node_fs_1.existsSync)((0, node_path_1.join)(process.cwd(), Logger.dirname)))) {
+            const dirname = (0, node_path_1.join)(process.cwd(), Logger.dirname);
+            if (!Logger.createdDir) {
+                if (!(0, node_fs_1.existsSync)(dirname))
+                    (0, node_fs_1.mkdirSync)(dirname, { recursive: true });
                 Logger.createdDir = true;
-                (0, node_fs_1.mkdirSync)((0, node_path_1.join)(process.cwd(), Logger.dirname), { recursive: true });
             }
             const fileName = (Logger.fileNames[this.name] ??= (() => {
                 return (Logger.fileNames[this.name] = Logger.__assignFileName(this));
             })());
             if (!Logger.streams[fileName]) {
-                Logger.streams[fileName] = (0, node_fs_1.createWriteStream)((0, node_path_1.join)(process.cwd(), Logger.dirname, fileName));
+                Logger.streams[fileName] = (0, node_fs_1.createWriteStream)((0, node_path_1.join)(dirname, fileName));
             }
             Logger.streams[fileName].write(`${(0, colors_1.stripColor)(log.join(' '))}\n`);
         }

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

@@ -1,5 +1,6 @@
 import type { Cache } from '../../cache';
 import { type APIPartialEmoji, GatewayIntentBits } from '../../types';
+export { type FakePromiseResult, fakePromise } from './fake-promise';
 import { type ColorResolvable, type EmojiResolvable, type Logger, type ObjectToLower, type ObjectToSnake, type TypeArray } from '..';
 /**
  * Calculates the shard ID for a guild based on its ID.
@@ -101,18 +102,15 @@ export declare const ReplaceRegex: {
 };
 export declare function magicImport(path: string): Promise<any>;
 export type OnFailCallback = (error: unknown) => any;
-export declare function fakePromise<T = unknown | Promise<unknown>>(value: T): {
-    then<R>(callback: (arg: Awaited<T>) => R): R;
-};
 export declare function lazyLoadPackage<T>(mod: string): T | undefined;
-export declare function isCloudfareWorker(): boolean;
+export declare function isCloudflareWorker(): boolean;
 /**
  *
- * Convert a timestamp to a snowflake.
- * @param id The timestamp to convert.
- * @returns The snowflake.
+ * Converts a Discord snowflake to its unix millisecond timestamp.
+ * @param id The snowflake to convert.
+ * @returns The unix millisecond timestamp.
  */
-export declare function snowflakeToTimestamp(id: string): bigint;
+export declare function snowflakeToTimestamp(id: string): number;
 export declare function resolvePartialEmoji(emoji: EmojiResolvable): APIPartialEmoji | undefined;
 export declare function resolveEmoji(emoji: EmojiResolvable, cache: Cache): Promise<APIPartialEmoji | undefined>;
 export declare function encodeEmoji(rawEmoji: APIPartialEmoji): string;

package/lib/common/it/utils.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.ReplaceRegex = exports.BaseHandler = void 0;
+exports.ReplaceRegex = exports.BaseHandler = exports.fakePromise = void 0;
 exports.calculateShardId = calculateShardId;
 exports.resolveColor = resolveColor;
 exports.delay = delay;
@@ -10,9 +10,8 @@ exports.filterSplit = filterSplit;
 exports.toSnakeCase = toSnakeCase;
 exports.toCamelCase = toCamelCase;
 exports.magicImport = magicImport;
-exports.fakePromise = fakePromise;
 exports.lazyLoadPackage = lazyLoadPackage;
-exports.isCloudfareWorker = isCloudfareWorker;
+exports.isCloudflareWorker = isCloudflareWorker;
 exports.snowflakeToTimestamp = snowflakeToTimestamp;
 exports.resolvePartialEmoji = resolvePartialEmoji;
 exports.resolveEmoji = resolveEmoji;
@@ -25,6 +24,8 @@ exports.assertString = assertString;
 const node_fs_1 = require("node:fs");
 const node_path_1 = require("node:path");
 const types_1 = require("../../types");
+var fake_promise_1 = require("./fake-promise");
+Object.defineProperty(exports, "fakePromise", { enumerable: true, get: function () { return fake_promise_1.fakePromise; } });
 const __1 = require("..");
 /**
  * Calculates the shard ID for a guild based on its ID.
@@ -54,10 +55,16 @@ function resolveColor(color) {
     }
     if (type === 'string') {
         const lookupColor = ColorLookup[color];
-        if (lookupColor) {
+        if (lookupColor != null) {
             return lookupColor === -1 ? Math.floor(Math.random() * 0xffffff) : lookupColor;
         }
-        return color.startsWith('#') ? Number.parseInt(color.slice(1), 16) : __1.EmbedColors.Default;
+        if (color.startsWith('#')) {
+            const hex = color.slice(1);
+            if (!/^[\da-f]+$/i.test(hex))
+                throw new __1.SeyfertError('INTERNAL_ERROR', { metadata: { detail: `Invalid color: ${color}` } });
+            return Number.parseInt(hex, 16);
+        }
+        return __1.EmbedColors.Default;
     }
     return Array.isArray(color) && color.length >= 3
         ? (color[0] << 16) | (color[1] << 8) | color[2]
@@ -80,6 +87,12 @@ function delay(time, result) {
 function isObject(o) {
     return o && typeof o === 'object' && !Array.isArray(o);
 }
+function isPlainObject(o) {
+    if (!o || typeof o !== 'object')
+        return false;
+    const proto = Object.getPrototypeOf(o);
+    return proto === Object.prototype || proto === null;
+}
 /**
  * Merges multiple options objects together, deeply extending objects.
  * @param defaults The default options object.
@@ -195,19 +208,19 @@ function toSnakeCase(target) {
                 result[exports.ReplaceRegex.snake(key)] = value;
                 break;
             case 'object': {
-                if (Array.isArray(value)) {
-                    result[exports.ReplaceRegex.snake(key)] = value.map(prop => typeof prop === 'object' && prop ? toSnakeCase(prop) : prop);
+                if (value === null) {
+                    result[exports.ReplaceRegex.snake(key)] = null;
                     break;
                 }
-                if (isObject(value)) {
-                    result[exports.ReplaceRegex.snake(key)] = toSnakeCase(value);
+                if (Array.isArray(value)) {
+                    result[exports.ReplaceRegex.snake(key)] = value.map(prop => (isPlainObject(prop) ? toSnakeCase(prop) : prop));
                     break;
                 }
-                if (!Number.isNaN(value)) {
-                    result[exports.ReplaceRegex.snake(key)] = null;
+                if (isPlainObject(value)) {
+                    result[exports.ReplaceRegex.snake(key)] = toSnakeCase(value);
                     break;
                 }
-                result[exports.ReplaceRegex.snake(key)] = toSnakeCase(value);
+                result[exports.ReplaceRegex.snake(key)] = value;
                 break;
             }
         }
@@ -233,19 +246,19 @@ function toCamelCase(target) {
                 result[exports.ReplaceRegex.camel(key)] = value;
                 break;
             case 'object': {
-                if (Array.isArray(value)) {
-                    result[exports.ReplaceRegex.camel(key)] = value.map(prop => typeof prop === 'object' && prop ? toCamelCase(prop) : prop);
+                if (value === null) {
+                    result[exports.ReplaceRegex.camel(key)] = null;
                     break;
                 }
-                if (isObject(value)) {
-                    result[exports.ReplaceRegex.camel(key)] = toCamelCase(value);
+                if (Array.isArray(value)) {
+                    result[exports.ReplaceRegex.camel(key)] = value.map(prop => (isPlainObject(prop) ? toCamelCase(prop) : prop));
                     break;
                 }
-                if (!Number.isNaN(value)) {
-                    result[exports.ReplaceRegex.camel(key)] = null;
+                if (isPlainObject(value)) {
+                    result[exports.ReplaceRegex.camel(key)] = toCamelCase(value);
                     break;
                 }
-                result[exports.ReplaceRegex.camel(key)] = toCamelCase(value);
+                result[exports.ReplaceRegex.camel(key)] = value;
                 break;
             }
         }
@@ -268,13 +281,6 @@ async function magicImport(path) {
         return new Function('path', 'return import(`file:///${path}?update=${Date.now()}`)')(path);
     }
 }
-function fakePromise(value) {
-    if (value instanceof Promise)
-        return value;
-    return {
-        then: callback => callback(value),
-    };
-}
 function lazyLoadPackage(mod) {
     try {
         return require(mod);
@@ -284,18 +290,18 @@ function lazyLoadPackage(mod) {
         return;
     }
 }
-function isCloudfareWorker() {
+function isCloudflareWorker() {
     //@ts-expect-error
     return process.platform === 'browser';
 }
 /**
  *
- * Convert a timestamp to a snowflake.
- * @param id The timestamp to convert.
- * @returns The snowflake.
+ * Converts a Discord snowflake to its unix millisecond timestamp.
+ * @param id The snowflake to convert.
+ * @returns The unix millisecond timestamp.
  */
 function snowflakeToTimestamp(id) {
-    return (BigInt(id) >> 22n) + __1.DiscordEpoch;
+    return Number((BigInt(id) >> 22n) + __1.DiscordEpoch);
 }
 function resolvePartialEmoji(emoji) {
     if (typeof emoji === 'string') {
@@ -364,20 +370,16 @@ function hasIntent(intents, target) {
     return (intents & intent) === intent;
 }
 function toArrayBuffer(buffer) {
-    const arrayBuffer = new ArrayBuffer(buffer.length);
-    const view = new Uint8Array(arrayBuffer);
-    for (let i = 0; i < buffer.length; ++i) {
-        view[i] = buffer[i];
+    const { buffer: ab, byteOffset, byteLength } = buffer;
+    if (ab instanceof SharedArrayBuffer) {
+        const copy = new ArrayBuffer(byteLength);
+        new Uint8Array(copy).set(new Uint8Array(ab, byteOffset, byteLength));
+        return copy;
     }
-    return arrayBuffer;
+    return ab.slice(byteOffset, byteOffset + byteLength);
 }
 function toBuffer(arrayBuffer) {
-    const buffer = Buffer.alloc(arrayBuffer.byteLength);
-    const view = new Uint8Array(arrayBuffer);
-    for (let i = 0; i < buffer.length; ++i) {
-        buffer[i] = view[i];
-    }
-    return buffer;
+    return Buffer.from(arrayBuffer);
 }
 function assertString(value, message) {
     if (!(typeof value === 'string' && value !== '')) {

package/lib/common/shorters/application.d.ts

@@ -32,7 +32,7 @@ export declare class ApplicationShorter extends BaseShorter {
      * Deletes an emoji for the application.
      * @param emojiId The ID of the emoji.
      */
-    deleteEmoji(emojiId: string): Promise<undefined>;
+    deleteEmoji(emojiId: string): Promise<void>;
     /**
      * Lists the entitlements for the application.
      * @param [query] The query parameters.
@@ -57,8 +57,8 @@ export declare class ApplicationShorter extends BaseShorter {
      * Lists the SKUs for the application.
      * @returns The SKUs.
      */
-    listSKUs(): Promise<import("../../types").RESTGetAPISKUsResult>;
+    listSKUs(): Promise<import("../..").RESTGetAPISKUsResult>;
     fetch(): Promise<ApplicationStructure>;
     edit(body: RESTPatchCurrentApplicationJSONBody): Promise<ApplicationStructure>;
-    getActivityInstance(instanceId: string): Promise<import("../../types").RestGetAPIApplicationActivityInstanceResult>;
+    getActivityInstance(instanceId: string): Promise<import("../..").RestGetAPIApplicationActivityInstanceResult>;
 }

package/lib/common/shorters/application.js

@@ -62,8 +62,9 @@ class ApplicationShorter extends base_1.BaseShorter {
      * Deletes an emoji for the application.
      * @param emojiId The ID of the emoji.
      */
-    deleteEmoji(emojiId) {
-        return this.client.proxy.applications(this.client.applicationId).emojis(emojiId).delete();
+    async deleteEmoji(emojiId) {
+        await this.client.proxy.applications(this.client.applicationId).emojis(emojiId).delete();
+        await this.client.cache.emojis?.remove(emojiId, this.client.applicationId);
     }
     /**
      * Lists the entitlements for the application.

package/lib/common/shorters/bans.d.ts

@@ -1,6 +1,11 @@
 import { type GuildBanStructure } from '../../client/transformers';
 import type { RESTGetAPIGuildBansQuery, RESTPostAPIGuildBulkBanJSONBody, RESTPutAPIGuildBanJSONBody } from '../../types';
+import type { BanOptions } from '../types/options';
 import { BaseShorter } from './base';
+export declare function resolveBanOptions(options?: BanOptions): {
+    body: RESTPutAPIGuildBanJSONBody | undefined;
+    reason?: string;
+};
 export declare class BanShorter extends BaseShorter {
     /**
      * Bulk creates bans in the guild.
@@ -8,7 +13,7 @@ export declare class BanShorter extends BaseShorter {
      * @param body The request body for bulk banning members.
      * @param reason The reason for bulk banning members.
      */
-    bulkCreate(guildId: string, body: RESTPostAPIGuildBulkBanJSONBody, reason?: string): Promise<import("../../types").RESTPostAPIGuildBulkBanResult>;
+    bulkCreate(guildId: string, body: RESTPostAPIGuildBulkBanJSONBody, reason?: string): Promise<import("../..").RESTPostAPIGuildBulkBanResult>;
     /**
      * Unbans a member from the guild.
      * @param guildId The ID of the guild.
@@ -20,10 +25,9 @@ export declare class BanShorter extends BaseShorter {
      * Bans a member from the guild.
      * @param guildId The ID of the guild.
      * @param memberId The ID of the member to ban.
-     * @param body The request body for banning the member.
-     * @param reason The reason for banning the member.
+     * @param options The options for banning the member.
      */
-    create(guildId: string, memberId: string, body?: RESTPutAPIGuildBanJSONBody, reason?: string): Promise<void>;
+    create(guildId: string, memberId: string, options?: BanOptions): Promise<void>;
     /**
      * Fetches a ban from the guild.
      * @param guildId The ID of the guild.

package/lib/common/shorters/bans.js

@@ -1,9 +1,18 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.BanShorter = void 0;
+exports.resolveBanOptions = resolveBanOptions;
 const cache_1 = require("../../cache");
 const transformers_1 = require("../../client/transformers");
 const base_1 = require("./base");
+function resolveBanOptions(options) {
+    return {
+        body: options?.deleteMessageSeconds === undefined
+            ? undefined
+            : { delete_message_seconds: options.deleteMessageSeconds },
+        reason: options?.reason,
+    };
+}
 class BanShorter extends base_1.BaseShorter {
     /**
      * Bulk creates bans in the guild.
@@ -29,11 +38,10 @@ class BanShorter extends base_1.BaseShorter {
      * Bans a member from the guild.
      * @param guildId The ID of the guild.
      * @param memberId The ID of the member to ban.
-     * @param body The request body for banning the member.
-     * @param reason The reason for banning the member.
+     * @param options The options for banning the member.
      */
-    async create(guildId, memberId, body, reason) {
-        await this.client.proxy.guilds(guildId).bans(memberId).put({ reason, body });
+    async create(guildId, memberId, options) {
+        await this.client.proxy.guilds(guildId).bans(memberId).put(resolveBanOptions(options));
         await this.client.cache.members?.removeIfNI('GuildModeration', memberId, guildId);
     }
     /**
@@ -51,7 +59,7 @@ class BanShorter extends base_1.BaseShorter {
                 return ban;
         }
         ban = await this.client.proxy.guilds(guildId).bans(userId).get();
-        await this.client.cache.members?.set(cache_1.CacheFrom.Rest, ban.user.id, guildId, ban);
+        await this.client.cache.bans?.set(cache_1.CacheFrom.Rest, ban.user.id, guildId, ban);
         return transformers_1.Transformers.GuildBan(this.client, ban, guildId);
     }
     /**

package/lib/common/shorters/channels.d.ts

@@ -53,7 +53,7 @@ export declare class ChannelShorter extends BaseShorter {
     pins(channelId: string, query?: RESTGetAPIChannelMessagesPinsQuery): Promise<{
         hasMore: boolean;
         items: {
-            pinnedAt: string;
+            pinnedAt: number;
             message: MessageStructure;
         }[];
     }>;
@@ -83,21 +83,21 @@ export declare class ChannelShorter extends BaseShorter {
     memberPermissions(channelId: string, member: GuildMember, checkAdmin?: boolean): Promise<PermissionsBitField>;
     overwritesFor(channelId: string, member: GuildMember): Promise<{
         everyone: {
-            type: import("../../types").OverwriteType;
+            type: import("../..").OverwriteType;
             id: string;
             deny: PermissionsBitField;
             allow: PermissionsBitField;
             guildId: string;
         } | undefined;
         roles: {
-            type: import("../../types").OverwriteType;
+            type: import("../..").OverwriteType;
             id: string;
             deny: PermissionsBitField;
             allow: PermissionsBitField;
             guildId: string;
         }[];
         member: {
-            type: import("../../types").OverwriteType;
+            type: import("../..").OverwriteType;
             id: string;
             deny: PermissionsBitField;
             allow: PermissionsBitField;

package/lib/common/shorters/channels.js

@@ -23,9 +23,9 @@ class ChannelShorter extends base_1.BaseShorter {
             const channel = await this.client.cache.channels?.raw(id);
             if (channel) {
                 const overwrites = await this.client.cache.overwrites?.raw(id);
-                if (overwrites)
-                    channel.permission_overwrites = overwrites;
-                return channel;
+                return overwrites
+                    ? { ...channel, permission_overwrites: overwrites }
+                    : channel;
             }
         }
         const channel = await this.client.proxy.channels(id).get();
@@ -129,7 +129,7 @@ class ChannelShorter extends base_1.BaseShorter {
         return {
             hasMore: pins.has_more,
             items: pins.items.map(x => ({
-                pinnedAt: x.pinned_at,
+                pinnedAt: Date.parse(x.pinned_at),
                 message: transformers_1.Transformers.Message(this.client, x.message),
             })),
         };

package/lib/common/shorters/emojis.js

@@ -50,6 +50,7 @@ class EmojiShorter extends base_1.BaseShorter {
                 return emoji;
         }
         const emoji = await this.client.proxy.guilds(guildId).emojis(emojiId).get();
+        await this.client.cache.emojis?.set(cache_1.CacheFrom.Rest, emoji.id, guildId, emoji);
         return transformers_1.Transformers.GuildEmoji(this.client, emoji, guildId);
     }
     /**

package/lib/common/shorters/guilds.d.ts

@@ -1,7 +1,7 @@
 import { type AnonymousGuildStructure, type AutoModerationRuleStructure, type GuildMemberStructure, type GuildStructure, type MessageStructure, type StickerStructure } from '../../client/transformers';
 import type { SeyfertChannelMap } from '../../commands';
 import { type AllChannels, type CreateStickerBodyRequest, type GuildChannelTypes } from '../../structures';
-import type { GuildWidgetStyle, RESTGetAPICurrentUserGuildsQuery, RESTGetAPIGuildMessagesSearchQuery, RESTGetAPIGuildMessagesSearchResult, RESTGetAPIGuildQuery, RESTPatchAPIAutoModerationRuleJSONBody, RESTPatchAPIChannelJSONBody, RESTPatchAPIGuildChannelPositionsJSONBody, RESTPatchAPIGuildJSONBody, RESTPatchAPIGuildStickerJSONBody, RESTPostAPIAutoModerationRuleJSONBody, RESTPostAPIGuildChannelJSONBody } from '../../types';
+import type { GuildWidgetStyle, RESTGetAPICurrentUserGuildsQuery, RESTGetAPIGuildMessagesSearchQuery, RESTGetAPIGuildMessagesSearchResult, RESTGetAPIGuildQuery, RESTPatchAPIAutoModerationRuleJSONBody, RESTPatchAPIChannelJSONBody, RESTPatchAPIGuildChannelPositionsJSONBody, RESTPatchAPIGuildJSONBody, RESTPatchAPIGuildStickerJSONBody, RESTPostAPIAutoModerationRuleJSONBody, RESTPostAPIChannelFollowersResult, RESTPostAPIGuildChannelJSONBody } from '../../types';
 import type { If } from '../types/util';
 import { BaseShorter } from './base';
 export declare class GuildShorter extends BaseShorter {
@@ -13,7 +13,7 @@ export declare class GuildShorter extends BaseShorter {
      * @param options.force Whether to force fetching the guild from the API even if it exists in the cache.
      * @returns A Promise that resolves to the fetched guild.
      */
-    fetch(id: string, options?: GuildFetchOptions | boolean): Promise<import("../../structures").Guild<"api">>;
+    fetch(id: string, options?: GuildFetchOptions | boolean): Promise<import("../..").Guild<"api">>;
     /**
      * Fetches a guild by its ID.
      * @param id The ID of the guild to fetch.
@@ -22,14 +22,14 @@ export declare class GuildShorter extends BaseShorter {
      * @param options.force Whether to force fetching the guild from the API even if it exists in the cache.
      * @returns A Promise that resolves to the fetched guild.
      */
-    raw(id: string, options?: GuildFetchOptions | boolean): Promise<import("../../types").APIGuild>;
+    raw(id: string, options?: GuildFetchOptions | boolean): Promise<import("../..").APIGuild>;
     /**
      * Generates the widget URL for the guild.
      * @param id The ID of the guild.
      * @param style The style of the widget.
      * @returns The generated widget URL.
      */
-    widgetURL(id: string, style?: GuildWidgetStyle): Promise<import("../../types").APIGuildWidgetSettings>;
+    widgetURL(id: string, style?: GuildWidgetStyle): Promise<import("../..").APIGuildWidgetSettings>;
     edit(guildId: string, body: RESTPatchAPIGuildJSONBody, reason?: string): Promise<GuildStructure<'api'>>;
     list<T extends boolean = false>(query?: RESTGetAPICurrentUserGuildsQuery, force?: T): Promise<If<T, AnonymousGuildStructure[], GuildStructure<'cached'>[] | AnonymousGuildStructure[]>>;
     fetchSelf(id: string, force?: boolean): Promise<GuildMemberStructure>;
@@ -61,7 +61,7 @@ export declare class GuildShorter extends BaseShorter {
          * @param force Whether to force fetching the channel from the API even if it exists in the cache.
          * @returns A Promise that resolves to the fetched channel.
          */
-        fetch: (guildId: string, channelId: string, force?: boolean) => Promise<AllChannels>;
+        fetch: (_guildId: string, channelId: string, force?: boolean) => Promise<AllChannels>;
         /**
          * Creates a new channel in the guild.
          * @param guildId The ID of the guild.
@@ -81,20 +81,20 @@ export declare class GuildShorter extends BaseShorter {
         delete: (guildId: string, channelId: string, reason?: string) => Promise<AllChannels>;
         /**
          * Edits a channel in the guild.
-         * @param guildchannelId The ID of the guild.
+         * @param guildId The ID of the guild.
          * @param channelId The ID of the channel to edit.
          * @param body The data to update the channel with.
          * @param reason The reason for editing the channel.
          * @returns A Promise that resolves to the edited channel.
          */
-        edit: (guildchannelId: string, channelId: string, body: RESTPatchAPIChannelJSONBody, reason?: string) => Promise<AllChannels>;
+        edit: (guildId: string, channelId: string, body: RESTPatchAPIChannelJSONBody, reason?: string) => Promise<AllChannels>;
         /**
          * Edits the positions of channels in the guild.
          * @param guildId The ID of the guild.
          * @param body The data containing the new positions of channels.
          */
         editPositions: (guildId: string, body: RESTPatchAPIGuildChannelPositionsJSONBody) => Promise<undefined>;
-        addFollower: (channelId: string, webhook_channel_id: string, reason?: string) => Promise<import("../../types").APIFollowedChannel>;
+        addFollower: (channelId: string, webhook_channel_id: string, reason?: string) => Promise<RESTPostAPIChannelFollowersResult>;
     };
     /**
      * Provides access to auto-moderation rule-related functionality in a guild.

package/lib/common/shorters/guilds.js

@@ -119,14 +119,13 @@ class GuildShorter extends base_1.BaseShorter {
          * @returns A Promise that resolves to an array of channels.
          */
         list: async (guildId, force = false) => {
-            let channels;
             if (!force) {
-                channels = (await this.client.cache.channels?.values(guildId)) ?? [];
-                if (channels.length) {
-                    return channels;
+                const cachedChannels = (await this.client.cache.channels?.values(guildId)) ?? [];
+                if (cachedChannels.length) {
+                    return cachedChannels;
                 }
             }
-            channels = await this.client.proxy.guilds(guildId).channels.get();
+            const channels = await this.client.proxy.guilds(guildId).channels.get();
             await this.client.cache.channels?.set(cache_1.CacheFrom.Rest, channels.map(x => [x.id, x]), guildId);
             const filtered = channels.filter((ch) => {
                 return 'permission_overwrites' in ch && ch.permission_overwrites !== undefined && ch.guild_id !== undefined;
@@ -145,19 +144,8 @@ class GuildShorter extends base_1.BaseShorter {
          * @param force Whether to force fetching the channel from the API even if it exists in the cache.
          * @returns A Promise that resolves to the fetched channel.
          */
-        fetch: async (guildId, channelId, force) => {
-            let channel;
-            if (!force) {
-                channel = await this.client.cache.channels?.get(channelId);
-                if (channel)
-                    return channel;
-            }
-            channel = await this.client.proxy.channels(channelId).get();
-            await this.client.cache.channels?.patch(cache_1.CacheFrom.Rest, channelId, guildId, channel);
-            if ('permission_overwrites' in channel && channel.permission_overwrites) {
-                await this.client.cache.overwrites?.set(cache_1.CacheFrom.Rest, channelId, guildId, channel.permission_overwrites);
-            }
-            return (0, structures_1.channelFrom)(channel, this.client);
+        fetch: async (_guildId, channelId, force) => {
+            return this.client.channels.fetch(channelId, force);
         },
         /**
          * Creates a new channel in the guild.
@@ -178,22 +166,18 @@ class GuildShorter extends base_1.BaseShorter {
          * @returns A Promise that resolves to the deleted channel.
          */
         delete: async (guildId, channelId, reason) => {
-            const res = await this.client.proxy.channels(channelId).delete({ reason });
-            await this.client.cache.channels?.removeIfNI(structures_1.BaseChannel.__intent__(guildId), res.id, guildId);
-            return (0, structures_1.channelFrom)(res, this.client);
+            return this.client.channels.delete(channelId, { guildId, reason });
         },
         /**
          * Edits a channel in the guild.
-         * @param guildchannelId The ID of the guild.
+         * @param guildId The ID of the guild.
          * @param channelId The ID of the channel to edit.
          * @param body The data to update the channel with.
          * @param reason The reason for editing the channel.
          * @returns A Promise that resolves to the edited channel.
          */
-        edit: async (guildchannelId, channelId, body, reason) => {
-            const res = await this.client.proxy.channels(channelId).patch({ body, reason });
-            await this.client.cache.channels?.setIfNI(cache_1.CacheFrom.Rest, structures_1.BaseChannel.__intent__(guildchannelId), res.id, guildchannelId, res);
-            return (0, structures_1.channelFrom)(res, this.client);
+        edit: async (guildId, channelId, body, reason) => {
+            return this.client.channels.edit(channelId, body, { guildId, reason });
         },
         /**
          * Edits the positions of channels in the guild.
@@ -318,13 +302,12 @@ class GuildShorter extends base_1.BaseShorter {
          * @returns A Promise that resolves to the fetched sticker.
          */
         fetch: async (guildId, stickerId, force = false) => {
-            let sticker;
             if (!force) {
-                sticker = await this.client.cache.stickers?.get(stickerId);
-                if (sticker)
-                    return sticker;
+                const cachedSticker = await this.client.cache.stickers?.get(stickerId);
+                if (cachedSticker)
+                    return cachedSticker;
             }
-            sticker = await this.client.proxy.guilds(guildId).stickers(stickerId).get();
+            const sticker = await this.client.proxy.guilds(guildId).stickers(stickerId).get();
             await this.client.cache.stickers?.patch(cache_1.CacheFrom.Rest, stickerId, guildId, sticker);
             return transformers_1.Transformers.Sticker(this.client, sticker);
         },

package/lib/common/shorters/interaction.d.ts

@@ -3,7 +3,7 @@ import { type WebhookMessageStructure } from '../../client/transformers';
 import type { InteractionMessageUpdateBodyRequest, MessageWebhookCreateBodyRequest } from '../types/write';
 import { BaseShorter } from './base';
 export declare class InteractionShorter extends BaseShorter {
-    reply(id: string, token: string, body: ReplyInteractionBody, withResponse?: boolean): Promise<import("../../types").RESTPostAPIInteractionCallbackWithResponseResult | undefined>;
+    reply(id: string, token: string, body: ReplyInteractionBody, withResponse?: boolean): Promise<import("../..").RESTPostAPIInteractionCallbackWithResponseResult | undefined>;
     fetchResponse(token: string, messageId: string, threadId?: string): Promise<WebhookMessageStructure>;
     fetchOriginal(token: string): Promise<WebhookMessageStructure>;
     editMessage(token: string, messageId: string, body: InteractionMessageUpdateBodyRequest): Promise<WebhookMessageStructure>;