seyfert 4.4.1 → 4.6.0

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.
      *
@@ -85,6 +88,15 @@ exports.SeyfertErrorMessages = {
     INVALID_OPTIONS_LENGTH: 'Invalid options length.',
     MISSING_COMPONENT: 'Cannot convert to JSON without a component.',
     MISSING_ACCESSORY: 'Cannot convert to JSON without an accessory.',
+    MISSING_MEDIA: 'Cannot convert to JSON without media.',
+    MISSING_MODAL_CUSTOM_ID: 'Cannot convert to JSON without a custom_id.',
+    MISSING_MODAL_TITLE: 'Cannot convert to JSON without a title.',
+    MISSING_POLL_QUESTION: 'Cannot convert to JSON without a question.',
+    MISSING_POLL_ANSWERS: 'Cannot convert to JSON without answers.',
+    MISSING_RADIO_GROUP_OPTION_LABEL: 'Cannot convert to JSON without a label.',
+    MISSING_RADIO_GROUP_OPTION_VALUE: 'Cannot convert to JSON without a value.',
+    MISSING_STRING_SELECT_OPTION_LABEL: 'Cannot convert to JSON without a label.',
+    MISSING_STRING_SELECT_OPTION_VALUE: 'Cannot convert to JSON without a value.',
     INVALID_ATTACHMENT_TYPE: 'Invalid attachment type.',
     INVALID_ANSWER_ID: 'Invalid answer id.',
     UNDEFINED_LOCALE: 'Undefined locale.',
@@ -127,7 +139,9 @@ exports.SeyfertErrorMessages = {
     GUILD_SEARCH_INDEX_NOT_READY: 'Guild search index is not yet available.',
 };
 function resolveSeyfertErrorMessage(code) {
-    const preset = exports.SeyfertErrorMessages[code];
+    const preset = Object.hasOwn(exports.SeyfertErrorMessages, code)
+        ? exports.SeyfertErrorMessages[code]
+        : undefined;
     if (preset)
         return preset;
     return code

package/lib/common/it/logger.js

@@ -72,15 +72,18 @@ class Logger {
         Logger.__assignFileName = cb;
     }
     static async clearLogs() {
-        for (const i of await node_fs_1.promises.readdir((0, node_path_1.join)(process.cwd(), Logger.dirname), { withFileTypes: true })) {
-            if (Logger.streams[i.name])
-                await new Promise((res, rej) => Logger.streams[i.name].close(err => {
-                    if (err)
-                        return rej(err);
-                    res(err);
-                }));
-            await node_fs_1.promises.unlink((0, node_path_1.join)(process.cwd(), Logger.dirname, i.name)).catch(() => undefined);
-            delete Logger.streams[i.name];
+        for (const [fileName, stream] of Object.entries(Logger.streams)) {
+            if (!stream)
+                continue;
+            await new Promise((resolve, reject) => stream.close(error => {
+                if (error)
+                    return reject(error);
+                resolve();
+            }));
+            delete Logger.streams[fileName];
+        }
+        for (const entry of await node_fs_1.promises.readdir((0, node_path_1.join)(process.cwd(), Logger.dirname), { withFileTypes: true })) {
+            await node_fs_1.promises.unlink((0, node_path_1.join)(process.cwd(), Logger.dirname, entry.name)).catch(() => undefined);
         }
     }
     /**

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

@@ -17,7 +17,7 @@ export declare class ApplicationShorter extends BaseShorter {
     /**
      * Creates a new emoji for the application.
      * @param body.name The name of the emoji.
-     * @param body.image The [image data string](https://discord.com/developers/docs/reference#image-data) of the emoji.
+     * @param body.image The [image data string](https://docs.discord.com/developers/reference#image-data) of the emoji.
      * @returns The created emoji.
      */
     createEmoji(raw: ApplicationEmojiResolvable): Promise<ApplicationEmojiStructure>;

package/lib/common/shorters/application.js

@@ -37,7 +37,7 @@ class ApplicationShorter extends base_1.BaseShorter {
     /**
      * Creates a new emoji for the application.
      * @param body.name The name of the emoji.
-     * @param body.image The [image data string](https://discord.com/developers/docs/reference#image-data) of the emoji.
+     * @param body.image The [image data string](https://docs.discord.com/developers/reference#image-data) of the emoji.
      * @returns The created emoji.
      */
     async createEmoji(raw) {

package/lib/common/shorters/bans.js

@@ -12,7 +12,7 @@ class BanShorter extends base_1.BaseShorter {
      * @param reason The reason for bulk banning members.
      */
     async bulkCreate(guildId, body, reason) {
-        const bans = await this.client.proxy.guilds(guildId)['bulk-bans'].post({ reason, body });
+        const bans = await this.client.proxy.guilds(guildId)['bulk-ban'].post({ reason, body });
         await Promise.all(bans.banned_users.map(id => this.client.cache.members?.removeIfNI('GuildModeration', id, guildId)));
         return bans;
     }

package/lib/common/shorters/guilds.js

@@ -96,7 +96,11 @@ class GuildShorter extends base_1.BaseShorter {
         if ('code' in result && result.code === 110_000) {
             if (!wait)
                 throw new error_1.SeyfertError('GUILD_SEARCH_INDEX_NOT_READY', {
-                    metadata: { guildId, retryAfter: result.retry_after },
+                    metadata: {
+                        guildId,
+                        retryAfter: result.retry_after,
+                        detail: `Guild search index for ${guildId} is not ready; retry after ${result.retry_after} seconds.`,
+                    },
                 });
             await (0, utils_1.delay)(result.retry_after * 1000);
             return this.searchMessages(guildId, query, wait);

package/lib/common/shorters/interaction.js

@@ -14,10 +14,11 @@ class InteractionShorter extends base_1.BaseShorter {
         return this.client.proxy
             .interactions(id)(token)
             .callback.post({
+            auth: false,
             body: __1.BaseInteraction.transformBodyRequest({
                 type: body.type,
                 data,
-            }, parsedFiles, this.client),
+            }, files, this.client),
             files: parsedFiles,
             query: { with_response: withResponse },
         });
@@ -40,7 +41,8 @@ class InteractionShorter extends base_1.BaseShorter {
             .webhooks(this.client.applicationId)(token)
             .messages(messageId)
             .patch({
-            body: __1.BaseInteraction.transformBody(data, parsedFiles, this.client),
+            auth: false,
+            body: __1.BaseInteraction.transformBody(data, files, this.client),
             files: parsedFiles,
         });
         return transformers_1.Transformers.WebhookMessage(this.client, apiMessage, this.client.applicationId, token);
@@ -52,7 +54,7 @@ class InteractionShorter extends base_1.BaseShorter {
         return this.client.proxy
             .webhooks(this.client.applicationId)(token)
             .messages(messageId)
-            .delete()
+            .delete({ auth: false })
             .then(() => this.client.components.deleteValue(messageId, 'messageDelete'));
     }
     deleteOriginal(token) {
@@ -63,7 +65,8 @@ class InteractionShorter extends base_1.BaseShorter {
         const apiMessage = (await this.client.proxy
             .webhooks(this.client.applicationId)(token)
             .post({
-            body: __1.BaseInteraction.transformBody(body, parsedFiles, this.client),
+            auth: false,
+            body: __1.BaseInteraction.transformBody(body, files, this.client),
             files: parsedFiles,
         }));
         return transformers_1.Transformers.WebhookMessage(this.client, apiMessage, this.client.applicationId, token);

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

@@ -84,6 +84,7 @@ export declare class InvitesShorter extends BaseShorter {
             slug?: string | undefined;
             coverImage?: string | undefined;
             flags?: import("../../types").ApplicationFlags | undefined;
+            flagsNew?: string | undefined;
             approximateGuildCount?: number | undefined;
             approximateUserInstallCount?: number | undefined;
             redirectUris?: string[] | undefined;
@@ -239,6 +240,7 @@ export declare class InvitesShorter extends BaseShorter {
             slug?: string | undefined;
             coverImage?: string | undefined;
             flags?: import("../../types").ApplicationFlags | undefined;
+            flagsNew?: string | undefined;
             approximateGuildCount?: number | undefined;
             approximateUserInstallCount?: number | undefined;
             redirectUris?: string[] | undefined;
@@ -415,6 +417,7 @@ export declare class InvitesShorter extends BaseShorter {
                 slug?: string | undefined;
                 coverImage?: string | undefined;
                 flags?: import("../../types").ApplicationFlags | undefined;
+                flagsNew?: string | undefined;
                 approximateGuildCount?: number | undefined;
                 approximateUserInstallCount?: number | undefined;
                 redirectUris?: string[] | undefined;
@@ -575,6 +578,7 @@ export declare class InvitesShorter extends BaseShorter {
                 slug?: string | undefined;
                 coverImage?: string | undefined;
                 flags?: import("../../types").ApplicationFlags | undefined;
+                flagsNew?: string | undefined;
                 approximateGuildCount?: number | undefined;
                 approximateUserInstallCount?: number | undefined;
                 redirectUris?: string[] | undefined;
@@ -750,6 +754,7 @@ export declare class InvitesShorter extends BaseShorter {
                 slug?: string | undefined;
                 coverImage?: string | undefined;
                 flags?: import("../../types").ApplicationFlags | undefined;
+                flagsNew?: string | undefined;
                 approximateGuildCount?: number | undefined;
                 approximateUserInstallCount?: number | undefined;
                 redirectUris?: string[] | undefined;

package/lib/common/shorters/members.js

@@ -4,6 +4,7 @@ exports.MemberShorter = void 0;
 const cache_1 = require("../../cache");
 const transformers_1 = require("../../client/transformers");
 const Permissions_1 = require("../../structures/extra/Permissions");
+const GuildRole_1 = require("../../structures/GuildRole");
 const types_1 = require("../../types");
 const base_1 = require("./base");
 class MemberShorter extends base_1.BaseShorter {
@@ -182,7 +183,7 @@ class MemberShorter extends base_1.BaseShorter {
     }
     async sortRoles(guildId, memberId, force = false) {
         const roles = await this.listRoles(guildId, memberId, force);
-        return roles.sort((a, b) => b.position - a.position);
+        return roles.sort((a, b) => GuildRole_1.GuildRole.comparePositions(b, a));
     }
     async permissions(guildId, memberId, force = false) {
         const roles = await this.listRoles(guildId, memberId, force);

package/lib/common/shorters/messages.js

@@ -9,7 +9,7 @@ const base_1 = require("./base");
 class MessageShorter extends base_1.BaseShorter {
     async write(channelId, { files, ...body }) {
         const parsedFiles = files ? await (0, builders_1.resolveFiles)(files) : undefined;
-        const transformedBody = structures_1.MessagesMethods.transformMessageBody(body, parsedFiles, this.client);
+        const transformedBody = structures_1.MessagesMethods.transformMessageBody(body, files, this.client);
         return this.client.proxy
             .channels(channelId)
             .messages.post({
@@ -27,7 +27,7 @@ class MessageShorter extends base_1.BaseShorter {
             .channels(channelId)
             .messages(messageId)
             .patch({
-            body: structures_1.MessagesMethods.transformMessageBody(body, parsedFiles, this.client),
+            body: structures_1.MessagesMethods.transformMessageBody(body, files, this.client),
             files: parsedFiles,
         })
             .then(async (message) => {

package/lib/common/shorters/threads.js

@@ -17,7 +17,7 @@ class ThreadShorter extends base_1.BaseShorter {
         if ('message' in body || 'files' in body) {
             const { message, files, ...rest } = body;
             const parsedFiles = files ? await (0, __1.resolveFiles)(files) : undefined;
-            const transformedBody = structures_1.MessagesMethods.transformMessageBody(message ?? {}, parsedFiles, this.client);
+            const transformedBody = structures_1.MessagesMethods.transformMessageBody(message ?? {}, files, this.client);
             thread = await this.client.proxy.channels(channelId).threads.post({
                 body: {
                     ...rest,

package/lib/common/shorters/webhook.js

@@ -69,10 +69,10 @@ class WebhookShorter extends base_1.BaseShorter {
     async writeMessage(webhookId, token, { body: data, ...payload }) {
         const { files, ...body } = data;
         const parsedFiles = files ? await (0, builders_1.resolveFiles)(files) : undefined;
-        const transformedBody = structures_1.MessagesMethods.transformMessageBody(body, parsedFiles, this.client);
+        const transformedBody = structures_1.MessagesMethods.transformMessageBody(body, files, this.client);
         return this.client.proxy
             .webhooks(webhookId)(token)
-            .post({ ...payload, files: parsedFiles, body: transformedBody })
+            .post({ ...payload, auth: false, files: parsedFiles, body: transformedBody })
             .then(m => (m?.id ? transformers_1.Transformers.WebhookMessage(this.client, m, webhookId, token) : null));
     }
     /**
@@ -86,7 +86,7 @@ class WebhookShorter extends base_1.BaseShorter {
     async editMessage(webhookId, token, { messageId, body: data, ...json }) {
         const { files, ...body } = data;
         const parsedFiles = files ? await (0, builders_1.resolveFiles)(files) : undefined;
-        const transformedBody = structures_1.MessagesMethods.transformMessageBody(body, parsedFiles, this.client);
+        const transformedBody = structures_1.MessagesMethods.transformMessageBody(body, files, this.client);
         return this.client.proxy
             .webhooks(webhookId)(token)
             .messages(messageId)

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

@@ -51,7 +51,14 @@ export type MakeRequired<T, K extends keyof T = keyof T> = T & {
 export type PickRequired<T, K extends keyof T> = Omit<T, K> & {
     [P in K]: NonFalsy<T[P]>;
 };
+export type MakePresent<T, K extends keyof T = keyof T> = T & {
+    [P in K]-?: NonNullish<T[P]>;
+};
+export type PickPresent<T, K extends keyof T> = Omit<T, K> & {
+    [P in K]-?: NonNullish<T[P]>;
+};
 export type NonFalsy<T> = T extends false | 0 | '' | null | undefined | 0n ? never : T;
+export type NonNullish<T> = T extends null | undefined ? never : T;
 export type CamelCase<S extends string> = S extends `${infer P1}_${infer P2}${infer P3}` ? `${Lowercase<P1>}${Uppercase<P2>}${CamelCase<P3>}` : Lowercase<S>;
 export type SnakeCase<S extends string> = S extends `${infer A}${infer Rest}` ? A extends Uppercase<A> ? `_${Lowercase<A>}${SnakeCase<Rest>}` : `${A}${SnakeCase<Rest>}` : Lowercase<S>;
 export type ObjectToLower<T> = T extends unknown[] ? ObjectToLower<T[0]>[] : Identify<{

package/lib/components/componentcommand.js

@@ -2,6 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ComponentCommand = exports.InteractionCommandType = void 0;
 const types_1 = require("../types");
+const customId_1 = require("./customId");
 exports.InteractionCommandType = {
     COMPONENT: 0,
     MODAL: 1,
@@ -12,8 +13,7 @@ class ComponentCommand {
     /** @internal */
     _filter(context) {
         if (this.customId) {
-            const matches = typeof this.customId === 'string' ? this.customId === context.customId : context.customId.match(this.customId);
-            if (!matches)
+            if (!(0, customId_1.matchesCustomId)(this.customId, context.customId))
                 return false;
         }
         if (this.filter)

package/lib/components/customId.d.ts

@@ -0,0 +1,3 @@
+type ComponentCustomId = string | RegExp;
+export declare function matchesCustomId(customId: ComponentCustomId, value: string): boolean;
+export {};

package/lib/components/customId.js

@@ -0,0 +1,11 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.matchesCustomId = matchesCustomId;
+function matchesCustomId(customId, value) {
+    if (typeof customId === 'string')
+        return customId === value;
+    if (!customId.global && !customId.sticky)
+        return customId.test(value);
+    // String#search ignores and restores lastIndex for standard stateful regular expressions.
+    return value.search(customId) !== -1;
+}

package/lib/components/handler.js

@@ -5,6 +5,7 @@ const collection_1 = require("../collection");
 const commands_1 = require("../commands");
 const common_1 = require("../common");
 const componentcommand_1 = require("./componentcommand");
+const customId_1 = require("./customId");
 const modalcommand_1 = require("./modalcommand");
 class ComponentHandler extends common_1.BaseHandler {
     client;
@@ -19,11 +20,9 @@ class ComponentHandler extends common_1.BaseHandler {
         this.client = client;
     }
     createMatchCallback(match) {
-        if (typeof match === 'string')
-            return str => str === match;
         if (Array.isArray(match))
             return str => match.includes(str);
-        return str => match.test(str);
+        return str => (0, customId_1.matchesCustomId)(match, str);
     }
     createComponentCollector(messageId, channelId, guildId, options = {}, components = []) {
         this.values.set(messageId, {

package/lib/components/modalcommand.js

@@ -2,14 +2,14 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ModalCommand = void 0;
 const componentcommand_1 = require("./componentcommand");
+const customId_1 = require("./customId");
 class ModalCommand {
     type = componentcommand_1.InteractionCommandType.MODAL;
     customId;
     /** @internal */
     _filter(context) {
         if (this.customId) {
-            const matches = typeof this.customId === 'string' ? this.customId === context.customId : context.customId.match(this.customId);
-            if (!matches)
+            if (!(0, customId_1.matchesCustomId)(this.customId, context.customId))
                 return false;
         }
         if (this.filter)

package/lib/events/hooks/invite.d.ts

@@ -70,6 +70,7 @@ export declare const INVITE_CREATE: (_self: UsingClient, data: GatewayInviteCrea
         slug?: string | undefined;
         coverImage?: string | undefined;
         flags?: import("../../types").ApplicationFlags | undefined;
+        flagsNew?: string | undefined;
         approximateGuildCount?: number | undefined;
         approximateUserInstallCount?: number | undefined;
         redirectUris?: string[] | undefined;

package/lib/events/hooks/presence.d.ts

@@ -81,6 +81,7 @@ export declare const PRESENCE_UPDATE: (self: UsingClient, data: GatewayPresenceU
         desktop?: import("../../types").PresenceUpdateReceiveStatus | undefined;
         mobile?: import("../../types").PresenceUpdateReceiveStatus | undefined;
         web?: import("../../types").PresenceUpdateReceiveStatus | undefined;
+        vr?: import("../../types").PresenceUpdateReceiveStatus | undefined;
     } | undefined;
 }, import("../..").ReturnCache<(Omit<import("../../types").GatewayPresenceUpdate, "user"> & {
     id: string;

package/lib/events/hooks/thread.d.ts

@@ -30,6 +30,7 @@ export declare const THREAD_LIST_SYNC: (_self: UsingClient, data: GatewayThreadL
         appliedTags: string[];
         id: string;
         type: import("../../types").ThreadChannelType;
+        applicationId?: string | null | undefined;
         flags?: import("../../types").ChannelFlags | undefined;
         rateLimitPerUser?: number | undefined;
         lastMessageId?: string | null | undefined;

package/lib/index.d.ts

@@ -6,7 +6,7 @@ export * from './builders';
 export * from './cache';
 export { Collection, LimitedCollection } from './collection';
 export * from './commands';
-export { Formatter, Logger, PermissionStrings } from './common';
+export { type AssignFilenameCallback, type CustomizeLoggerCallback, Formatter, Logger, type LoggerOptions, LogLevels, PermissionStrings, } from './common';
 export * from './components';
 export * from './events';
 export * from './langs';

package/lib/index.js

@@ -14,7 +14,7 @@ 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 });
-exports.config = exports.WorkerManager = exports.ShardManager = exports.Logger = exports.Formatter = exports.LimitedCollection = exports.Collection = void 0;
+exports.config = exports.WorkerManager = exports.ShardManager = exports.LogLevels = exports.Logger = exports.Formatter = exports.LimitedCollection = exports.Collection = void 0;
 exports.createEvent = createEvent;
 exports.extendContext = extendContext;
 __exportStar(require("./client"), exports);
@@ -33,6 +33,7 @@ __exportStar(require("./commands"), exports);
 var common_2 = require("./common");
 Object.defineProperty(exports, "Formatter", { enumerable: true, get: function () { return common_2.Formatter; } });
 Object.defineProperty(exports, "Logger", { enumerable: true, get: function () { return common_2.Logger; } });
+Object.defineProperty(exports, "LogLevels", { enumerable: true, get: function () { return common_2.LogLevels; } });
 __exportStar(require("./components"), exports);
 __exportStar(require("./events"), exports);
 __exportStar(require("./langs"), exports);

package/lib/structures/AnonymousGuild.d.ts

@@ -1,7 +1,7 @@
 import { BaseGuild } from './extra/BaseGuild';
 /**
  * Class for anonymous guilds.
- * @link https://discord.com/developers/docs/resources/guild#guild-resource
+ * @link https://docs.discord.com/developers/resources/guild#guild-resource
  */
 export declare class AnonymousGuild extends BaseGuild {
 }

package/lib/structures/AnonymousGuild.js

@@ -4,7 +4,7 @@ exports.AnonymousGuild = void 0;
 const BaseGuild_1 = require("./extra/BaseGuild");
 /**
  * Class for anonymous guilds.
- * @link https://discord.com/developers/docs/resources/guild#guild-resource
+ * @link https://docs.discord.com/developers/resources/guild#guild-resource
  */
 class AnonymousGuild extends BaseGuild_1.BaseGuild {
 }

package/lib/structures/Guild.d.ts

@@ -178,6 +178,7 @@ export declare class Guild<State extends StructStates = 'api'> extends Guild_bas
                 slug?: string | undefined;
                 coverImage?: string | undefined;
                 flags?: import("../types").ApplicationFlags | undefined;
+                flagsNew?: string | undefined;
                 approximateGuildCount?: number | undefined;
                 approximateUserInstallCount?: number | undefined;
                 redirectUris?: string[] | undefined;
@@ -338,6 +339,7 @@ export declare class Guild<State extends StructStates = 'api'> extends Guild_bas
                 slug?: string | undefined;
                 coverImage?: string | undefined;
                 flags?: import("../types").ApplicationFlags | undefined;
+                flagsNew?: string | undefined;
                 approximateGuildCount?: number | undefined;
                 approximateUserInstallCount?: number | undefined;
                 redirectUris?: string[] | undefined;
@@ -493,6 +495,7 @@ export declare class Guild<State extends StructStates = 'api'> extends Guild_bas
                 slug?: string | undefined;
                 coverImage?: string | undefined;
                 flags?: import("../types").ApplicationFlags | undefined;
+                flagsNew?: string | undefined;
                 approximateGuildCount?: number | undefined;
                 approximateUserInstallCount?: number | undefined;
                 redirectUris?: string[] | undefined;

package/lib/structures/GuildMember.d.ts

@@ -64,7 +64,7 @@ export interface GuildMember extends ObjectToLower<Omit<APIGuildMember, 'user' |
 }
 /**
  * Represents a guild member
- * @link https://discord.com/developers/docs/resources/guild#guild-member-object
+ * @link https://docs.discord.com/developers/resources/guild#guild-member-object
  */
 export declare class GuildMember extends BaseGuildMember {
     /** the choosen guild id */
@@ -111,7 +111,7 @@ export interface InteractionGuildMember extends ObjectToLower<Omit<APIInteractio
 }
 /**
  * Represents a guild member
- * @link https://discord.com/developers/docs/resources/guild#guild-member-object
+ * @link https://docs.discord.com/developers/resources/guild#guild-member-object
  */
 export declare class InteractionGuildMember extends GuildMember {
     permissions: PermissionsBitField;

package/lib/structures/GuildMember.js

@@ -5,6 +5,7 @@ const DiscordBase_1 = require("./extra/DiscordBase");
 const transformers_1 = require("../client/transformers");
 const common_1 = require("../common");
 const Permissions_1 = require("./extra/Permissions");
+const GuildRole_1 = require("./GuildRole");
 class BaseGuildMember extends DiscordBase_1.DiscordBase {
     guildId;
     _roles;
@@ -80,7 +81,7 @@ class BaseGuildMember extends DiscordBase_1.DiscordBase {
             add: (id) => this.client.members.addRole(this.guildId, this.id, id),
             remove: (id) => this.client.members.removeRole(this.guildId, this.id, id),
             permissions: (force = false) => this.roles.list(force).then(roles => new Permissions_1.PermissionsBitField(roles.map(x => BigInt(x.permissions.bits)))),
-            sorted: (force = false) => this.roles.list(force).then(roles => roles.sort((a, b) => b.position - a.position)),
+            sorted: (force = false) => this.roles.list(force).then(roles => roles.sort((a, b) => GuildRole_1.GuildRole.comparePositions(b, a))),
             highest: (force = false) => this.roles.sorted(force).then(roles => roles[0]),
         };
     }
@@ -103,7 +104,7 @@ class BaseGuildMember extends DiscordBase_1.DiscordBase {
 exports.BaseGuildMember = BaseGuildMember;
 /**
  * Represents a guild member
- * @link https://discord.com/developers/docs/resources/guild#guild-member-object
+ * @link https://docs.discord.com/developers/resources/guild#guild-member-object
  */
 class GuildMember extends BaseGuildMember {
     guildId;
@@ -170,7 +171,24 @@ class GuildMember extends BaseGuildMember {
             return false;
         if (this.client.botId === ownerId)
             return true;
-        return (await this.__me.roles.highest()).position > (await this.roles.highest(force)).position;
+        const highestFromCompleteRoles = async (member, forceRoles) => {
+            const roles = await member.roles.sorted(forceRoles);
+            const roleIds = new Set(roles.map(role => role.id));
+            if (!member.roles.keys.every(roleId => roleIds.has(roleId)))
+                return;
+            return roles.at(0);
+        };
+        const myHighest = await highestFromCompleteRoles(this.__me, force);
+        const theirHighest = await highestFromCompleteRoles(this, force);
+        if (myHighest && theirHighest)
+            return GuildRole_1.GuildRole.comparePositions(myHighest, theirHighest) > 0;
+        if (force)
+            return false;
+        const forcedMyHighest = await highestFromCompleteRoles(this.__me, true);
+        const forcedTheirHighest = await highestFromCompleteRoles(this, true);
+        if (!forcedMyHighest || !forcedTheirHighest)
+            return false;
+        return GuildRole_1.GuildRole.comparePositions(forcedMyHighest, forcedTheirHighest) > 0;
     }
     async bannable(force = false) {
         return (await this.manageable(force)) && (await this.__me.fetchPermissions(force)).has(['BanMembers']);
@@ -190,7 +208,7 @@ class UnavailableMember extends BaseGuildMember {
 exports.UnavailableMember = UnavailableMember;
 /**
  * Represents a guild member
- * @link https://discord.com/developers/docs/resources/guild#guild-member-object
+ * @link https://docs.discord.com/developers/resources/guild#guild-member-object
  */
 class InteractionGuildMember extends GuildMember {
     permissions;

package/lib/structures/GuildPreview.d.ts

@@ -3,7 +3,7 @@ import type { APIGuildPreview } from '../types';
 import { AnonymousGuild } from './AnonymousGuild';
 /**
  * Represent Discord Guild Preview Object
- * @link https://discord.com/developers/docs/resources/guild#guild-preview-object
+ * @link https://docs.discord.com/developers/resources/guild#guild-preview-object
  */
 export declare class GuildPreview extends AnonymousGuild {
     constructor(client: UsingClient, data: APIGuildPreview);

package/lib/structures/GuildPreview.js

@@ -4,7 +4,7 @@ exports.GuildPreview = void 0;
 const AnonymousGuild_1 = require("./AnonymousGuild");
 /**
  * Represent Discord Guild Preview Object
- * @link https://discord.com/developers/docs/resources/guild#guild-preview-object
+ * @link https://docs.discord.com/developers/resources/guild#guild-preview-object
  */
 class GuildPreview extends AnonymousGuild_1.AnonymousGuild {
     constructor(client, data) {

package/lib/structures/GuildRole.d.ts

@@ -11,6 +11,19 @@ export declare class GuildRole extends DiscordBase {
     readonly guildId: string;
     permissions: PermissionsBitField;
     constructor(client: UsingClient, data: APIRole, guildId: string);
+    /**
+     * Compares the hierarchy positions of two roles.
+     * Discord ranks the lower snowflake higher when roles share the same position.
+     * @returns A positive number when the first role is higher, a negative number when the second role is higher, or 0
+     * when both roles have the same position and ID.
+     */
+    static comparePositions(first: Pick<APIRole, 'id' | 'position'>, second: Pick<APIRole, 'id' | 'position'>): number;
+    /**
+     * Compares this role's hierarchy position with another role.
+     * @returns A positive number when this role is higher, a negative number when the other role is higher, or 0 when
+     * both roles have the same position and ID.
+     */
+    comparePositionTo(role: Pick<APIRole, 'id' | 'position'>): number;
     guild(mode?: 'rest' | 'flow'): Promise<GuildStructure<'cached' | 'api'>>;
     guild(mode: 'cache'): ReturnCache<GuildStructure<'cached'> | undefined>;
     fetch(force?: boolean): Promise<GuildRoleStructure>;

package/lib/structures/GuildRole.js

@@ -12,6 +12,27 @@ class GuildRole extends DiscordBase_1.DiscordBase {
         this.guildId = guildId;
         this.permissions = new Permissions_1.PermissionsBitField(BigInt(data.permissions));
     }
+    /**
+     * Compares the hierarchy positions of two roles.
+     * Discord ranks the lower snowflake higher when roles share the same position.
+     * @returns A positive number when the first role is higher, a negative number when the second role is higher, or 0
+     * when both roles have the same position and ID.
+     */
+    static comparePositions(first, second) {
+        if (first.position !== second.position)
+            return first.position - second.position;
+        if (first.id === second.id)
+            return 0;
+        return BigInt(first.id) < BigInt(second.id) ? 1 : -1;
+    }
+    /**
+     * Compares this role's hierarchy position with another role.
+     * @returns A positive number when this role is higher, a negative number when the other role is higher, or 0 when
+     * both roles have the same position and ID.
+     */
+    comparePositionTo(role) {
+        return GuildRole.comparePositions(this, role);
+    }
     guild(mode = 'flow') {
         switch (mode) {
             case 'cache':

package/lib/structures/GuildTemplate.js

@@ -17,7 +17,7 @@ class GuildTemplate extends Base_1.Base {
         }
     }
     fetch() {
-        return this.client.templates.fetch(this.sourceGuildId);
+        return this.client.templates.fetch(this.code);
     }
     sync() {
         return this.client.templates.sync(this.sourceGuildId, this.code);