diff options
Diffstat (limited to 'src')
103 files changed, 160 insertions, 295 deletions
diff --git a/src/arguments/contentWithDuration.ts b/src/arguments/contentWithDuration.ts index 8dd7621..c48e723 100644 --- a/src/arguments/contentWithDuration.ts +++ b/src/arguments/contentWithDuration.ts @@ -1,5 +1,4 @@ -import { BushArgumentTypeCaster } from '../lib/extensions/discord-akairo/BushArgumentTypeCaster'; -import { BushMessage } from '../lib/extensions/discord.js/BushMessage'; +import { BushArgumentTypeCaster, BushMessage } from '../lib'; export const contentWithDurationTypeCaster: BushArgumentTypeCaster = async ( _message: BushMessage, diff --git a/src/arguments/duration.ts b/src/arguments/duration.ts index f8b6ab1..9ef3845 100644 --- a/src/arguments/duration.ts +++ b/src/arguments/duration.ts @@ -1,5 +1,4 @@ -import { BushArgumentTypeCaster } from '../lib/extensions/discord-akairo/BushArgumentTypeCaster'; -import { BushMessage } from '../lib/extensions/discord.js/BushMessage'; +import { BushArgumentTypeCaster, BushMessage } from '../lib'; export const durationTypeCaster: BushArgumentTypeCaster = (_message: BushMessage, phrase): number => { // if (!phrase) return null; @@ -1,5 +1,5 @@ import * as config from './config/options'; -import { BushClient } from './lib/extensions/discord-akairo/BushClient'; +import { BushClient } from './lib'; BushClient.preStart(); const client: BushClient = new BushClient(config); diff --git a/src/commands/config/muteRole.ts b/src/commands/config/muteRole.ts index 3c662ea..6fa84df 100644 --- a/src/commands/config/muteRole.ts +++ b/src/commands/config/muteRole.ts @@ -1,8 +1,5 @@ import { Role } from 'discord.js'; -import { BushCommand } from '../../lib/extensions/discord-akairo/BushCommand'; -import { BushSlashMessage } from '../../lib/extensions/discord-akairo/BushSlashMessage'; -import { BushMessage } from '../../lib/extensions/discord.js/BushMessage'; -import AllowedMentions from '../../lib/utils/AllowedMentions'; +import { AllowedMentions, BushCommand, BushMessage, BushSlashMessage } from '../../lib'; export default class MuteRoleCommand extends BushCommand { public constructor() { diff --git a/src/commands/config/prefix.ts b/src/commands/config/prefix.ts index eaf4fcc..52f6034 100644 --- a/src/commands/config/prefix.ts +++ b/src/commands/config/prefix.ts @@ -1,6 +1,4 @@ -import { BushCommand } from '../../lib/extensions/discord-akairo/BushCommand'; -import { BushSlashMessage } from '../../lib/extensions/discord-akairo/BushSlashMessage'; -import { BushMessage } from '../../lib/extensions/discord.js/BushMessage'; +import { BushCommand, BushMessage, BushSlashMessage } from '../../lib'; export default class PrefixCommand extends BushCommand { public constructor() { diff --git a/src/commands/config/welcomeChannel.ts b/src/commands/config/welcomeChannel.ts index 2d66a25..0c07b9a 100644 --- a/src/commands/config/welcomeChannel.ts +++ b/src/commands/config/welcomeChannel.ts @@ -1,7 +1,5 @@ import { Channel } from 'discord.js'; -import { BushCommand } from '../../lib/extensions/discord-akairo/BushCommand'; -import { BushSlashMessage } from '../../lib/extensions/discord-akairo/BushSlashMessage'; -import { BushMessage } from '../../lib/extensions/discord.js/BushMessage'; +import { BushCommand, BushMessage, BushSlashMessage } from '../../lib'; export default class WelcomeChannelCommand extends BushCommand { public constructor() { diff --git a/src/commands/dev/eval.ts b/src/commands/dev/eval.ts index 82b0e5e..295d042 100644 --- a/src/commands/dev/eval.ts +++ b/src/commands/dev/eval.ts @@ -5,9 +5,7 @@ import { Constants } from 'discord-akairo'; import { CommandInteraction, MessageEmbed, MessageEmbedOptions, Util } from 'discord.js'; import { transpile } from 'typescript'; import { inspect, promisify } from 'util'; -import { BushCommand } from '../../lib/extensions/discord-akairo/BushCommand'; -import { BushSlashMessage } from '../../lib/extensions/discord-akairo/BushSlashMessage'; -import { BushMessage } from '../../lib/extensions/discord.js/BushMessage'; +import { BushCommand, BushMessage, BushSlashMessage } from '../../lib'; const clean = (text) => { if (typeof text === 'string') { @@ -183,7 +181,7 @@ export default class EvalCommand extends BushCommand { members = message.guild.members, roles = message.guild.roles, client = this.client, - { Ban, Global, Guild, Level, ModLog, StickyRole } = await import('../../lib/models/index.js'), + { Ban, Global, Guild, Level, ModLog, StickyRole } = await import('../../lib'), { ButtonInteraction, Collector, diff --git a/src/commands/dev/reload.ts b/src/commands/dev/reload.ts index fdb669f..a66d755 100644 --- a/src/commands/dev/reload.ts +++ b/src/commands/dev/reload.ts @@ -1,6 +1,4 @@ -import { BushCommand } from '../../lib/extensions/discord-akairo/BushCommand'; -import { BushSlashMessage } from '../../lib/extensions/discord-akairo/BushSlashMessage'; -import { BushMessage } from '../../lib/extensions/discord.js/BushMessage'; +import { BushCommand, BushMessage, BushSlashMessage } from '../../lib'; export default class ReloadCommand extends BushCommand { public constructor() { diff --git a/src/commands/dev/setLevel.ts b/src/commands/dev/setLevel.ts index 871a9de..fb2f41f 100644 --- a/src/commands/dev/setLevel.ts +++ b/src/commands/dev/setLevel.ts @@ -1,9 +1,5 @@ import { User } from 'discord.js'; -import { BushCommand } from '../../lib/extensions/discord-akairo/BushCommand'; -import { BushSlashMessage } from '../../lib/extensions/discord-akairo/BushSlashMessage'; -import { BushMessage } from '../../lib/extensions/discord.js/BushMessage'; -import { Level } from '../../lib/models'; -import AllowedMentions from '../../lib/utils/AllowedMentions'; +import { AllowedMentions, BushCommand, BushMessage, BushSlashMessage, Level } from '../../lib'; export default class SetLevelCommand extends BushCommand { public constructor() { diff --git a/src/commands/dev/superUser.ts b/src/commands/dev/superUser.ts index 8bbc391..981c0da 100644 --- a/src/commands/dev/superUser.ts +++ b/src/commands/dev/superUser.ts @@ -1,8 +1,6 @@ import { Constants } from 'discord-akairo'; import { User } from 'discord.js'; -import { BushCommand } from '../../lib/extensions/discord-akairo/BushCommand'; -import { BushMessage } from '../../lib/extensions/discord.js/BushMessage'; -import { Global } from '../../lib/models'; +import { BushCommand, BushMessage, Global } from '../../lib'; export default class SuperUserCommand extends BushCommand { public constructor() { diff --git a/src/commands/dev/testDuration.ts b/src/commands/dev/testDuration.ts index bf30840..2fc757e 100644 --- a/src/commands/dev/testDuration.ts +++ b/src/commands/dev/testDuration.ts @@ -1,7 +1,6 @@ import { stripIndents } from 'common-tags'; import { Message } from 'discord.js'; -import { BushCommand } from '../../lib/extensions/discord-akairo/BushCommand'; -import { BushSlashMessage } from '../../lib/extensions/discord-akairo/BushSlashMessage'; +import { BushCommand, BushSlashMessage } from '../../lib'; export default class TestDurationCommand extends BushCommand { public constructor() { diff --git a/src/commands/info/botInfo.ts b/src/commands/info/botInfo.ts index 6cdae17..4a94318 100644 --- a/src/commands/info/botInfo.ts +++ b/src/commands/info/botInfo.ts @@ -1,6 +1,5 @@ import { Message, MessageEmbed } from 'discord.js'; -import { duration } from 'moment'; -import { BushCommand } from '../../lib/extensions/discord-akairo/BushCommand'; +import { BushCommand } from '../../lib'; export default class BotInfoCommand extends BushCommand { public constructor() { @@ -32,11 +31,11 @@ export default class BotInfoCommand extends BushCommand { }, { name: 'Uptime', - value: this.client.util.capitalize(duration(this.client.uptime, 'milliseconds').humanize()) + value: this.client.util.capitalize(this.client.util.humanizeDuration(this.client.uptime)) }, { name: 'User count', - value: this.client.users.cache.size.toString(), + value: this.client.users.cache.size.toLocaleString(), inline: true }, { diff --git a/src/commands/info/help.ts b/src/commands/info/help.ts index 598f01a..a561d69 100644 --- a/ |