diff options
Diffstat (limited to 'src/lib/extensions')
52 files changed, 236 insertions, 186 deletions
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'; |