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/src/commands/info/help.ts +++ b/src/commands/info/help.ts @@ -1,7 +1,5 @@ import { MessageActionRow, MessageButton, MessageEmbed } 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 HelpCommand extends BushCommand { public constructor() { diff --git a/src/commands/info/ping.ts b/src/commands/info/ping.ts index 75f4700..c1be3fb 100644 --- a/src/commands/info/ping.ts +++ b/src/commands/info/ping.ts @@ -1,6 +1,5 @@ import { Message, MessageEmbed } 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 PingCommand extends BushCommand { public constructor() { diff --git a/src/commands/info/pronouns.ts b/src/commands/info/pronouns.ts index 1f7ac15..241dce3 100644 --- a/src/commands/info/pronouns.ts +++ b/src/commands/info/pronouns.ts @@ -1,7 +1,6 @@ import { Message, MessageEmbed, User } from 'discord.js'; import got, { HTTPError } from 'got'; -import { BushCommand } from '../../lib/extensions/discord-akairo/BushCommand'; -import { BushSlashMessage } from '../../lib/extensions/discord-akairo/BushSlashMessage'; +import { BushCommand, BushSlashMessage } from '../../lib'; export const pronounMapping = { unspecified: 'Unspecified', diff --git a/src/commands/moderation/ban.ts b/src/commands/moderation/ban.ts index f3cc1e2..0c68497 100644 --- a/src/commands/moderation/ban.ts +++ b/src/commands/moderation/ban.ts @@ -1,5 +1,5 @@ import { Message, User } from 'discord.js'; -import { BushCommand } from '../../lib/extensions/discord-akairo/BushCommand'; +import { BushCommand } from '../../lib'; export default class BanCommand extends BushCommand { public constructor() { diff --git a/src/commands/moderation/kick.ts b/src/commands/moderation/kick.ts index f8bb5a1..8375198 100644 --- a/src/commands/moderation/kick.ts +++ b/src/commands/moderation/kick.ts @@ -1,5 +1,5 @@ import { GuildMember, Message } from 'discord.js'; -import { BushCommand } from '../../lib/extensions/discord-akairo/BushCommand'; +import { BushCommand } from '../../lib'; export default class KickCommand extends BushCommand { public constructor() { diff --git a/src/commands/moderation/modlog.ts b/src/commands/moderation/modlog.ts index 2f7601b..5be50a4 100644 --- a/src/commands/moderation/modlog.ts +++ b/src/commands/moderation/modlog.ts @@ -1,9 +1,7 @@ import { Argument } from 'discord-akairo'; import { MessageEmbed } from 'discord.js'; import moment from 'moment'; -import { BushCommand } from '../../lib/extensions/discord-akairo/BushCommand'; -import { BushMessage } from '../../lib/extensions/discord.js/BushMessage'; -import { ModLog } from '../../lib/models'; +import { BushCommand, BushMessage, ModLog } from '../../lib'; export default class ModlogCommand extends BushCommand { public constructor() { diff --git a/src/commands/moderation/mute.ts b/src/commands/moderation/mute.ts index 5e5cdba..33c0e32 100644 --- a/src/commands/moderation/mute.ts +++ b/src/commands/moderation/mute.ts @@ -1,8 +1,5 @@ import { Argument } from 'discord-akairo'; -import { BushCommand } from '../../lib/extensions/discord-akairo/BushCommand'; -import { BushGuildMember } from '../../lib/extensions/discord.js/BushGuildMember'; -import { BushMessage } from '../../lib/extensions/discord.js/BushMessage'; -import { BushUser } from '../../lib/extensions/discord.js/BushUser'; +import { BushCommand, BushGuildMember, BushMessage, BushUser } from '../../lib'; export default class MuteCommand extends BushCommand { public constructor() { diff --git a/src/commands/moderation/role.ts b/src/commands/moderation/role.ts index 71bb88e..83e85e0 100644 --- a/src/commands/moderation/role.ts +++ b/src/commands/moderation/role.ts @@ -1,7 +1,6 @@ /* eslint-disable @typescript-eslint/no-empty-function */ import { GuildMember, Message, Role } from 'discord.js'; -import { BushCommand } from '../../lib/extensions/discord-akairo/BushCommand'; -import AllowedMentions from '../../lib/utils/AllowedMentions'; +import { AllowedMentions, BushCommand } from '../../lib'; export default class RoleCommand extends BushCommand { private roleWhitelist: Record<string, string[]> = { diff --git a/src/commands/moderation/warn.ts b/src/commands/moderation/warn.ts index 9df5891..f2b9142 100644 --- a/src/commands/moderation/warn.ts +++ b/src/commands/moderation/warn.ts @@ -1,6 +1,5 @@ import { GuildMember, Message } from 'discord.js'; -import { BushCommand } from '../../lib/extensions/discord-akairo/BushCommand'; -import { Guild, ModLog, ModLogType } from '../../lib/models'; +import { BushCommand, Guild, ModLog, ModLogType } from '../../lib'; export default class WarnCommand extends BushCommand { public constructor() { diff --git a/src/commands/moulberry-bush/capePerms.ts b/src/commands/moulberry-bush/capePerms.ts index b6508d0..539ddf6 100644 --- a/src/commands/moulberry-bush/capePerms.ts +++ b/src/commands/moulberry-bush/capePerms.ts @@ -1,8 +1,7 @@ import { Constants } from 'discord-akairo'; import { MessageEmbed } from 'discord.js'; import got from 'got'; -import { BushCommand } from '../../lib/extensions/discord-akairo/BushCommand'; -import { BushMessage } from '../../lib/extensions/discord.js/BushMessage'; +import { BushCommand, BushMessage } from '../../lib'; export default class CapePermissionsCommand extends BushCommand { private nameMap = { diff --git a/src/commands/moulberry-bush/giveawayPing.ts b/src/commands/moulberry-bush/giveawayPing.ts index dbbbfef..80555b1 100644 --- a/src/commands/moulberry-bush/giveawayPing.ts +++ b/src/commands/moulberry-bush/giveawayPing.ts @@ -1,6 +1,4 @@ -import { BushCommand } from '../../lib/extensions/discord-akairo/BushCommand'; -import { BushMessage } from '../../lib/extensions/discord.js/BushMessage'; -import AllowedMentions from '../../lib/utils/AllowedMentions'; +import { AllowedMentions, BushCommand, BushMessage } from '../../lib'; export default class GiveawayPingCommand extends BushCommand { public constructor() { diff --git a/src/commands/moulberry-bush/level.ts b/src/commands/moulberry-bush/level.ts index eabf7a0..90a4b7f 100644 --- a/src/commands/moulberry-bush/level.ts +++ b/src/commands/moulberry-bush/level.ts @@ -1,13 +1,11 @@ import { Message, User } from 'discord.js'; -import { BushCommand } from '../../lib/extensions/discord-akairo/BushCommand'; -import { BushSlashMessage } from '../../lib/extensions/discord-akairo/BushSlashMessage'; -import { Level } from '../../lib/models'; +import { BushCommand, BushSlashMessage, Level } from '../../lib'; /* import canvas from 'canvas'; import { MessageAttachment } from 'discord.js'; import { join } from 'path'; import got from 'got/dist/source'; -import { CanvasProgressBar } from '../../lib/extensions/Util'; +import { CanvasProgressBar } from '../../lib'; */ export default class LevelCommand extends BushCommand { diff --git a/src/commands/moulberry-bush/rule.ts b/src/commands/moulberry-bush/rule.ts index 2bcbb8d..516aadf 100644 --- a/src/commands/moulberry-bush/rule.ts +++ b/src/commands/moulberry-bush/rule.ts @@ -1,8 +1,6 @@ import { Argument, Constants } from 'discord-akairo'; import { MessageEmbed, User } from 'discord.js'; -import { BushCommand } from '../../lib/extensions/discord-akairo/BushCommand'; -import { BushMessage } from '../../lib/extensions/discord.js/BushMessage'; -import AllowedMentions from '../../lib/utils/AllowedMentions'; +import { AllowedMentions, BushCommand, BushMessage } from '../../lib'; const rules = [ { diff --git a/src/inhibitors/blacklist/guildBlacklist.ts b/src/inhibitors/blacklist/guildBlacklist.ts index 04f496a..06e93fa 100644 --- a/src/inhibitors/blacklist/guildBlacklist.ts +++ b/src/inhibitors/blacklist/guildBlacklist.ts @@ -1,6 +1,4 @@ -import { BushInhibitor } from '../../lib/extensions/discord-akairo/BushInhibitor'; -import { BushSlashMessage } from '../../lib/extensions/discord-akairo/BushSlashMessage'; -import { BushMessage } from '../../lib/extensions/discord.js/BushMessage'; +import { BushInhibitor, BushMessage, BushSlashMessage } from '../../lib'; export default class GuildBlacklistInhibitor extends BushInhibitor { public constructor() { diff --git a/src/inhibitors/blacklist/userBlacklist.ts b/src/inhibitors/blacklist/userBlacklist.ts index 4349bb1..01563a0 100644 --- a/src/inhibitors/blacklist/userBlacklist.ts +++ b/src/inhibitors/blacklist/userBlacklist.ts @@ -1,6 +1,4 @@ -import { BushInhibitor } from '../../lib/extensions/discord-akairo/BushInhibitor'; -import { BushSlashMessage } from '../../lib/extensions/discord-akairo/BushSlashMessage'; -import { BushMessage } from '../../lib/extensions/discord.js/BushMessage'; +import { BushInhibitor, BushMessage, BushSlashMessage } from '../../lib'; export default class UserBlacklistInhibitor extends BushInhibitor { public constructor() { diff --git a/src/inhibitors/commands/disabledCommand.ts b/src/inhibitors/commands/disabledCommand.ts index 6936a41..ba143ee 100644 --- a/src/inhibitors/commands/disabledCommand.ts +++ b/src/inhibitors/commands/disabledCommand.ts @@ -1,7 +1,4 @@ -import { BushCommand } from '../../lib/extensions/discord-akairo/BushCommand'; -import { BushInhibitor } from '../../lib/extensions/discord-akairo/BushInhibitor'; -import { BushSlashMessage } from '../../lib/extensions/discord-akairo/BushSlashMessage'; -import { BushMessage } from '../../lib/extensions/discord.js/BushMessage'; +import { BushCommand, BushInhibitor, BushMessage, BushSlashMessage } from '../../lib'; export default class DisabledCommandInhibitor extends BushInhibitor { public constructor() { diff --git a/src/inhibitors/noCache.ts b/src/inhibitors/noCache.ts index db46801..1115af7 100644 --- a/src/inhibitors/noCache.ts +++ b/src/inhibitors/noCache.ts @@ -1,6 +1,4 @@ -import { BushInhibitor } from '../lib/extensions/discord-akairo/BushInhibitor'; -import { BushSlashMessage } from '../lib/extensions/discord-akairo/BushSlashMessage'; -import { BushMessage } from '../lib/extensions/discord.js/BushMessage'; +import { BushInhibitor, BushMessage, BushSlashMessage } from '../lib'; export default class NoCacheInhibitor extends BushInhibitor { public constructor() { diff --git a/src/lib/extensions/discord-akairo/BushArgumentTypeCaster.ts b/src/lib/extensions/discord-akairo/BushArgumentTypeCaster.ts index 9afcf8b..ed81290 100644 --- a/src/lib/extensions/discord-akairo/BushArgumentTypeCaster.ts +++ b/src/lib/extensions/discord-akairo/BushArgumentTypeCaster.ts @@ -1,4 +1,4 @@ /* eslint-disable @typescript-eslint/no-explicit-any */ -import { BushMessage } from '../discord.js/BushMessage'; +import { BushMessage } from '..'; export type BushArgumentTypeCaster = (message: BushMessage, phrase: string) => any; diff --git a/src/lib/extensions/discord-akairo/BushClient.ts b/src/lib/extensions/discord-akairo/BushClient.ts index b7441bf..4f33fa4 100644 --- a/src/lib/extensions/discord-akairo/BushClient.ts +++ b/src/lib/extensions/discord-akairo/BushClient.ts @@ -15,15 +15,22 @@ import * as path from 'path'; import { exit } from 'process'; import readline from 'readline'; import { Sequelize } from 'sequelize'; -import { BushClientUtil, BushCommandHandler, BushInhibitorHandler, BushListenerHandler, BushTaskHandler } from '.'; import { + AllowedMentions, BushButtonInteraction, + BushCache, BushCategoryChannel, + BushClientUtil, + BushCommandHandler, BushCommandInteraction, + BushConstants, BushDMChannel, BushGuild, BushGuildEmoji, BushGuildMember, + BushInhibitorHandler, + BushListenerHandler, + BushLogger, BushMessage, BushMessageReaction, BushNewsChannel, @@ -31,22 +38,19 @@ import { BushRole, BushSelectMenuInteraction, BushStoreChannel, + BushTaskHandler, BushTextChannel, BushThreadChannel, BushThreadMember, BushUser, BushVoiceChannel, BushVoiceState -} from '../'; +} from '../..'; import { contentWithDurationTypeCaster } from '../../../arguments/contentWithDuration'; import { durationTypeCaster } from '../../../arguments/duration'; import * as config from '../../../config/options'; -import UpdateCacheTask from '../../../tasks/updateCache'; +import { UpdateCacheTask } from '../../../tasks/updateCache'; import * as Models from '../../models'; -import AllowedMentions from '../../utils/AllowedMentions'; -import { BushCache } from '../../utils/BushCache'; -import { BushConstants } from '../../utils/BushConstants'; -import { BushLogger } from '../../utils/BushLogger'; export type BotConfig = typeof config; export type BushReplyMessageType = string | MessagePayload | ReplyMessageOptions; diff --git a/src/lib/extensions/discord-akairo/BushClientUtil.ts b/src/lib/extensions/discord-akairo/BushClientUtil.ts index 126ed90..20ce365 100644 --- a/src/lib/extensions/discord-akairo/BushClientUtil.ts +++ b/src/lib/extensions/discord-akairo/BushClientUtil.ts @@ -26,13 +26,22 @@ import { import got from 'got'; import humanizeDuration from 'humanize-duration'; import { promisify } from 'util'; -import { Ban, Global, Guild, ModLog, ModLogType, Mute, PunishmentRole } from '../../models'; -import { BushCache } from '../../utils/BushCache'; -import { BushConstants } from '../../utils/BushConstants'; -import { BushGuildResolvable } from '../discord.js/BushCommandInteraction'; -import { BushGuildMember } from '../discord.js/BushGuildMember'; -import { BushMessage } from '../discord.js/BushMessage'; -import { BushClient, BushGuildMemberResolvable } from './BushClient'; +import { + Ban, + BushCache, + BushClient, + BushConstants, + BushGuildMember, + BushGuildMemberResolvable, + BushGuildResolvable, + BushMessage, + Global, + Guild, + ModLog, + ModLogType, + Mute, + PunishmentRole +} from '../..'; interface hastebinRes { key: string; diff --git a/src/lib/extensions/discord-akairo/BushCommand.ts b/src/lib/extensions/discord-akairo/BushCommand.ts index 90c68df..6143816 100644 --- a/src/lib/extensions/discord-akairo/BushCommand.ts +++ b/src/lib/extensions/discord-akairo/BushCommand.ts @@ -9,10 +9,7 @@ import { CommandOptions } from 'discord-akairo'; import { Snowflake } from 'discord.js'; -import { BushMessage } from '../discord.js/BushMessage'; -import { BushClient } from './BushClient'; -import { BushCommandHandler } from './BushCommandHandler'; -import { BushSlashMessage } from './BushSlashMessage'; +import { BushClient, BushCommandHandler, BushMessage, BushSlashMessage } from '..'; type BushArgumentType = | 'string' diff --git a/src/lib/extensions/discord-akairo/BushCommandHandler.ts b/src/lib/extensions/discord-akairo/BushCommandHandler.ts index 09baf2e..76bade4 100644 --- a/src/lib/extensions/discord-akairo/BushCommandHandler.ts +++ b/src/lib/extensions/discord-akairo/BushCommandHandler.ts @@ -1,10 +1,7 @@ /* eslint-disable @typescript-eslint/no-explicit-any */ import { Category, CommandHandler, CommandHandlerOptions } from 'discord-akairo'; import { Collection } from 'discord.js'; -import { BushConstants } from '../../utils/BushConstants'; -import { BushMessage } from '../discord.js/BushMessage'; -import { BushClient } from './BushClient'; -import { BushCommand } from './BushCommand'; +import { BushClient, BushCommand, BushConstants, BushMessage } from '../..'; export type BushCommandHandlerOptions = CommandHandlerOptions; diff --git a/src/lib/extensions/discord-akairo/BushCommandUtil.ts b/src/lib/extensions/discord-akairo/BushCommandUtil.ts index 1e86401..35fdd55 100644 --- a/src/lib/extensions/discord-akairo/BushCommandUtil.ts +++ b/src/lib/extensions/discord-akairo/BushCommandUtil.ts @@ -1,8 +1,6 @@ import { CommandUtil, ParsedComponentData } from 'discord-akairo'; import { Collection, Snowflake } from 'discord.js'; -import { BushMessage } from '../discord.js/BushMessage'; -import { BushCommand } from './BushCommand'; -import { BushCommandHandler } from './BushCommandHandler'; +import { BushCommand, BushCommandHandler, BushMessage } from '..'; export interface BushParsedComponentData extends ParsedComponentData { command?: BushCommand; diff --git a/src/lib/extensions/discord-akairo/BushInhibitor.ts b/src/lib/extensions/discord-akairo/BushInhibitor.ts index ae91494..47e9515 100644 --- a/src/lib/extensions/discord-akairo/BushInhibitor.ts +++ b/src/lib/extensions/discord-akairo/BushInhibitor.ts @@ -1,9 +1,6 @@ /* eslint-disable @typescript-eslint/no-explicit-any */ import { Inhibitor } from 'discord-akairo'; -import { BushMessage } from '../discord.js/BushMessage'; -import { BushClient } from './BushClient'; -import { BushCommand } from './BushCommand'; -import { BushSlashMessage } from './BushSlashMessage'; +import { BushClient, BushCommand, BushMessage, BushSlashMessage } from '..'; export class BushInhibitor extends Inhibitor { public declare client: BushClient; diff --git a/src/lib/extensions/discord-akairo/BushInhibitorHandler.ts b/src/lib/extensions/discord-akairo/BushInhibitorHandler.ts index 2a947da..4077228 100644 --- a/src/lib/extensions/discord-akairo/BushInhibitorHandler.ts +++ b/src/lib/extensions/discord-akairo/BushInhibitorHandler.ts @@ -1,5 +1,5 @@ import { InhibitorHandler } from 'discord-akairo'; -import { BushClient } from './BushClient'; +import { BushClient } from '..'; export class BushInhibitorHandler extends InhibitorHandler { public declare client: BushClient; diff --git a/src/lib/extensions/discord-akairo/BushListener.ts b/src/lib/extensions/discord-akairo/BushListener.ts index e555e89..573bed9 100644 --- a/src/lib/extensions/discord-akairo/BushListener.ts +++ b/src/lib/extensions/discord-akairo/BushListener.ts @@ -1,5 +1,5 @@ import { Listener } from 'discord-akairo'; -import { BushClient } from './BushClient'; +import { BushClient } from '..'; export class BushListener extends Listener { public declare client: BushClient; diff --git a/src/lib/extensions/discord-akairo/BushListenerHandler.ts b/src/lib/extensions/discord-akairo/BushListenerHandler.ts index 28615fc..73ca2df 100644 --- a/src/lib/extensions/discord-akairo/BushListenerHandler.ts +++ b/src/lib/extensions/discord-akairo/BushListenerHandler.ts @@ -1,5 +1,5 @@ import { ListenerHandler } from 'discord-akairo'; -import { BushClient } from './BushClient'; +import { BushClient } from '..'; export class BushListenerHandler extends ListenerHandler { declare client: BushClient; diff --git a/src/lib/extensions/discord-akairo/BushSlashMessage.ts b/src/lib/extensions/discord-akairo/BushSlashMessage.ts index 9e9f994..cf2f391 100644 --- a/src/lib/extensions/discord-akairo/BushSlashMessage.ts +++ b/src/lib/extensions/discord-akairo/BushSlashMessage.ts @@ -1,9 +1,6 @@ import { AkairoMessage } from 'discord-akairo'; import { CommandInteraction } from 'discord.js'; -import { BushGuild } from '../discord.js/BushGuild'; -import { BushUser } from '../discord.js/BushUser'; -import { BushClient } from './BushClient'; -import { BushCommandUtil } from './BushCommandUtil'; +import { BushClient, BushCommandUtil, BushGuild, BushUser } from '..'; export class BushSlashMessage extends AkairoMessage { public declare client: BushClient; diff --git a/src/lib/extensions/discord-akairo/BushTask.ts b/src/lib/extensions/discord-akairo/BushTask.ts index 06d0602..6471130 100644 --- a/src/lib/extensions/discord-akairo/BushTask.ts +++ b/src/lib/extensions/discord-akairo/BushTask.ts @@ -1,5 +1,5 @@ import { Task } from 'discord-akairo'; -import { BushClient } from './BushClient'; +import { BushClient } from '..'; export class BushTask extends Task { public declare client: BushClient; diff --git a/src/lib/extensions/discord-akairo/BushTaskHandler.ts b/src/lib/extensions/discord-akairo/BushTaskHandler.ts index 588988d..a24aa23 100644 --- a/src/lib/extensions/discord-akairo/BushTaskHandler.ts +++ b/src/lib/extensions/discord-akairo/BushTaskHandler.ts @@ -1,5 +1,5 @@ import { AkairoHandlerOptions, TaskHandler } from 'discord-akairo'; -import { BushClient } from './BushClient'; +import { BushClient } from '..'; export type BushTaskHandlerOptions = AkairoHandlerOptions; diff --git a/src/lib/extensions/discord.js/BushActivity.ts b/src/lib/extensions/discord.js/BushActivity.ts index 6ca1611..1ac19ed 100644 --- a/src/lib/extensions/discord.js/BushActivity.ts +++ b/src/lib/extensions/discord.js/BushActivity.ts @@ -1,6 +1,5 @@ import { Activity } from 'discord.js'; -import { BushEmoji } from './BushEmoji'; -import { BushPresence } from './BushPresence'; +import { BushEmoji, BushPresence } from '..'; export class BushActivity extends Activity { public emoji: BushEmoji | null; diff --git a/src/lib/extensions/discord.js/BushApplicationCommand.ts b/src/lib/extensions/discord.js/BushApplicationCommand.ts index 5a0e139..97cc650 100644 --- a/src/lib/extensions/discord.js/BushApplicationCommand.ts +++ b/src/lib/extensions/discord.js/BushApplicationCommand.ts @@ -1,8 +1,7 @@ /* eslint-disable @typescript-eslint/ban-types */ /* eslint-disable @typescript-eslint/no-unused-vars */ import { ApplicationCommand, Snowflake } from 'discord.js'; -import { BushClient } from '../discord-akairo/BushClient'; -import { BushGuild } from './BushGuild'; +import { BushClient, BushGuild } from '..'; export class BushApplicationCommand<PermissionsFetchType = {}> extends ApplicationCommand { public declare readonly client: BushClient; diff --git a/src/lib/extensions/discord.js/BushApplicationCommandManager.ts b/src/lib/extensions/discord.js/BushApplicationCommandManager.ts index fb3375a..71345c5 100644 --- a/src/lib/extensions/discord.js/BushApplicationCommandManager.ts +++ b/src/lib/extensions/discord.js/BushApplicationCommandManager.ts @@ -1,8 +1,6 @@ /* eslint-disable @typescript-eslint/no-explicit-any */ import { ApplicationCommandManager, ApplicationCommandPermissionsManager, GuildResolvable, Snowflake } from 'discord.js'; -import { BushClient } from '../discord-akairo/BushClient'; -import { BushApplicationCommand } from './BushApplicationCommand'; -import { BushGuildResolvable } from './BushCommandInteraction'; +import { BushApplicationCommand, BushClient, BushGuildResolvable } from '..'; export type BushApplicationCommandResolvable = BushApplicationCommand | Snowflake; diff --git a/src/lib/extensions/discord.js/BushApplicationCommandPermissionsManager.ts b/src/lib/extensions/discord.js/BushApplicationCommandPermissionsManager.ts index 517935d..5355ad8 100644 --- a/src/lib/extensions/discord.js/BushApplicationCommandPermissionsManager.ts +++ b/src/lib/extensions/discord.js/BushApplicationCommandPermissionsManager.ts @@ -4,10 +4,7 @@ import { ApplicationCommandPermissionsManager, GuildApplicationCommandManager } from 'discord.js'; -import { BushClient } from '../discord-akairo/BushClient'; -import { BushApplicationCommand } from './BushApplicationCommand'; -import { BushApplicationCommandManager } from './BushApplicationCommandManager'; -import { BushGuildApplicationCommandManager } from './BushGuildApplicationCommandManager'; +import { BushApplicationCommand, BushApplicationCommandManager, BushClient, BushGuildApplicationCommandManager } from '..'; export class BushApplicationCommandPermissionsManager< BaseOptions, diff --git a/src/lib/extensions/discord.js/BushButtonInteraction.ts b/src/lib/extensions/discord.js/BushButtonInteraction.ts index 3a54f61..6f934bc 100644 --- a/src/lib/extensions/discord.js/BushButtonInteraction.ts +++ b/src/lib/extensions/discord.js/BushButtonInteraction.ts @@ -1,12 +1,6 @@ import { APIInteractionGuildMember } from 'discord-api-types/v8'; import { ButtonInteraction, PartialDMChannel } from 'discord.js'; -import { BushClient } from '../discord-akairo/BushClient'; -import { BushDMChannel } from './BushDMChannel'; -import { BushGuild } from './BushGuild'; -import { BushGuildMember } from './BushGuildMember'; -import { BushNewsChannel } from './BushNewsChannel'; -import { BushTextChannel } from './BushTextChannel'; -import { BushUser } from './BushUser'; +import { BushClient, BushDMChannel, BushGuild, BushGuildMember, BushNewsChannel, BushTextChannel, BushUser } from '..'; export class BushButtonInteraction extends ButtonInteraction { public declare readonly channel: BushTextChannel | BushDMChannel | BushNewsChannel | PartialDMChannel | null; diff --git a/src/lib/extensions/discord.js/BushCategoryChannel.ts b/src/lib/extensions/discord.js/BushCategoryChannel.ts index a66b2c6..584fc6d 100644 --- a/src/lib/extensions/discord.js/BushCategoryChannel.ts +++ b/src/lib/extensions/discord.js/BushCategoryChannel.ts @@ -1,8 +1,5 @@ import { CategoryChannel, Collection, Snowflake } from 'discord.js'; -import { BushClient } from '../discord-akairo/BushClient'; -import { BushGuild } from './BushGuild'; -import { BushGuildChannel } from './BushGuildChannel'; -import { BushGuildMember } from './BushGuildMember'; +import { BushClient, BushGuild, BushGuildChannel, BushGuildMember } from '..'; export class BushCategoryChannel extends CategoryChannel { public declare readonly client: BushClient; diff --git a/src/lib/extensions/discord.js/BushCommandInteraction.ts b/src/lib/extensions/discord.js/BushCommandInteraction.ts index 84c0707..d1ba954 100644 --- a/src/lib/extensions/discord.js/BushCommandInteraction.ts +++ b/src/lib/extensions/discord.js/BushCommandInteraction.ts @@ -9,14 +9,16 @@ import { Snowflake, TextChannel } from 'discord.js'; -import { BushClient } from '../discord-akairo/BushClient'; -import { BushApplicationCommand } from './BushApplicationCommand'; -import { BushGuild } from './BushGuild'; -import { BushGuildChannel } from './BushGuildChannel'; -import { BushGuildEmoji } from './BushGuildEmoji'; -import { BushGuildMember } from './BushGuildMember'; -import { BushRole } from './BushRole'; -import { BushUser } from './BushUser'; +import { + BushApplicationCommand, + BushClient, + BushGuild, + BushGuildChannel, + BushGuildEmoji, + BushGuildMember, + BushRole, + BushUser +} from '..'; export type BushGuildResolvable = | BushGuild diff --git a/src/lib/extensions/discord.js/BushDMChannel.ts b/src/lib/extensions/discord.js/BushDMChannel.ts index 9bf814b..c6f5ca3 100644 --- a/src/lib/extensions/discord.js/BushDMChannel.ts +++ b/src/lib/extensions/discord.js/BushDMChannel.ts @@ -1,7 +1,5 @@ import { DMChannel } from 'discord.js'; -import { BushClient } from '../discord-akairo/BushClient'; -import { BushMessageManager } from './BushMessageManager'; -import { BushUser } from './BushUser'; +import { BushClient, BushMessageManager, BushUser } from '..'; export class BushDMChannel extends DMChannel { public declare readonly client: BushClient; diff --git a/src/lib/extensions/discord.js/BushEmoji.ts b/src/lib/extensions/discord.js/BushEmoji.ts index ba48166..9d46d44 100644 --- a/src/lib/extensions/discord.js/BushEmoji.ts +++ b/src/lib/extensions/discord.js/BushEmoji.ts @@ -1,5 +1,5 @@ import { Emoji } from 'discord.js'; -import { BushClient } from '../discord-akairo/BushClient'; +import { BushClient } from '..'; export class BushEmoji extends Emoji { public declare readonly client: BushClient; diff --git a/src/lib/extensions/discord.js/BushGuild.ts b/src/lib/extensions/discord.js/BushGuild.ts index ea34aec..691dc92 100644 --- a/src/lib/extensions/discord.js/BushGuild.ts +++ b/src/lib/extensions/discord.js/BushGuild.ts @@ -1,6 +1,5 @@ import { Guild } from 'discord.js'; -import { Guild as GuildDB, GuildModel } from '../../models/Guild'; -import { BushClient } from '../discord-akairo/BushClient'; +import { BushClient, Guild as GuildDB, GuildModel } from '../..'; export class BushGuild extends Guild { public declare readonly client: BushClient; diff --git a/src/lib/extensions/discord.js/BushGuildApplicationCommandManager.ts b/src/lib/extensions/discord.js/BushGuildApplicationCommandManager.ts index d4c1337..4c80bba 100644 --- a/src/lib/extensions/discord.js/BushGuildApplicationCommandManager.ts +++ b/src/lib/extensions/discord.js/BushGuildApplicationCommandManager.ts @@ -1,6 +1,6 @@ /* eslint-disable @typescript-eslint/no-explicit-any */ import { GuildApplicationCommandManager } from 'discord.js'; -import { BushGuild } from './BushGuild'; +import { BushGuild } from '..'; export class BushGuildApplicationCommandManager extends GuildApplicationCommandManager { public guild: BushGuild; diff --git a/src/lib/extensions/discord.js/BushGuildChannel.ts b/src/lib/extensions/discord.js/BushGuildChannel.ts index 7eada41..351e454 100644 --- a/src/lib/extensions/discord.js/BushGuildChannel.ts +++ b/src/lib/extensions/discord.js/BushGuildChannel.ts @@ -1,6 +1,5 @@ import { GuildChannel } from 'discord.js'; -import { BushClient } from '../discord-akairo/BushClient'; -import { BushGuild } from './BushGuild'; +import { BushClient, BushGuild } from '..'; export class BushGuildChannel extends GuildChannel { public declare readonly client: BushClient; diff --git a/src/lib/extensions/discord.js/BushGuildEmoji.ts b/src/lib/extensions/discord.js/BushGuildEmoji.ts index c03c1b5..ed41bf8 100644 --- a/src/lib/extensions/discord.js/BushGuildEmoji.ts +++ b/src/lib/extensions/discord.js/BushGuildEmoji.ts @@ -1,8 +1,5 @@ import { GuildEmoji } from 'discord.js'; -import { BushClient } from '../discord-akairo/BushClient'; -import { BushGuild } from './BushGuild'; -import { BushGuildEmojiRoleManager } from './BushGuildEmojiRoleManager'; -import { BushUser } from './BushUser'; +import { BushClient, BushGuild, BushGuildEmojiRoleManager, BushUser } from '..'; export class BushGuildEmoji extends GuildEmoji { public declare readonly client: BushClient; diff --git a/src/lib/extensions/discord.js/BushGuildEmojiRoleManager.ts b/src/lib/extensions/discord.js/BushGuildEmojiRoleManager.ts index 00afb25..042d062 100644 --- a/src/lib/extensions/discord.js/BushGuildEmojiRoleManager.ts +++ b/src/lib/extensions/discord.js/BushGuildEmojiRoleManager.ts @@ -1,7 +1,5 @@ import { Collection, GuildEmojiRoleManager, Snowflake } from 'discord.js'; -import { BushGuild } from './BushGuild'; -import { BushGuildEmoji } from './BushGuildEmoji'; -import { BushRole } from './BushRole'; +import { BushGuild, BushGuildEmoji, BushRole } from '..'; export class BushGuildEmojiRoleManager extends GuildEmojiRoleManager { public declare emoji: BushGuildEmoji; diff --git a/src/lib/extensions/discord.js/BushGuildMember.ts b/src/lib/extensions/discord.js/BushGuildMember.ts index 7a63012..54b26f0 100644 --- a/src/lib/extensions/discord.js/BushGuildMember.ts +++ b/src/lib/extensions/discord.js/BushGuildMember.ts @@ -1,9 +1,6 @@ /* eslint-disable @typescript-eslint/no-unused-vars */ import { GuildMember, RoleResolvable } from 'discord.js'; -import { ModLogType } from '../../models'; -import { BushClient, BushUserResolvable } from '../discord-akairo/BushClient'; -import { BushGuild } from './BushGuild'; -import { BushUser } from './BushUser'; +import { BushClient, BushGuild, BushUser, BushUserResolvable, ModLogType } from '../..'; interface BushPunishmentOptions { reason?: string; diff --git a/src/lib/extensions/discord.js/BushGuildMemberManager.ts b/src/lib/extensions/discord.js/BushGuildMemberManager.ts index dbc2da5..7643463 100644 --- a/src/lib/extensions/discord.js/BushGuildMemberManager.ts +++ b/src/lib/extensions/discord.js/BushGuildMemberManager.ts @@ -1,6 +1,6 @@ // /* eslint-disable @typescript-eslint/no-explicit-any */ // import { GuildMemberManager } from 'discord.js'; -// import { BushGuild } from './BushGuild'; +// import { BushGuild } from '..'; // export class BushGuildMemberManager extends GuildMemberManager { // public guild: BushGuild; diff --git a/src/lib/extensions/discord.js/BushMessage.ts b/src/lib/extensions/discord.js/BushMessage.ts index f7e8cd0..9e440aa 100644 --- a/src/lib/extensions/discord.js/BushMessage.ts +++ b/src/lib/extensions/discord.js/BushMessage.ts @@ -1,13 +1,14 @@ import { Message } from 'discord.js'; -import { BushClient } from '../discord-akairo/BushClient'; -// import { BushCommandUtil } from '../discord-akairo/BushCommandUtil'; -import { BushDMChannel } from './BushDMChannel'; -import { BushGuild } from './BushGuild'; -import { BushGuildMember } from './BushGuildMember'; -import { BushNewsChannel } from './BushNewsChannel'; -import { BushTextChannel } from './BushTextChannel'; -import { BushThreadChannel } from './BushThreadChannel'; -import { BushUser } from './BushUser'; +import { + BushClient, + BushDMChannel, + BushGuild, + BushGuildMember, + BushNewsChannel, + BushTextChannel, + BushThreadChannel, + BushUser +} from '..'; export class BushMessage extends Message { public declare readonly client: BushClient; diff --git a/src/lib/extensions/discord.js/BushMessageManager.ts b/src/lib/extensions/discord.js/BushMessageManager.ts index 181808a..fb449f2 100644 --- a/src/lib/extensions/discord.js/BushMessageManager.ts +++ b/src/lib/extensions/discord.js/BushMessageManager.ts @@ -1,10 +1,6 @@ /* eslint-disable @typescript-eslint/no-explicit-any */ import { Collection, MessageManager, Snowflake } from 'discord.js'; -import { BushClient } from '../discord-akairo/BushClient'; -import { BushDMChannel } from './BushDMChannel'; -import { BushMessage } from './BushMessage'; -import { BushTextChannel } from './BushTextChannel'; -import { BushThreadChannel } from './BushThreadChannel'; +import { BushClient, BushDMChannel, BushMessage, BushTextChannel, BushThreadChannel } from '..'; export class BushMessageManager extends MessageManager { public declare readonly client: BushClient; diff --git a/src/lib/extensions/discord.js/BushMessageReaction.ts b/src/lib/extensions/discord.js/BushMessageReaction.ts index 9958059..0f81c3f 100644 --- a/src/lib/extensions/discord.js/BushMessageReaction.ts +++ b/src/lib/extensions/discord.js/BushMessageReaction.ts @@ -1,8 +1,5 @@ import { MessageReaction } from 'discord.js'; -import { BushClient } from '../discord-akairo/BushClient'; -import { BushGuildEmoji } from './BushGuildEmoji'; -import { BushMessage } from './BushMessage'; -import { BushReactionEmoji } from './BushReactionEmoji'; +import { BushClient, BushGuildEmoji, BushMessage, BushReactionEmoji } from '..'; export class BushMessageReaction extends MessageReaction { public readonly client: BushClient; diff --git a/src/lib/extensions/discord.js/BushNewsChannel.ts b/src/lib/extensions/discord.js/BushNewsChannel.ts index b026b5e..0ceff70 100644 --- a/src/lib/extensions/discord.js/BushNewsChannel.ts +++ b/src/lib/extensions/discord.js/BushNewsChannel.ts @@ -1,8 +1,5 @@ import { NewsChannel } from 'discord.js'; -import { BushClient } from '../discord-akairo/BushClient'; -import { BushGuild } from './BushGuild'; -import { BushMessageManager } from './BushMessageManager'; -import { BushThreadManager } from './BushThreadManager'; +import { BushClient, BushGuild, BushMessageManager, BushThreadManager } from '..'; export class BushNewsChannel extends NewsChannel { public declare readonly client: BushClient; diff --git a/src/lib/extensions/discord.js/BushPresence.ts b/src/lib/extensions/discord.js/BushPresence.ts index 13c7567..a119bf9 100644 --- a/src/lib/extensions/discord.js/BushPresence.ts +++ b/src/lib/extensions/discord.js/BushPresence.ts @@ -1,8 +1,5 @@ import { Presence } from 'discord.js'; -import { BushClient } from '../discord-akairo/BushClient'; -import { BushGuild } from './BushGuild'; -import { BushGuildMember } from './BushGuildMember'; -import { BushUser } from './BushUser'; +import { BushClient, BushGuild, BushGuildMember, BushUser } from '..'; export class BushPresence extends Presence { public declare guild: BushGuild | null; diff --git a/src/lib/extensions/discord.js/BushReactionEmoji.ts b/src/lib/extensions/discord.js/BushReactionEmoji.ts index a25c1b8..404ac17 100644 --- a/src/lib/extensions/discord.js/BushReactionEmoji.ts +++ b/src/lib/extensions/discord.js/BushReactionEmoji.ts @@ -1,6 +1,5 @@ import { ReactionEmoji } from 'discord.js'; -import { BushClient } from '../discord-akairo/BushClient'; -import { BushMessageReaction } from './BushMessageReaction'; +import { BushClient, BushMessageReaction } from '..'; export class BushReactionEmoji extends ReactionEmoji { public declare readonly client: BushClient; diff --git a/src/lib/extensions/discord.js/BushRole.ts b/src/lib/extensions/discord.js/BushRole.ts index 1d502b2..d4df18e 100644 --- a/src/lib/extensions/discord.js/BushRole.ts +++ b/src/lib/extensions/discord.js/BushRole.ts @@ -1,7 +1,5 @@ import { Collection, Role, Snowflake } from 'discord.js'; -import { BushClient } from '../discord-akairo/BushClient'; -import { BushGuild } from './BushGuild'; -import { BushGuildMember } from './BushGuildMember'; +import { BushClient, BushGuild, BushGuildMember } from '..'; export class BushRole extends Role { public declare readonly client: BushClient; diff --git a/src/lib/extensions/discord.js/BushSelectMenuInteraction.ts b/src/lib/extensions/discord.js/BushSelectMenuInteraction.ts index 1dd1638..4099fa1 100644 --- a/src/lib/extensions/discord.js/BushSelectMenuInteraction.ts +++ b/src/lib/extensions/discord.js/BushSelectMenuInteraction.ts @@ -1,12 +1,6 @@ import { APIInteractionGuildMember } from 'discord-api-types/v8'; import { PartialDMChannel, SelectMenuInteraction } from 'discord.js'; -import { BushClient } from '../discord-akairo/BushClient'; -import { BushDMChannel } from './BushDMChannel'; -import { BushGuild } from './BushGuild'; -import { BushGuildMember } from './BushGuildMember'; -import { BushNewsChannel } from './BushNewsChannel'; -import { BushTextChannel } from './BushTextChannel'; -import { BushUser } from './BushUser'; +import { BushClient, BushDMChannel, BushGuild, BushGuildMember, BushNewsChannel, BushTextChannel, BushUser } from '..'; export class BushSelectMenuInteraction extends SelectMenuInteraction { public declare readonly channel: BushTextChannel | BushDMChannel | BushNewsChannel | PartialDMChannel | null; diff --git a/src/lib/extensions/discord.js/BushStageChannel.ts b/src/lib/extensions/discord.js/BushStageChannel.ts index 5bd3f45..a29fc5a 100644 --- a/src/lib/extensions/discord.js/BushStageChannel.ts +++ b/src/lib/extensions/discord.js/BushStageChannel.ts @@ -1,9 +1,5 @@ import { Collection, Snowflake, StageChannel } from 'discord.js'; -import { BushClient } from '../discord-akairo/BushClient'; -import { BushCategoryChannel } from './BushCategoryChannel'; -import { BushGuild } from './BushGuild'; -import { BushGuildMember } from './BushGuildMember'; -import { BushStageInstance } from './BushStageInstance'; +import { BushCategoryChannel, BushClient, BushGuild, BushGuildMember, BushStageInstance } from '..'; export class BushStageChannel extends StageChannel { public declare readonly client: BushClient; diff --git a/src/lib/extensions/discord.js/BushStageInstance.ts b/src/lib/extensions/discord.js/BushStageInstance.ts index f162d33..e5d99b1 100644 --- a/src/lib/extensions/discord.js/BushStageInstance.ts +++ b/src/lib/extensions/discord.js/BushStageInstance.ts @@ -1,7 +1,5 @@ import { StageInstance } from 'discord.js'; -import { BushClient } from '../discord-akairo/BushClient'; -import { BushGuild } from './BushGuild'; -import { BushStageChannel } from './BushStageChannel'; +import { BushClient, BushGuild, BushStageChannel } from '..'; export class BushStageInstance extends StageInstance { public declare readonly client: BushClient; diff --git a/src/lib/extensions/discord.js/BushStoreChannel.ts b/src/lib/extensions/discord.js/BushStoreChannel.ts index 8ce22c0..f730828 100644 --- a/src/lib/extensions/discord.js/BushStoreChannel.ts +++ b/src/lib/extensions/discord.js/BushStoreChannel.ts @@ -1,8 +1,5 @@ import { Collection, Snowflake, StoreChannel } from 'discord.js'; -import { BushClient } from '../discord-akairo/BushClient'; -import { BushCategoryChannel } from './BushCategoryChannel'; -import { BushGuild } from './BushGuild'; -import { BushGuildMember } from './BushGuildMember'; +import { BushCategoryChannel, BushClient, BushGuild, BushGuildMember } from '..'; export class BushStoreChannel extends StoreChannel { public declare readonly client: BushClient; diff --git a/src/lib/extensions/discord.js/BushTextChannel.ts b/src/lib/extensions/discord.js/BushTextChannel.ts index 26e3858..2572378 100644 --- a/src/lib/extensions/discord.js/BushTextChannel.ts +++ b/src/lib/extensions/discord.js/BushTextChannel.ts @@ -1,7 +1,5 @@ import { TextChannel } from 'discord.js'; -import { BushClient } from '../discord-akairo/BushClient'; -import { BushGuild } from './BushGuild'; -import { BushMessageManager } from './BushMessageManager'; +import { BushClient, BushGuild, BushMessageManager } from '..'; export class BushTextChannel extends TextChannel { public declare readonly client: BushClient; diff --git a/src/lib/extensions/discord.js/BushThreadChannel.ts b/src/lib/extensions/discord.js/BushThreadChannel.ts index 9f6e84b..8d7c353 100644 --- a/src/lib/extensions/discord.js/BushThreadChannel.ts +++ b/src/lib/extensions/discord.js/BushThreadChannel.ts @@ -1,12 +1,14 @@ /* eslint-disable @typescript-eslint/ban-types */ import { Collection, Snowflake, ThreadChannel } from 'discord.js'; -import { BushClient } from '../discord-akairo/BushClient'; -import { BushGuild } from './BushGuild'; -import { BushGuildMember } from './BushGuildMember'; -import { BushMessageManager } from './BushMessageManager'; -import { BushNewsChannel } from './BushNewsChannel'; -import { BushTextChannel } from './BushTextChannel'; -import { BushThreadMemberManager } from './BushThreadMemberManager'; +import { + BushClient, + BushGuild, + BushGuildMember, + BushMessageManager, + BushNewsChannel, + BushTextChannel, + BushThreadMemberManager +} from '..'; export class BushThreadChannel extends ThreadChannel { public declare guild: BushGuild; diff --git a/src/lib/extensions/discord.js/BushThreadManager.ts b/src/lib/extensions/discord.js/BushThreadManager.ts index 76eaf22..61ba269 100644 --- a/src/lib/extensions/discord.js/BushThreadManager.ts +++ b/src/lib/extensions/discord.js/BushThreadManager.ts @@ -1,7 +1,6 @@ /* eslint-disable @typescript-eslint/no-explicit-any */ import { ThreadManager } from 'discord.js'; -import { BushNewsChannel } from './BushNewsChannel'; -import { BushTextChannel } from './BushTextChannel'; +import { BushNewsChannel, BushTextChannel } from '..'; export class BushThreadManager extends ThreadManager { public declare channel: BushTextChannel | BushNewsChannel; diff --git a/src/lib/extensions/discord.js/BushThreadMember.ts b/src/lib/extensions/discord.js/BushThreadMember.ts index 4ef51ae..634606f 100644 --- a/src/lib/extensions/discord.js/BushThreadMember.ts +++ b/src/lib/extensions/discord.js/BushThreadMember.ts @@ -1,8 +1,6 @@ /* eslint-disable @typescript-eslint/ban-types */ import { ThreadMember } from 'discord.js'; -import { BushGuildMember } from './BushGuildMember'; -import { BushThreadChannel } from './BushThreadChannel'; -import { BushUser } from './BushUser'; +import { BushGuildMember, BushThreadChannel, BushUser } from '..'; export class BushThreadMember extends ThreadMember { public declare readonly guildMember: BushGuildMember | null; diff --git a/src/lib/extensions/discord.js/BushThreadMemberManager.ts b/src/lib/extensions/discord.js/BushThreadMemberManager.ts index 0c44f71..ab2cfbf 100644 --- a/src/lib/extensions/discord.js/BushThreadMemberManager.ts +++ b/src/lib/extensions/discord.js/BushThreadMemberManager.ts @@ -1,8 +1,7 @@ /* eslint-disable @typescript-eslint/no-explicit-any */ /* eslint-disable @typescript-eslint/no-empty-interface */ import { ThreadMemberManager } from 'discord.js'; -import { BushClient } from '../discord-akairo/BushClient'; -import { BushThreadChannel } from './BushThreadChannel'; +import { BushClient, BushThreadChannel } from '..'; export interface BushThreadMemberManager extends ThreadMemberManager {} diff --git a/src/lib/extensions/discord.js/BushUser.ts b/src/lib/extensions/discord.js/BushUser.ts index 53a6be3..64b803c 100644 --- a/src/lib/extensions/discord.js/BushUser.ts +++ b/src/lib/extensions/discord.js/BushUser.ts @@ -1,6 +1,5 @@ import { User } from 'discord.js'; -import { BushClient } from '../discord-akairo/BushClient'; -import { BushDMChannel } from './BushDMChannel'; +import { BushClient, BushDMChannel } from '..'; export class BushUser extends User { public declare readonly client: BushClient; diff --git a/src/lib/extensions/discord.js/BushVoiceChannel.ts b/src/lib/extensions/discord.js/BushVoiceChannel.ts index 82a68b1..4f96b1f 100644 --- a/src/lib/extensions/discord.js/BushVoiceChannel.ts +++ b/src/lib/extensions/discord.js/BushVoiceChannel.ts @@ -1,7 +1,5 @@ import { Collection, Snowflake, VoiceChannel } from 'discord.js'; -import { BushClient } from '../discord-akairo/BushClient'; -import { BushGuild } from './BushGuild'; -import { BushGuildMember } from './BushGuildMember'; +import { BushClient, BushGuild, BushGuildMember } from '..'; export class BushVoiceChannel extends VoiceChannel { public declare readonly client: BushClient; diff --git a/src/lib/extensions/discord.js/BushVoiceState.ts b/src/lib/extensions/discord.js/BushVoiceState.ts index d93fa13..1d00e20 100644 --- a/src/lib/extensions/discord.js/BushVoiceState.ts +++ b/src/lib/extensions/discord.js/BushVoiceState.ts @@ -1,8 +1,5 @@ import { VoiceState } from 'discord.js'; -import { BushGuild } from './BushGuild'; -import { BushGuildMember } from './BushGuildMember'; -import { BushStageChannel } from './BushStageChannel'; -import { BushVoiceChannel } from './BushVoiceChannel'; +import { BushGuild, BushGuildMember, BushStageChannel, BushVoiceChannel } from '..'; export class BushVoiceState extends VoiceState { public readonly channel: BushVoiceChannel | BushStageChannel | null; diff --git a/src/lib/models/Ban.ts b/src/lib/models/Ban.ts index 54ca6ae..eac03e2 100644 --- a/src/lib/models/Ban.ts +++ b/src/lib/models/Ban.ts @@ -1,7 +1,7 @@ import { Snowflake } from 'discord.js'; import { DataTypes, Sequelize } from 'sequelize'; import { v4 as uuidv4 } from 'uuid'; -import { BaseModel } from './BaseModel'; +import { BaseModel } from '..'; export interface BanModel { id: string; diff --git a/src/lib/models/Global.ts b/src/lib/models/Global.ts index 842f14b..7018fae 100644 --- a/src/lib/models/Global.ts +++ b/src/lib/models/Global.ts @@ -1,6 +1,6 @@ import { Snowflake } from 'discord.js'; import { DataTypes, Optional, Sequelize } from 'sequelize'; -import { BaseModel } from './BaseModel'; +import { BaseModel } from '..'; export interface GlobalModel { environment: 'production' | 'development'; diff --git a/src/lib/models/Guild.ts b/src/lib/models/Guild.ts index 0fc3413..5980fb9 100644 --- a/src/lib/models/Guild.ts +++ b/src/lib/models/Guild.ts @@ -1,7 +1,6 @@ import { Snowflake } from 'discord.js'; import { DataTypes, Optional, Sequelize } from 'sequelize'; -import { BushClient } from '../extensions/discord-akairo/BushClient'; -import { BaseModel } from './BaseModel'; +import { BaseModel, BushClient } from '..'; export interface GuildModel { id: string; diff --git a/src/lib/models/Level.ts b/src/lib/models/Level.ts index e1f30f4..0daa61b 100644 --- a/src/lib/models/Level.ts +++ b/src/lib/models/Level.ts @@ -1,5 +1,5 @@ import { DataTypes, Sequelize } from 'sequelize'; -import { BaseModel } from './BaseModel'; +import { BaseModel } from '..'; export interface LevelModel { id: string; diff --git a/src/lib/models/ModLog.ts b/src/lib/models/ModLog.ts index 6261794..a1a3085 100644 --- a/src/lib/models/ModLog.ts +++ b/src/lib/models/ModLog.ts @@ -1,7 +1,7 @@ import { Snowflake } from 'discord.js'; import { DataTypes, Sequelize } from 'sequelize'; import { v4 as uuidv4 } from 'uuid'; -import { BaseModel } from './BaseModel'; +import { BaseModel } from '..'; export enum ModLogType { PERM_BAN = 'PERM_BAN', diff --git a/src/lib/models/Mute.ts b/src/lib/models/Mute.ts index 71a32e3..7ca40d5 100644 --- a/src/lib/models/Mute.ts +++ b/src/lib/models/Mute.ts @@ -1,7 +1,7 @@ import { Snowflake } from 'discord.js'; import { DataTypes, Sequelize } from 'sequelize'; import { v4 as uuidv4 } from 'uuid'; -import { BaseModel } from './BaseModel'; +import { BaseModel } from '..'; export interface MuteModel { id: string; diff --git a/src/lib/models/PunishmentRole.ts b/src/lib/models/PunishmentRole.ts index 927cf28..9753b57 100644 --- a/src/lib/models/PunishmentRole.ts +++ b/src/lib/models/PunishmentRole.ts @@ -1,7 +1,7 @@ import { Snowflake } from 'discord.js'; import { DataTypes, Sequelize } from 'sequelize'; import { v4 as uuidv4 } from 'uuid'; -import { BaseModel } from './BaseModel'; +import { BaseModel } from '..'; export interface PunishmentRoleModel { id: string; diff --git a/src/lib/models/StickyRole.ts b/src/lib/models/StickyRole.ts index a3928e7..d2dc9ac 100644 --- a/src/lib/models/StickyRole.ts +++ b/src/lib/models/StickyRole.ts @@ -1,6 +1,6 @@ import { Snowflake } from 'discord.js'; import { DataTypes, Sequelize } from 'sequelize'; -import { BaseModel } from './BaseModel'; +import { BaseModel } from '..'; export interface StickyRoleModel { user: Snowflake; diff --git a/src/lib/utils/AllowedMentions.ts b/src/lib/utils/AllowedMentions.ts index 47e440b..9b02c31 100644 --- a/src/lib/utils/AllowedMentions.ts +++ b/src/lib/utils/AllowedMentions.ts @@ -1,6 +1,6 @@ import { MessageMentionOptions, MessageMentionTypes } from 'discord.js'; -export default class AllowedMentions { +export class AllowedMentions { public everyone: boolean; public users: boolean; public roles: boolean; diff --git a/src/listeners/client/interaction.ts b/src/listeners/client/interaction.ts index 881d759..171d5a5 100644 --- a/src/listeners/client/interaction.ts +++ b/src/listeners/client/interaction.ts @@ -1,5 +1,5 @@ import { ButtonInteraction, CommandInteraction, Interaction, SelectMenuInteraction } from 'discord.js'; -import { BushListener } from '../../lib/extensions/discord-akairo/BushListener'; +import { BushListener } from '../../lib'; export default class InteractionListener extends BushListener { public constructor() { diff --git a/src/listeners/client/ready.ts b/src/listeners/client/ready.ts index c739152..d6e5f2f 100644 --- a/src/listeners/client/ready.ts +++ b/src/listeners/client/ready.ts @@ -1,5 +1,5 @@ import chalk from 'chalk'; -import { BushListener } from '../../lib/extensions/discord-akairo/BushListener'; +import { BushListener } from '../../lib'; export default class ReadyListener extends BushListener { public constructor() { diff --git a/src/listeners/commands/commandBlocked.ts b/src/listeners/commands/commandBlocked.ts index 342e025..aebc05d 100644 --- a/src/listeners/commands/commandBlocked.ts +++ b/src/listeners/commands/commandBlocked.ts @@ -1,6 +1,4 @@ -import { BushCommand } from '../../lib/extensions/discord-akairo/BushCommand'; -import { BushListener } from '../../lib/extensions/discord-akairo/BushListener'; -import { BushMessage } from '../../lib/extensions/discord.js/BushMessage'; +import { BushCommand, BushListener, BushMessage } from '../../lib'; export default class CommandBlockedListener extends BushListener { public constructor() { diff --git a/src/listeners/commands/commandError.ts b/src/listeners/commands/commandError.ts index d80a2bc..0e84571 100644 --- a/src/listeners/commands/commandError.ts +++ b/src/listeners/commands/commandError.ts @@ -1,8 +1,7 @@ import { stripIndents } from 'common-tags'; import { Command } from 'discord-akairo'; import { MessageEmbed } from 'discord.js'; -import { BushListener } from '../../lib/extensions/discord-akairo/BushListener'; -import { BushMessage } from '../../lib/extensions/discord.js/BushMessage'; +import { BushListener, BushMessage } from '../../lib'; export default class CommandErrorListener extends BushListener { public constructor() { diff --git a/src/listeners/commands/commandMissingPermissions.ts b/src/listeners/commands/commandMissingPermissions.ts index bef8e9c..7f04304 100644 --- a/src/listeners/commands/commandMissingPermissions.ts +++ b/src/listeners/commands/commandMissingPermissions.ts @@ -1,7 +1,5 @@ import { PermissionString } from 'discord.js'; -import { BushCommand } from '../../lib/extensions/discord-akairo/BushCommand'; -import { BushListener } from '../../lib/extensions/discord-akairo/BushListener'; -import { BushMessage } from '../../lib/extensions/discord.js/BushMessage'; +import { BushCommand, BushListener, BushMessage } from '../../lib'; export default class CommandMissingPermissionsListener extends BushListener { public constructor() { diff --git a/src/listeners/commands/commandStarted.ts b/src/listeners/commands/commandStarted.ts index 02726f3..4f8c13c 100644 --- a/src/listeners/commands/commandStarted.ts +++ b/src/listeners/commands/commandStarted.ts @@ -1,6 +1,5 @@ import { Message } from 'discord.js'; -import { BushCommand } from '../../lib/extensions/discord-akairo/BushCommand'; -import { BushListener } from '../../lib/extensions/discord-akairo/BushListener'; +import { BushCommand, BushListener } from '../../lib'; export default class CommandStartedListener extends BushListener { public constructor() { diff --git a/src/listeners/commands/slashBlocked.ts b/src/listeners/commands/slashBlocked.ts index 04180f7..a2e4b0e 100644 --- a/src/listeners/commands/slashBlocked.ts +++ b/src/listeners/commands/slashBlocked.ts @@ -1,6 +1,4 @@ -import { BushCommand } from '../../lib/extensions/discord-akairo/BushCommand'; -import { BushListener } from '../../lib/extensions/discord-akairo/BushListener'; -import { BushSlashMessage } from '../../lib/extensions/discord-akairo/BushSlashMessage'; +import { BushCommand, BushListener, BushSlashMessage } from '../../lib'; export default class SlashBlockedListener extends BushListener { public constructor() { diff --git a/src/listeners/commands/slashCommandError.ts b/src/listeners/commands/slashCommandError.ts index 6bbb462..1fa9dfa 100644 --- a/src/listeners/commands/slashCommandError.ts +++ b/src/listeners/commands/slashCommandError.ts @@ -1,8 +1,6 @@ import { stripIndents } from 'common-tags'; import { MessageEmbed } from 'discord.js'; -import { BushCommand } from '../../lib/extensions/discord-akairo/BushCommand'; -import { BushListener } from '../../lib/extensions/discord-akairo/BushListener'; -import { BushSlashMessage } from '../../lib/extensions/discord-akairo/BushSlashMessage'; +import { BushCommand, BushListener, BushSlashMessage } from '../../lib'; export default class SlashCommandErrorListener extends BushListener { public constructor() { diff --git a/src/listeners/commands/slashMissingPermissions.ts b/src/listeners/commands/slashMissingPermissions.ts index d8f32cf..85cb5dd 100644 --- a/src/listeners/commands/slashMissingPermissions.ts +++ b/src/listeners/commands/slashMissingPermissions.ts @@ -1,6 +1,6 @@ import { Command } from 'discord-akairo'; import { CommandInteraction } from 'discord.js'; -import { BushListener } from '../../lib/extensions/discord-akairo/BushListener'; +import { BushListener } from '../../lib'; export default class SlashMissingPermissionsListener extends BushListener { public constructor() { diff --git a/src/listeners/commands/slashStarted.ts b/src/listeners/commands/slashStarted.ts index d6d5c3a..c6a6351 100644 --- a/src/listeners/commands/slashStarted.ts +++ b/src/listeners/commands/slashStarted.ts @@ -1,6 +1,4 @@ -import { BushCommand } from '../../lib/extensions/discord-akairo/BushCommand'; -import { BushListener } from '../../lib/extensions/discord-akairo/BushListener'; -import { BushSlashMessage } from '../../lib/extensions/discord-akairo/BushSlashMessage'; +import { BushCommand, BushListener, BushSlashMessage } from '../../lib'; export default class SlashStartedListener extends BushListener { public constructor() { diff --git a/src/listeners/guild/syncUnban.ts b/src/listeners/guild/syncUnban.ts index 25529ea..2729ae7 100644 --- a/src/listeners/guild/syncUnban.ts +++ b/src/listeners/guild/syncUnban.ts @@ -1,6 +1,5 @@ import { Guild, User } from 'discord.js'; -import { BushListener } from '../../lib/extensions/discord-akairo/BushListener'; -import { Ban } from '../../lib/models'; +import { Ban, BushListener } from '../../lib'; export default class SyncUnbanListener extends BushListener { public constructor() { diff --git a/src/listeners/message/level.ts b/src/listeners/message/level.ts index 08ac933..1a24e1b 100644 --- a/src/listeners/message/level.ts +++ b/src/listeners/message/level.ts @@ -1,6 +1,5 @@ import { Message } from 'discord.js'; -import { BushListener } from '../../lib/extensions/discord-akairo/BushListener'; -import { Level } from '../../lib/models'; +import { BushListener, Level } from '../../lib'; export default class LevelListener extends BushListener { private levelCooldowns: Set<string> = new Set(); diff --git a/src/listeners/other/consoleListener.ts b/src/listeners/other/consoleListener.ts index b3d30ad..d1915f1 100644 --- a/src/listeners/other/consoleListener.ts +++ b/src/listeners/other/consoleListener.ts @@ -1,6 +1,6 @@ /* eslint-disable @typescript-eslint/no-var-requires */ /* eslint-disable @typescript-eslint/no-unused-vars */ -import { BushListener } from '../../lib/extensions/discord-akairo/BushListener'; +import { BushListener } from '../../lib'; export default class ConsoleListener extends BushListener { public constructor() { @@ -15,7 +15,7 @@ export default class ConsoleListener extends BushListener { const bot = this.client, config = this.client.config, 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/listeners/other/promiseRejection.ts b/src/listeners/other/promiseRejection.ts index 228c65d..883197a 100644 --- a/src/listeners/other/promiseRejection.ts +++ b/src/listeners/other/promiseRejection.ts @@ -1,4 +1,4 @@ -import { BushListener } from '../../lib/extensions/discord-akairo/BushListener'; +import { BushListener } from '../../lib'; export default class PromiseRejectionListener extends BushListener { public constructor() { diff --git a/src/tasks/unban.ts b/src/tasks/unban.ts index 861f71f..3d39b02 100644 --- a/src/tasks/unban.ts +++ b/src/tasks/unban.ts @@ -1,7 +1,6 @@ import { DiscordAPIError } from 'discord.js'; import { Op } from 'sequelize'; -import { BushTask } from '../lib/extensions/discord-akairo/BushTask'; -import { Ban } from '../lib/models'; +import { Ban, BushTask } from '../lib'; export default class UnbanTask extends BushTask { public constructor() { diff --git a/src/tasks/unmute.ts b/src/tasks/unmute.ts index a259b17..379fca4 100644 --- a/src/tasks/unmute.ts +++ b/src/tasks/unmute.ts @@ -1,8 +1,6 @@ import { DiscordAPIError } from 'discord.js'; import { Op } from 'sequelize'; -import { BushTask } from '../lib/extensions/discord-akairo/BushTask'; -import { Guild } from '../lib/models'; -import { Mute } from '../lib/models/Mute'; +import { BushTask, Guild, Mute } from '../lib'; export default class UnmuteTask extends BushTask { public constructor() { diff --git a/src/tasks/updateCache.ts b/src/tasks/updateCache.ts index 08e0f3c..5babb5e 100644 --- a/src/tasks/updateCache.ts +++ b/src/tasks/updateCache.ts @@ -1,9 +1,7 @@ -import { BushClient } from '../lib/extensions/discord-akairo/BushClient'; -import { BushTask } from '../lib/extensions/discord-akairo/BushTask'; -import { Global } from '../lib/models'; +import { BushClient, BushTask, Global } from '../lib'; import * as config from './../config/options'; -export default class UpdateCacheTask extends BushTask { +export class UpdateCacheTask extends BushTask { public constructor() { super('updateCache', { delay: 300_000, // 5 minutes |