diff options
Diffstat (limited to 'src')
110 files changed, 370 insertions, 281 deletions
diff --git a/src/arguments/contentWithDuration.ts b/src/arguments/contentWithDuration.ts index c48e723..9753f50 100644 --- a/src/arguments/contentWithDuration.ts +++ b/src/arguments/contentWithDuration.ts @@ -1,4 +1,4 @@ -import { BushArgumentTypeCaster, BushMessage } from '../lib'; +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 9ef3845..53b200e 100644 --- a/src/arguments/duration.ts +++ b/src/arguments/duration.ts @@ -1,4 +1,4 @@ -import { BushArgumentTypeCaster, BushMessage } from '../lib'; +import { BushArgumentTypeCaster, BushMessage } from '@lib'; export const durationTypeCaster: BushArgumentTypeCaster = (_message: BushMessage, phrase): number => { // if (!phrase) return null; @@ -1,5 +1,6 @@ +import 'module-alias/register'; import * as config from './config/options'; -import { BushClient } from './lib'; +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 6fa84df..6fda0b8 100644 --- a/src/commands/config/muteRole.ts +++ b/src/commands/config/muteRole.ts @@ -1,5 +1,5 @@ +import { AllowedMentions, BushCommand, BushMessage, BushSlashMessage } from '@lib'; import { Role } from 'discord.js'; -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 52f6034..9be6ec4 100644 --- a/src/commands/config/prefix.ts +++ b/src/commands/config/prefix.ts @@ -1,4 +1,4 @@ -import { BushCommand, BushMessage, BushSlashMessage } from '../../lib'; +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 0c07b9a..f15e07d 100644 --- a/src/commands/config/welcomeChannel.ts +++ b/src/commands/config/welcomeChannel.ts @@ -1,5 +1,5 @@ +import { BushCommand, BushMessage, BushSlashMessage } from '@lib'; import { Channel } from 'discord.js'; -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 295d042..f3a30ab 100644 --- a/src/commands/dev/eval.ts +++ b/src/commands/dev/eval.ts @@ -1,11 +1,11 @@ /* eslint-disable @typescript-eslint/no-var-requires */ /* eslint-disable @typescript-eslint/no-unused-vars */ +import { BushCommand, BushMessage, BushSlashMessage } from '@lib'; import { exec } from 'child_process'; import { Constants } from 'discord-akairo'; import { CommandInteraction, MessageEmbed, MessageEmbedOptions, Util } from 'discord.js'; import { transpile } from 'typescript'; import { inspect, promisify } from 'util'; -import { BushCommand, BushMessage, BushSlashMessage } from '../../lib'; const clean = (text) => { if (typeof text === 'string') { @@ -181,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'), + { 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 a66d755..c6a2140 100644 --- a/src/commands/dev/reload.ts +++ b/src/commands/dev/reload.ts @@ -1,4 +1,4 @@ -import { BushCommand, BushMessage, BushSlashMessage } from '../../lib'; +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 fb2f41f..9c7daeb 100644 --- a/src/commands/dev/setLevel.ts +++ b/src/commands/dev/setLevel.ts @@ -1,5 +1,5 @@ +import { AllowedMentions, BushCommand, BushMessage, BushSlashMessage, Level } from '@lib'; import { User } from 'discord.js'; -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 4d5ce2d..83623df 100644 --- a/src/commands/dev/superUser.ts +++ b/src/commands/dev/superUser.ts @@ -1,6 +1,6 @@ +import { BushCommand, BushMessage, BushSlashMessage, Global } from '@lib'; import { Constants } from 'discord-akairo'; import { User } from 'discord.js'; -import { BushCommand, BushMessage, BushSlashMessage, 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 2fc757e..719292e 100644 --- a/src/commands/dev/testDuration.ts +++ b/src/commands/dev/testDuration.ts @@ -1,6 +1,6 @@ +import { BushCommand, BushSlashMessage } from '@lib'; import { stripIndents } from 'common-tags'; import { Message } from 'discord.js'; -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 80ca29d..d9961af 100644 --- a/src/commands/info/botInfo.ts +++ b/src/commands/info/botInfo.ts @@ -1,5 +1,5 @@ +import { BushCommand, BushMessage, BushSlashMessage } from '@lib'; import { MessageEmbed } from 'discord.js'; -import { BushCommand, BushMessage, BushSlashMessage } from '../../lib'; export default class BotInfoCommand extends BushCommand { public constructor() { diff --git a/src/commands/info/help.ts b/src/commands/info/help.ts index a561d69..439f0ef 100644 --- a/src/commands/info/help.ts +++ b/src/commands/info/help.ts @@ -1,5 +1,5 @@ +import { BushCommand, BushMessage, BushSlashMessage } from '@lib'; import { MessageActionRow, MessageButton, MessageEmbed } from 'discord.js'; -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 804ede2..4638aa9 100644 --- a/src/commands/info/ping.ts +++ b/src/commands/info/ping.ts @@ -1,5 +1,5 @@ +import { BushCommand, BushMessage, BushSlashMessage } from '@lib'; import { Message, MessageEmbed } from 'discord.js'; -import { BushCommand, BushMessage, 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 241dce3..60701d1 100644 --- a/src/commands/info/pronouns.ts +++ b/src/commands/info/pronouns.ts @@ -1,6 +1,6 @@ +import { BushCommand, BushSlashMessage } from '@lib'; import { Message, MessageEmbed, User } from 'discord.js'; import got, { HTTPError } from 'got'; -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 244014b..be7a51f 100644 --- a/src/commands/moderation/ban.ts +++ b/src/commands/moderation/ban.ts @@ -1,5 +1,5 @@ +import { BushCommand, BushMessage, BushSlashMessage } from '@lib'; import { User } from 'discord.js'; -import { BushCommand, BushMessage, BushSlashMessage } 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 87bf1f7..f960488 100644 --- a/src/commands/moderation/kick.ts +++ b/src/commands/moderation/kick.ts @@ -1,4 +1,4 @@ -import { BushCommand, BushGuildMember, BushMessage, BushSlashMessage, BushUser } from '../../lib'; +import { BushCommand, BushGuildMember, BushMessage, BushSlashMessage, BushUser } 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 36f72fc..c71f962 100644 --- a/src/commands/moderation/modlog.ts +++ b/src/commands/moderation/modlog.ts @@ -1,7 +1,7 @@ +import { BushCommand, BushMessage, BushSlashMessage, ModLog } from '@lib'; import { Argument } from 'discord-akairo'; import { MessageEmbed } from 'discord.js'; import moment from 'moment'; -import { BushCommand, BushMessage, BushSlashMessage, 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 bc3abf2..26ccb21 100644 --- a/src/commands/moderation/mute.ts +++ b/src/commands/moderation/mute.ts @@ -1,5 +1,5 @@ +import { BushCommand, BushGuildMember, BushMessage, BushSlashMessage, BushUser } from '@lib'; import { Argument } from 'discord-akairo'; -import { BushCommand, BushGuildMember, BushMessage, BushSlashMessage, 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 6bac9e8..33f474e 100644 --- a/src/commands/moderation/role.ts +++ b/src/commands/moderation/role.ts @@ -1,5 +1,5 @@ /* eslint-disable @typescript-eslint/no-empty-function */ -import { AllowedMentions, BushCommand, BushGuildMember, BushMessage, BushRole, BushSlashMessage } from '../../lib'; +import { AllowedMentions, BushCommand, BushGuildMember, BushMessage, BushRole, BushSlashMessage } from '@lib'; export default class RoleCommand extends BushCommand { public constructor() { diff --git a/src/commands/moderation/warn.ts b/src/commands/moderation/warn.ts index d1c17d4..5d679ab 100644 --- a/src/commands/moderation/warn.ts +++ b/src/commands/moderation/warn.ts @@ -1,4 +1,4 @@ -import { BushCommand, BushGuildMember, BushMessage, BushSlashMessage, BushUser } from '../../lib'; +import { BushCommand, BushGuildMember, BushMessage, BushSlashMessage, BushUser } 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 a564fc3..b19d3bc 100644 --- a/src/commands/moulberry-bush/capePerms.ts +++ b/src/commands/moulberry-bush/capePerms.ts @@ -1,7 +1,7 @@ +import { BushCommand, BushMessage, BushSlashMessage } from '@lib'; import { Constants } from 'discord-akairo'; import { MessageEmbed } from 'discord.js'; import got from 'got'; -import { BushCommand, BushMessage, BushSlashMessage } 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 80555b1..93373b0 100644 --- a/src/commands/moulberry-bush/giveawayPing.ts +++ b/src/commands/moulberry-bush/giveawayPing.ts @@ -1,4 +1,4 @@ -import { AllowedMentions, BushCommand, BushMessage } from '../../lib'; +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 5dcafe5..7f3509f 100644 --- a/src/commands/moulberry-bush/level.ts +++ b/src/commands/moulberry-bush/level.ts @@ -1,10 +1,10 @@ -import { BushCommand, BushMessage, BushSlashMessage, BushUser, Level } from '../../lib'; +import { BushCommand, BushMessage, BushSlashMessage, BushUser, 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'; +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 f2e0911..a2b8c78 100644 --- a/src/commands/moulberry-bush/rule.ts +++ b/src/commands/moulberry-bush/rule.ts @@ -1,6 +1,6 @@ +import { AllowedMentions, BushCommand, BushMessage, BushSlashMessage } from '@lib'; import { Argument, Constants } from 'discord-akairo'; import { MessageEmbed, User } from 'discord.js'; -import { AllowedMentions, BushCommand, BushMessage, BushSlashMessage } from '../../lib'; const rules = [ { diff --git a/src/inhibitors/blacklist/guildBlacklist.ts b/src/inhibitors/blacklist/guildBlacklist.ts index 06e93fa..d9a42da 100644 --- a/src/inhibitors/blacklist/guildBlacklist.ts +++ b/src/inhibitors/blacklist/guildBlacklist.ts @@ -1,4 +1,4 @@ -import { BushInhibitor, BushMessage, BushSlashMessage } from '../../lib'; +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 01563a0..f3cc642 100644 --- a/src/inhibitors/blacklist/userBlacklist.ts +++ b/src/inhibitors/blacklist/userBlacklist.ts @@ -1,4 +1,4 @@ -import { BushInhibitor, BushMessage, BushSlashMessage } from '../../lib'; +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 ba143ee..fb31375 100644 --- a/src/inhibitors/commands/disabledCommand.ts +++ b/src/inhibitors/commands/disabledCommand.ts @@ -1,4 +1,4 @@ -import { BushCommand, BushInhibitor, BushMessage, BushSlashMessage } from '../../lib'; +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 1115af7..9d6e560 100644 --- a/src/inhibitors/noCache.ts +++ b/src/inhibitors/noCache.ts @@ -1,4 +1,4 @@ -import { BushInhibitor, BushMessage, BushSlashMessage } from '../lib'; +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 ed81290..9afcf8b 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 '..'; +import { BushMessage } from '../discord.js/BushMessage'; 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 99fd772..cb6a1de 100644 --- a/src/lib/extensions/discord-akairo/BushClient.ts +++ b/src/lib/extensions/discord-akairo/BushClient.ts @@ -15,42 +15,46 @@ import * as path from 'path'; import { exit } from 'process'; import readline from 'readline'; import { Sequelize } from 'sequelize'; -import { - AllowedMentions, - BushButtonInteraction, - BushCache, - BushCategoryChannel, - BushClientUtil, - BushCommandHandler, - BushCommandInteraction, - BushConstants, - BushDMChannel, - BushGuild, - BushGuildEmoji, - BushGuildMember, - BushInhibitorHandler, - BushListenerHandler, - BushLogger, - BushMessage, - BushMessageReaction, - BushNewsChannel, - BushPresence, - BushRole, - BushSelectMenuInteraction, - BushStoreChannel, - BushTaskHandler, - BushTextChannel, - BushThreadChannel, - BushThreadMember, - BushUser, - BushVoiceChannel, - BushVoiceState -} from '../..'; import { contentWithDurationTypeCaster } from '../../../arguments/contentWithDuration'; import { durationTypeCaster } from '../../../arguments/duration'; import * as config from '../../../config/options'; import { UpdateCacheTask } from '../../../tasks/updateCache'; -import * as Models from '../../models'; +import { Ban } from '../../models/Ban'; +import { Global } from '../../models/Global'; +import { Guild as GuildModel } from '../../models/Guild'; +import { Level } from '../../models/Level'; +import { ModLog } from '../../models/ModLog'; +import { Mute } from '../../models/Mute'; +import { StickyRole } from '../../models/StickyRole'; +import { AllowedMentions } from '../../utils/AllowedMentions'; +import { BushCache } from '../../utils/BushCache'; +import { BushConstants } from '../../utils/BushConstants'; +import { BushLogger } from '../../utils/BushLogger'; +import { BushButtonInteraction } from '../discord.js/BushButtonInteraction'; +import { BushCategoryChannel } from '../discord.js/BushCategoryChannel'; +import { BushCommandInteraction } from '../discord.js/BushCommandInteraction'; +import { BushDMChannel } from '../discord.js/BushDMChannel'; +import { BushGuild } from '../discord.js/BushGuild'; +import { BushGuildEmoji } from '../discord.js/BushGuildEmoji'; +import { BushGuildMember } from '../discord.js/BushGuildMember'; +import { BushMessage } from '../discord.js/BushMessage'; +import { BushMessageReaction } from '../discord.js/BushMessageReaction'; +import { BushNewsChannel } from '../discord.js/BushNewsChannel'; +import { BushPresence } from '../discord.js/BushPresence'; +import { BushRole } from '../discord.js/BushRole'; +import { BushSelectMenuInteraction } from '../discord.js/BushSelectMenuInteraction'; +import { BushStoreChannel } from '../discord.js/BushStoreChannel'; +import { BushTextChannel } from '../discord.js/BushTextChannel'; +import { BushThreadChannel } from '../discord.js/BushThreadChannel'; +import { BushThreadMember } from '../discord.js/BushThreadMember'; +import { BushUser } from '../discord.js/BushUser'; +import { BushVoiceChannel } from '../discord.js/BushVoiceChannel'; +import { BushVoiceState } from '../discord.js/BushVoiceState'; +import { BushClientUtil } from './BushClientUtil'; +import { BushCommandHandler } from './BushCommandHandler'; +import { BushInhibitorHandler } from './BushInhibitorHandler'; +import { BushListenerHandler } from './BushListenerHandler'; +import { BushTaskHandler } from './BushTaskHandler'; export type BotConfig = typeof config; export type BushReplyMessageType = string | MessagePayload | ReplyMessageOptions; @@ -106,11 +110,29 @@ export class BushClient extends AkairoClient { super( { ownerID: config.owners, - intents: Object.values(Intents.FLAGS).reduce((acc, p) => acc | p, 0) + intents: Object.values(Intents.FLAGS).reduce((acc, p) => acc | p, 0), + presence: { + activities: [ + { + name: 'Beep Boop', + type: 'WATCHING' + } + ], + status: 'online' + } }, { allowedMentions: AllowedMentions.users(), // No everyone or role mentions by default - intents: Object.values(Intents.FLAGS).reduce((acc, p) => acc | p, 0) + intents: Object.values(Intents.FLAGS).reduce((acc, p) => acc | p, 0), + presence: { + activities: [ + { + name: 'Beep Boop', + type: 'WATCHING' + } + ], + status: 'online' + } } ); @@ -142,7 +164,7 @@ export class BushClient extends AkairoClient { directory: path.join(__dirname, '..', '..', '..', 'commands'), prefix: async ({ guild }: { guild: Guild }) => { if (this.config.dev) return 'dev '; - const row = await Models.Guild.findByPk(guild.id); + const row = await GuildModel.findByPk(guild.id); return (row?.prefix || this.config.prefix) as string; }, allowMention: true, @@ -223,7 +245,7 @@ export class BushClient extends AkairoClient { } } await this.dbPreInit(); - await new UpdateCacheTask().init(this); + await UpdateCacheTask.init(this); this.console.success('Startup', `Successfully created <<global cache>>.`, false); this.taskHandler.startAll(); } @@ -231,13 +253,13 @@ export class BushClient extends AkairoClient { public async dbPreInit(): Promise<void> { try { await this.db.authenticate(); - Models.Global.initModel(this.db); - Models.Guild.initModel(this.db, this); - Models.ModLog.initModel(this.db); - Models.Ban.initModel(this.db); - Models.Mute.initModel(this.db); - Models.Level.initModel(this.db); - Models.StickyRole.initModel(this.db); + Global.initModel(this.db); + GuildModel.initModel(this.db, this); + ModLog.initModel(this.db); + Ban.initModel(this.db); + Mute.initModel(this.db); + Level.initModel(this.db); + StickyRole.initModel(this.db); await this.db.sync({ alter: true }); // Sync all tables to fix everything if updated await this.console.success('Startup', `Successfully connected to <<database>>.`, false); } catch (e) { diff --git a/src/lib/extensions/discord-akairo/BushClientUtil.ts b/src/lib/extensions/discord-akairo/BushClientUtil.ts index c2d9da7..6c6d49a 100644 --- a/src/lib/extensions/discord-akairo/BushClientUtil.ts +++ b/src/lib/extensions/discord-akairo/BushClientUtil.ts @@ -1,5 +1,6 @@ /* eslint-disable @typescript-eslint/no-explicit-any */ /* eslint-disable @typescript-eslint/explicit-module-boundary-types */ + import { exec } from 'child_process'; import { ClientUtil } from 'discord-akairo'; import { APIMessage } from 'discord-api-types'; @@ -26,23 +27,19 @@ import { import got from 'got'; import humanizeDuration from 'humanize-duration'; import { promisify } from 'util'; -import { - Ban, - BushCache, - BushClient, - BushConstants, - BushGuildMember, - BushGuildMemberResolvable, - BushGuildResolvable, - BushMessage, - BushSlashMessage, - Global, - Guild, - ModLog, - ModLogType, - Mute, - PunishmentRole -} from '../..'; +import { Ban } from '../../models/Ban'; +import { Global } from '../../models/Global'; +import { Guild } from '../../models/Guild'; +import { ModLog, ModLogType } from '../../models/ModLog'; +import { Mute } from '../../models/Mute'; +import { PunishmentRole } from '../../models/PunishmentRole'; +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 { BushSlashMessage } from './BushSlashMessage'; interface hastebinRes { key: string; diff --git a/src/lib/extensions/discord-akairo/BushCommand.ts b/src/lib/extensions/discord-akairo/BushCommand.ts index 6143816..90c68df 100644 --- a/src/lib/extensions/discord-akairo/BushCommand.ts +++ b/src/lib/extensions/discord-akairo/BushCommand.ts @@ -9,7 +9,10 @@ import { CommandOptions } from 'discord-akairo'; import { Snowflake } from 'discord.js'; -import { BushClient, BushCommandHandler, BushMessage, BushSlashMessage } from '..'; +import { BushMessage } from '../discord.js/BushMessage'; +import { BushClient } from './BushClient'; +import { BushCommandHandler } from './BushCommandHandler'; +import { BushSlashMessage } from './BushSlashMessage'; type BushArgumentType = | 'string' diff --git a/src/lib/extensions/discord-akairo/BushCommandHandler.ts b/src/lib/extensions/discord-akairo/BushCommandHandler.ts index 76bade4..09baf2e 100644 --- a/src/lib/extensions/discord-akairo/BushCommandHandler.ts +++ b/src/lib/extensions/discord-akairo/BushCommandHandler.ts @@ -1,7 +1,10 @@ /* eslint-disable @typescript-eslint/no-explicit-any */ import { Category, CommandHandler, CommandHandlerOptions } from 'discord-akairo'; import { Collection } from 'discord.js'; -import { BushClient, BushCommand, BushConstants, BushMessage } from '../..'; +import { BushConstants } from '../../utils/BushConstants'; +import { BushMessage } from '../discord.js/BushMessage'; +import { BushClient } from './BushClient'; +import { BushCommand } from './BushCommand'; export type BushCommandHandlerOptions = CommandHandlerOptions; diff --git a/src/lib/extensions/discord-akairo/BushCommandUtil.ts b/src/lib/extensions/discord-akairo/BushCommandUtil.ts index 35fdd55..1e86401 100644 --- a/src/lib/extensions/discord-akairo/BushCommandUtil.ts +++ b/src/lib/extensions/discord-akairo/BushCommandUtil.ts @@ -1,6 +1,8 @@ import { CommandUtil, ParsedComponentData } from 'discord-akairo'; import { Collection, Snowflake } from 'discord.js'; -import { BushCommand, BushCommandHandler, BushMessage } from '..'; +import { BushMessage } from '../discord.js/BushMessage'; +import { BushCommand } from './BushCommand'; +import { BushCommandHandler } from './BushCommandHandler'; 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 47e9515..ae91494 100644 --- a/src/lib/extensions/discord-akairo/BushInhibitor.ts +++ b/src/lib/extensions/discord-akairo/BushInhibitor.ts @@ -1,6 +1,9 @@ /* eslint-disable @typescript-eslint/no-explicit-any */ import { Inhibitor } from 'discord-akairo'; -import { BushClient, BushCommand, BushMessage, BushSlashMessage } from '..'; +import { BushMessage } from '../discord.js/BushMessage'; +import { BushClient } from './BushClient'; +import { BushCommand } from './BushCommand'; +import { BushSlashMessage } from './BushSlashMessage'; 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 4077228..2a947da 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 '..'; +import { BushClient } from './BushClient'; 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 573bed9..e555e89 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 '..'; +import { BushClient } from './BushClient'; 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 73ca2df..28615fc 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 '..'; +import { BushClient } from './BushClient'; 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 63358b0..eee6ac2 100644 --- a/src/lib/extensions/discord-akairo/BushSlashMessage.ts +++ b/src/lib/extensions/discord-akairo/BushSlashMessage.ts @@ -1,6 +1,10 @@ import { AkairoMessage } from 'discord-akairo'; import { CommandInteraction } from 'discord.js'; -import { BushClient, BushCommandUtil, BushGuild, BushGuildMember, BushUser } from '..'; +import { BushGuild } from '../discord.js/BushGuild'; +import { BushGuildMember } from '../discord.js/BushGuildMember'; +import { BushUser } from '../discord.js/BushUser'; +import { BushClient } from './BushClient'; +import { BushCommandUtil } from './BushCommandUtil'; 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 498a837..b315270 100644 --- a/src/lib/extensions/discord-akairo/BushTask.ts +++ b/src/lib/extensions/discord-akairo/BushTask.ts @@ -1,9 +1,9 @@ import { Task, TaskOptions } from 'discord-akairo'; -import { BushClient } from '..'; +import { BushClient } from './BushClient'; export class BushTask extends Task { + public declare client: BushClient; public constructor(id: string, options?: TaskOptions) { super(id, options); } - public declare client: BushClient; } diff --git a/src/lib/extensions/discord-akairo/BushTaskHandler.ts b/src/lib/extensions/discord-akairo/BushTaskHandler.ts index a24aa23..588988d 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 '..'; +import { BushClient } from './BushClient'; export type BushTaskHandlerOptions = AkairoHandlerOptions; diff --git a/src/lib/extensions/discord-akairo/index.ts b/src/lib/extensions/discord-akairo/index.ts deleted file mode 100644 index fd92de2..0000000 --- a/src/lib/extensions/discord-akairo/index.ts +++ /dev/null @@ -1,13 +0,0 @@ -export * from './BushArgumentTypeCaster'; -export * from './BushClient'; -export * from './BushClientUtil'; -export * from './BushCommand'; -export * from './BushCommandHandler'; -export * from './BushCommandUtil'; -export * from './BushInhibitor'; -export * from './BushInhibitorHandler'; -export * from './BushListener'; -export * from './BushListenerHandler'; -export * from './BushSlashMessage'; -export * from './BushTask'; -export * from './BushTaskHandler'; diff --git a/src/lib/extensions/discord.js/BushActivity.ts b/src/lib/extensions/discord.js/BushActivity.ts index 1ac19ed..6ca1611 100644 --- a/src/lib/extensions/discord.js/BushActivity.ts +++ b/src/lib/extensions/discord.js/BushActivity.ts @@ -1,5 +1,6 @@ import { Activity } from 'discord.js'; -import { BushEmoji, BushPresence } from '..'; +import { BushEmoji } from './BushEmoji'; +import { BushPresence } from './BushPresence'; 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 97cc650..5a0e139 100644 --- a/src/lib/extensions/discord.js/BushApplicationCommand.ts +++ b/src/lib/extensions/discord.js/BushApplicationCommand.ts @@ -1,7 +1,8 @@ /* eslint-disable @typescript-eslint/ban-types */ /* eslint-disable @typescript-eslint/no-unused-vars */ import { ApplicationCommand, Snowflake } from 'discord.js'; -import { BushClient, BushGuild } from '..'; +import { BushClient } from '../discord-akairo/BushClient'; +import { BushGuild } from './BushGuild'; 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 74def59..51c93dd 100644 --- a/src/lib/extensions/discord.js/BushApplicationCommandManager.ts +++ b/src/lib/extensions/discord.js/BushApplicationCommandManager.ts @@ -1,6 +1,9 @@ /* eslint-disable @typescript-eslint/no-explicit-any */ import { ApplicationCommandManager, GuildResolvable, Snowflake } from 'discord.js'; -import { BushApplicationCommand, BushApplicationCommandPermissionsManager, BushClient, BushGuildResolvable } from '..'; +import { BushClient } from '../discord-akairo/BushClient'; +import { BushApplicationCommand } from './BushApplicationCommand'; +import { BushApplicationCommandPermissionsManager } from './BushApplicationCommandPermissionsManager'; +import { BushGuildResolvable } from './BushCommandInteraction'; export type BushApplicationCommandResolvable = BushApplicationCommand | Snowflake; diff --git a/src/lib/extensions/discord.js/BushApplicationCommandPermissionsManager.ts b/src/lib/extensions/discord.js/BushApplicationCommandPermissionsManager.ts index 29be5d9..3779c93 100644 --- a/src/lib/extensions/discord.js/BushApplicationCommandPermissionsManager.ts +++ b/src/lib/extensions/discord.js/BushApplicationCommandPermissionsManager.ts @@ -1,10 +1,13 @@ import { + ApplicationCommandPermissionsManager, ApplicationCommand, ApplicationCommandManager, - ApplicationCommandPermissionsManager, GuildApplicationCommandManager } from 'discord.js'; -import { BushApplicationCommand, BushApplicationCommandManager, BushClient, BushGuildApplicationCommandManager } from '..'; +import { BushClient } from '../discord-akairo/BushClient'; +import { BushApplicationCommand } from './BushApplicationCommand'; +import { BushApplicationCommandManager } from './BushApplicationCommandManager'; +import { BushGuildApplicationCommandManager } from './BushGuildApplicationCommandManager'; export class BushApplicationCommandPermissionsManager< BaseOptions, diff --git a/src/lib/extensions/discord.js/BushButtonInteraction.ts b/src/lib/extensions/discord.js/BushButtonInteraction.ts index 6f934bc..3a54f61 100644 --- a/src/lib/extensions/discord.js/BushButtonInteraction.ts +++ b/src/lib/extensions/discord.js/BushButtonInteraction.ts @@ -1,6 +1,12 @@ import { APIInteractionGuildMember } from 'discord-api-types/v8'; import { ButtonInteraction, PartialDMChannel } from 'discord.js'; -import { BushClient, BushDMChannel, BushGuild, BushGuildMember, BushNewsChannel, BushTextChannel, BushUser } from '..'; +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'; 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 584fc6d..a66b2c6 100644 --- a/src/lib/extensions/discord.js/BushCategoryChannel.ts +++ b/src/lib/extensions/discord.js/BushCategoryChannel.ts @@ -1,5 +1,8 @@ import { CategoryChannel, Collection, Snowflake } from 'discord.js'; -import { BushClient, BushGuild, BushGuildChannel, BushGuildMember } from '..'; +import { BushClient } from '../discord-akairo/BushClient'; +import { BushGuild } from './BushGuild'; +import { BushGuildChannel } from './BushGuildChannel'; +import { BushGuildMember } from './BushGuildMember'; 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 d1ba954..84c0707 100644 --- a/src/lib/extensions/discord.js/BushCommandInteraction.ts +++ b/src/lib/extensions/discord.js/BushCommandInteraction.ts @@ -9,16 +9,14 @@ import { Snowflake, TextChannel } from 'discord.js'; -import { - BushApplicationCommand, - BushClient, - BushGuild, - BushGuildChannel, - BushGuildEmoji, - BushGuildMember, - BushRole, - BushUser -} from '..'; +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'; export type BushGuildResolvable = | BushGuild diff --git a/src/lib/extensions/discord.js/BushDMChannel.ts b/src/lib/extensions/discord.js/BushDMChannel.ts index c6f5ca3..9bf814b 100644 --- a/src/lib/extensions/discord.js/BushDMChannel.ts +++ b/src/lib/extensions/discord.js/BushDMChannel.ts @@ -1,5 +1,7 @@ import { DMChannel } from 'discord.js'; -import { BushClient, BushMessageManager, BushUser } from '..'; +import { BushClient } from '../discord-akairo/BushClient'; +import { BushMessageManager } from './BushMessageManager'; +import { BushUser } from './BushUser'; 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 9d46d44..ba48166 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 '..'; +import { BushClient } from '../discord-akairo/BushClient'; 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 691dc92..ea34aec 100644 --- a/src/lib/extensions/discord.js/BushGuild.ts +++ b/src/lib/extensions/discord.js/BushGuild.ts @@ -1,5 +1,6 @@ import { Guild } from 'discord.js'; -import { BushClient, Guild as GuildDB, GuildModel } from '../..'; +import { Guild as GuildDB, GuildModel } from '../../models/Guild'; +import { BushClient } from '../discord-akairo/BushClient'; 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 4c80bba..d4c1337 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 '..'; +import { BushGuild } from './BushGuild'; 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 351e454..7eada41 100644 --- a/src/lib/extensions/discord.js/BushGuildChannel.ts +++ b/src/lib/extensions/discord.js/BushGuildChannel.ts @@ -1,5 +1,6 @@ import { GuildChannel } from 'discord.js'; -import { BushClient, BushGuild } from '..'; +import { BushClient } from '../discord-akairo/BushClient'; +import { BushGuild } from './BushGuild'; 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 ed41bf8..c03c1b5 100644 --- a/src/lib/extensions/discord.js/BushGuildEmoji.ts +++ b/src/lib/extensions/discord.js/BushGuildEmoji.ts @@ -1,5 +1,8 @@ import { GuildEmoji } from 'discord.js'; -import { BushClient, BushGuild, BushGuildEmojiRoleManager, BushUser } from '..'; +import { BushClient } from '../discord-akairo/BushClient'; +import { BushGuild } from './BushGuild'; +import { BushGuildEmojiRoleManager } from './BushGuildEmojiRoleManager'; +import { BushUser } from './BushUser'; 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 042d062..00afb25 100644 --- a/src/lib/extensions/discord.js/BushGuildEmojiRoleManager.ts +++ b/src/lib/extensions/discord.js/BushGuildEmojiRoleManager.ts @@ -1,5 +1,7 @@ import { Collection, GuildEmojiRoleManager, Snowflake } from 'discord.js'; -import { BushGuild, BushGuildEmoji, BushRole } from '..'; +import { BushGuild } from './BushGuild'; +import { BushGuildEmoji } from './BushGuildEmoji'; +import { BushRole } from './BushRole'; 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 4dcd99c..9e9266e 100644 --- a/src/lib/extensions/discord.js/BushGuildMember.ts +++ b/src/lib/extensions/discord.js/BushGuildMember.ts @@ -1,6 +1,9 @@ /* eslint-disable @typescript-eslint/no-unused-vars */ import { GuildMember, RoleResolvable } from 'discord.js'; -import { BushClient, BushGuild, BushUser, BushUserResolvable, ModLogType } from '../..'; +import { ModLogType } from '../../models/ModLog'; +import { BushClient, BushUserResolvable } from '../discord-akairo/BushClient'; +import { BushGuild } from './BushGuild'; +import { BushUser } from './BushUser'; interface BushPunishmentOptions { reason?: string; diff --git a/src/lib/extensions/discord.js/BushGuildMemberManager.ts b/src/lib/extensions/discord.js/BushGuildMemberManager.ts index 7643463..dbc2da5 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 '..'; +// import { BushGuild } from './BushGuild'; // 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 3694356..d4b47c6 100644 --- a/src/lib/extensions/discord.js/BushMessage.ts +++ b/src/lib/extensions/discord.js/BushMessage.ts @@ -1,14 +1,12 @@ import { Message } from 'discord.js'; -import { - BushClient, - BushDMChannel, - BushGuild, - BushGuildMember, - BushNewsChannel, - BushTextChannel, - BushThreadChannel, - BushUser -} from '..'; +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 { BushThreadChannel } from './BushThreadChannel'; +import { BushUser } from './BushUser'; 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 fb449f2..181808a 100644 --- a/src/lib/extensions/discord.js/BushMessageManager.ts +++ b/src/lib/extensions/discord.js/BushMessageManager.ts @@ -1,6 +1,10 @@ /* eslint-disable @typescript-eslint/no-explicit-any */ import { Collection, MessageManager, Snowflake } from 'discord.js'; -import { BushClient, BushDMChannel, BushMessage, BushTextChannel, BushThreadChannel } from '..'; +import { BushClient } from '../discord-akairo/BushClient'; +import { BushDMChannel } from './BushDMChannel'; +import { BushMessage } from './BushMessage'; +import { BushTextChannel } from './BushTextChannel'; +import { BushThreadChannel } from './BushThreadChannel'; 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 0f81c3f..9958059 100644 --- a/src/lib/extensions/discord.js/BushMessageReaction.ts +++ b/src/lib/extensions/discord.js/BushMessageReaction.ts @@ -1,5 +1,8 @@ import { MessageReaction } from 'discord.js'; -import { BushClient, BushGuildEmoji, BushMessage, BushReactionEmoji } from '..'; +import { BushClient } from '../discord-akairo/BushClient'; +import { BushGuildEmoji } from './BushGuildEmoji'; +import { BushMessage } from './BushMessage'; +import { BushReactionEmoji } from './BushReactionEmoji'; 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 1b23abf..9682632 100644 --- a/src/lib/extensions/discord.js/BushNewsChannel.ts +++ b/src/lib/extensions/discord.js/BushNewsChannel.ts @@ -1,5 +1,8 @@ import { AllowedThreadTypeForNewsChannel, NewsChannel } from 'discord.js'; -import { BushClient, BushGuild, BushMessageManager, BushThreadManager } from '..'; +import { BushClient } from '../discord-akairo/BushClient'; +import { BushGuild } from './BushGuild'; +import { BushMessageManager } from './BushMessageManager'; +import { BushThreadManager } from './BushThreadManager'; 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 a119bf9..13c7567 100644 --- a/src/lib/extensions/discord.js/BushPresence.ts +++ b/src/lib/extensions/discord.js/BushPresence.ts @@ -1,5 +1,8 @@ import { Presence } from 'discord.js'; -import { BushClient, BushGuild, BushGuildMember, BushUser } from '..'; +import { BushClient } from '../discord-akairo/BushClient'; +import { BushGuild } from './BushGuild'; +import { BushGuildMember } from './BushGuildMember'; +import { BushUser } from './BushUser'; 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 404ac17..a25c1b8 100644 --- a/src/lib/extensions/discord.js/BushReactionEmoji.ts +++ b/src/lib/extensions/discord.js/BushReactionEmoji.ts @@ -1,5 +1,6 @@ import { ReactionEmoji } from 'discord.js'; -import { BushClient, BushMessageReaction } from '..'; +import { BushClient } from '../discord-akairo/BushClient'; +import { BushMessageReaction } from './BushMessageReaction'; 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 d4df18e..1d502b2 100644 --- a/src/lib/extensions/discord.js/BushRole.ts +++ b/src/lib/extensions/discord.js/BushRole.ts @@ -1,5 +1,7 @@ import { Collection, Role, Snowflake } from 'discord.js'; -import { BushClient, BushGuild, BushGuildMember } from '..'; +import { BushClient } from '../discord-akairo/BushClient'; +import { BushGuild } from './BushGuild'; +import { BushGuildMember } from './BushGuildMember'; 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 4099fa1..1dd1638 100644 --- a/src/lib/extensions/discord.js/BushSelectMenuInteraction.ts +++ b/src/lib/extensions/discord.js/BushSelectMenuInteraction.ts @@ -1,6 +1,12 @@ import { APIInteractionGuildMember } from 'discord-api-types/v8'; import { PartialDMChannel, SelectMenuInteraction } from 'discord.js'; -import { BushClient, BushDMChannel, BushGuild, BushGuildMember, BushNewsChannel, BushTextChannel, BushUser } from '..'; +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'; 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 a29fc5a..5bd3f45 100644 --- a/src/lib/extensions/discord.js/BushStageChannel.ts +++ b/src/lib/extensions/discord.js/BushStageChannel.ts @@ -1,5 +1,9 @@ import { Collection, Snowflake, StageChannel } from 'discord.js'; -import { BushCategoryChannel, BushClient, BushGuild, BushGuildMember, BushStageInstance } from '..'; +import { BushClient } from '../discord-akairo/BushClient'; +import { BushCategoryChannel } from './BushCategoryChannel'; +import { BushGuild } from './BushGuild'; +import { BushGuildMember } from './BushGuildMember'; +import { BushStageInstance } from './BushStageInstance'; 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 e5d99b1..f162d33 100644 --- a/src/lib/extensions/discord.js/BushStageInstance.ts +++ b/src/lib/extensions/discord.js/BushStageInstance.ts @@ -1,5 +1,7 @@ import { StageInstance } from 'discord.js'; -import { BushClient, BushGuild, BushStageChannel } from '..'; +import { BushClient } from '../discord-akairo/BushClient'; +import { BushGuild } from './BushGuild'; +import { BushStageChannel } from './BushStageChannel'; 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 f730828..8ce22c0 100644 --- a/src/lib/extensions/discord.js/BushStoreChannel.ts +++ b/src/lib/extensions/discord.js/BushStoreChannel.ts @@ -1,5 +1,8 @@ import { Collection, Snowflake, StoreChannel } from 'discord.js'; -import { BushCategoryChannel, BushClient, BushGuild, BushGuildMember } from '..'; +import { BushClient } from '../discord-akairo/BushClient'; +import { BushCategoryChannel } from './BushCategoryChannel'; +import { BushGuild } from './BushGuild'; +import { BushGuildMember } from './BushGuildMember'; 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 2572378..26e3858 100644 --- a/src/lib/extensions/discord.js/BushTextChannel.ts +++ b/src/lib/extensions/discord.js/BushTextChannel.ts @@ -1,5 +1,7 @@ import { TextChannel } from 'discord.js'; -import { BushClient, BushGuild, BushMessageManager } from '..'; +import { BushClient } from '../discord-akairo/BushClient'; +import { BushGuild } from './BushGuild'; +import { BushMessageManager } from './BushMessageManager'; 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 8d7c353..455939d 100644 --- a/src/lib/extensions/discord.js/BushThreadChannel.ts +++ b/src/lib/extensions/discord.js/BushThreadChannel.ts @@ -1,14 +1,13 @@ /* eslint-disable @typescript-eslint/ban-types */ + import { Collection, Snowflake, ThreadChannel } from 'discord.js'; -import { - BushClient, - BushGuild, - BushGuildMember, - BushMessageManager, - BushNewsChannel, - BushTextChannel, - BushThreadMemberManager -} from '..'; +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'; 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 15a1c8e..50eaa2d 100644 --- a/src/lib/extensions/discord.js/BushThreadManager.ts +++ b/src/lib/extensions/discord.js/BushThreadManager.ts @@ -1,6 +1,7 @@ /* eslint-disable @typescript-eslint/no-explicit-any */ import { ThreadManager } from 'discord.js'; -import { BushNewsChannel, BushTextChannel } from '..'; +import { BushNewsChannel } from './BushNewsChannel'; +import { BushTextChannel } from './BushTextChannel'; export class BushThreadManager<AllowedThreadType> extends ThreadManager<AllowedThreadType> { public declare channel: BushTextChannel | BushNewsChannel; diff --git a/src/lib/extensions/discord.js/BushThreadMember.ts b/src/lib/extensions/discord.js/BushThreadMember.ts index 634606f..4ef51ae 100644 --- a/src/lib/extensions/discord.js/BushThreadMember.ts +++ b/src/lib/extensions/discord.js/BushThreadMember.ts @@ -1,6 +1,8 @@ /* eslint-disable @typescript-eslint/ban-types */ import { ThreadMember } from 'discord.js'; -import { BushGuildMember, BushThreadChannel, BushUser } from '..'; +import { BushGuildMember } from './BushGuildMember'; +import { BushThreadChannel } from './BushThreadChannel'; +import { BushUser } from './BushUser'; 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 df4fc74..e585ee7 100644 --- a/src/lib/extensions/discord.js/BushThreadMemberManager.ts +++ b/src/lib/extensions/discord.js/BushThreadMemberManager.ts @@ -1,7 +1,8 @@ /* eslint-disable @typescript-eslint/no-explicit-any */ /* eslint-disable @typescript-eslint/no-empty-interface */ import { ThreadMemberManager } from 'discord.js'; -import { BushClient, BushThreadChannel } from '..'; +import { BushClient } from '../discord-akairo/BushClient'; +import { BushThreadChannel } from './BushThreadChannel'; export class BushThreadMemberManager extends ThreadMemberManager { public declare thread: BushThreadChannel; diff --git a/src/lib/extensions/discord.js/BushUser.ts b/src/lib/extensions/discord.js/BushUser.ts index 64b803c..53a6be3 100644 --- a/src/lib/extensions/discord.js/BushUser.ts +++ b/src/lib/extensions/discord.js/BushUser.ts @@ -1,5 +1,6 @@ import { User } from 'discord.js'; -import { BushClient, BushDMChannel } from '..'; +import { BushClient } from '../discord-akairo/BushClient'; +import { BushDMChannel } from './BushDMChannel'; 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 4f96b1f..82a68b1 100644 --- a/src/lib/extensions/discord.js/BushVoiceChannel.ts +++ b/src/lib/extensions/discord.js/BushVoiceChannel.ts @@ -1,5 +1,7 @@ import { Collection, Snowflake, VoiceChannel } from 'discord.js'; -import { BushClient, BushGuild, BushGuildMember } from '..'; +import { BushClient } from '../discord-akairo/BushClient'; +import { BushGuild } from './BushGuild'; +import { BushGuildMember } from './BushGuildMember'; 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 1d00e20..d93fa13 100644 --- a/src/lib/extensions/discord.js/BushVoiceState.ts +++ b/src/lib/extensions/discord.js/BushVoiceState.ts @@ -1,5 +1,8 @@ import { VoiceState } from 'discord.js'; -import { BushGuild, BushGuildMember, BushStageChannel, BushVoiceChannel } from '..'; +import { BushGuild } from './BushGuild'; +import { BushGuildMember } from './BushGuildMember'; +import { BushStageChannel } from './BushStageChannel'; +import { BushVoiceChannel } from './BushVoiceChannel'; export class BushVoiceState extends VoiceState { public readonly channel: BushVoiceChannel | BushStageChannel | null; diff --git a/src/lib/extensions/discord.js/index.ts b/src/lib/extensions/discord.js/index.ts deleted file mode 100644 index 766500d..0000000 --- a/src/lib/extensions/discord.js/index.ts +++ /dev/null @@ -1,35 +0,0 @@ -export * from './BushActivity'; -export * from './BushApplicationCommand'; -export * from './BushApplicationCommandManager'; -export * from './BushApplicationCommandPermissionsManager'; -export * from './BushButtonInteraction'; -export * from './BushCategoryChannel'; -export * from './BushCommandInteraction'; -export * from './BushDMChannel'; -export * from './BushEmoji'; -export * from './BushGuild'; -export * from './BushGuildApplicationCommandManager'; -export * from './BushGuildChannel'; -export * from './BushGuildEmoji'; -export * from './BushGuildEmojiRoleManager'; -export * from './BushGuildMember'; -// export * from './BushGuildMemberManager'; -export * from './BushMessage'; -export * from './BushMessageManager'; -export * from './BushMessageReaction'; -export * from './BushNewsChannel'; -export * from './BushPresence'; -export * from './BushReactionEmoji'; -export * from './BushRole'; -export * from './BushSelectMenuInteraction'; -export * from './BushStageChannel'; -export * from './BushStageInstance'; -export * from './BushStoreChannel'; -export * from './BushTextChannel'; -export * from './BushThreadChannel'; -export * from './BushThreadManager'; -export * from './BushThreadMember'; -export * from './BushThreadMemberManager'; -export * from './BushUser'; -export * from './BushVoiceChannel'; -export * from './BushVoiceState'; diff --git a/src/lib/extensions/global.d.ts b/src/lib/extensions/global.d.ts index 6b5d129..8c7a117 100644 --- a/src/lib/extensions/global.d.ts +++ b/src/lib/extensions/global.d.ts @@ -1,6 +1,6 @@ import { BushClient } from './discord-akairo/BushClient'; declare global { - declare namespace NodeJS { + namespace NodeJS { export interface Global { client: BushClient; } diff --git a/src/lib/extensions/index.ts b/src/lib/extensions/index.ts deleted file mode 100644 index 318adcc..0000000 --- a/src/lib/extensions/index.ts +++ /dev/null @@ -1,3 +0,0 @@ -export * from './discord-akairo/index'; -export * from './discord.js/index'; -export * from './global'; diff --git a/src/lib/index.ts b/src/lib/index.ts index 6a1433c..1059e2b 100644 --- a/src/lib/index.ts +++ b/src/lib/index.ts @@ -1,3 +1,62 @@ -export * from './extensions'; -export * from './models'; -export * from './utils'; +export * from './extensions/discord-akairo/BushArgumentTypeCaster'; +export * from './extensions/discord-akairo/BushClient'; +export * from './extensions/discord-akairo/BushClientUtil'; +export * from './extensions/discord-akairo/BushCommand'; +export * from './extensions/discord-akairo/BushCommandHandler'; +export * from './extensions/discord-akairo/BushCommandUtil'; +export * from './extensions/discord-akairo/BushInhibitor'; +export * from './extensions/discord-akairo/BushInhibitorHandler'; +export * from './extensions/discord-akairo/BushListener'; +export * from './extensions/discord-akairo/BushListenerHandler'; +export * from './extensions/discord-akairo/BushSlashMessage'; +export * from './extensions/discord-akairo/BushTask'; +export * from './extensions/discord-akairo/BushTaskHandler'; +export * from './extensions/discord.js/BushActivity'; +export * from './extensions/discord.js/BushApplicationCommand'; +export * from './extensions/discord.js/BushApplicationCommandManager'; +export * from './extensions/discord.js/BushApplicationCommandPermissionsManager'; +export * from './extensions/discord.js/BushButtonInteraction'; +export * from './extensions/discord.js/BushCategoryChannel'; +export * from './extensions/discord.js/BushCommandInteraction'; +export * from './extensions/discord.js/BushDMChannel'; +export * from './extensions/discord.js/BushEmoji'; +export * from './extensions/discord.js/BushGuild'; +export * from './extensions/discord.js/BushGuildApplicationCommandManager'; +export * from './extensions/discord.js/BushGuildChannel'; +export * from './extensions/discord.js/BushGuildEmoji'; +export * from './extensions/discord.js/BushGuildEmojiRoleManager'; +export * from './extensions/discord.js/BushGuildMember'; +// export * from './extensions/discord.js/BushGuildMemberManager'; +export * from './extensions/discord.js/BushMessage'; +export * from './extensions/discord.js/BushMessageManager'; +export * from './extensions/discord.js/BushMessageReaction'; +export * from './extensions/discord.js/BushNewsChannel'; +export * from './extensions/discord.js/BushPresence'; +export * from './extensions/discord.js/BushReactionEmoji'; +export * from './extensions/discord.js/BushRole'; +export * from './extensions/discord.js/BushSelectMenuInteraction'; +export * from './extensions/discord.js/BushStageChannel'; +export * from './extensions/discord.js/BushStageInstance'; +export * from './extensions/discord.js/BushStoreChannel'; +export * from './extensions/discord.js/BushTextChannel'; +export * from './extensions/discord.js/BushThreadChannel'; +export * from './extensions/discord.js/BushThreadManager'; +export * from './extensions/discord.js/BushThreadMember'; +export * from './extensions/discord.js/BushThreadMemberManager'; +export * from './extensions/discord.js/BushUser'; +export * from './extensions/discord.js/BushVoiceChannel'; +export * from './extensions/discord.js/BushVoiceState'; +export * from './models/Ban'; +export * from './models/BaseModel'; +export * from './models/Global'; +export * from './models/Guild'; +export * from './models/Level'; +export * from './models/ModLog'; +export * from './models/Mute'; +export * from './models/PunishmentRole'; +export * from './models/StickyRole'; +export * from './utils/AllowedMentions'; +export * from './utils/BushCache'; +export * from './utils/BushConstants'; +export * from './utils/BushLogger'; +export * from './utils/CanvasProgressBar'; diff --git a/src/lib/models/Ban.ts b/src/lib/models/Ban.ts index eac03e2..54ca6ae 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 '..'; +import { BaseModel } from './BaseModel'; export interface BanModel { id: string; diff --git a/src/lib/models/Global.ts b/src/lib/models/Global.ts index 7018fae..842f14b 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 '..'; +import { BaseModel } from './BaseModel'; export interface GlobalModel { environment: 'production' | 'development'; diff --git a/src/lib/models/Guild.ts b/src/lib/models/Guild.ts index 5980fb9..0fc3413 100644 --- a/src/lib/models/Guild.ts +++ b/src/lib/models/Guild.ts @@ -1,6 +1,7 @@ import { Snowflake } from 'discord.js'; import { DataTypes, Optional, Sequelize } from 'sequelize'; -import { BaseModel, BushClient } from '..'; +import { BushClient } from '../extensions/discord-akairo/BushClient'; +import { BaseModel } from './BaseModel'; export interface GuildModel { id: string; diff --git a/src/lib/models/Level.ts b/src/lib/models/Level.ts index 0daa61b..e1f30f4 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 '..'; +import { BaseModel } from './BaseModel'; export interface LevelModel { id: string; diff --git a/src/lib/models/ModLog.ts b/src/lib/models/ModLog.ts index a1a3085..6261794 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 '..'; +import { BaseModel } from './BaseModel'; export enum ModLogType { PERM_BAN = 'PERM_BAN', diff --git a/src/lib/models/Mute.ts b/src/lib/models/Mute.ts index 7ca40d5..71a32e3 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 '..'; +import { BaseModel } from './BaseModel'; export interface MuteModel { id: string; diff --git a/src/lib/models/PunishmentRole.ts b/src/lib/models/PunishmentRole.ts index 9753b57..927cf28 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 '..'; +import { BaseModel } from './BaseModel'; export interface PunishmentRoleModel { id: string; diff --git a/src/lib/models/StickyRole.ts b/src/lib/models/StickyRole.ts index d2dc9ac..a3928e7 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 '..'; +import { BaseModel } from './BaseModel'; export interface StickyRoleModel { user: Snowflake; diff --git a/src/lib/models/index.ts b/src/lib/models/index.ts deleted file mode 100644 index 794c335..0000000 --- a/src/lib/models/index.ts +++ /dev/null @@ -1,9 +0,0 @@ -export * from './Ban'; -export * from './BaseModel'; -export * from './Global'; -export * from './Guild'; -export * from './Level'; -export * from './ModLog'; -export * from './Mute'; -export * from './PunishmentRole'; -export * from './StickyRole'; diff --git a/src/lib/utils/BushLogger.ts b/src/lib/utils/BushLogger.ts index 184b100..915d8f1 100644 --- a/src/lib/utils/BushLogger.ts +++ b/src/lib/utils/BushLogger.ts @@ -3,7 +3,7 @@ import chalk from 'chalk'; import { MessageEmbed } from 'discord.js'; import { inspect } from 'util'; -import { BushClient, BushSendMessageType } from '..'; +import { BushClient, BushSendMessageType } from '../extensions/discord-akairo/BushClient'; export class BushLogger { private client: BushClient; diff --git a/src/lib/utils/index.ts b/src/lib/utils/index.ts deleted file mode 100644 index b0319e5..0000000 --- a/src/lib/utils/index.ts +++ /dev/null @@ -1,5 +0,0 @@ -export * from './AllowedMentions'; -export * from './BushCache'; -export * from './BushConstants'; -export * from './BushLogger'; -export * from './CanvasProgressBar'; diff --git a/src/listeners/client/interaction.ts b/src/listeners/client/interaction.ts index d7d8776..c848d15 100644 --- a/src/listeners/client/interaction.ts +++ b/src/listeners/client/interaction.ts @@ -1,5 +1,5 @@ +import { BushListener } from '@lib'; import { ButtonInteraction, CommandInteraction, Interaction, SelectMenuInteraction } from 'discord.js'; -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 d6e5f2f..c3d9b45 100644 --- a/src/listeners/client/ready.ts +++ b/src/listeners/client/ready.ts @@ -1,5 +1,5 @@ +import { BushListener } from '@lib'; import chalk from 'chalk'; -import { BushListener } from '../../lib'; export default class ReadyListener extends BushListener { public constructor() { @@ -20,15 +20,5 @@ export default class ReadyListener extends BushListener { `------------------------------------------------------------------------------${this.client.config.dev ? '---' : ''}` ) ); - - this.client.user.setPresence({ - activities: [ - { - name: 'Beep Boop', - type: 'WATCHING' - } - ], - status: 'online' - }); } } diff --git a/src/listeners/commands/commandBlocked.ts b/src/listeners/commands/commandBlocked.ts index aebc05d..03050c2 100644 --- a/src/listeners/commands/commandBlocked.ts +++ b/src/listeners/commands/commandBlocked.ts @@ -1,4 +1,4 @@ -import { BushCommand, BushListener, BushMessage } from '../../lib'; +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 36a482d..9d51ea8 100644 --- a/src/listeners/commands/commandError.ts +++ b/src/listeners/commands/commandError.ts @@ -1,7 +1,7 @@ +import { BushListener, BushMessage } from '@lib'; import { stripIndents } from 'common-tags'; import { Command } from 'discord-akairo'; import { MessageEmbed } from 'discord.js'; -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 7f04304..ffcc408 100644 --- a/src/listeners/commands/commandMissingPermissions.ts +++ b/src/listeners/commands/commandMissingPermissions.ts @@ -1,5 +1,5 @@ +import { BushCommand, BushListener, BushMessage } from '@lib'; import { PermissionString } from 'discord.js'; -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 ba1af42..24bb041 100644 --- a/src/listeners/commands/commandStarted.ts +++ b/src/listeners/commands/commandStarted.ts @@ -1,5 +1,5 @@ +import { BushCommand, BushListener } from '@lib'; import { Message } from 'discord.js'; -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 a2e4b0e..bf98734 100644 --- a/src/listeners/commands/slashBlocked.ts +++ b/src/listeners/commands/slashBlocked.ts @@ -1,4 +1,4 @@ -import { BushCommand, BushListener, BushSlashMessage } from '../../lib'; +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 1fa9dfa..9bf5f6a 100644 --- a/src/listeners/commands/slashCommandError.ts +++ b/src/listeners/commands/slashCommandError.ts @@ -1,6 +1,6 @@ +import { BushCommand, BushListener, BushSlashMessage } from '@lib'; import { stripIndents } from 'common-tags'; -import { MessageEmbed } from 'discord.js'; -import { BushCommand, BushListener, BushSlashMessage } from '../../lib'; +import { GuildChannel, MessageEmbed } from 'discord.js'; export default class SlashCommandErrorListener extends BushListener { public constructor() { @@ -25,7 +25,7 @@ export default class SlashCommandErrorListener extends BushListener { await this.client.logger.channelError({ embeds: [errorEmbed] }); if (message) { - const channel = message.channel?.name || message.interaction.user.tag; + const channel = (message.channel as GuildChannel)?.name || message.interaction.user.tag; if (!this.client.config.owners.includes(message.author.id)) { const errorUserEmbed: MessageEmbed = new MessageEmbed() .setTitle('A Slash Command Error Occurred') @@ -51,7 +51,7 @@ export default class SlashCommandErrorListener extends BushListener { }); } } - const channel = message.channel?.name || message.interaction.user.tag; + const channel = (message.channel as GuildChannel)?.name || message.interaction.user.tag; this.client.console.error( 'SlashError', `an error occurred with the <<${command}>> command in <<${channel}>> triggered by <<${message?.author?.tag}>>:\n` + diff --git a/src/listeners/commands/slashMissingPermissions.ts b/src/listeners/commands/slashMissingPermissions.ts index 85cb5dd..a410bef 100644 --- a/src/listeners/commands/slashMissingPermissions.ts +++ b/src/listeners/commands/slashMissingPermissions.ts @@ -1,6 +1,6 @@ +import { BushListener } from '@lib'; import { Command } from 'discord-akairo'; import { CommandInteraction } from 'discord.js'; -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 c6a6351..a0201c5 100644 --- a/src/listeners/commands/slashStarted.ts +++ b/src/listeners/commands/slashStarted.ts @@ -1,4 +1,4 @@ -import { BushCommand, BushListener, BushSlashMessage } from '../../lib'; +import { BushCommand, BushListener, BushSlashMessage } from '@lib'; export default class SlashStartedListener extends BushListener { public constructor() { @@ -11,7 +11,7 @@ export default class SlashStartedListener extends BushListener { this.client.logger.info( 'SlashCommand', `The <<${command.id}>> command was used by <<${message.author.tag}>> in ${ - !message.channel ? `their <<DMs>>` : `<<#${message.channel.name}>> in <<${message.guild?.name}>>` + message.channel.type === 'DM' ? `their <<DMs>>` : `<<#${message.channel.name}>> in <<${message.guild?.name}>>` }.`, true //// I don't want to spam the log channel when people use commands ); diff --git a/src/listeners/guild/syncUnban.ts b/src/listeners/guild/syncUnban.ts index 2729ae7..aa148f9 100644 --- a/src/listeners/guild/syncUnban.ts +++ b/src/listeners/guild/syncUnban.ts @@ -1,5 +1,5 @@ +import { Ban, BushListener } from '@lib'; import { Guild, User } from 'discord.js'; -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 1a24e1b..ab78c77 100644 --- a/src/listeners/message/level.ts +++ b/src/listeners/message/level.ts @@ -1,5 +1,5 @@ +import { BushListener, Level } from '@lib'; import { Message } from 'discord.js'; -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 d1915f1..ef1efd5 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'; +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'), + { 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 883197a..460d849 100644 --- a/src/listeners/other/promiseRejection.ts +++ b/src/listeners/other/promiseRejection.ts @@ -1,4 +1,4 @@ -import { BushListener } from '../../lib'; +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 3d39b02..f5d6b53 100644 --- a/src/tasks/unban.ts +++ b/src/tasks/unban.ts @@ -1,6 +1,6 @@ +import { Ban, BushTask } from '@lib'; import { DiscordAPIError } from 'discord.js'; import { Op } from 'sequelize'; -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 379fca4..7a04360 100644 --- a/src/tasks/unmute.ts +++ b/src/tasks/unmute.ts @@ -1,6 +1,6 @@ +import { BushTask, Guild, Mute } from '@lib'; import { DiscordAPIError } from 'discord.js'; import { Op } from 'sequelize'; -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 5babb5e..05c7dc0 100644 --- a/src/tasks/updateCache.ts +++ b/src/tasks/updateCache.ts @@ -1,4 +1,6 @@ -import { BushClient, BushTask, Global } from '../lib'; +import { BushClient } from '../lib/extensions/discord-akairo/BushClient'; +import { BushTask } from '../lib/extensions/discord-akairo/BushTask'; +import { Global } from '../lib/models/Global'; import * as config from './../config/options'; export class UpdateCacheTask extends BushTask { @@ -8,16 +10,16 @@ export class UpdateCacheTask extends BushTask { runOnStart: false // done in preinit task }); } - async exec(): Promise<void> { - await this.updateCache(this.client); + public async exec(): Promise<void> { + await UpdateCacheTask.updateCache(this.client); await this.client.logger.verbose(`UpdateCache`, `Updated cache.`); } - async init(client: BushClient): Promise<void> { - await this.updateCache(client); + public static async init(client: BushClient): Promise<void> { + await UpdateCacheTask.updateCache(client); } - async updateCache(client: BushClient): Promise<void> { + private static async updateCache(client: BushClient): Promise<void> { const environment = config.dev ? 'development' : 'production'; const row = (await Global.findByPk(environment)) || @@ -31,7 +33,7 @@ export class UpdateCacheTask extends BushTask { })); for (const option in row) { - if (client.cache[option]) this.client.cache[option] = row[option]; + if (client.cache[option]) client.cache[option] = row[option]; } } } |