seyfert 1.2.2 → 1.2.3

package/lib/api/api.js

@@ -7,7 +7,7 @@ const promises_1 = require("node:timers/promises");
 const node_worker_threads_1 = require("node:worker_threads");
 const common_1 = require("../common");
 const functions_1 = require("../structures/extra/functions");
-const CDN_1 = require("./CDN");
+const Router_1 = require("./Router");
 const bucket_1 = require("./bucket");
 const shared_1 = require("./shared");
 const utils_1 = require("./utils/utils");
@@ -16,7 +16,7 @@ class ApiHandler {
     globalBlock = false;
     ratelimits = new Map();
     readyQueue = [];
-    cdn = new CDN_1.CDN();
+    cdn = Router_1.CDNRouter.createProxy();
     debugger;
     workerPromises;
     constructor(options) {
@@ -62,14 +62,9 @@ class ApiHandler {
             }, request.files
                 ?.filter(x => !['string', 'boolean', 'number'].includes(typeof x.data))
                 .map(x => x.data));
-            let resolve = (_value) => { };
-            let reject = () => { };
-            const promise = new Promise((res, rej) => {
-                resolve = res;
-                reject = rej;
+            return new Promise((res, rej) => {
+                this.workerPromises.set(nonce, { reject: rej, resolve: res });
             });
-            this.workerPromises.set(nonce, { reject, resolve });
-            return promise;
         }
         const route = request.route || this.routefy(url, method);
         let attempts = 0;

package/lib/api/index.d.ts

@@ -1,4 +1,3 @@
-export * from './CDN';
 export * from './Router';
 export * from './Routes';
 export * from './api';

package/lib/api/index.js

@@ -14,7 +14,6 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
     for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-__exportStar(require("./CDN"), exports);
 __exportStar(require("./Router"), exports);
 __exportStar(require("./Routes"), exports);
 __exportStar(require("./api"), exports);

package/lib/builders/Modal.d.ts

@@ -9,7 +9,10 @@ import type { ModalBuilderComponents, ModalSubmitCallback } from './types';
  * @example
  * const modal = new Modal();
  * modal.setTitle("Sample Modal");
- * modal.addComponents(new TextInput().setLabel("Enter text"));
+ * modal.addComponents(
+ *   new ActionRow<TextInput>()
+ *   .addComponents(new TextInput().setLabel("Enter text"))
+ * ));
  * modal.run((interaction) => {
  *   // Handle modal submission
  * });

package/lib/builders/Modal.js

@@ -10,7 +10,10 @@ const index_1 = require("./index");
  * @example
  * const modal = new Modal();
  * modal.setTitle("Sample Modal");
- * modal.addComponents(new TextInput().setLabel("Enter text"));
+ * modal.addComponents(
+ *   new ActionRow<TextInput>()
+ *   .addComponents(new TextInput().setLabel("Enter text"))
+ * ));
  * modal.run((interaction) => {
  *   // Handle modal submission
  * });

package/lib/cache/adapters/default.d.ts

@@ -16,6 +16,7 @@ export declare class MemoryAdapter implements Adapter {
     count(to: string): number;
     remove(keys: string): void;
     remove(keys: string[]): void;
+    flush(): void;
     contains(to: string, keys: string): boolean;
     getToRelationship(to: string): string[];
     bulkAddToRelationShip(data: Record<string, string[]>): void;

package/lib/cache/adapters/default.js

@@ -77,6 +77,10 @@ class MemoryAdapter {
             this.storage.delete(i);
         }
     }
+    flush() {
+        this.storage.clear();
+        this.relationships.clear();
+    }
     contains(to, keys) {
         return this.getToRelationship(to).includes(keys);
     }

package/lib/cache/adapters/redis.d.ts

@@ -12,6 +12,7 @@ export declare class RedisAdapter implements Adapter {
     } | {
         redisOptions: RedisOptions;
     }) & RedisAdapterOptions);
+    private __scanSets;
     scan(query: string, returnKeys?: false): Promise<any[]>;
     scan(query: string, returnKeys: true): Promise<string[]>;
     get(keys: string[]): Promise<any[]>;
@@ -24,6 +25,7 @@ export declare class RedisAdapter implements Adapter {
     keys(to: string): Promise<string[]>;
     count(to: string): Promise<number>;
     remove(keys: string | string[]): Promise<void>;
+    flush(): Promise<void>;
     contains(to: string, keys: string): Promise<boolean>;
     getToRelationship(to: string): Promise<string[]>;
     bulkAddToRelationShip(data: Record<string, string[]>): Promise<void>;

package/lib/cache/adapters/redis.js

@@ -19,6 +19,20 @@ class RedisAdapter {
         this.client = 'client' in data ? data.client : new Redis(data.redisOptions);
         this.namespace = data.namespace ?? 'seyfert';
     }
+    __scanSets(query, returnKeys = false) {
+        const match = this.buildKey(query);
+        return new Promise((r, j) => {
+            const stream = this.client.scanStream({
+                match,
+                type: 'set',
+            });
+            const keys = [];
+            stream
+                .on('data', resultKeys => keys.push(...resultKeys))
+                .on('end', () => (returnKeys ? r(keys.map(x => this.buildKey(x))) : r(this.get(keys))))
+                .on('error', err => j(err));
+        });
+    }
     scan(query, returnKeys = false) {
         const match = this.buildKey(query);
         return new Promise((r, j) => {
@@ -107,6 +121,9 @@ class RedisAdapter {
         }
         await this.client.del(...keys.map(x => this.buildKey(x)));
     }
+    async flush() {
+        await this.remove(await Promise.all([this.scan(this.buildKey('*'), true), this.__scanSets(this.buildKey('*'), true)]).then(x => x.flat()));
+    }
     async contains(to, keys) {
         return (await this.client.sismember(`${this.buildKey(to)}:set`, keys)) === 1;
     }

package/lib/cache/adapters/types.d.ts

@@ -17,6 +17,7 @@ export interface Adapter {
     keys(to: string): Awaitable<string[]>;
     count(to: string): Awaitable<number>;
     remove(keys: string | string[]): Awaitable<void>;
+    flush(): Awaitable<void>;
     contains(to: string, keys: string): Awaitable<boolean>;
     getToRelationship(to: string): Awaitable<string[]>;
     bulkAddToRelationShip(data: Record<string, string[]>): Awaitable<void>;

package/lib/cache/adapters/workeradapter.d.ts

@@ -24,6 +24,7 @@ export declare class WorkerAdapter implements Adapter {
     keys(...rest: any[]): Promise<any>;
     count(...rest: any[]): Promise<any>;
     remove(...rest: any[]): Promise<any>;
+    flush(): Promise<any>;
     contains(...rest: any[]): Promise<any>;
     getToRelationship(...rest: any[]): Promise<any>;
     bulkAddToRelationShip(...rest: any[]): Promise<any>;

package/lib/cache/adapters/workeradapter.js

@@ -26,19 +26,13 @@ class WorkerAdapter {
             method,
             workerId: this.workerData.workerId,
         });
-        let resolve = (_) => {
-            /**/
-        };
-        let timeout = -1;
-        const promise = new Promise((res, rej) => {
-            resolve = res;
-            timeout = setTimeout(() => {
+        return new Promise((res, rej) => {
+            const timeout = setTimeout(() => {
                 this.promises.delete(nonce);
                 rej(new Error('Timeout cache request'));
             }, 60e3);
+            this.promises.set(nonce, { resolve: res, timeout });
         });
-        this.promises.set(nonce, { resolve, timeout });
-        return promise;
     }
     scan(...rest) {
         return this.send('scan', ...rest);
@@ -64,6 +58,9 @@ class WorkerAdapter {
     remove(...rest) {
         return this.send('remove', ...rest);
     }
+    flush() {
+        return this.send('flush');
+    }
     contains(...rest) {
         return this.send('contains', ...rest);
     }

package/lib/cache/index.d.ts

@@ -11,7 +11,7 @@ import { StageInstances } from './resources/stage-instances';
 import { Stickers } from './resources/stickers';
 import { Threads } from './resources/threads';
 import { VoiceStates } from './resources/voice-states';
-import { type GatewayDispatchPayload, GatewayIntentBits } from 'discord-api-types/v10';
+import { GatewayIntentBits, type GatewayDispatchPayload } from 'discord-api-types/v10';
 import type { InternalOptions, UsingClient } from '../commands';
 import { Overwrites } from './resources/overwrites';
 export type InferAsyncCache = InternalOptions extends {
@@ -40,6 +40,7 @@ export declare class Cache {
     presences?: Presences;
     stageInstances?: StageInstances;
     constructor(intents: number, adapter: Adapter, disabledCache?: (NonGuildBased | GuildBased | GuildRelated)[], client?: UsingClient);
+    flush(): ReturnCache<void>;
     hasIntent(intent: keyof typeof GatewayIntentBits): boolean;
     get hasGuildsIntent(): boolean;
     get hasRolesIntent(): boolean;
@@ -79,6 +80,7 @@ export declare class Cache {
             id: string;
             deny: import("../structures/extra/Permissions").PermissionsBitField;
             allow: import("../structures/extra/Permissions").PermissionsBitField;
+            guildId: string;
         }[][];
     }>>;
     bulkPatch(keys: (readonly [

package/lib/cache/index.js

@@ -107,6 +107,9 @@ class Cache {
         this.threads?.__setClient(client);
         this.stageInstances?.__setClient(client);
     }
+    flush() {
+        return this.adapter.flush();
+    }
     // internal use ./structures
     hasIntent(intent) {
         return (this.intents & v10_1.GatewayIntentBits[intent]) === v10_1.GatewayIntentBits[intent];

package/lib/cache/resources/overwrites.d.ts

@@ -9,12 +9,14 @@ export declare class Overwrites extends GuildRelatedResource {
         id: string;
         deny: PermissionsBitField;
         allow: PermissionsBitField;
+        guildId: string;
     }[] | undefined>;
     values(guild: string): ReturnCache<{
         type: number;
         id: string;
         deny: PermissionsBitField;
         allow: PermissionsBitField;
+        guildId: string;
     }[][]>;
     bulk(ids: string[]): ReturnCache<{
         type: number;

package/lib/client/base.d.ts

@@ -2,7 +2,7 @@ import { ApiHandler } from '../api';
 import type { Adapter } from '../cache';
 import { Cache } from '../cache';
 import type { Command, ContextMenuCommand, RegisteredMiddlewares } from '../commands';
-import type { InferWithPrefix, MiddlewareContext } from '../commands/applications/shared';
+import { type InferWithPrefix, type MiddlewareContext } from '../commands/applications/shared';
 import { type CommandHandlerLike } from '../commands/handler';
 import { ChannelShorter, EmojiShorter, GuildShorter, Logger, MemberShorter, MessageShorter, ReactionShorter, RoleShorter, TemplateShorter, UsersShorter, WebhookShorter, type MakeRequired } from '../common';
 import type { LocaleString } from 'discord-api-types/rest/v10';

package/lib/client/base.js

@@ -4,6 +4,7 @@ exports.BaseClient = void 0;
 const node_path_1 = require("node:path");
 const api_1 = require("../api");
 const cache_1 = require("../cache");
+const shared_1 = require("../commands/applications/shared");
 const handler_1 = require("../commands/handler");
 const common_1 = require("../common");
 const handler_2 = require("../components/handler");
@@ -155,14 +156,14 @@ class BaseClient {
     async uploadCommands(applicationId) {
         applicationId ??= await this.getRC().then(x => x.applicationId ?? this.applicationId);
         BaseClient.assertString(applicationId, 'applicationId is not a string');
-        const commands = this.commands.values.map(x => x.toJSON());
-        const filter = (0, common_1.filterSplit)(commands, command => !command.guild_id);
+        const commands = this.commands.values;
+        const filter = (0, common_1.filterSplit)(commands, command => !command.guildId);
         await this.proxy.applications(applicationId).commands.put({
-            body: filter.expect,
+            body: filter.expect.filter(cmd => !('ignore' in cmd) || cmd.ignore !== shared_1.IgnoreCommand.Slash).map(x => x.toJSON()),
         });
         const guilds = new Set();
         for (const command of filter.never) {
-            for (const guild_id of command.guild_id) {
+            for (const guild_id of command.guildId) {
                 guilds.add(guild_id);
             }
         }
@@ -171,7 +172,9 @@ class BaseClient {
                 .applications(applicationId)
                 .guilds(guild)
                 .commands.put({
-                body: filter.never.filter(x => x.guild_id?.includes(guild)),
+                body: filter.never
+                    .filter(cmd => cmd.guildId?.includes(guild) && (!('ignore' in cmd) || cmd.ignore !== shared_1.IgnoreCommand.Slash))
+                    .map(x => x.toJSON()),
             });
         }
     }

package/lib/client/onmessagecreate.js

@@ -5,18 +5,21 @@ const v10_1 = require("discord-api-types/v10");
 const __1 = require("..");
 const structures_1 = require("../structures");
 function getCommandFromContent(commandRaw, self) {
-    const parentName = commandRaw[0];
-    const groupName = commandRaw.length === 3 ? commandRaw[1] : undefined;
-    const subcommandName = groupName ? commandRaw[2] : commandRaw[1];
-    const parent = self.commands.values.find(x => x.name === parentName);
-    const fullCommandName = `${parentName}${groupName ? ` ${groupName} ${subcommandName}` : `${subcommandName ? ` ${subcommandName}` : ''}`}`;
+    const rawParentName = commandRaw[0];
+    const rawGroupName = commandRaw.length === 3 ? commandRaw[1] : undefined;
+    const rawSubcommandName = rawGroupName ? commandRaw[2] : commandRaw[1];
+    const parent = self.commands.values.find(x => (!('ignore' in x) || x.ignore !== __1.IgnoreCommand.Message) &&
+        (x.name === rawParentName || ('aliases' in x ? x.aliases?.includes(rawParentName) : false)));
+    const fullCommandName = `${rawParentName}${rawGroupName ? ` ${rawGroupName} ${rawSubcommandName}` : `${rawSubcommandName ? ` ${rawSubcommandName}` : ''}`}`;
     if (!(parent instanceof __1.Command))
         return { fullCommandName };
-    if (groupName && !parent.groups?.[groupName])
-        return getCommandFromContent([parentName, groupName], self);
-    if (subcommandName && !parent.options?.some(x => x instanceof __1.SubCommand && x.name === subcommandName))
-        return getCommandFromContent([parentName], self);
-    const command = groupName || subcommandName
+    if (rawGroupName && !parent.groups?.[rawGroupName] && !parent.groupsAliases?.[rawGroupName])
+        return getCommandFromContent([rawParentName, rawGroupName], self);
+    if (rawSubcommandName &&
+        !parent.options?.some(x => x instanceof __1.SubCommand && (x.name === rawSubcommandName || x.aliases?.includes(rawSubcommandName))))
+        return getCommandFromContent([rawParentName], self);
+    const groupName = rawGroupName ? parent.groupsAliases?.[rawGroupName] || rawGroupName : undefined;
+    const command = groupName || rawSubcommandName
         ? parent.options?.find(opt => {
             if (opt instanceof __1.SubCommand) {
                 if (groupName) {
@@ -25,7 +28,7 @@ function getCommandFromContent(commandRaw, self) {
                 }
                 if (opt.group && !groupName)
                     return false;
-                return subcommandName === opt.name;
+                return rawSubcommandName === opt.name || opt.aliases?.includes(rawSubcommandName);
             }
             return false;
         })
@@ -40,7 +43,7 @@ async function onMessageCreate(self, rawMessage, shardId) {
     if (!self.options?.commands)
         return;
     const message = new structures_1.Message(self, rawMessage);
-    const prefixes = ((await self.options.commands.prefix?.(message)) ?? []).sort((a, b) => b.length - a.length);
+    const prefixes = (await self.options.commands.prefix(message)).sort((a, b) => b.length - a.length);
     const prefix = prefixes.find(x => message.content.startsWith(x));
     if (!prefix || !message.content.startsWith(prefix))
         return;

package/lib/client/workerclient.js

@@ -216,8 +216,8 @@ class WorkerClient extends base_1.BaseClient {
                     let result;
                     try {
                         // biome-ignore lint/security/noGlobalEval: yes
-                        result = await eval(`
-					(${data.func})(this)
+                        result = await eval(`
+					(${data.func})(this)
 					`);
                     }
                     catch (e) {
@@ -251,19 +251,13 @@ class WorkerClient extends base_1.BaseClient {
         return nonce;
     }
     generateSendPromise(nonce, message = 'Timeout') {
-        let resolve = (_) => {
-            /**/
-        };
-        let timeout = -1;
-        const promise = new Promise((res, rej) => {
-            resolve = res;
-            timeout = setTimeout(() => {
+        return new Promise((res, rej) => {
+            const timeout = setTimeout(() => {
                 this.promises.delete(nonce);
                 rej(new Error(message));
             }, 60e3);
+            this.promises.set(nonce, { resolve: res, timeout });
         });
-        this.promises.set(nonce, { resolve, timeout });
-        return promise;
     }
     tellWorker(workerId, func) {
         const nonce = this.generateNonce();

package/lib/commands/applications/chat.d.ts

@@ -5,7 +5,7 @@ import { type FlatObjectKeys } from '../../common';
 import type { AllChannels, AutocompleteInteraction, GuildRole, InteractionGuildMember, User } from '../../structures';
 import type { Groups, IntegrationTypes, InteractionContextTypes, RegisteredMiddlewares } from '../decorators';
 import type { CommandContext } from './chatcontext';
-import type { DefaultLocale, OKFunction, OnOptionsReturnObject, StopFunction, UsingClient } from './shared';
+import type { DefaultLocale, IgnoreCommand, OKFunction, OnOptionsReturnObject, StopFunction, UsingClient } from './shared';
 export interface ReturnOptionsTypes {
     1: never;
     2: never;
@@ -72,11 +72,6 @@ declare class BaseCommand {
         description: string | undefined;
     };
     __autoload?: true;
-    __tGroups?: Record<string, {
-        name: string | undefined;
-        description: string | undefined;
-        defaultDescription: string;
-    }>;
     guildId?: string[];
     name: string;
     type: number;
@@ -89,6 +84,8 @@ declare class BaseCommand {
     name_localizations?: Partial<Record<LocaleString, string>>;
     description_localizations?: Partial<Record<LocaleString, string>>;
     options?: CommandOption[] | SubCommand[];
+    ignore?: IgnoreCommand;
+    aliases?: string[];
     toJSON(): {
         name: BaseCommand['name'];
         type: BaseCommand['type'];
@@ -114,6 +111,12 @@ declare class BaseCommand {
 export declare class Command extends BaseCommand {
     type: ApplicationCommandType;
     groups?: Parameters<typeof Groups>[0];
+    groupsAliases?: Record<string, string>;
+    __tGroups?: Record<string, {
+        name: string | undefined;
+        description: string | undefined;
+        defaultDescription: string;
+    }>;
     toJSON(): {
         options: APIApplicationCommandOption[];
         name: string;

package/lib/commands/applications/chat.js

@@ -8,7 +8,6 @@ class BaseCommand {
     __filePath;
     __t;
     __autoload;
-    __tGroups;
     guildId;
     name;
     type; // ApplicationCommandType.ChatInput | ApplicationCommandOptionType.Subcommand
@@ -21,6 +20,8 @@ class BaseCommand {
     name_localizations;
     description_localizations;
     options;
+    ignore;
+    aliases;
     /** @internal */
     async __runOptions(ctx, resolver) {
         if (!this?.options?.length) {
@@ -139,6 +140,8 @@ class BaseCommand {
 class Command extends BaseCommand {
     type = v10_1.ApplicationCommandType.ChatInput;
     groups;
+    groupsAliases;
+    __tGroups;
     toJSON() {
         const options = [];
         for (const i of this.options ?? []) {

package/lib/commands/applications/shared.d.ts

@@ -39,3 +39,7 @@ export type OnOptionsReturnObject = Record<string, {
     failed: true;
     value: string;
 }>;
+export declare enum IgnoreCommand {
+    Slash = 0,
+    Message = 1
+}

package/lib/commands/applications/shared.js

@@ -1,2 +1,8 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.IgnoreCommand = void 0;
+var IgnoreCommand;
+(function (IgnoreCommand) {
+    IgnoreCommand[IgnoreCommand["Slash"] = 0] = "Slash";
+    IgnoreCommand[IgnoreCommand["Message"] = 1] = "Message";
+})(IgnoreCommand || (exports.IgnoreCommand = IgnoreCommand = {}));

package/lib/commands/decorators.d.ts

@@ -1,7 +1,7 @@
 import { ApplicationCommandType, type LocaleString } from 'discord-api-types/v10';
 import type { FlatObjectKeys, PermissionStrings } from '../common';
 import type { CommandOption, OptionsRecord, SubCommand } from './applications/chat';
-import type { DefaultLocale, MiddlewareContext } from './applications/shared';
+import type { DefaultLocale, IgnoreCommand, MiddlewareContext } from './applications/shared';
 export interface RegisteredMiddlewares {
 }
 export declare enum IntegrationTypes {
@@ -22,6 +22,8 @@ type DeclareOptions = {
     nsfw?: boolean;
     integrationTypes?: (keyof typeof IntegrationTypes)[];
     contexts?: (keyof typeof InteractionContextTypes)[];
+    ignore?: IgnoreCommand;
+    aliases?: string[];
 } | (Omit<{
     name: string;
     description: string;
@@ -59,26 +61,32 @@ export declare function GroupsT(groups: Record<string, {
     name?: FlatObjectKeys<DefaultLocale>;
     description?: FlatObjectKeys<DefaultLocale>;
     defaultDescription: string;
+    aliases?: string[];
 }>): <T extends new (...args: any[]) => {}>(target: T) => {
     new (...args: any[]): {
         __tGroups: Record<string, {
             name?: undefined;
             description?: undefined;
             defaultDescription: string;
+            aliases?: string[] | undefined;
         }>;
+        groupsAliases: Record<string, string>;
     };
 } & T;
 export declare function Groups(groups: Record<string, {
     name?: [language: LocaleString, value: string][];
     description?: [language: LocaleString, value: string][];
     defaultDescription: string;
+    aliases?: string[];
 }>): <T extends new (...args: any[]) => {}>(target: T) => {
     new (...args: any[]): {
         groups: Record<string, {
             name?: [language: "id" | "en-US" | "en-GB" | "bg" | "zh-CN" | "zh-TW" | "hr" | "cs" | "da" | "nl" | "fi" | "fr" | "de" | "el" | "hi" | "hu" | "it" | "ja" | "ko" | "lt" | "no" | "pl" | "pt-BR" | "ro" | "ru" | "es-ES" | "es-419" | "sv-SE" | "th" | "tr" | "uk" | "vi", value: string][] | undefined;
             description?: [language: "id" | "en-US" | "en-GB" | "bg" | "zh-CN" | "zh-TW" | "hr" | "cs" | "da" | "nl" | "fi" | "fr" | "de" | "el" | "hi" | "hu" | "it" | "ja" | "ko" | "lt" | "no" | "pl" | "pt-BR" | "ro" | "ru" | "es-ES" | "es-419" | "sv-SE" | "th" | "tr" | "uk" | "vi", value: string][] | undefined;
             defaultDescription: string;
+            aliases?: string[] | undefined;
         }>;
+        groupsAliases: Record<string, string>;
     };
 } & T;
 export declare function Group(groupName: string): <T extends new (...args: any[]) => {}>(target: T) => {
@@ -115,6 +123,8 @@ export declare function Declare(declare: DeclareOptions): <T extends new (...arg
         description: string;
         type: ApplicationCommandType;
         guildId?: string[] | undefined;
+        ignore?: IgnoreCommand | undefined;
+        aliases?: string[] | undefined;
     };
 } & T;
 export {};

package/lib/commands/decorators.js

@@ -29,12 +29,30 @@ exports.LocalesT = LocalesT;
 function GroupsT(groups) {
     return (target) => class extends target {
         __tGroups = groups;
+        groupsAliases = {};
+        constructor(...args) {
+            super(...args);
+            for (const i in groups) {
+                for (const j of groups[i].aliases ?? []) {
+                    this.groupsAliases[j] = i;
+                }
+            }
+        }
     };
 }
 exports.GroupsT = GroupsT;
 function Groups(groups) {
     return (target) => class extends target {
         groups = groups;
+        groupsAliases = {};
+        constructor(...args) {
+            super(...args);
+            for (const i in groups) {
+                for (const j of groups[i].aliases ?? []) {
+                    this.groupsAliases[j] = i;
+                }
+            }
+        }
     };
 }
 exports.Groups = Groups;
@@ -84,6 +102,8 @@ function Declare(declare) {
         description = '';
         type = v10_1.ApplicationCommandType.ChatInput;
         guildId;
+        ignore;
+        aliases;
         constructor(...args) {
             super(...args);
             if ('description' in declare)
@@ -92,6 +112,10 @@ function Declare(declare) {
                 this.type = declare.type;
             if ('guildId' in declare)
                 this.guildId = declare.guildId;
+            if ('ignore' in declare)
+                this.ignore = declare.ignore;
+            if ('aliases' in declare)
+                this.aliases = declare.aliases;
             // check if all properties are valid
         }
     };

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

@@ -63,18 +63,21 @@ export declare class ChannelShorter extends BaseShorter {
             id: string;
             deny: PermissionsBitField;
             allow: PermissionsBitField;
+            guildId: string;
         } | undefined;
         roles: {
             type: number;
             id: string;
             deny: PermissionsBitField;
             allow: PermissionsBitField;
+            guildId: string;
         }[];
         member: {
             type: number;
             id: string;
             deny: PermissionsBitField;
             allow: PermissionsBitField;
+            guildId: string;
         } | undefined;
     }>;
     rolePermissions(channelId: string, role: GuildRole, checkAdmin?: boolean): Promise<PermissionsBitField>;

package/lib/common/shorters/channels.js

@@ -98,11 +98,12 @@ class ChannelShorter extends base_1.BaseShorter {
             .then(thread => (0, channels_1.default)(thread, this.client)));
     }
     async memberPermissions(channelId, member, checkAdmin = true) {
-        const permissions = await member.fetchPermissions();
-        if (checkAdmin && permissions.has(v10_1.PermissionFlagsBits.Administrator)) {
+        const memberPermissions = await member.fetchPermissions();
+        if (checkAdmin && memberPermissions.has(v10_1.PermissionFlagsBits.Administrator)) {
             return new Permissions_1.PermissionsBitField(Permissions_1.PermissionsBitField.All);
         }
         const overwrites = await this.overwritesFor(channelId, member);
+        const permissions = new Permissions_1.PermissionsBitField(memberPermissions.bits);
         permissions.remove(overwrites.everyone?.deny.bits ?? 0n);
         permissions.add(overwrites.everyone?.allow.bits ?? 0n);
         permissions.remove(overwrites.roles.length > 0 ? overwrites.roles.map(role => role.deny.bits) : 0n);

package/lib/common/types/options.d.ts

@@ -1,7 +1,7 @@
 import type { Identify } from '..';
-import type { ImageURLOptions } from '../../api';
+import type { CDNUrlOptions } from '../../api';
 import type { UsingClient } from '../../commands';
-export type ImageOptions = ImageURLOptions;
+export type ImageOptions = CDNUrlOptions;
 export type MethodContext<T = {}> = Identify<{
     client: UsingClient;
 } & T>;

package/lib/structures/GuildEmoji.d.ts

@@ -1,5 +1,5 @@
 import type { APIEmoji, RESTPatchAPIChannelJSONBody, RESTPatchAPIGuildEmojiJSONBody } from 'discord-api-types/v10';
-import type { BaseImageURLOptions } from '../api';
+import type { BaseCDNUrlOptions } from '../api';
 import type { UsingClient } from '../commands';
 import type { EmojiShorter, MethodContext, ObjectToLower } from '../common';
 import { DiscordBase } from './extra/DiscordBase';
@@ -12,7 +12,7 @@ export declare class GuildEmoji extends DiscordBase {
     edit(body: RESTPatchAPIChannelJSONBody, reason?: string): Promise<GuildEmoji>;
     delete(reason?: string): Promise<void>;
     fetch(force?: boolean): Promise<GuildEmoji>;
-    url(options?: BaseImageURLOptions): string;
+    url(options?: BaseCDNUrlOptions): string;
     toString(): string;
     toJSON(): {
         id: string;