@sapphire/framework - npm Package Compare versions

Comparing version 2.0.0-next.2bb2e122.0 to 2.0.0-next.2d21b038.0

dist/arguments/CoreBoolean.js

 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.CoreArgument = void 0;
+const resolvers_1 = require("../lib/resolvers");
 const Argument_1 = require("../lib/structures/Argument");
-const truths = ['1', 'true', '+', 't', 'yes', 'y'];
-const falses = ['0', 'false', '-', 'f', 'no', 'n'];
 class CoreArgument extends Argument_1.Argument {
@@ -12,8 +11,11 @@ constructor(context) {
     run(parameter, context) {
-        const boolean = parameter.toLowerCase();
-        if (truths.includes(boolean))
-            return this.ok(true);
-        if (falses.includes(boolean))
-            return this.ok(false);
-        return this.error({ parameter, message: 'The argument did not resolve to a boolean.', context });
+        const resolved = resolvers_1.resolveBoolean(parameter, { truths: context.truths, falses: context.falses });
+        if (resolved.success)
+            return this.ok(resolved.value);
+        return this.error({
+            parameter,
+            identifier: resolved.error,
+            message: 'The argument did not resolve to a boolean.',
+            context
+        });
     }
@@ -20,0 +22,0 @@ }

dist/arguments/CoreChannel.js

 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.CoreArgument = void 0;
+const resolvers_1 = require("../lib/resolvers");
 const Argument_1 = require("../lib/structures/Argument");
@@ -10,10 +11,11 @@ class CoreArgument extends Argument_1.Argument {
     run(parameter, context) {
-        const channel = (context.message.guild ? context.message.guild.channels : this.container.client.channels).cache.get(parameter);
-        return channel
-            ? this.ok(channel)
-            : this.error({
-                parameter,
-                message: 'The argument did not resolve to a channel.',
-                context: { ...context, channel }
-            });
+        const resolved = resolvers_1.resolveChannel(parameter, context.message);
+        if (resolved.success)
+            return this.ok(resolved.value);
+        return this.error({
+            parameter,
+            identifier: resolved.error,
+            message: 'The argument did not resolve to a channel.',
+            context
+        });
     }
@@ -20,0 +22,0 @@ }

dist/arguments/CoreDate.js

@@ -5,2 +5,3 @@ "use strict";
 require("../lib/errors/Identifiers");
+const resolvers_1 = require("../lib/resolvers");
 const Argument_1 = require("../lib/structures/Argument");
@@ -10,20 +11,18 @@ class CoreArgument extends Argument_1.Argument {
         super(context, { name: 'date' });
+        this.messages = {
+            ["dateTooEarly" /* ArgumentDateTooEarly */]: ({ minimum }) => `The given date must be after ${new Date(minimum).toISOString()}.`,
+            ["dateTooFar" /* ArgumentDateTooFar */]: ({ maximum }) => `The given date must be before ${new Date(maximum).toISOString()}.`,
+            ["dateError" /* ArgumentDateError */]: () => 'The argument did not resolve to a date.'
+        };
     }
     run(parameter, context) {
-        const parsed = new Date(parameter);
-        const time = parsed.getTime();
-        if (Number.isNaN(time)) {
-            return this.error({
-                parameter,
-                message: 'The argument did not resolve to a valid date.',
-                context
-            });
-        }
-        if (typeof context.minimum === 'number' && time < context.minimum) {
-            return this.error({ parameter, identifier: "dateTooSmall" /* ArgumentDateTooSmall */, message: 'The argument is too small.', context });
-        }
-        if (typeof context.maximum === 'number' && time > context.maximum) {
-            return this.error({ parameter, identifier: "dateTooBig" /* ArgumentDateTooBig */, message: 'The argument is too big.', context });
-        }
-        return this.ok(parsed);
+        const resolved = resolvers_1.resolveDate(parameter, { minimum: context.minimum, maximum: context.maximum });
+        if (resolved.success)
+            return this.ok(resolved.value);
+        return this.error({
+            parameter,
+            identifier: resolved.error,
+            message: this.messages[resolved.error](context),
+            context
+        });
     }
@@ -30,0 +29,0 @@ }

dist/arguments/CoreDMChannel.js

 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.CoreArgument = void 0;
-const discord_js_utilities_1 = require("@sapphire/discord.js-utilities");
-const ExtendedArgument_1 = require("../lib/structures/ExtendedArgument");
-class CoreArgument extends ExtendedArgument_1.ExtendedArgument {
+const resolvers_1 = require("../lib/resolvers");
+const Argument_1 = require("../lib/structures/Argument");
+class CoreArgument extends Argument_1.Argument {
     constructor(context) {
-        super(context, { baseArgument: 'channel', name: 'dmChannel' });
+        super(context, { name: 'dmChannel' });
     }
-    handle(channel, context) {
-        return discord_js_utilities_1.isDMChannel(channel)
-            ? this.ok(channel)
-            : this.error({
-                parameter: context.parameter,
-                message: 'The argument did not resolve to a DM channel.',
-                context: { ...context, channel }
-            });
+    run(parameter, context) {
+        const resolved = resolvers_1.resolveDMChannel(parameter, context.message);
+        if (resolved.success)
+            return this.ok(resolved.value);
+        return this.error({
+            parameter,
+            identifier: resolved.error,
+            message: 'The argument did not resolve to a DM channel.',
+            context
+        });
     }
@@ -19,0 +21,0 @@ }

dist/arguments/CoreFloat.js

@@ -5,2 +5,3 @@ "use strict";
 require("../lib/errors/Identifiers");
+const resolvers_1 = require("../lib/resolvers");
 const Argument_1 = require("../lib/structures/Argument");
@@ -10,25 +11,18 @@ class CoreArgument extends Argument_1.Argument {
         super(context, { name: 'float' });
+        this.messages = {
+            ["floatTooSmall" /* ArgumentFloatTooSmall */]: ({ minimum }) => `The given number must be greater than ${minimum}.`,
+            ["floatTooLarge" /* ArgumentFloatTooLarge */]: ({ maximum }) => `The given number must be less than ${maximum}.`,
+            ["floatError" /* ArgumentFloatError */]: () => 'The argument did not resolve to a valid decimal.'
+        };
     }
     run(parameter, context) {
-        const parsed = Number(parameter);
-        if (Number.isNaN(parsed)) {
-            return this.error({ parameter, message: 'The argument did not resolve to a valid floating point number.', context });
-        }
-        if (typeof context.minimum === 'number' && parsed < context.minimum) {
-            return this.error({
-                parameter,
-                identifier: "floatTooSmall" /* ArgumentFloatTooSmall */,
-                message: `The argument must be greater than ${context.minimum}.`,
-                context
-            });
-        }
-        if (typeof context.maximum === 'number' && parsed > context.maximum) {
-            return this.error({
-                parameter,
-                identifier: "floatTooBig" /* ArgumentFloatTooBig */,
-                message: `The argument must be less than ${context.maximum}.`,
-                context
-            });
-        }
-        return this.ok(parsed);
+        const resolved = resolvers_1.resolveFloat(parameter, { minimum: context.minimum, maximum: context.maximum });
+        if (resolved.success)
+            return this.ok(resolved.value);
+        return this.error({
+            parameter,
+            identifier: resolved.error,
+            message: this.messages[resolved.error](context),
+            context
+        });
     }
@@ -35,0 +29,0 @@ }

dist/arguments/CoreGuildCategoryChannel.js

 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.CoreArgument = void 0;
-const discord_js_utilities_1 = require("@sapphire/discord.js-utilities");
-const ExtendedArgument_1 = require("../lib/structures/ExtendedArgument");
-class CoreArgument extends ExtendedArgument_1.ExtendedArgument {
+require("../lib/errors/Identifiers");
+const resolvers_1 = require("../lib/resolvers");
+const Argument_1 = require("../lib/structures/Argument");
+class CoreArgument extends Argument_1.Argument {
     constructor(context) {
-        super(context, {
-            name: 'guildCategoryChannel',
-            baseArgument: 'guildChannel'
-        });
+        super(context, { name: 'guildCategoryChannel' });
     }
-    handle(channel, context) {
-        return discord_js_utilities_1.isCategoryChannel(channel)
-            ? this.ok(channel)
-            : this.error({
-                parameter: context.parameter,
-                message: 'The argument did not resolve to a server category channel.',
-                context: { ...context, channel }
+    run(parameter, context) {
+        const { guild } = context.message;
+        if (!guild) {
+            return this.error({
+                parameter,
+                identifier: "guildChannelMissingGuildError" /* ArgumentGuildChannelMissingGuildError */,
+                message: 'This command can only be used in a server.',
+                context
             });
+        }
+        const resolved = resolvers_1.resolveGuildCategoryChannel(parameter, guild);
+        if (resolved.success)
+            return this.ok(resolved.value);
+        return this.error({
+            parameter,
+            identifier: resolved.error,
+            message: 'The argument did not resolve to a valid server category channel.',
+            context: { ...context, guild }
+        });
     }
@@ -22,0 +31,0 @@ }

dist/arguments/CoreGuildChannel.js

 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.CoreArgument = void 0;
-const discord_utilities_1 = require("@sapphire/discord-utilities");
 require("../lib/errors/Identifiers");
+const resolvers_1 = require("../lib/resolvers");
 const Argument_1 = require("../lib/structures/Argument");
@@ -16,26 +16,19 @@ class CoreArgument extends Argument_1.Argument {
                 parameter,
-                identifier: "guildChannelMissingGuild" /* ArgumentGuildChannelMissingGuild */,
-                message: 'The argument must be run in a guild.',
-                context: { ...context, guild }
+                identifier: "guildChannelMissingGuildError" /* ArgumentGuildChannelMissingGuildError */,
+                message: 'This command can only be used in a server.',
+                context
             });
         }
-        const channel = this.resolveById(parameter, guild) ?? this.resolveByQuery(parameter, guild);
-        return channel
-            ? this.ok(channel)
-            : this.error({
-                parameter,
-                message: 'The argument did not resolve to a guild channel.',
-                context: { ...context, guild }
-            });
+        const resolved = resolvers_1.resolveGuildChannel(parameter, guild);
+        if (resolved.success)
+            return this.ok(resolved.value);
+        return this.error({
+            parameter,
+            identifier: resolved.error,
+            message: 'The argument did not resolve to a valid server channel.',
+            context: { ...context, guild }
+        });
     }
-    resolveById(argument, guild) {
-        const channelId = discord_utilities_1.ChannelMentionRegex.exec(argument) ?? discord_utilities_1.SnowflakeRegex.exec(argument);
-        return channelId ? guild.channels.cache.get(channelId[1]) ?? null : null;
-    }
-    resolveByQuery(argument, guild) {
-        const lowerCaseArgument = argument.toLowerCase();
-        return guild.channels.cache.find((channel) => channel.name.toLowerCase() === lowerCaseArgument) ?? null;
-    }
 }
 exports.CoreArgument = CoreArgument;
 //# sourceMappingURL=CoreGuildChannel.js.map

dist/arguments/CoreGuildNewsChannel.js

 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.CoreArgument = void 0;
-const discord_js_utilities_1 = require("@sapphire/discord.js-utilities");
-const ExtendedArgument_1 = require("../lib/structures/ExtendedArgument");
-class CoreArgument extends ExtendedArgument_1.ExtendedArgument {
+require("../lib/errors/Identifiers");
+const resolvers_1 = require("../lib/resolvers");
+const Argument_1 = require("../lib/structures/Argument");
+class CoreArgument extends Argument_1.Argument {
     constructor(context) {
-        super(context, {
-            name: 'guildNewsChannel',
-            baseArgument: 'guildChannel'
-        });
+        super(context, { name: 'guildNewsChannel' });
     }
-    handle(channel, context) {
-        return discord_js_utilities_1.isNewsChannel(channel)
-            ? this.ok(channel)
-            : this.error({
-                parameter: context.parameter,
-                message: 'The argument did not resolve to a server announcement channel.',
-                context: { ...context, channel }
+    run(parameter, context) {
+        const { guild } = context.message;
+        if (!guild) {
+            return this.error({
+                parameter,
+                identifier: "guildChannelMissingGuildError" /* ArgumentGuildChannelMissingGuildError */,
+                message: 'This command can only be used in a server.',
+                context
             });
+        }
+        const resolved = resolvers_1.resolveGuildNewsChannel(parameter, guild);
+        if (resolved.success)
+            return this.ok(resolved.value);
+        return this.error({
+            parameter,
+            identifier: resolved.error,
+            message: 'The given argument did not resolve to a valid announcements channel.',
+            context: { ...context, guild }
+        });
     }
@@ -22,0 +31,0 @@ }

dist/arguments/CoreGuildNewsThreadChannel.js

 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.CoreArgument = void 0;
-const ExtendedArgument_1 = require("../lib/structures/ExtendedArgument");
-class CoreArgument extends ExtendedArgument_1.ExtendedArgument {
+require("../lib/errors/Identifiers");
+const resolvers_1 = require("../lib/resolvers");
+const Argument_1 = require("../lib/structures/Argument");
+class CoreArgument extends Argument_1.Argument {
     constructor(context) {
-        super(context, {
-            name: 'guildNewsThreadChannel',
-            baseArgument: 'guildThreadChannel'
-        });
+        super(context, { name: 'guildNewsThreadChannel' });
     }
-    handle(channel, context) {
-        return channel.type === 'GUILD_NEWS_THREAD'
-            ? this.ok(channel)
-            : this.error({
-                parameter: context.parameter,
-                message: 'The argument did not resolve to a server announcement thread channel.',
-                context: { ...context, channel }
+    run(parameter, context) {
+        const { guild } = context.message;
+        if (!guild) {
+            return this.error({
+                parameter,
+                identifier: "guildChannelMissingGuildError" /* ArgumentGuildChannelMissingGuildError */,
+                message: 'This command can only be used in a server.',
+                context
             });
+        }
+        const resolved = resolvers_1.resolveGuildNewsThreadChannel(parameter, guild);
+        if (resolved.success)
+            return this.ok(resolved.value);
+        return this.error({
+            parameter,
+            identifier: resolved.error,
+            message: 'The given argument did not resolve to a valid announcements thread.',
+            context: { ...context, guild }
+        });
     }
@@ -21,0 +31,0 @@ }

dist/arguments/CoreGuildPrivateThreadChannel.js

 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.CoreArgument = void 0;
-const ExtendedArgument_1 = require("../lib/structures/ExtendedArgument");
-class CoreArgument extends ExtendedArgument_1.ExtendedArgument {
+require("../lib/errors/Identifiers");
+const resolvers_1 = require("../lib/resolvers");
+const Argument_1 = require("../lib/structures/Argument");
+class CoreArgument extends Argument_1.Argument {
     constructor(context) {
-        super(context, {
-            name: 'guildPrivateThreadChannel',
-            baseArgument: 'guildThreadChannel'
-        });
+        super(context, { name: 'guildPrivateThreadChannel' });
     }
-    handle(channel, context) {
-        return channel.type === 'GUILD_PRIVATE_THREAD'
-            ? this.ok(channel)
-            : this.error({
-                parameter: context.parameter,
-                message: 'The argument did not resolve to a private server thread channel.',
-                context: { ...context, channel }
+    run(parameter, context) {
+        const { guild } = context.message;
+        if (!guild) {
+            return this.error({
+                parameter,
+                identifier: "guildChannelMissingGuildError" /* ArgumentGuildChannelMissingGuildError */,
+                message: 'This command can only be used in a server.',
+                context
             });
+        }
+        const resolved = resolvers_1.resolveGuildPrivateThreadChannel(parameter, guild);
+        if (resolved.success)
+            return this.ok(resolved.value);
+        return this.error({
+            parameter,
+            identifier: resolved.error,
+            message: 'The given argument did not resolve to a valid private thread.',
+            context: { ...context, guild }
+        });
     }
@@ -21,0 +31,0 @@ }

dist/arguments/CoreGuildPublicThreadChannel.js

 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.CoreArgument = void 0;
-const ExtendedArgument_1 = require("../lib/structures/ExtendedArgument");
-class CoreArgument extends ExtendedArgument_1.ExtendedArgument {
+require("../lib/errors/Identifiers");
+const resolvers_1 = require("../lib/resolvers");
+const Argument_1 = require("../lib/structures/Argument");
+class CoreArgument extends Argument_1.Argument {
     constructor(context) {
-        super(context, {
-            name: 'guildPublicThreadChannel',
-            baseArgument: 'guildThreadChannel'
-        });
+        super(context, { name: 'guildPublicThreadChannel' });
     }
-    handle(channel, context) {
-        return channel.type === 'GUILD_PUBLIC_THREAD'
-            ? this.ok(channel)
-            : this.error({
-                parameter: context.parameter,
-                message: 'The argument did not resolve to a public server thread channel.',
-                context: { ...context, channel }
+    run(parameter, context) {
+        const { guild } = context.message;
+        if (!guild) {
+            return this.error({
+                parameter,
+                identifier: "guildChannelMissingGuildError" /* ArgumentGuildChannelMissingGuildError */,
+                message: 'This command can only be used in a server.',
+                context
             });
+        }
+        const resolved = resolvers_1.resolveGuildPublicThreadChannel(parameter, guild);
+        if (resolved.success)
+            return this.ok(resolved.value);
+        return this.error({
+            parameter,
+            identifier: resolved.error,
+            message: 'The given argument did not resolve to a valid public thread.',
+            context: { ...context, guild }
+        });
     }
@@ -21,0 +31,0 @@ }

dist/arguments/CoreGuildStageVoiceChannel.js

 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.CoreArgument = void 0;
-const ExtendedArgument_1 = require("../lib/structures/ExtendedArgument");
-class CoreArgument extends ExtendedArgument_1.ExtendedArgument {
+require("../lib/errors/Identifiers");
+const resolvers_1 = require("../lib/resolvers");
+const Argument_1 = require("../lib/structures/Argument");
+class CoreArgument extends Argument_1.Argument {
     constructor(context) {
-        super(context, {
-            name: 'guildStageVoiceChannel',
-            baseArgument: 'guildChannel'
-        });
+        super(context, { name: 'guildStageVoiceChannel' });
     }
-    handle(channel, context) {
-        return channel.type === 'GUILD_STAGE_VOICE'
-            ? this.ok(channel)
-            : this.error({
-                parameter: context.parameter,
-                message: 'The argument did not resolve to a server stage voice channel.',
-                context: { ...context, channel }
+    run(parameter, context) {
+        const { guild } = context.message;
+        if (!guild) {
+            return this.error({
+                parameter,
+                identifier: "guildChannelMissingGuildError" /* ArgumentGuildChannelMissingGuildError */,
+                message: 'This command can only be used in a server.',
+                context
             });
+        }
+        const resolved = resolvers_1.resolveGuildStageVoiceChannel(parameter, guild);
+        if (resolved.success)
+            return this.ok(resolved.value);
+        return this.error({
+            parameter,
+            identifier: resolved.error,
+            message: 'The given argument did not resolve to a valid stage voice channel.',
+            context: { ...context, guild }
+        });
     }
@@ -21,0 +31,0 @@ }

dist/arguments/CoreGuildTextChannel.js

 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.CoreArgument = void 0;
-const discord_js_utilities_1 = require("@sapphire/discord.js-utilities");
-const ExtendedArgument_1 = require("../lib/structures/ExtendedArgument");
-class CoreArgument extends ExtendedArgument_1.ExtendedArgument {
+require("../lib/errors/Identifiers");
+const resolvers_1 = require("../lib/resolvers");
+const Argument_1 = require("../lib/structures/Argument");
+class CoreArgument extends Argument_1.Argument {
     constructor(context) {
-        super(context, {
-            name: 'guildTextChannel',
-            baseArgument: 'guildChannel'
-        });
+        super(context, { name: 'guildTextChannel' });
     }
-    handle(channel, context) {
-        return discord_js_utilities_1.isTextChannel(channel)
-            ? this.ok(channel)
-            : this.error({
-                parameter: context.parameter,
-                message: 'The argument did not resolve to a server text channel.',
-                context: { ...context, channel }
+    run(parameter, context) {
+        const { guild } = context.message;
+        if (!guild) {
+            return this.error({
+                parameter,
+                identifier: "guildChannelMissingGuildError" /* ArgumentGuildChannelMissingGuildError */,
+                message: 'This command can only be used in a server.',
+                context
             });
+        }
+        const resolved = resolvers_1.resolveGuildTextChannel(parameter, guild);
+        if (resolved.success)
+            return this.ok(resolved.value);
+        return this.error({
+            parameter,
+            identifier: resolved.error,
+            message: 'The given argument did not resolve to a valid text channel.',
+            context: { ...context, guild }
+        });
     }
@@ -22,0 +31,0 @@ }

dist/arguments/CoreGuildThreadChannel.js

 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.CoreArgument = void 0;
-const ExtendedArgument_1 = require("../lib/structures/ExtendedArgument");
-class CoreArgument extends ExtendedArgument_1.ExtendedArgument {
+require("../lib/errors/Identifiers");
+const resolvers_1 = require("../lib/resolvers");
+const Argument_1 = require("../lib/structures/Argument");
+class CoreArgument extends Argument_1.Argument {
     constructor(context) {
-        super(context, {
-            name: 'guildThreadChannel',
-            baseArgument: 'guildChannel'
-        });
+        super(context, { name: 'guildThreadChannel' });
     }
-    handle(channel, context) {
-        return channel.isThread()
-            ? this.ok(channel)
-            : this.error({
-                parameter: context.parameter,
-                message: 'The argument did not resolve to a server thread channel.',
-                context: { ...context, channel }
+    run(parameter, context) {
+        const { guild } = context.message;
+        if (!guild) {
+            return this.error({
+                parameter,
+                identifier: "guildChannelMissingGuildError" /* ArgumentGuildChannelMissingGuildError */,
+                message: 'This command can only be used in a server.',
+                context
             });
+        }
+        const resolved = resolvers_1.resolveGuildThreadChannel(parameter, guild);
+        if (resolved.success)
+            return this.ok(resolved.value);
+        return this.error({
+            parameter,
+            identifier: resolved.error,
+            message: 'The given argument did not resolve to a valid thread.',
+            context: { ...context, guild }
+        });
     }
@@ -21,0 +31,0 @@ }

dist/arguments/CoreGuildVoiceChannel.js

 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.CoreArgument = void 0;
-const discord_js_utilities_1 = require("@sapphire/discord.js-utilities");
-const ExtendedArgument_1 = require("../lib/structures/ExtendedArgument");
-class CoreArgument extends ExtendedArgument_1.ExtendedArgument {
+require("../lib/errors/Identifiers");
+const resolvers_1 = require("../lib/resolvers");
+const Argument_1 = require("../lib/structures/Argument");
+class CoreArgument extends Argument_1.Argument {
     constructor(context) {
-        super(context, {
-            name: 'guildVoiceChannel',
-            baseArgument: 'guildChannel'
-        });
+        super(context, { name: 'guildVoiceChannel' });
     }
-    handle(channel, context) {
-        return discord_js_utilities_1.isVoiceChannel(channel)
-            ? this.ok(channel)
-            : this.error({
-                parameter: context.parameter,
-                message: 'The argument did not resolve to a server voice channel.',
-                context: { ...context, channel }
+    run(parameter, context) {
+        const { guild } = context.message;
+        if (!guild) {
+            return this.error({
+                parameter,
+                identifier: "guildChannelMissingGuildError" /* ArgumentGuildChannelMissingGuildError */,
+                message: 'This command can only be used in a server.',
+                context
             });
+        }
+        const resolved = resolvers_1.resolveGuildVoiceChannel(parameter, guild);
+        if (resolved.success)
+            return this.ok(resolved.value);
+        return this.error({
+            parameter,
+            identifier: resolved.error,
+            message: 'The given argument did not resolve to a valid voice channel.',
+            context: { ...context, guild }
+        });
     }
@@ -22,0 +31,0 @@ }

dist/arguments/CoreHyperlink.js

 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.CoreArgument = void 0;
-const url_1 = require("url");
+const resolvers_1 = require("../lib/resolvers");
 const Argument_1 = require("../lib/structures/Argument");
@@ -11,8 +11,11 @@ class CoreArgument extends Argument_1.Argument {
     run(parameter, context) {
-        try {
-            return this.ok(new url_1.URL(parameter));
-        }
-        catch {
-            return this.error({ parameter, message: 'The argument did not resolve to a valid URL.', context });
-        }
+        const resolved = resolvers_1.resolveHyperlink(parameter);
+        if (resolved.success)
+            return this.ok(resolved.value);
+        return this.error({
+            parameter,
+            identifier: resolved.error,
+            message: 'The argument did not resolve to a valid URL.',
+            context
+        });
     }
@@ -19,0 +22,0 @@ }

dist/arguments/CoreInteger.js

@@ -5,2 +5,3 @@ "use strict";
 require("../lib/errors/Identifiers");
+const resolvers_1 = require("../lib/resolvers");
 const Argument_1 = require("../lib/structures/Argument");
@@ -10,29 +11,18 @@ class CoreArgument extends Argument_1.Argument {
         super(context, { name: 'integer' });
+        this.messages = {
+            ["integerTooSmall" /* ArgumentIntegerTooSmall */]: ({ minimum }) => `The given number must be greater than ${minimum}.`,
+            ["integerTooLarge" /* ArgumentIntegerTooLarge */]: ({ maximum }) => `The given number must be less than ${maximum}.`,
+            ["integerError" /* ArgumentIntegerError */]: () => 'The argument did not resolve to a valid number.'
+        };
     }
     run(parameter, context) {
-        const parsed = Number(parameter);
-        if (!Number.isInteger(parsed)) {
-            return this.error({
-                parameter,
-                message: 'The argument did not resolve to an integer.',
-                context
-            });
-        }
-        if (typeof context.minimum === 'number' && parsed < context.minimum) {
-            return this.error({
-                parameter,
-                identifier: "integerTooSmall" /* ArgumentIntegerTooSmall */,
-                message: `The argument must be greater than ${context.minimum}.`,
-                context
-            });
-        }
-        if (typeof context.maximum === 'number' && parsed > context.maximum) {
-            return this.error({
-                parameter,
-                identifier: "integerTooBig" /* ArgumentIntegerTooBig */,
-                message: `The argument must be less than ${context.maximum}.`,
-                context
-            });
-        }
-        return this.ok(parsed);
+        const resolved = resolvers_1.resolveInteger(parameter, { minimum: context.minimum, maximum: context.maximum });
+        if (resolved.success)
+            return this.ok(resolved.value);
+        return this.error({
+            parameter,
+            identifier: resolved.error,
+            message: this.messages[resolved.error](context),
+            context
+        });
     }
@@ -39,0 +29,0 @@ }

dist/arguments/CoreMember.js

 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.CoreArgument = void 0;
-const discord_utilities_1 = require("@sapphire/discord-utilities");
 require("../lib/errors/Identifiers");
+const resolvers_1 = require("../lib/resolvers");
 const Argument_1 = require("../lib/structures/Argument");
@@ -17,30 +17,18 @@ class CoreArgument extends Argument_1.Argument {
                 identifier: "memberMissingGuild" /* ArgumentMemberMissingGuild */,
-                message: 'The argument must be run on a guild.',
-                context: { ...context, guild }
+                message: 'This command can only be used in a server.',
+                context
             });
         }
-        const member = (await this.resolveById(parameter, guild)) ?? (await this.resolveByQuery(parameter, guild));
-        return member
-            ? this.ok(member)
-            : this.error({
-                parameter,
-                message: 'The argument did not resolve to a member.',
-                context: { ...context, guild }
-            });
+        const resolved = await resolvers_1.resolveMember(parameter, guild);
+        if (resolved.success)
+            return this.ok(resolved.value);
+        return this.error({
+            parameter,
+            identifier: resolved.error,
+            message: 'The given argument did not resolve to a server member.',
+            context: { ...context, guild }
+        });
     }
-    async resolveById(argument, guild) {
-        const memberId = discord_utilities_1.UserOrMemberMentionRegex.exec(argument) ?? discord_utilities_1.SnowflakeRegex.exec(argument);
-        return memberId ? guild.members.fetch(memberId[1]).catch(() => null) : null;
-    }
-    async resolveByQuery(argument, guild) {
-        const members = await guild.members
-            .fetch({
-            query: argument,
-            limit: 1
-        })
-            .catch(() => null);
-        return members?.first() ?? null;
-    }
 }
 exports.CoreArgument = CoreArgument;
 //# sourceMappingURL=CoreMember.js.map

dist/arguments/CoreMessage.js

 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.CoreArgument = void 0;
-const discord_js_utilities_1 = require("@sapphire/discord.js-utilities");
-const discord_js_1 = require("discord.js");
+const resolvers_1 = require("../lib/resolvers");
 const Argument_1 = require("../lib/structures/Argument");
@@ -13,37 +12,14 @@ class CoreArgument extends Argument_1.Argument {
         const channel = context.channel ?? context.message.channel;
-        const message = (await this.resolveById(parameter, channel)) ?? (await this.resolveByLink(parameter, context));
-        return message
-            ? this.ok(message)
-            : this.error({
-                parameter,
-                message: 'The argument did not resolve to a message.',
-                context: { ...context, channel }
-            });
+        const resolved = await resolvers_1.resolveMessage(parameter, { message: context.message, channel: context.channel });
+        if (resolved.success)
+            return this.ok(resolved.value);
+        return this.error({
+            parameter,
+            identifier: resolved.error,
+            message: 'The given argument did not resolve to a message.',
+            context: { ...context, channel }
+        });
     }
-    resolveById(argument, channel) {
-        return discord_js_utilities_1.SnowflakeRegex.test(argument) ? channel.messages.fetch(argument).catch(() => null) : null;
-    }
-    async resolveByLink(argument, { message }) {
-        if (!message.guild)
-            return null;
-        const matches = discord_js_utilities_1.MessageLinkRegex.exec(argument);
-        if (!matches)
-            return null;
-        const [, guildId, channelId, messageId] = matches;
-        const guild = this.container.client.guilds.cache.get(guildId);
-        if (guild !== message.guild)
-            return null;
-        const channel = guild.channels.cache.get(channelId);
-        if (!channel)
-            return null;
-        if (!(discord_js_utilities_1.isNewsChannel(channel) || discord_js_utilities_1.isTextChannel(channel)))
-            return null;
-        if (!channel.viewable)
-            return null;
-        if (!channel.permissionsFor(message.author)?.has(discord_js_1.Permissions.FLAGS.VIEW_CHANNEL))
-            return null;
-        return channel.messages.fetch(messageId).catch(() => null);
-    }
 }
 exports.CoreArgument = CoreArgument;
 //# sourceMappingURL=CoreMessage.js.map

dist/arguments/CoreNumber.js

@@ -5,2 +5,3 @@ "use strict";
 require("../lib/errors/Identifiers");
+const resolvers_1 = require("../lib/resolvers");
 const Argument_1 = require("../lib/structures/Argument");
@@ -10,29 +11,18 @@ class CoreArgument extends Argument_1.Argument {
         super(context, { name: 'number' });
+        this.messages = {
+            ["numberTooSmall" /* ArgumentNumberTooSmall */]: ({ minimum }) => `The given number must be greater than ${minimum}.`,
+            ["numberTooLarge" /* ArgumentNumberTooLarge */]: ({ maximum }) => `The given number must be less than ${maximum}.`,
+            ["numberError" /* ArgumentNumberError */]: () => 'The argument did not resolve to a valid number.'
+        };
     }
     run(parameter, context) {
-        const parsed = Number(parameter);
-        if (Number.isNaN(parsed)) {
-            return this.error({
-                parameter,
-                message: 'The argument did not resolve to a valid number.',
-                context
-            });
-        }
-        if (typeof context.minimum === 'number' && parsed < context.minimum) {
-            return this.error({
-                parameter,
-                identifier: "numberTooSmall" /* ArgumentNumberTooSmall */,
-                message: `The argument must be greater than ${context.minimum}.`,
-                context
-            });
-        }
-        if (typeof context.maximum === 'number' && parsed > context.maximum) {
-            return this.error({
-                parameter,
-                identifier: "numberTooBig" /* ArgumentNumberTooBig */,
-                message: `The argument must be smaller than ${context.maximum}.`,
-                context
-            });
-        }
-        return this.ok(parsed);
+        const resolved = resolvers_1.resolveNumber(parameter, { minimum: context.minimum, maximum: context.maximum });
+        if (resolved.success)
+            return this.ok(resolved.value);
+        return this.error({
+            parameter,
+            identifier: resolved.error,
+            message: this.messages[resolved.error](context),
+            context
+        });
     }
@@ -39,0 +29,0 @@ }

dist/arguments/CoreRole.js

 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.CoreArgument = void 0;
-const discord_utilities_1 = require("@sapphire/discord-utilities");
 require("../lib/errors/Identifiers");
+const resolvers_1 = require("../lib/resolvers");
 const Argument_1 = require("../lib/structures/Argument");
@@ -17,19 +17,18 @@ class CoreArgument extends Argument_1.Argument {
                 identifier: "roleMissingGuild" /* ArgumentRoleMissingGuild */,
-                message: 'The argument must be run on a guild.',
+                message: 'This command can only be used in a server.',
                 context
             });
         }
-        const role = (await this.resolveById(parameter, guild)) ?? this.resolveByQuery(parameter, guild);
-        return role ? this.ok(role) : this.error({ parameter, message: 'The argument did not resolve to a role.', context });
+        const resolved = await resolvers_1.resolveRole(parameter, guild);
+        if (resolved.success)
+            return this.ok(resolved.value);
+        return this.error({
+            parameter,
+            identifier: resolved.error,
+            message: 'The given argument did not resolve to a role.',
+            context: { ...context, guild }
+        });
     }
-    async resolveById(argument, guild) {
-        const roleId = discord_utilities_1.RoleMentionRegex.exec(argument) ?? discord_utilities_1.SnowflakeRegex.exec(argument);
-        return roleId ? guild.roles.fetch(roleId[1]).catch(() => null) : null;
-    }
-    resolveByQuery(argument, guild) {
-        const lowerCaseArgument = argument.toLowerCase();
-        return guild.roles.cache.find((role) => role.name.toLowerCase() === lowerCaseArgument) ?? null;
-    }
 }
 exports.CoreArgument = CoreArgument;
 //# sourceMappingURL=CoreRole.js.map

dist/arguments/CoreString.js

@@ -5,2 +5,3 @@ "use strict";
 require("../lib/errors/Identifiers");
+const resolvers_1 = require("../lib/resolvers");
 const Argument_1 = require("../lib/structures/Argument");
@@ -10,21 +11,17 @@ class CoreArgument extends Argument_1.Argument {
         super(context, { name: 'string' });
+        this.messages = {
+            ["stringTooShort" /* ArgumentStringTooShort */]: ({ minimum }) => `The argument must be longer than ${minimum} characters.`,
+            ["stringTooLong" /* ArgumentStringTooLong */]: ({ maximum }) => `The argument must be shorter than ${maximum} characters.`
+        };
     }
     run(parameter, context) {
-        if (typeof context.minimum === 'number' && parameter.length < context.minimum) {
-            return this.error({
-                parameter,
-                identifier: "stringTooShort" /* ArgumentStringTooShort */,
-                message: `The argument must be longer than ${context.minimum} characters.`,
-                context
-            });
-        }
-        if (typeof context.maximum === 'number' && parameter.length > context.maximum) {
-            return this.error({
-                parameter,
-                identifier: "stringTooLong" /* ArgumentStringTooLong */,
-                message: `The argument must be shorter than ${context.maximum} characters.`,
-                context
-            });
-        }
-        return this.ok(parameter);
+        const resolved = resolvers_1.resolveString(parameter, { minimum: context?.minimum, maximum: context?.maximum });
+        if (resolved.success)
+            return this.ok(resolved.value);
+        return this.error({
+            parameter,
+            identifier: resolved.error,
+            message: this.messages[resolved.error](context),
+            context
+        });
     }
@@ -31,0 +28,0 @@ }

dist/arguments/CoreUser.js

 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.CoreArgument = void 0;
-const discord_utilities_1 = require("@sapphire/discord-utilities");
+const resolvers_1 = require("../lib/resolvers");
 const Argument_1 = require("../lib/structures/Argument");
@@ -11,5 +11,11 @@ class CoreArgument extends Argument_1.Argument {
     async run(parameter, context) {
-        const userId = discord_utilities_1.UserOrMemberMentionRegex.exec(parameter) ?? discord_utilities_1.SnowflakeRegex.exec(parameter);
-        const user = userId ? await this.container.client.users.fetch(userId[1]).catch(() => null) : null;
-        return user ? this.ok(user) : this.error({ parameter, message: 'The argument did not resolve to a user.', context });
+        const resolved = await resolvers_1.resolveUser(parameter);
+        if (resolved.success)
+            return this.ok(resolved.value);
+        return this.error({
+            parameter,
+            identifier: resolved.error,
+            message: 'The given argument did not resolve to a Discord user.',
+            context
+        });
     }
@@ -16,0 +22,0 @@ }

dist/index.js

@@ -1,6 +0,6 @@
-/* Version: 2.0.0-next.2bb2e122.0 - August 23, 2021 17:57:26 */
+/* Version: 2.0.0-next.2d21b038.0 - August 25, 2021 14:03:07 */
 'use strict';
 
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.version = exports.ClientPermissionsCorePrecondition = exports.StoreRegistry = exports.Store = exports.Piece = exports.MissingExportsError = exports.LoaderError = exports.container = exports.AliasStore = exports.AliasPiece = void 0;
+exports.version = exports.ClientPermissionsCorePrecondition = exports.Resolvers = exports.StoreRegistry = exports.Store = exports.Piece = exports.MissingExportsError = exports.LoaderError = exports.container = exports.AliasStore = exports.AliasPiece = void 0;
 const tslib_1 = require("tslib");
@@ -26,2 +26,3 @@ var pieces_1 = require("@sapphire/pieces");
 tslib_1.__exportStar(require("./lib/plugins/symbols"), exports);
+exports.Resolvers = tslib_1.__importStar(require("./lib/resolvers"));
 tslib_1.__exportStar(require("./lib/SapphireClient"), exports);
@@ -51,2 +52,2 @@ tslib_1.__exportStar(require("./lib/structures/Argument"), exports);
 Object.defineProperty(exports, "ClientPermissionsCorePrecondition", { enumerable: true, get: function () { return ClientPermissions_1.CorePrecondition; } });
-exports.version = '2.0.0-next.2bb2e122.0';
+exports.version = '2.0.0-next.2d21b038.0';

dist/lib/errors/Identifiers.js

@@ -6,34 +6,39 @@ "use strict";
 (function (Identifiers) {
-    Identifiers["ArgumentBoolean"] = "boolean";
-    Identifiers["ArgumentCategoryChannel"] = "categoryChannel";
-    Identifiers["ArgumentChannel"] = "channel";
-    Identifiers["ArgumentDate"] = "date";
-    Identifiers["ArgumentDateTooSmall"] = "dateTooSmall";
-    Identifiers["ArgumentDateTooBig"] = "dateTooBig";
-    Identifiers["ArgumentDMChannel"] = "dmChannel";
-    Identifiers["ArgumentFloat"] = "float";
+    Identifiers["ArgsMissing"] = "argsMissing";
+    Identifiers["ArgsUnavailable"] = "argsUnavailable";
+    Identifiers["ArgumentBooleanError"] = "booleanError";
+    Identifiers["ArgumentChannelError"] = "channelError";
+    Identifiers["ArgumentDateError"] = "dateError";
+    Identifiers["ArgumentDateTooEarly"] = "dateTooEarly";
+    Identifiers["ArgumentDateTooFar"] = "dateTooFar";
+    Identifiers["ArgumentDMChannelError"] = "dmChannelError";
+    Identifiers["ArgumentFloatError"] = "floatError";
+    Identifiers["ArgumentFloatTooLarge"] = "floatTooLarge";
     Identifiers["ArgumentFloatTooSmall"] = "floatTooSmall";
-    Identifiers["ArgumentFloatTooBig"] = "floatTooBig";
-    Identifiers["ArgumentGuildChannel"] = "guildChannel";
-    Identifiers["ArgumentGuildChannelMissingGuild"] = "guildChannelMissingGuild";
-    Identifiers["ArgumentHyperlink"] = "hyperlink";
-    Identifiers["ArgumentInteger"] = "integer";
+    Identifiers["ArgumentGuildCategoryChannelError"] = "categoryChannelError";
+    Identifiers["ArgumentGuildChannelError"] = "guildChannelError";
+    Identifiers["ArgumentGuildChannelMissingGuildError"] = "guildChannelMissingGuildError";
+    Identifiers["ArgumentGuildNewsChannelError"] = "guildNewsChannelError";
+    Identifiers["ArgumentGuildNewsThreadChannelError"] = "guildNewsChannelError";
+    Identifiers["ArgumentGuildPrivateThreadChannelError"] = "guildPrivateThreadChannelError";
+    Identifiers["ArgumentGuildPublicThreadChannelError"] = "guildPublicThreadChannelError";
+    Identifiers["ArgumentGuildStageVoiceChannelError"] = "guildStageVoiceChannelError";
+    Identifiers["ArgumentGuildTextChannelError"] = "guildTextChannelError";
+    Identifiers["ArgumentGuildThreadChannelError"] = "guildThreadChannelError";
+    Identifiers["ArgumentGuildVoiceChannelError"] = "guildVoiceChannelError";
+    Identifiers["ArgumentHyperlinkError"] = "hyperlinkError";
+    Identifiers["ArgumentIntegerError"] = "integerError";
+    Identifiers["ArgumentIntegerTooLarge"] = "integerTooLarge";
     Identifiers["ArgumentIntegerTooSmall"] = "integerTooSmall";
-    Identifiers["ArgumentIntegerTooBig"] = "integerTooBig";
-    Identifiers["ArgumentMember"] = "member";
+    Identifiers["ArgumentMemberError"] = "memberError";
     Identifiers["ArgumentMemberMissingGuild"] = "memberMissingGuild";
-    Identifiers["ArgumentMessage"] = "message";
-    Identifiers["ArgumentNewsChannel"] = "newsChannel";
-    Identifiers["ArgumentNumber"] = "number";
+    Identifiers["ArgumentMessageError"] = "messageError";
+    Identifiers["ArgumentNumberError"] = "numberError";
+    Identifiers["ArgumentNumberTooLarge"] = "numberTooLarge";
     Identifiers["ArgumentNumberTooSmall"] = "numberTooSmall";
-    Identifiers["ArgumentNumberTooBig"] = "numberTooBig";
-    Identifiers["ArgumentRole"] = "role";
+    Identifiers["ArgumentRoleError"] = "roleError";
     Identifiers["ArgumentRoleMissingGuild"] = "roleMissingGuild";
+    Identifiers["ArgumentStringTooLong"] = "stringTooLong";
     Identifiers["ArgumentStringTooShort"] = "stringTooShort";
-    Identifiers["ArgumentStringTooLong"] = "stringTooLong";
-    Identifiers["ArgumentTextChannel"] = "textChannel";
-    Identifiers["ArgumentUser"] = "user";
-    Identifiers["ArgumentVoiceChannel"] = "voiceChannel";
-    Identifiers["ArgsUnavailable"] = "argsUnavailable";
-    Identifiers["ArgsMissing"] = "argsMissing";
+    Identifiers["ArgumentUserError"] = "userError";
     Identifiers["CommandDisabled"] = "commandDisabled";
@@ -40,0 +45,0 @@ Identifiers["PreconditionCooldown"] = "preconditionCooldown";

dist/lib/structures/Command.js

 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.CommandPreConditions = exports.Command = void 0;
+exports.CommandPreConditions = exports.CommandOptionsRunTypeEnum = exports.Command = void 0;
 const tslib_1 = require("tslib");
@@ -9,2 +9,3 @@ const pieces_1 = require("@sapphire/pieces");
 const Lexure = tslib_1.__importStar(require("lexure"));
+const path_1 = require("path");
 const Args_1 = require("../parsers/Args");
@@ -23,2 +24,11 @@ require("../types/Enums");
         /**
+         * The full category for the command. Either an array of strings that denote every (sub)folder the command is in,
+         * or `null` if it could not be resolved automatically.
+         *
+         * If this is `null` for how you setup your code then you can overwrite how the `fullCategory` is resolved by
+         * extending this class and overwriting the assignment in the constructor.
+         * @since 2.0.0
+         */
+        this.fullCategory = null;
+        /**
          * The lexer to be used for command parsing
@@ -37,2 +47,15 @@ * @since 1.0.0
         ]);
+        if (options.fullCategory) {
+            this.fullCategory = options.fullCategory;
+        }
+        else {
+            const commandsFolders = [...this.container.stores.get('commands').paths.values()].map((p) => p.split(path_1.sep).pop() ?? '');
+            const commandPath = context.path.split(path_1.sep);
+            for (const commandFolder of commandsFolders) {
+                if (commandPath.includes(commandFolder)) {
+                    this.fullCategory = commandPath.slice(commandPath.indexOf(commandFolder) + 1, -1);
+                    break;
+                }
+            }
+        }
         if (options.generateDashLessAliases) {
@@ -62,2 +85,38 @@ const dashLessAliases = [];
     /**
+     * Get all the main categories of commands.
+     */
+    get categories() {
+        return Array.from(new Set([...this.container.stores.get('commands').values()].map(({ category }) => category)));
+    }
+    /**
+     * The main category for the command, if any.
+     * This is resolved from {@link Command.fullCategory}, which is automatically
+     * resolved in the constructor. If you need different logic for category
+     * then please first look into overwriting {@link Command.fullCategory} before
+     * looking to overwrite this getter.
+     */
+    get category() {
+        return (this.fullCategory?.length ?? 0) > 0 ? this.fullCategory?.[0] ?? null : null;
+    }
+    /**
+     * The sub category for the command
+     * This is resolved from {@link Command.fullCategory}, which is automatically
+     * resolved in the constructor. If you need different logic for category
+     * then please first look into overwriting {@link Command.fullCategory} before
+     * looking to overwrite this getter.
+     */
+    get subCategory() {
+        return (this.fullCategory?.length ?? 0) > 1 ? this.fullCategory?.[1] ?? null : null;
+    }
+    /**
+     * The parent category for the command
+     * This is resolved from {@link Command.fullCategory}, which is automatically
+     * resolved in the constructor. If you need different logic for category
+     * then please first look into overwriting {@link Command.fullCategory} before
+     * looking to overwrite this getter.
+     */
+    get parentCategory() {
+        return (this.fullCategory?.length ?? 0) > 0 ? this.fullCategory?.[(this.fullCategory?.length ?? 1) - 1] ?? null : null;
+    }
+    /**
      * Defines the JSON.stringify behavior of the command.
@@ -70,2 +129,3 @@ */
             detailedDescription: this.detailedDescription,
+            category: this.category,
             strategy: this.strategy
@@ -222,2 +282,16 @@ };
 /**
+ * The allowed values for {@link CommandOptions.runIn} as an enum.
+ * @since 2.0.0
+ */
+var CommandOptionsRunTypeEnum;
+(function (CommandOptionsRunTypeEnum) {
+    CommandOptionsRunTypeEnum["Dm"] = "DM";
+    CommandOptionsRunTypeEnum["GuildText"] = "GUILD_TEXT";
+    CommandOptionsRunTypeEnum["GuildNews"] = "GUILD_NEWS";
+    CommandOptionsRunTypeEnum["GuildNewsThread"] = "GUILD_NEWS_THREAD";
+    CommandOptionsRunTypeEnum["GuildPublicThread"] = "GUILD_PUBLIC_THREAD";
+    CommandOptionsRunTypeEnum["GuildPrivateThread"] = "GUILD_PRIVATE_THREAD";
+    CommandOptionsRunTypeEnum["GuildAny"] = "GUILD_ANY";
+})(CommandOptionsRunTypeEnum = exports.CommandOptionsRunTypeEnum || (exports.CommandOptionsRunTypeEnum = {}));
+/**
  * The available command pre-conditions.
@@ -224,0 +298,0 @@ * @since 2.0.0

dist/preconditions/UserPermissions.js

@@ -26,3 +26,3 @@ "use strict";
         const channel = message.channel;
-        const permissions = message.guild ? channel.permissionsFor(message.client.id) : this.dmChannelPermissions;
+        const permissions = message.guild ? channel.permissionsFor(message.author) : this.dmChannelPermissions;
         const missing = permissions.missing(required);
@@ -29,0 +29,0 @@ return missing.length === 0

package.json

 {
 	"name": "@sapphire/framework",
-	"version": "2.0.0-next.2bb2e122.0",
+	"version": "2.0.0-next.2d21b038.0",
 	"description": "Discord bot framework built on top of @sapphire/lib for advanced and amazing bots.",
@@ -38,2 +38,3 @@ "main": "dist/index.js",
 		"@commitlint/config-conventional": "^13.1.0",
+		"@favware/npm-deprecate": "^1.0.2",
 		"@favware/rollup-type-bundler": "^1.0.3",
@@ -40,0 +41,0 @@ "@sapphire/eslint-config": "^3.2.3",

No alert changes

Improved metrics

Total package byte prevSize

358362

increased by16.54%

Number of package files

210

increased by31.25%

Lines of code

6076

increased by12.21%

Worsened metrics

Dev dependency count

25

increased by4.17%

No dependency changes