diff options
Diffstat (limited to 'lib')
-rw-r--r-- | lib/automod/AutomodShared.ts | 10 | ||||
-rw-r--r-- | lib/extensions/discord.js/ExtendedGuild.ts | 7 | ||||
-rw-r--r-- | lib/models/instance/Guild.ts | 4 | ||||
-rw-r--r-- | lib/models/shared/GuildCount.ts | 2 | ||||
-rw-r--r-- | lib/models/shared/Shared.ts | 2 | ||||
-rw-r--r-- | lib/utils/BushClientUtils.ts | 14 | ||||
-rw-r--r-- | lib/utils/BushLogger.ts | 2 |
7 files changed, 19 insertions, 22 deletions
diff --git a/lib/automod/AutomodShared.ts b/lib/automod/AutomodShared.ts index 08cde25..9cdb020 100644 --- a/lib/automod/AutomodShared.ts +++ b/lib/automod/AutomodShared.ts @@ -1,3 +1,8 @@ +import * as Moderation from '#lib/common/Moderation.js'; +import { unmuteResponse } from '#lib/extensions/discord.js/ExtendedGuildMember.js'; +import { colors, emojis } from '#lib/utils/BushConstants.js'; +import * as Format from '#lib/utils/Format.js'; +import { formatUnmuteResponse } from '#lib/utils/FormatResponse.js'; import { ActionRowBuilder, ButtonBuilder, @@ -8,11 +13,6 @@ import { PermissionFlagsBits, Snowflake } from 'discord.js'; -import * as Moderation from '../common/Moderation.js'; -import { unmuteResponse } from '../extensions/discord.js/ExtendedGuildMember.js'; -import { colors, emojis } from '../utils/BushConstants.js'; -import * as Format from '../utils/Format.js'; -import { formatUnmuteResponse } from '../utils/FormatResponse.js'; /** * Handles shared auto moderation functionality. diff --git a/lib/extensions/discord.js/ExtendedGuild.ts b/lib/extensions/discord.js/ExtendedGuild.ts index 63ee2fd..20c3d29 100644 --- a/lib/extensions/discord.js/ExtendedGuild.ts +++ b/lib/extensions/discord.js/ExtendedGuild.ts @@ -11,6 +11,9 @@ import { type GuildLogType, type GuildModel } from '#lib'; +import * as Moderation from '#lib/common/Moderation.js'; +import { Guild as GuildDB, ModLogType } from '#lib/models/index.js'; +import { addOrRemoveFromArray } from '#lib/utils/BushUtils.js'; import assert from 'assert/strict'; import { AttachmentBuilder, @@ -39,10 +42,6 @@ import { type WebhookMessageOptions } from 'discord.js'; import _ from 'lodash'; -import * as Moderation from '../../common/Moderation.js'; -import { Guild as GuildDB } from '../../models/instance/Guild.js'; -import { ModLogType } from '../../models/instance/ModLog.js'; -import { addOrRemoveFromArray } from '../../utils/BushUtils.js'; declare module 'discord.js' { export interface Guild { diff --git a/lib/models/instance/Guild.ts b/lib/models/instance/Guild.ts index 1d645e9..5387f81 100644 --- a/lib/models/instance/Guild.ts +++ b/lib/models/instance/Guild.ts @@ -1,8 +1,8 @@ import config from '#config'; +import { BadWordDetails } from '#lib/automod/AutomodShared.js'; +import { type BushClient } from '#lib/extensions/discord-akairo/BushClient.js'; import { ChannelType, Constants, type Snowflake } from 'discord.js'; import { DataTypes, type Sequelize } from 'sequelize'; -import { BadWordDetails } from '../../automod/AutomodShared.js'; -import { type BushClient } from '../../extensions/discord-akairo/BushClient.js'; import { BaseModel } from '../BaseModel.js'; export interface GuildModel { diff --git a/lib/models/shared/GuildCount.ts b/lib/models/shared/GuildCount.ts index 7afef56..25fd6c0 100644 --- a/lib/models/shared/GuildCount.ts +++ b/lib/models/shared/GuildCount.ts @@ -1,5 +1,5 @@ +import { Environment } from '#config'; import { DataTypes, Model, type Sequelize } from 'sequelize'; -import { Environment } from '../../../config/Config.js'; export interface GuildCountModel { timestamp: Date; diff --git a/lib/models/shared/Shared.ts b/lib/models/shared/Shared.ts index bf8d461..3d83747 100644 --- a/lib/models/shared/Shared.ts +++ b/lib/models/shared/Shared.ts @@ -1,6 +1,6 @@ +import { BadWords } from '#lib/automod/AutomodShared.js'; import { Snowflake } from 'discord.js'; import { DataTypes, Sequelize } from 'sequelize'; -import { BadWords } from '../../automod/AutomodShared.js'; import { BaseModel } from '../BaseModel.js'; export interface SharedModel { diff --git a/lib/utils/BushClientUtils.ts b/lib/utils/BushClientUtils.ts index 2cf546e..bc4a40a 100644 --- a/lib/utils/BushClientUtils.ts +++ b/lib/utils/BushClientUtils.ts @@ -1,3 +1,9 @@ +import { ConfigChannelKey } from '#config'; +import type { BushInspectOptions, CodeBlockLang } from '#lib'; +import { GlobalCache, SharedCache } from '#lib/common/BushCache.js'; +import { CommandMessage } from '#lib/extensions/discord-akairo/BushCommand.js'; +import { SlashMessage } from '#lib/extensions/discord-akairo/SlashMessage.js'; +import { Global, Shared } from '#lib/models/index.js'; import assert from 'assert/strict'; import { cleanCodeBlockContent, @@ -16,14 +22,6 @@ import { type UserResolvable } from 'discord.js'; import _ from 'lodash'; -import { ConfigChannelKey } from '../../config/Config.js'; -import { GlobalCache, SharedCache } from '../common/BushCache.js'; -import { CommandMessage } from '../extensions/discord-akairo/BushCommand.js'; -import { SlashMessage } from '../extensions/discord-akairo/SlashMessage.js'; -import { Global } from '../models/shared/Global.js'; -import { Shared } from '../models/shared/Shared.js'; -import { BushInspectOptions } from '../types/BushInspectOptions.js'; -import { CodeBlockLang } from '../types/CodeBlockLang.js'; import { emojis, Pronoun, PronounCode, pronounMapping, regex } from './BushConstants.js'; import { addOrRemoveFromArray, formatError, inspect } from './BushUtils.js'; import { generateErrorEmbed } from './ErrorHandler.js'; diff --git a/lib/utils/BushLogger.ts b/lib/utils/BushLogger.ts index 4acda69..f575b50 100644 --- a/lib/utils/BushLogger.ts +++ b/lib/utils/BushLogger.ts @@ -1,10 +1,10 @@ import chalk from 'chalk'; // eslint-disable-next-line @typescript-eslint/no-unused-vars +import { type SendMessageType } from '#lib/extensions/discord-akairo/BushClient.js'; import { bold, Client, EmbedBuilder, escapeMarkdown, PartialTextBasedChannelFields, type Message } from 'discord.js'; import { stripVTControlCharacters as stripColor } from 'node:util'; import repl, { REPLServer, REPL_MODE_STRICT } from 'repl'; import { WriteStream } from 'tty'; -import { type SendMessageType } from '../extensions/discord-akairo/BushClient.js'; import { colors } from './BushConstants.js'; import { inspect } from './BushUtils.js'; |