@pikokr/command.ts 3.0.6-dev.292ef89 → 3.0.6-dev.33d39ce

package/dist/command/decorator.js

@@ -75,9 +75,33 @@ const rest = (target, propertyKey, parameterIndex) => {
     Reflect.defineMetadata(constants_1.KRest, parameterIndex, target, propertyKey);
 };
 exports.rest = rest;
-exports.ownerOnly = utils_2.createCheckDecorator((msg) => msg.data.cts.owners.includes(msg.author.id), (i) => i.data.cts.owners.includes(i.user.id));
-exports.guildOnly = utils_2.createCheckDecorator((msg) => !!msg.guild, (i) => !!i.guildId);
-exports.dmOnly = utils_2.createCheckDecorator((msg) => !msg.guild, (i) => !i.guildId);
+exports.ownerOnly = utils_2.createCheckDecorator((msg) => {
+    if (msg.data.cts.owners.includes(msg.author.id))
+        return true;
+    throw new error_1.OwnerOnlyCommandError();
+}, (i) => {
+    if (i.data.cts.owners.includes(i.user.id))
+        return true;
+    throw new error_1.OwnerOnlyCommandError();
+});
+exports.guildOnly = utils_2.createCheckDecorator((msg) => {
+    if (!!msg.guild)
+        return true;
+    throw new error_1.GuildOnlyCommandError();
+}, (i) => {
+    if (!!i.guildId)
+        return true;
+    throw new error_1.GuildOnlyCommandError();
+});
+exports.dmOnly = utils_2.createCheckDecorator((msg) => {
+    if (!msg.guild)
+        return true;
+    throw new error_1.DMOnlyCommandError();
+}, (i) => {
+    if (!i.guildId)
+        return true;
+    throw new error_1.DMOnlyCommandError();
+});
 const requireUserPermissions = (permission) => utils_2.createCheckDecorator((msg) => {
     if (!msg.guild || !msg.member)
         throw new Error('This command must be used in guild.');

package/dist/error/checks/DMOnlyCommand.d.ts

@@ -0,0 +1,3 @@
+export declare class DMOnlyCommandError extends Error {
+    constructor();
+}

package/dist/error/checks/DMOnlyCommand.js

@@ -0,0 +1,9 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.DMOnlyCommandError = void 0;
+class DMOnlyCommandError extends Error {
+    constructor() {
+        super();
+    }
+}
+exports.DMOnlyCommandError = DMOnlyCommandError;

package/dist/error/checks/GuildOnlyCommand.d.ts

@@ -0,0 +1,3 @@
+export declare class GuildOnlyCommandError extends Error {
+    constructor();
+}

package/dist/error/checks/GuildOnlyCommand.js

@@ -0,0 +1,9 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.GuildOnlyCommandError = void 0;
+class GuildOnlyCommandError extends Error {
+    constructor() {
+        super();
+    }
+}
+exports.GuildOnlyCommandError = GuildOnlyCommandError;

package/dist/error/checks/OwnerOnlyCommand.d.ts

@@ -0,0 +1,3 @@
+export declare class OwnerOnlyCommandError extends Error {
+    constructor();
+}

package/dist/error/checks/OwnerOnlyCommand.js

@@ -0,0 +1,9 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.OwnerOnlyCommandError = void 0;
+class OwnerOnlyCommandError extends Error {
+    constructor() {
+        super();
+    }
+}
+exports.OwnerOnlyCommandError = OwnerOnlyCommandError;

package/dist/error/checks/index.d.ts

@@ -0,0 +1,3 @@
+export * from './OwnerOnlyCommand';
+export * from './GuildOnlyCommand';
+export * from './DMOnlyCommand';

package/dist/error/checks/index.js

@@ -0,0 +1,15 @@
+"use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __exportStar = (this && this.__exportStar) || function(m, exports) {
+    for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+__exportStar(require("./OwnerOnlyCommand"), exports);
+__exportStar(require("./GuildOnlyCommand"), exports);
+__exportStar(require("./DMOnlyCommand"), exports);

package/dist/error/index.d.ts

@@ -4,3 +4,4 @@ export * from './ArgumentNotProvided';
 export * from './ArgumentConverterNotFound';
 export * from './CommandCheckFailed';
 export * from './PermissionRequired';
+export * from './checks';

package/dist/error/index.js

@@ -16,3 +16,4 @@ __exportStar(require("./ArgumentNotProvided"), exports);
 __exportStar(require("./ArgumentConverterNotFound"), exports);
 __exportStar(require("./CommandCheckFailed"), exports);
 __exportStar(require("./PermissionRequired"), exports);
+__exportStar(require("./checks"), exports);

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@pikokr/command.ts",
   "description": "Discord.js command framework for typescript.",
-  "version": "3.0.6-dev.292ef89",
+  "version": "3.0.6-dev.33d39ce",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
   "license": "MIT",

package/src/command/decorator.ts

@@ -5,7 +5,7 @@ import { ArgumentConverter, SlashArgumentConverter } from './ArgumentConverter'
 import { Module } from '../structures'
 import { createCheckDecorator } from './utils'
 import { GuildMember, Message, PermissionResolvable, Permissions, TextChannel } from 'discord.js'
-import { ClientPermissionRequired, UserPermissionRequired } from '../error'
+import { ClientPermissionRequired, DMOnlyCommandError, GuildOnlyCommandError, OwnerOnlyCommandError, UserPermissionRequired } from '../error'
 
 type CommandOptions = {
   name: string
@@ -111,18 +111,36 @@ export const rest: ParameterDecorator = (target, propertyKey, parameterIndex) =>
 }
 
 export const ownerOnly = createCheckDecorator(
-  (msg) => msg.data.cts.owners.includes(msg.author.id),
-  (i) => i.data.cts.owners.includes(i.user.id),
+  (msg) => {
+    if (msg.data.cts.owners.includes(msg.author.id)) return true
+    throw new OwnerOnlyCommandError()
+  },
+  (i) => {
+    if (i.data.cts.owners.includes(i.user.id)) return true
+    throw new OwnerOnlyCommandError()
+  },
 )
 
 export const guildOnly = createCheckDecorator(
-  (msg) => !!msg.guild,
-  (i) => !!i.guildId,
+  (msg) => {
+    if (!!msg.guild) return true
+    throw new GuildOnlyCommandError()
+  },
+  (i) => {
+    if (!!i.guildId) return true
+    throw new GuildOnlyCommandError()
+  },
 )
 
 export const dmOnly = createCheckDecorator(
-  (msg) => !msg.guild,
-  (i) => !i.guildId,
+  (msg) => {
+    if (!msg.guild) return true
+    throw new DMOnlyCommandError()
+  },
+  (i) => {
+    if (!i.guildId) return true
+    throw new DMOnlyCommandError()
+  },
 )
 
 export const requireUserPermissions = (permission: PermissionResolvable) =>

package/src/error/checks/DMOnlyCommand.ts

@@ -0,0 +1,5 @@
+export class DMOnlyCommandError extends Error {
+  constructor() {
+    super()
+  }
+}

package/src/error/checks/GuildOnlyCommand.ts

@@ -0,0 +1,5 @@
+export class GuildOnlyCommandError extends Error {
+  constructor() {
+    super()
+  }
+}

package/src/error/checks/OwnerOnlyCommand.ts

@@ -0,0 +1,5 @@
+export class OwnerOnlyCommandError extends Error {
+  constructor() {
+    super()
+  }
+}

package/src/error/checks/index.ts

@@ -0,0 +1,3 @@
+export * from './OwnerOnlyCommand'
+export * from './GuildOnlyCommand'
+export * from './DMOnlyCommand'

package/src/error/index.ts

@@ -4,3 +4,4 @@ export * from './ArgumentNotProvided'
 export * from './ArgumentConverterNotFound'
 export * from './CommandCheckFailed'
 export * from './PermissionRequired'
+export * from './checks'