@pikokr/command.ts 3.0.8-dev.b4462b7 → 3.0.8-dev.e5806ef

package/.all-contributorsrc

@@ -0,0 +1,33 @@
+{
+  "files": [
+    "README.md"
+  ],
+  "imageSize": 100,
+  "contributorsPerLine": 7,
+  "contributorsSortAlphabetically": false,
+  "badgeTemplate": "[![All Contributors](https://img.shields.io/badge/all_contributors-<%= contributors.length %>-orange.svg?style=flat-square)](#contributors)",
+  "contributorTemplate": "<a href=\"<%= contributor.profile %>\"><img src=\"<%= contributor.avatar_url %>\" width=\"<%= options.imageSize %>px;\" alt=\"\"/><br /><sub><b><%= contributor.name %></b></sub></a>",
+  "types": {
+    "custom": {
+      "symbol": "🔭",
+      "description": "A custom contribution type.",
+      "link": "[<%= symbol %>](<%= url %> \"<%= description %>\"),"
+    }
+  },
+  "skipCi": true,
+  "contributors": [
+    {
+      "login": "pikokr",
+      "name": "파링",
+      "avatar_url": "https://avatars.githubusercontent.com/u/68010770?v=4",
+      "profile": "https://pikokr.dev",
+      "contributions": [
+        "code"
+      ]
+    }
+  ],
+  "projectName": "command.ts",
+  "projectOwner": "pikokr",
+  "repoType": "github",
+  "repoHost": "https://github.com"
+}

package/README.md

@@ -1,5 +1,7 @@
 # Command.TS
 
+[![.github/workflows/publish.yml](https://github.com/pikokr/command.ts/actions/workflows/publish.yml/badge.svg)](https://github.com/pikokr/command.ts/actions/workflows/publish.yml)
+
 ![cts](https://user-images.githubusercontent.com/68010770/145200458-b14c5e4e-6927-4516-8d48-c68a384d2a20.png)
 
 Command framework for discord.js

package/dist/builtinModules/BuiltinCommandConverters.js

@@ -37,18 +37,30 @@ class BuiltinCommandConverters extends BuiltInModule_1.BuiltInModule {
         }
     }
     user(msg, value) {
+        let user = this.client.users.cache.get(value);
+        if (user)
+            return user;
+        user = this.client.users.cache.find(x => x.tag === value);
+        if (user)
+            return user;
         const id = this.getUserIDByMention(value);
         if (!id)
             return null;
-        const user = this.client.users.cache.get(id);
+        user = this.client.users.cache.get(id);
         return user || null;
     }
     member(msg, value) {
-        var _a;
+        var _a, _b, _c;
+        let user = (_a = msg.guild) === null || _a === void 0 ? void 0 : _a.members.cache.get(value);
+        if (!user)
+            return user;
+        user = (_b = msg.guild) === null || _b === void 0 ? void 0 : _b.members.cache.find(x => x.user.tag === value);
+        if (user)
+            return user;
         const id = this.getUserIDByMention(value);
         if (!id)
             return;
-        const user = (_a = msg.guild) === null || _a === void 0 ? void 0 : _a.members.cache.get(id);
+        user = (_c = msg.guild) === null || _c === void 0 ? void 0 : _c.members.cache.get(id);
         return user || undefined;
     }
     number(msg, value) {

package/dist/builtinModules/CommandHandler.js

@@ -32,6 +32,9 @@ class CommandHandler extends BuiltInModule_1.BuiltInModule {
     }
     message(msg) {
         return __awaiter(this, void 0, void 0, function* () {
+            if (!(yield this.client.options.command.check(msg))) {
+                return;
+            }
             const error = (error) => this.client.client.emit('commandError', error, msg);
             try {
                 const prefixList = typeof this.client.options.command.prefix === 'string'

package/dist/error/CommandCheckFailed.d.ts

@@ -7,7 +7,7 @@ export declare class CommandCheckFailed extends Error {
     constructor(msg: Message, command: Command);
 }
 export declare class SlashCommandCheckFailed extends Error {
-    msg: CommandInteraction;
+    interaction: CommandInteraction;
     command: SlashCommand;
-    constructor(msg: CommandInteraction, command: SlashCommand);
+    constructor(interaction: CommandInteraction, command: SlashCommand);
 }

package/dist/error/CommandCheckFailed.js

@@ -10,9 +10,9 @@ class CommandCheckFailed extends Error {
 }
 exports.CommandCheckFailed = CommandCheckFailed;
 class SlashCommandCheckFailed extends Error {
-    constructor(msg, command) {
+    constructor(interaction, command) {
         super();
-        this.msg = msg;
+        this.interaction = interaction;
         this.command = command;
     }
 }

package/dist/structures/CommandClient.d.ts

@@ -1,9 +1,10 @@
 import { Registry } from './Registry';
-import { Client, Snowflake } from 'discord.js';
+import { Client, Message, Snowflake } from 'discord.js';
 import { CoolDownAdapter } from '../command';
 import { REST } from '@discordjs/rest';
 export interface CommandOptions {
     prefix: string | ((msg: any) => string | Promise<string | string[]> | string[]) | string[];
+    check: (msg: Message) => boolean | Promise<boolean>;
 }
 export interface SlashCommandOptions {
     guild?: Snowflake | Snowflake[];

package/dist/structures/CommandClient.js

@@ -44,12 +44,16 @@ class CommandClient {
         this.options = lodash_1.default.merge({
             command: {
                 prefix: '!',
+                check: () => true
             },
             owners: 'auto',
             slashCommands: {
                 autoSync: true,
             },
         }, options);
+        if (this.options.owners !== 'auto') {
+            this.owners = this.options.owners;
+        }
         this.client.once('ready', () => this.ready());
         this.registry.registerModule(new builtinModules_1.CommandHandler(this.registry));
         this.registry.registerModule(new builtinModules_1.BuiltinCommandConverters(this));

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@pikokr/command.ts",
   "description": "Discord.js command framework for typescript.",
-  "version": "3.0.8-dev.b4462b7",
+  "version": "3.0.8-dev.e5806ef",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
   "license": "MIT",

package/src/builtinModules/BuiltinCommandConverters.ts

@@ -34,17 +34,25 @@ export class BuiltinCommandConverters extends BuiltInModule {
 
   @argumentConverter(User)
   user(msg: Message, value: string): User | null {
+    let user = this.client.users.cache.get(value)
+    if (user) return user
+    user = this.client.users.cache.find(x=>x.tag === value)
+    if (user) return user
     const id = this.getUserIDByMention(value)
     if (!id) return null
-    const user = this.client.users.cache.get(id)
+    user = this.client.users.cache.get(id)
     return user || null
   }
 
   @argumentConverter(GuildMember)
   member(msg: Message, value: string): GuildMember | undefined {
+    let user = msg.guild?.members.cache.get(value)
+    if (!user) return user
+    user = msg.guild?.members.cache.find(x=>x.user.tag===value)
+    if (user) return user
     const id = this.getUserIDByMention(value)
     if (!id) return
-    const user = msg.guild?.members.cache.get(id)
+    user = msg.guild?.members.cache.get(id)
     return user || undefined
   }
 

package/src/builtinModules/CommandHandler.ts

@@ -17,6 +17,10 @@ export class CommandHandler extends BuiltInModule {
 
   @listener('messageCreate')
   async message(msg: Message) {
+    if (!await this.client.options.command.check(msg)) {
+      return
+    }
+
     const error = (error: Error) => this.client.client.emit('commandError', error, msg)
 
     try {

package/src/error/CommandCheckFailed.ts

@@ -9,7 +9,7 @@ export class CommandCheckFailed extends Error {
 }
 
 export class SlashCommandCheckFailed extends Error {
-  constructor(public msg: CommandInteraction, public command: SlashCommand) {
+  constructor(public interaction: CommandInteraction, public command: SlashCommand) {
     super()
   }
 }

package/src/structures/CommandClient.ts

@@ -1,12 +1,13 @@
 import _ from 'lodash'
 import { Registry } from './Registry'
-import { Client, Snowflake, User } from 'discord.js'
+import {Client, Message, Snowflake, User} from 'discord.js'
 import { BuiltinCommandConverters, BuiltinSlashCommandConverters, CommandHandler } from '../builtinModules'
 import { CoolDownAdapter, DefaultCoolDownAdapter } from '../command'
 import { REST } from '@discordjs/rest'
 
 export interface CommandOptions {
   prefix: string | ((msg: any) => string | Promise<string | string[]> | string[]) | string[]
+  check: (msg: Message) => boolean|Promise<boolean>
 }
 
 export interface SlashCommandOptions {
@@ -64,6 +65,7 @@ export class CommandClient {
       {
         command: {
           prefix: '!',
+          check: () => true
         },
         owners: 'auto',
         slashCommands: {
@@ -72,6 +74,11 @@ export class CommandClient {
       },
       options,
     )
+
+    if (this.options.owners !== 'auto') {
+      this.owners = this.options.owners
+    }
+
     this.client.once('ready', () => this.ready())
     this.registry.registerModule(new CommandHandler(this.registry))
     this.registry.registerModule(new BuiltinCommandConverters(this))

package/test/modules/dev.ts

@@ -8,7 +8,7 @@ export class Dev extends BuiltInModule {
   }
 
   @listener('slashCommandError')
-  async slashError(e: Error, i: CommandInteraction) {
+  slashError(e: Error, i: CommandInteraction) {
     if (e instanceof SlashCommandCheckFailed) {
       return i.reply({
         content: 'Command before-run check failed',