seyfert 0.1.0 → 1.0.1

package/lib/common/index.js

@@ -18,7 +18,6 @@ __exportStar(require("./it/constants"), exports);
 __exportStar(require("./it/utils"), exports);
 //
 __exportStar(require("discord-api-types/v10"), exports);
-__exportStar(require("./bot/watcher"), exports);
 __exportStar(require("./it/colors"), exports);
 __exportStar(require("./it/logger"), exports);
 __exportStar(require("./shorters/channels"), exports);
@@ -28,3 +27,5 @@ __exportStar(require("./types/options"), exports);
 __exportStar(require("./types/resolvables"), exports);
 __exportStar(require("./types/util"), exports);
 __exportStar(require("./types/write"), exports);
+//
+__exportStar(require("./bot/watcher"), exports);

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

@@ -1,3 +1,5 @@
+/// <reference types="node" />
+import { type WriteStream } from 'node:fs';
 export declare enum LogLevels {
     Debug = 0,
     Info = 1,
@@ -9,6 +11,7 @@ export type LoggerOptions = {
     logLevel?: LogLevels;
     name?: string;
     active?: boolean;
+    saveOnFile?: boolean;
 };
 export type CustomCallback = (self: Logger, level: LogLevels, args: unknown[]) => unknown[];
 /**
@@ -19,6 +22,10 @@ export declare class Logger {
      * The options for configuring the logger.
      */
     readonly options: Required<LoggerOptions>;
+    static streams: Partial<Record<string, WriteStream>>;
+    static saveOnFile?: string[] | 'all';
+    static dirname: string;
+    private static createdDir?;
     /**
      * The custom callback function for logging.
      */
@@ -32,6 +39,7 @@ export declare class Logger {
      * });
      */
     static customize(cb: CustomCallback): void;
+    static clearLogs(): Promise<void>;
     /**
      * Constructs a new Logger instance with the provided options.
      * @param options The options for configuring the logger.
@@ -45,6 +53,8 @@ export declare class Logger {
      * Gets the log level of the logger.
      */
     get level(): LogLevels;
+    set saveOnFile(saveOnFile: boolean);
+    get saveOnFile(): boolean;
     /**
      * Sets whether the logger is active or not.
      */
@@ -93,6 +103,7 @@ export declare class Logger {
      * @param args The arguments to log.
      */
     fatal(...args: any[]): void;
+    private __write;
     /**
      * The default options for the logger.
      */

package/lib/common/it/logger.js

@@ -1,6 +1,9 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Logger = exports.LogLevels = void 0;
+const node_fs_1 = require("node:fs");
+const promises_1 = require("node:fs/promises");
+const node_path_1 = require("node:path");
 const colors_1 = require("./colors");
 const utils_1 = require("./utils");
 var LogLevels;
@@ -19,6 +22,10 @@ class Logger {
      * The options for configuring the logger.
      */
     options;
+    static streams = {};
+    static saveOnFile;
+    static dirname = 'seyfert-logs';
+    static createdDir;
     /**
      * The custom callback function for logging.
      */
@@ -34,6 +41,14 @@ class Logger {
     static customize(cb) {
         Logger.__callback = cb;
     }
+    static async clearLogs() {
+        for (const i of await (0, promises_1.readdir)((0, node_path_1.join)(process.cwd(), Logger.dirname))) {
+            if (this.streams[i])
+                await new Promise(res => this.streams[i].close(res));
+            await (0, promises_1.unlink)((0, node_path_1.join)(process.cwd(), Logger.dirname, i)).catch(() => { });
+            delete this.streams[i];
+        }
+    }
     /**
      * Constructs a new Logger instance with the provided options.
      * @param options The options for configuring the logger.
@@ -53,6 +68,12 @@ class Logger {
     get level() {
         return this.options.logLevel;
     }
+    set saveOnFile(saveOnFile) {
+        this.options.saveOnFile = saveOnFile;
+    }
+    get saveOnFile() {
+        return this.options.saveOnFile;
+    }
     /**
      * Sets whether the logger is active or not.
      */
@@ -104,6 +125,7 @@ class Logger {
         else {
             log = Logger.__callback(this, level, args);
         }
+        this.__write(log);
         return console.log(...log);
     }
     /**
@@ -141,6 +163,20 @@ class Logger {
     fatal(...args) {
         this.rawLog(LogLevels.Fatal, ...args);
     }
+    __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))) {
+                Logger.createdDir = true;
+                (0, node_fs_1.mkdirSync)((0, node_path_1.join)(process.cwd(), Logger.dirname), { recursive: true });
+            }
+            const date = new Date();
+            const name = `${date.getMonth() + 1}-${date.getDate()}-${date.getFullYear()}${this.name}.log`;
+            if (!Logger.streams[name]) {
+                Logger.streams[name] = (0, node_fs_1.createWriteStream)((0, node_path_1.join)(process.cwd(), Logger.dirname, name));
+            }
+            Logger.streams[name].write(`${Buffer.from((0, colors_1.stripColor)(log.join(' ')))}\n`);
+        }
+    }
     /**
      * The default options for the logger.
      */
@@ -148,6 +184,7 @@ class Logger {
         logLevel: LogLevels.Debug,
         name: 'seyfert',
         active: true,
+        saveOnFile: false,
     };
     /**
      * A function that returns the input string as is, without any color modification.
@@ -184,6 +221,18 @@ exports.Logger = Logger;
  * @param data The memory usage data.
  * @returns The formatted string representing memory usage.
  */
-function formatMemoryUsage(data) {
-    return `[RAM Usage ${Math.round((data / 1024 / 1024) * 100) / 100} MB]`;
+function formatMemoryUsage(bytes) {
+    const gigaBytes = bytes / 1024 ** 3;
+    if (gigaBytes >= 1) {
+        return `[RAM Usage ${gigaBytes.toFixed(3)} GB]`;
+    }
+    const megaBytes = bytes / 1024 ** 2;
+    if (megaBytes >= 1) {
+        return `[RAM Usage ${megaBytes.toFixed(2)} MB]`;
+    }
+    const kiloBytes = bytes / 1024;
+    if (kiloBytes >= 1) {
+        return `[RAM Usage ${kiloBytes.toFixed(2)} KB]`;
+    }
+    return `[RAM Usage ${bytes.toFixed(2)} B]`;
 }

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

@@ -5,19 +5,6 @@ import { type ColorResolvable, type Logger, type ObjectToLower, type ObjectToSna
  * @returns The numeric representation of the color.
  */
 export declare function resolveColor(color: ColorResolvable): number;
-/**
- * Flattens an array to a certain depth.
- * @param arr The array to flatten.
- * @returns The flattened array.
- */
-export declare function fastFlat<A extends any[]>(arr: A): FlatArray<A, 1>[];
-/**
- * Creates a new array with the results of calling a provided function on every element in the array.
- * @param arr The array to iterate over.
- * @param fn The function that produces an element of the new array.
- * @returns A new array with the results of calling the provided function on every element in the array.
- */
-export declare function fastMap<U, T extends any[]>(arr: T, fn: (value: T[number], index: number, array: T) => U): U[];
 /**
  * Delays the resolution of a Promise by the specified time.
  * @param time The time in milliseconds to delay the resolution.
@@ -105,3 +92,6 @@ 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;
+};

package/lib/common/it/utils.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.magicImport = exports.ReplaceRegex = exports.toCamelCase = exports.toSnakeCase = exports.BaseHandler = exports.filterSplit = exports.MergeOptions = exports.isObject = exports.delay = exports.fastMap = exports.fastFlat = exports.resolveColor = void 0;
+exports.fakePromise = exports.magicImport = exports.ReplaceRegex = exports.toCamelCase = exports.toSnakeCase = exports.BaseHandler = exports.filterSplit = exports.MergeOptions = exports.isObject = exports.delay = exports.resolveColor = void 0;
 const promises_1 = require("node:fs/promises");
 const node_path_1 = require("node:path");
 const promises_2 = require("node:timers/promises");
@@ -32,35 +32,6 @@ function resolveColor(color) {
     return color;
 }
 exports.resolveColor = resolveColor;
-/**
- * Flattens an array to a certain depth.
- * @param arr The array to flatten.
- * @returns The flattened array.
- */
-function fastFlat(arr) {
-    let newArr = [];
-    for (const element of arr) {
-        newArr = newArr.concat(element);
-    }
-    return newArr;
-}
-exports.fastFlat = fastFlat;
-/**
- * Creates a new array with the results of calling a provided function on every element in the array.
- * @param arr The array to iterate over.
- * @param fn The function that produces an element of the new array.
- * @returns A new array with the results of calling the provided function on every element in the array.
- */
-function fastMap(arr, fn) {
-    const newArr = [];
-    let key = 0;
-    for (const value of arr) {
-        newArr.push(fn(value, key, arr));
-        key++;
-    }
-    return newArr;
-}
-exports.fastMap = fastMap;
 /**
  * Delays the resolution of a Promise by the specified time.
  * @param time The time in milliseconds to delay the resolution.
@@ -273,3 +244,11 @@ async function magicImport(path) {
     }
 }
 exports.magicImport = magicImport;
+function fakePromise(value) {
+    if (value instanceof Promise)
+        return value;
+    return {
+        then: callback => callback(value),
+    };
+}
+exports.fakePromise = fakePromise;

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

@@ -1,5 +1,7 @@
-import type { RESTPatchAPIChannelJSONBody } from '..';
-import { Message } from '../../structures';
+import { type RESTPatchAPIChannelJSONBody } from '..';
+import { Message, type GuildMember, type GuildRole } from '../../structures';
+import { type AllChannels } from '../../structures/channels';
+import { PermissionsBitField } from '../../structures/extra/Permissions';
 import { BaseShorter } from './base';
 export declare class ChannelShorter extends BaseShorter {
     get channels(): {
@@ -9,14 +11,14 @@ export declare class ChannelShorter 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: (id: string, force?: boolean) => Promise<import("../../structures").AllChannels>;
+        fetch: (id: string, force?: boolean) => Promise<AllChannels>;
         /**
          * Deletes a channel by its ID.
          * @param id The ID of the channel to delete.
          * @param optional Optional parameters for the deletion.
          * @returns A Promise that resolves to the deleted channel.
          */
-        delete: (id: string, optional?: ChannelShorterOptionalParams) => Promise<import("../../structures").AllChannels>;
+        delete: (id: string, optional?: ChannelShorterOptionalParams) => Promise<AllChannels>;
         /**
          * Edits a channel by its ID.
          * @param id The ID of the channel to edit.
@@ -24,7 +26,7 @@ export declare class ChannelShorter extends BaseShorter {
          * @param optional Optional parameters for the editing.
          * @returns A Promise that resolves to the edited channel.
          */
-        edit: (id: string, body: RESTPatchAPIChannelJSONBody, optional?: ChannelShorterOptionalParams) => Promise<import("../../structures").AllChannels>;
+        edit: (id: string, body: RESTPatchAPIChannelJSONBody, optional?: ChannelShorterOptionalParams) => Promise<AllChannels>;
         /**
          * Sends a typing indicator to the channel.
          * @param id The ID of the channel.
@@ -58,6 +60,30 @@ export declare class ChannelShorter extends BaseShorter {
              */
             delete: (messageId: string, channelId: string, reason?: string | undefined) => Promise<never>;
         };
+        overwrites: {
+            memberPermissions: (channelId: string, member: GuildMember, checkAdmin?: boolean) => Promise<PermissionsBitField>;
+            overwritesFor: (channelId: string, member: GuildMember) => Promise<{
+                everyone: {
+                    type: number;
+                    id: string;
+                    deny: PermissionsBitField;
+                    allow: PermissionsBitField;
+                } | undefined;
+                roles: {
+                    type: number;
+                    id: string;
+                    deny: PermissionsBitField;
+                    allow: PermissionsBitField;
+                }[];
+                member: {
+                    type: number;
+                    id: string;
+                    deny: PermissionsBitField;
+                    allow: PermissionsBitField;
+                } | undefined;
+            }>;
+            rolePermissions: (channelId: string, role: GuildRole, checkAdmin?: boolean) => Promise<PermissionsBitField>;
+        };
     };
     get pins(): {
         /**
@@ -83,6 +109,30 @@ export declare class ChannelShorter extends BaseShorter {
          */
         delete: (messageId: string, channelId: string, reason?: string) => Promise<never>;
     };
+    get overwrites(): {
+        memberPermissions: (channelId: string, member: GuildMember, checkAdmin?: boolean) => Promise<PermissionsBitField>;
+        overwritesFor: (channelId: string, member: GuildMember) => Promise<{
+            everyone: {
+                type: number;
+                id: string;
+                deny: PermissionsBitField;
+                allow: PermissionsBitField;
+            } | undefined;
+            roles: {
+                type: number;
+                id: string;
+                deny: PermissionsBitField;
+                allow: PermissionsBitField;
+            }[];
+            member: {
+                type: number;
+                id: string;
+                deny: PermissionsBitField;
+                allow: PermissionsBitField;
+            } | undefined;
+        }>;
+        rolePermissions: (channelId: string, role: GuildRole, checkAdmin?: boolean) => Promise<PermissionsBitField>;
+    };
 }
 export type ChannelShorterOptionalParams = Partial<{
     guildId: string;

package/lib/common/shorters/channels.js

@@ -4,8 +4,10 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ChannelShorter = void 0;
+const __1 = require("..");
 const structures_1 = require("../../structures");
 const channels_1 = __importDefault(require("../../structures/channels"));
+const Permissions_1 = require("../../structures/extra/Permissions");
 const base_1 = require("./base");
 class ChannelShorter extends base_1.BaseShorter {
     get channels() {
@@ -48,6 +50,8 @@ class ChannelShorter extends base_1.BaseShorter {
             edit: async (id, body, optional = { guildId: '@me' }) => {
                 const res = await this.client.proxy.channels(id).patch({ body, reason: optional.reason });
                 await this.client.cache.channels?.setIfNI(structures_1.BaseChannel.__intent__(optional.guildId), res.id, optional.guildId, res);
+                if (body.permission_overwrites && 'permission_overwrites' in res)
+                    await this.client.cache.overwrites?.setIfNI(structures_1.BaseChannel.__intent__(optional.guildId), res.id, optional.guildId, res.permission_overwrites);
                 return (0, channels_1.default)(res, this.client);
             },
             /**
@@ -60,6 +64,7 @@ class ChannelShorter extends base_1.BaseShorter {
              * Provides access to pinned messages in the channel.
              */
             pins: this.pins,
+            overwrites: this.overwrites,
         };
     }
     get pins() {
@@ -91,5 +96,59 @@ class ChannelShorter extends base_1.BaseShorter {
             delete: (messageId, channelId, reason) => this.client.proxy.channels(channelId).pins(messageId).delete({ reason }),
         };
     }
+    get overwrites() {
+        return {
+            memberPermissions: async (channelId, member, checkAdmin = true) => {
+                const permissions = await member.fetchPermissions();
+                if (checkAdmin && permissions.has(__1.PermissionFlagsBits.Administrator)) {
+                    return new Permissions_1.PermissionsBitField(Permissions_1.PermissionsBitField.All);
+                }
+                const overwrites = await this.overwrites.overwritesFor(channelId, member);
+                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);
+                permissions.add(overwrites.roles.length > 0 ? overwrites.roles.map(role => role.allow.bits) : 0n);
+                permissions.remove(overwrites.member?.deny.bits ?? 0n);
+                permissions.add(overwrites.member?.allow.bits ?? 0n);
+                return permissions;
+            },
+            overwritesFor: async (channelId, member) => {
+                const roleOverwrites = [];
+                let memberOverwrites;
+                let everyoneOverwrites;
+                const channelOverwrites = (await this.client.cache.overwrites?.get(channelId)) ?? [];
+                for (const overwrite of channelOverwrites) {
+                    if (overwrite.id === member.guildId) {
+                        everyoneOverwrites = overwrite;
+                    }
+                    else if (member.roles.values.includes(overwrite.id)) {
+                        roleOverwrites.push(overwrite);
+                    }
+                    else if (overwrite.id === member.id) {
+                        memberOverwrites = overwrite;
+                    }
+                }
+                return {
+                    everyone: everyoneOverwrites,
+                    roles: roleOverwrites,
+                    member: memberOverwrites,
+                };
+            },
+            rolePermissions: async (channelId, role, checkAdmin = true) => {
+                if (checkAdmin && role.permissions.has(__1.PermissionFlagsBits.Administrator)) {
+                    return new Permissions_1.PermissionsBitField(Permissions_1.PermissionsBitField.All);
+                }
+                const channelOverwrites = (await this.client.cache.overwrites?.get(channelId)) ?? [];
+                const everyoneOverwrites = channelOverwrites.find(x => x.id === role.guildId);
+                const roleOverwrites = channelOverwrites.find(x => x.id === role.id);
+                const permissions = new Permissions_1.PermissionsBitField(role.permissions.bits);
+                permissions.remove(everyoneOverwrites?.deny.bits ?? 0n);
+                permissions.add(everyoneOverwrites?.allow.bits ?? 0n);
+                permissions.remove(roleOverwrites?.deny.bits ?? 0n);
+                permissions.add(roleOverwrites?.allow.bits ?? 0n);
+                return permissions;
+            },
+        };
+    }
 }
 exports.ChannelShorter = ChannelShorter;

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

@@ -1,6 +1,6 @@
-import type { GuildWidgetStyle, RESTPatchAPIAutoModerationRuleJSONBody, RESTPatchAPIChannelJSONBody, RESTPatchAPIGuildChannelPositionsJSONBody, RESTPatchAPIGuildEmojiJSONBody, RESTPatchAPIGuildStickerJSONBody, RESTPostAPIAutoModerationRuleJSONBody, RESTPostAPIGuildChannelJSONBody, RESTPostAPIGuildEmojiJSONBody, RESTPostAPIGuildsJSONBody } from 'discord-api-types/v10';
+import type { GuildWidgetStyle, RESTGetAPICurrentUserGuildsQuery, RESTPatchAPIAutoModerationRuleJSONBody, RESTPatchAPIChannelJSONBody, RESTPatchAPIGuildChannelPositionsJSONBody, RESTPatchAPIGuildEmojiJSONBody, RESTPatchAPIGuildStickerJSONBody, RESTPostAPIAutoModerationRuleJSONBody, RESTPostAPIGuildChannelJSONBody, RESTPostAPIGuildEmojiJSONBody, RESTPostAPIGuildsJSONBody } from 'discord-api-types/v10';
 import type { ImageResolvable, ObjectToLower, OmitInsert } from '..';
-import { Guild, GuildEmoji, Sticker, type CreateStickerBodyRequest } from '../../structures';
+import { AnonymousGuild, Guild, GuildEmoji, GuildMember, Sticker, type CreateStickerBodyRequest } from '../../structures';
 import { BaseShorter } from './base';
 export declare class GuildShorter extends BaseShorter {
     /**
@@ -27,6 +27,9 @@ export declare class GuildShorter extends BaseShorter {
          * @returns The generated widget URL.
          */
         widgetURL: (id: string, style?: GuildWidgetStyle) => Promise<import("discord-api-types/v10").APIGuildWidgetSettings>;
+        list: (query?: RESTGetAPICurrentUserGuildsQuery) => Promise<AnonymousGuild[]>;
+        fetchSelf: (id: string) => Promise<GuildMember>;
+        leave: (id: string) => Promise<void | undefined>;
         channels: {
             /**
              * Retrieves a list of channels in the guild.

package/lib/common/shorters/guilds.js

@@ -53,6 +53,24 @@ class GuildShorter extends base_1.BaseShorter {
                 }
                 return this.client.proxy.guilds(id).widget.get({ query });
             },
+            list: (query) => {
+                return this.client.proxy
+                    .users('@me')
+                    .guilds.get({ query })
+                    .then(guilds => guilds.map(guild => new structures_1.AnonymousGuild(this.client, { ...guild, splash: null })));
+            },
+            fetchSelf: async (id) => {
+                const self = await this.client.proxy.guilds(id).members(this.client.botId).get();
+                await this.client.cache.members?.patch(self.user.id, id, self);
+                return new structures_1.GuildMember(this.client, self, self.user, id);
+            },
+            leave: (id) => {
+                return this.client.proxy
+                    .users('@me')
+                    .guilds(id)
+                    .delete()
+                    .then(() => this.client.cache.guilds?.removeIfNI('Guilds', id));
+            },
             channels: this.channels,
             moderation: this.moderation,
             stickers: this.stickers,

package/lib/common/shorters/messages.js

@@ -18,7 +18,6 @@ class MessageShorter extends base_1.BaseShorter {
                     files: parsedFiles,
                 })
                     .then(message => {
-                    this.client.components.onRequestMessage(body, message);
                     return new structures_1.Message(this.client, message);
                 });
             },
@@ -32,7 +31,6 @@ class MessageShorter extends base_1.BaseShorter {
                     files: parsedFiles,
                 })
                     .then(message => {
-                    this.client.components.onRequestUpdateMessage(body, message);
                     return new structures_1.Message(this.client, message);
                 });
             },

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

@@ -0,0 +1,29 @@
+import type { GuildMember, GuildRole } from '../../structures';
+import { PermissionsBitField } from '../../structures/extra/Permissions';
+import { BaseShorter } from './base';
+export declare class OverwritesShorter extends BaseShorter {
+    get overwrites(): {
+        memberPermissions: (channelId: string, member: GuildMember, checkAdmin?: boolean) => Promise<PermissionsBitField>;
+        overwritesFor: (channelId: string, member: GuildMember) => Promise<{
+            everyone: {
+                type: number;
+                id: string;
+                deny: PermissionsBitField;
+                allow: PermissionsBitField;
+            } | undefined;
+            roles: {
+                type: number;
+                id: string;
+                deny: PermissionsBitField;
+                allow: PermissionsBitField;
+            }[];
+            member: {
+                type: number;
+                id: string;
+                deny: PermissionsBitField;
+                allow: PermissionsBitField;
+            } | undefined;
+        }>;
+        rolePermissions: (channelId: string, role: GuildRole, checkAdmin?: boolean) => Promise<PermissionsBitField>;
+    };
+}

package/lib/common/shorters/overwrites.js

@@ -0,0 +1,63 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.OverwritesShorter = void 0;
+const v10_1 = require("discord-api-types/v10");
+const Permissions_1 = require("../../structures/extra/Permissions");
+const base_1 = require("./base");
+class OverwritesShorter extends base_1.BaseShorter {
+    get overwrites() {
+        return {
+            memberPermissions: async (channelId, member, checkAdmin = true) => {
+                const permissions = await member.fetchPermissions();
+                if (checkAdmin && permissions.has(v10_1.PermissionFlagsBits.Administrator)) {
+                    return new Permissions_1.PermissionsBitField(Permissions_1.PermissionsBitField.All);
+                }
+                const overwrites = await this.overwrites.overwritesFor(channelId, member);
+                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);
+                permissions.add(overwrites.roles.length > 0 ? overwrites.roles.map(role => role.allow.bits) : 0n);
+                permissions.remove(overwrites.member?.deny.bits ?? 0n);
+                permissions.add(overwrites.member?.allow.bits ?? 0n);
+                return permissions;
+            },
+            overwritesFor: async (channelId, member) => {
+                const roleOverwrites = [];
+                let memberOverwrites;
+                let everyoneOverwrites;
+                const channelOverwrites = await this.client.cache.overwrites?.get(channelId) ?? [];
+                for (const overwrite of channelOverwrites) {
+                    if (overwrite.id === member.guildId) {
+                        everyoneOverwrites = overwrite;
+                    }
+                    else if (member.roles.values.includes(overwrite.id)) {
+                        roleOverwrites.push(overwrite);
+                    }
+                    else if (overwrite.id === member.id) {
+                        memberOverwrites = overwrite;
+                    }
+                }
+                return {
+                    everyone: everyoneOverwrites,
+                    roles: roleOverwrites,
+                    member: memberOverwrites,
+                };
+            },
+            rolePermissions: async (channelId, role, checkAdmin = true) => {
+                if (checkAdmin && role.permissions.has(v10_1.PermissionFlagsBits.Administrator)) {
+                    return new Permissions_1.PermissionsBitField(Permissions_1.PermissionsBitField.All);
+                }
+                const channelOverwrites = await this.client.cache.overwrites?.get(channelId) ?? [];
+                const everyoneOverwrites = channelOverwrites.find(x => x.id === role.guildId);
+                const roleOverwrites = channelOverwrites.find(x => x.id === role.id);
+                const permissions = new Permissions_1.PermissionsBitField(role.permissions.bits);
+                permissions.remove(everyoneOverwrites?.deny.bits ?? 0n);
+                permissions.add(everyoneOverwrites?.allow.bits ?? 0n);
+                permissions.remove(roleOverwrites?.deny.bits ?? 0n);
+                permissions.add(roleOverwrites?.allow.bits ?? 0n);
+                return permissions;
+            },
+        };
+    }
+}
+exports.OverwritesShorter = OverwritesShorter;

package/lib/common/shorters/roles.js

@@ -13,9 +13,9 @@ class RoleShorter extends base_1.BaseShorter {
             list: async (guildId, force = false) => {
                 let roles = [];
                 if (!force) {
-                    roles = (await this.client.cache.roles?.values(guildId)) ?? [];
-                    if (roles.length) {
-                        return roles.map(r => new structures_1.GuildRole(this.client, r, guildId));
+                    const cachedRoles = (await this.client.cache.roles?.values(guildId)) ?? [];
+                    if (cachedRoles.length) {
+                        return cachedRoles;
                     }
                 }
                 roles = await this.client.proxy.guilds(guildId).roles.get();

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

@@ -8,11 +8,11 @@ export declare class WebhookShorter extends BaseShorter {
         fetch: (webhookId: string, token?: string) => Promise<Webhook>;
         messages: {
             write: (webhookId: string, token: string, { body: data, ...payload }: {
-                body: Omit<RESTPostAPIWebhookWithTokenJSONBody, "embeds" | "components"> & import("..").ResolverProps;
+                body: Omit<RESTPostAPIWebhookWithTokenJSONBody, "components" | "embeds"> & import("..").ResolverProps;
                 query?: import("discord-api-types/rest/v10/webhook").RESTPostAPIWebhookWithTokenQuery | undefined;
             }) => Promise<WebhookMessage | null>;
             edit: (webhookId: string, token: string, { messageId, body: data, ...json }: {
-                body: Omit<import("discord-api-types/rest/v10/webhook").RESTPatchAPIWebhookWithTokenMessageJSONBody, "embeds" | "components"> & import("..").ResolverProps;
+                body: Omit<import("discord-api-types/rest/v10/webhook").RESTPatchAPIWebhookWithTokenMessageJSONBody, "components" | "embeds"> & import("..").ResolverProps;
                 messageId: string;
                 query?: import("discord-api-types/rest/v10/webhook").RESTGetAPIWebhookWithTokenMessageQuery | undefined;
             }) => Promise<WebhookMessage>;

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

@@ -3,7 +3,7 @@ export type ToClass<T, This> = new (...args: any[]) => {
     [K in keyof T]: T[K] extends (...args: any[]) => any ? ReturnType<T[K]> extends Promise<T> ? (...args: Parameters<T[K]>) => Promise<This> : ReturnType<T[K]> extends T ? (...args: Parameters<T[K]>) => This : T[K] : T[K];
 };
 export type StringToNumber<T extends string> = T extends `${infer N extends number}` ? N : never;
-export type MakePartial<T, K extends keyof T> = T & {
+export type MakePartial<T, K extends keyof T> = Omit<T, K> & {
     [P in K]?: T[P];
 };
 export type DeepPartial<T> = {
@@ -40,7 +40,7 @@ export type PickPartial<T, K extends keyof T> = {
 } & {
     [P in K]: T[P];
 };
-export type MakeRequired<T, K extends keyof T> = T & {
+export type MakeRequired<T, K extends keyof T = keyof T> = T & {
     [P in K]-?: NonFalsy<T[P]>;
 };
 export type NonFalsy<T> = T extends false | 0 | '' | null | undefined | 0n ? never : T;
@@ -87,4 +87,5 @@ export type PartialClass<T> = PartialAvoid<Function, T>;
 export type AtLeastOne<T, U = {
     [K in keyof T]: Pick<T, K>;
 }> = Partial<T> & U[keyof U];
+export type FlatObjectKeys<T extends Record<string, any>, Key = keyof T> = Key extends string ? T[Key] extends Record<string, unknown> ? `${Key}.${FlatObjectKeys<T[Key]>}` : T[Key] extends string ? `${Key}` : never : never;
 export {};