diff options
| author | IRONM00N <64110067+IRONM00N@users.noreply.github.com> | 2021-06-19 16:52:09 -0400 |
|---|---|---|
| committer | IRONM00N <64110067+IRONM00N@users.noreply.github.com> | 2021-06-19 16:52:09 -0400 |
| commit | f2883f221706f86ee045fa94ad8cd3c9b5db5f97 (patch) | |
| tree | cd3613ef478eb5306b474fa3a5871de9c985d81b /src/lib | |
| parent | ea64ebfff9aae32deb036643422d3427959dcd24 (diff) | |
| parent | 0c24fcffe34653564aaaf8a3cb124d6a3f6f4a42 (diff) | |
| download | tanzanite-f2883f221706f86ee045fa94ad8cd3c9b5db5f97.tar.gz tanzanite-f2883f221706f86ee045fa94ad8cd3c9b5db5f97.tar.bz2 tanzanite-f2883f221706f86ee045fa94ad8cd3c9b5db5f97.zip | |
resolved conflicts and stuff
Diffstat (limited to 'src/lib')
| -rw-r--r-- | src/lib/extensions/BushClient.ts | 4 | ||||
| -rw-r--r-- | src/lib/extensions/BushCommandHandler.ts | 1 | ||||
| -rw-r--r-- | src/lib/extensions/BushTaskHandler.ts | 3 | ||||
| -rw-r--r-- | src/lib/models/Modlog.ts | 3 |
4 files changed, 6 insertions, 5 deletions
diff --git a/src/lib/extensions/BushClient.ts b/src/lib/extensions/BushClient.ts index 1bd3493..5c7729c 100644 --- a/src/lib/extensions/BushClient.ts +++ b/src/lib/extensions/BushClient.ts @@ -90,7 +90,9 @@ export class BushClient extends AkairoClient { otherwise: '' }, ignorePermissions: this.config.owners, - ignoreCooldown: this.config.owners + ignoreCooldown: this.config.owners, + automateCategories: true, + autoRegisterSlashCommands: true }); this.util = new BushClientUtil(this); diff --git a/src/lib/extensions/BushCommandHandler.ts b/src/lib/extensions/BushCommandHandler.ts index 670125d..b6501c2 100644 --- a/src/lib/extensions/BushCommandHandler.ts +++ b/src/lib/extensions/BushCommandHandler.ts @@ -16,6 +16,7 @@ export const ArgumentMatches = { REST_CONTENT: 'restContent', NONE: 'none' }; +export type BushCommandHandlerOptions = CommandHandlerOptions; export const ArgumentTypes = { STRING: 'string', diff --git a/src/lib/extensions/BushTaskHandler.ts b/src/lib/extensions/BushTaskHandler.ts index c76dbfb..923e42b 100644 --- a/src/lib/extensions/BushTaskHandler.ts +++ b/src/lib/extensions/BushTaskHandler.ts @@ -1,8 +1,7 @@ import { AkairoHandlerOptions, TaskHandler } from 'discord-akairo'; import { BushClient } from './BushClient'; -// eslint-disable-next-line @typescript-eslint/no-empty-interface -export interface BushTaskHandlerOptions extends AkairoHandlerOptions {} +export type BushTaskHandlerOptions = AkairoHandlerOptions; export class BushTaskHandler extends TaskHandler { public constructor(client: BushClient, options: BushTaskHandlerOptions) { diff --git a/src/lib/models/Modlog.ts b/src/lib/models/Modlog.ts index 3917a88..5a2cb69 100644 --- a/src/lib/models/Modlog.ts +++ b/src/lib/models/Modlog.ts @@ -1,7 +1,6 @@ import { DataTypes, Sequelize } from 'sequelize'; -import { BaseModel } from './BaseModel'; import { v4 as uuidv4 } from 'uuid'; -import * as Models from './'; +import { BaseModel } from './BaseModel'; export enum ModlogType { BAN = 'BAN', |