From 1dee5bcda6a43eaa7fcc88ed3b0e458f32104de4 Mon Sep 17 00:00:00 2001 From: IRONM00N <64110067+IRONM00N@users.noreply.github.com> Date: Sun, 4 Jul 2021 17:07:38 -0400 Subject: cleaned up lib imports --- .../discord-akairo/BushArgumentTypeCaster.ts | 2 +- src/lib/extensions/discord-akairo/BushClient.ts | 18 ++++++++++------- .../extensions/discord-akairo/BushClientUtil.ts | 23 +++++++++++++++------- src/lib/extensions/discord-akairo/BushCommand.ts | 5 +---- .../discord-akairo/BushCommandHandler.ts | 5 +---- .../extensions/discord-akairo/BushCommandUtil.ts | 4 +--- src/lib/extensions/discord-akairo/BushInhibitor.ts | 5 +---- .../discord-akairo/BushInhibitorHandler.ts | 2 +- src/lib/extensions/discord-akairo/BushListener.ts | 2 +- .../discord-akairo/BushListenerHandler.ts | 2 +- .../extensions/discord-akairo/BushSlashMessage.ts | 5 +---- src/lib/extensions/discord-akairo/BushTask.ts | 2 +- .../extensions/discord-akairo/BushTaskHandler.ts | 2 +- src/lib/extensions/discord.js/BushActivity.ts | 3 +-- .../discord.js/BushApplicationCommand.ts | 3 +-- .../discord.js/BushApplicationCommandManager.ts | 4 +--- .../BushApplicationCommandPermissionsManager.ts | 5 +---- .../extensions/discord.js/BushButtonInteraction.ts | 8 +------- .../extensions/discord.js/BushCategoryChannel.ts | 5 +---- .../discord.js/BushCommandInteraction.ts | 18 +++++++++-------- src/lib/extensions/discord.js/BushDMChannel.ts | 4 +--- src/lib/extensions/discord.js/BushEmoji.ts | 2 +- src/lib/extensions/discord.js/BushGuild.ts | 3 +-- .../BushGuildApplicationCommandManager.ts | 2 +- src/lib/extensions/discord.js/BushGuildChannel.ts | 3 +-- src/lib/extensions/discord.js/BushGuildEmoji.ts | 5 +---- .../discord.js/BushGuildEmojiRoleManager.ts | 4 +--- src/lib/extensions/discord.js/BushGuildMember.ts | 5 +---- .../discord.js/BushGuildMemberManager.ts | 2 +- src/lib/extensions/discord.js/BushMessage.ts | 19 +++++++++--------- .../extensions/discord.js/BushMessageManager.ts | 6 +----- .../extensions/discord.js/BushMessageReaction.ts | 5 +---- src/lib/extensions/discord.js/BushNewsChannel.ts | 5 +---- src/lib/extensions/discord.js/BushPresence.ts | 5 +---- src/lib/extensions/discord.js/BushReactionEmoji.ts | 3 +-- src/lib/extensions/discord.js/BushRole.ts | 4 +--- .../discord.js/BushSelectMenuInteraction.ts | 8 +------- src/lib/extensions/discord.js/BushStageChannel.ts | 6 +----- src/lib/extensions/discord.js/BushStageInstance.ts | 4 +--- src/lib/extensions/discord.js/BushStoreChannel.ts | 5 +---- src/lib/extensions/discord.js/BushTextChannel.ts | 4 +--- src/lib/extensions/discord.js/BushThreadChannel.ts | 16 ++++++++------- src/lib/extensions/discord.js/BushThreadManager.ts | 3 +-- src/lib/extensions/discord.js/BushThreadMember.ts | 4 +--- .../discord.js/BushThreadMemberManager.ts | 3 +-- src/lib/extensions/discord.js/BushUser.ts | 3 +-- src/lib/extensions/discord.js/BushVoiceChannel.ts | 4 +--- src/lib/extensions/discord.js/BushVoiceState.ts | 5 +---- src/lib/models/Ban.ts | 2 +- src/lib/models/Global.ts | 2 +- src/lib/models/Guild.ts | 3 +-- src/lib/models/Level.ts | 2 +- src/lib/models/ModLog.ts | 2 +- src/lib/models/Mute.ts | 2 +- src/lib/models/PunishmentRole.ts | 2 +- src/lib/models/StickyRole.ts | 2 +- src/lib/utils/AllowedMentions.ts | 2 +- 57 files changed, 108 insertions(+), 176 deletions(-) (limited to 'src/lib') 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 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; -- cgit