diff --git a/src/commands/economy/balance.ts b/src/commands/economy/balance.ts index f4c581e..033b43b 100644 --- a/src/commands/economy/balance.ts +++ b/src/commands/economy/balance.ts @@ -20,7 +20,7 @@ import { Command, RegisterBehavior } from '@sapphire/framework'; import type { User, Guild, Message } from 'discord.js'; import { updateUser } from '#utils/database/dbExistingUser'; -import { getBalance } from '#utils/database/economy'; +import { getBalance } from '#utils/database/fun/economy'; import { EmbedBuilder } from 'discord.js'; export class BalanceCommand extends Command { diff --git a/src/commands/economy/daily.ts b/src/commands/economy/daily.ts index a99e2e3..4e39ad7 100644 --- a/src/commands/economy/daily.ts +++ b/src/commands/economy/daily.ts @@ -21,7 +21,7 @@ import { Command, RegisterBehavior } from '@sapphire/framework'; import { Time } from '@sapphire/time-utilities'; import type { User, Guild, GuildMember, Message } from 'discord.js'; import { updateUser } from '#utils/database/dbExistingUser'; -import { daily, getLastDaily } from '#utils/database/economy'; +import { daily, getLastDaily } from '#utils/database/fun/economy'; import { EmbedBuilder } from 'discord.js'; import IDs from '#utils/ids'; diff --git a/src/commands/economy/pay.ts b/src/commands/economy/pay.ts index 3eac7fb..3076f57 100644 --- a/src/commands/economy/pay.ts +++ b/src/commands/economy/pay.ts @@ -20,7 +20,7 @@ import { Args, Command, RegisterBehavior } from '@sapphire/framework'; import type { User, Guild, Message } from 'discord.js'; import { updateUser } from '#utils/database/dbExistingUser'; -import { getBalance, transfer } from '#utils/database/economy'; +import { getBalance, transfer } from '#utils/database/fun/economy'; import { EmbedBuilder, TextChannel } from 'discord.js'; import IDs from '#utils/ids'; diff --git a/src/commands/fun/1984.ts b/src/commands/fun/1984.ts index dd12739..b4e9b86 100644 --- a/src/commands/fun/1984.ts +++ b/src/commands/fun/1984.ts @@ -20,7 +20,7 @@ import { Command, RegisterBehavior } from '@sapphire/framework'; import { EmbedBuilder, GuildMember } from 'discord.js'; import { N1984 } from '#utils/gifs'; -import { addFunLog, countTotal } from '#utils/database/fun'; +import { addFunLog, countTotal } from '#utils/database/fun/fun'; export class N1984Command extends Command { public constructor(context: Command.LoaderContext, options: Command.Options) { diff --git a/src/commands/fun/cringe.ts b/src/commands/fun/cringe.ts index aaf22c8..1ac3701 100644 --- a/src/commands/fun/cringe.ts +++ b/src/commands/fun/cringe.ts @@ -20,7 +20,7 @@ import { Command, RegisterBehavior } from '@sapphire/framework'; import { EmbedBuilder, GuildMember } from 'discord.js'; import { Cringe } from '#utils/gifs'; -import { addFunLog, countTotal } from '#utils/database/fun'; +import { addFunLog, countTotal } from '#utils/database/fun/fun'; export class CringeCommand extends Command { public constructor(context: Command.LoaderContext, options: Command.Options) { diff --git a/src/commands/fun/hug.ts b/src/commands/fun/hug.ts index a7696c0..53197eb 100644 --- a/src/commands/fun/hug.ts +++ b/src/commands/fun/hug.ts @@ -20,7 +20,7 @@ import { Command, RegisterBehavior } from '@sapphire/framework'; import { EmbedBuilder, GuildMember } from 'discord.js'; import { Hugs } from '#utils/gifs'; -import { addFunLog, countTotal } from '#utils/database/fun'; +import { addFunLog, countTotal } from '#utils/database/fun/fun'; export class HugCommand extends Command { public constructor(context: Command.LoaderContext, options: Command.Options) { diff --git a/src/commands/fun/kill.ts b/src/commands/fun/kill.ts index 2028fb2..e72a6e1 100644 --- a/src/commands/fun/kill.ts +++ b/src/commands/fun/kill.ts @@ -20,7 +20,7 @@ import { Command, RegisterBehavior } from '@sapphire/framework'; import { EmbedBuilder, GuildMember } from 'discord.js'; import { Kill } from '#utils/gifs'; -import { addFunLog, countTotal } from '#utils/database/fun'; +import { addFunLog, countTotal } from '#utils/database/fun/fun'; export class KillCommand extends Command { public constructor(context: Command.LoaderContext, options: Command.Options) { diff --git a/src/commands/fun/poke.ts b/src/commands/fun/poke.ts index 0aa456a..9f97242 100644 --- a/src/commands/fun/poke.ts +++ b/src/commands/fun/poke.ts @@ -20,7 +20,7 @@ import { Command, RegisterBehavior } from '@sapphire/framework'; import { EmbedBuilder, GuildMember } from 'discord.js'; import { Poke } from '#utils/gifs'; -import { addFunLog, countTotal } from '#utils/database/fun'; +import { addFunLog, countTotal } from '#utils/database/fun/fun'; export class PokeCommand extends Command { public constructor(context: Command.LoaderContext, options: Command.Options) { diff --git a/src/commands/mod/ban/ban.ts b/src/commands/mod/ban/ban.ts index dd46388..1750802 100644 --- a/src/commands/mod/ban/ban.ts +++ b/src/commands/mod/ban/ban.ts @@ -21,9 +21,9 @@ import { Args, Command, RegisterBehavior } from '@sapphire/framework'; import type { User, Message, Snowflake, TextChannel, Guild } from 'discord.js'; import { EmbedBuilder } from 'discord.js'; import IDs from '#utils/ids'; -import { addBan, checkBan } from '#utils/database/ban'; +import { addBan, checkBan } from '#utils/database/moderation/ban'; import { addEmptyUser, updateUser } from '#utils/database/dbExistingUser'; -import { checkTempBan, removeTempBan } from '#utils/database/tempBan'; +import { checkTempBan, removeTempBan } from '#utils/database/moderation/tempBan'; export class BanCommand extends Command { public constructor(context: Command.LoaderContext, options: Command.Options) { diff --git a/src/commands/mod/ban/tempBan.ts b/src/commands/mod/ban/tempBan.ts index 4b753e2..03ce4a1 100644 --- a/src/commands/mod/ban/tempBan.ts +++ b/src/commands/mod/ban/tempBan.ts @@ -22,7 +22,7 @@ import { Duration, DurationFormatter } from '@sapphire/time-utilities'; import type { User, Snowflake, TextChannel, Guild } from 'discord.js'; import { EmbedBuilder, Message } from 'discord.js'; import IDs from '#utils/ids'; -import { addTempBan, checkTempBan } from '#utils/database/tempBan'; +import { addTempBan, checkTempBan } from '#utils/database/moderation/tempBan'; import { addEmptyUser, updateUser } from '#utils/database/dbExistingUser'; export class TempBanCommand extends Command { diff --git a/src/commands/mod/ban/unban.ts b/src/commands/mod/ban/unban.ts index 9448115..8a4ba32 100644 --- a/src/commands/mod/ban/unban.ts +++ b/src/commands/mod/ban/unban.ts @@ -28,8 +28,8 @@ import type { } from 'discord.js'; import { EmbedBuilder } from 'discord.js'; import IDs from '#utils/ids'; -import { removeBan, checkBan, addBan } from '#utils/database/ban'; -import { checkTempBan, removeTempBan } from '#utils/database/tempBan'; +import { removeBan, checkBan, addBan } from '#utils/database/moderation/ban'; +import { checkTempBan, removeTempBan } from '#utils/database/moderation/tempBan'; import { addEmptyUser, addExistingUser } from '#utils/database/dbExistingUser'; export class UnbanCommand extends Command { diff --git a/src/commands/mod/restriction/restrict.ts b/src/commands/mod/restriction/restrict.ts index 5aff7f2..c11a136 100644 --- a/src/commands/mod/restriction/restrict.ts +++ b/src/commands/mod/restriction/restrict.ts @@ -36,7 +36,7 @@ import { updateUser, fetchRoles, } from '#utils/database/dbExistingUser'; -import { restrict, checkActive } from '#utils/database/restriction'; +import { restrict, checkActive } from '#utils/database/moderation/restriction'; import { randint } from '#utils/maths'; import { blockedRolesAfterRestricted } from '#utils/blockedRoles'; diff --git a/src/commands/mod/restriction/restrictLogs.ts b/src/commands/mod/restriction/restrictLogs.ts index add7099..7241f78 100644 --- a/src/commands/mod/restriction/restrictLogs.ts +++ b/src/commands/mod/restriction/restrictLogs.ts @@ -21,7 +21,7 @@ import { Args, Command, RegisterBehavior } from '@sapphire/framework'; import { ChannelType, EmbedBuilder } from 'discord.js'; import type { Message, TextChannel, Guild, Snowflake } from 'discord.js'; import IDs from '#utils/ids'; -import { getRestrictions } from '#utils/database/restriction'; +import { getRestrictions } from '#utils/database/moderation/restriction'; import { checkStaff } from '#utils/checker'; export class RestrictLogsCommand extends Command { diff --git a/src/commands/mod/restriction/unrestrict.ts b/src/commands/mod/restriction/unrestrict.ts index b9d39bf..d7e87a6 100644 --- a/src/commands/mod/restriction/unrestrict.ts +++ b/src/commands/mod/restriction/unrestrict.ts @@ -26,7 +26,7 @@ import { unRestrict, checkActive, unRestrictLegacy, -} from '#utils/database/restriction'; +} from '#utils/database/moderation/restriction'; export class UnRestrictCommand extends Command { public constructor(context: Command.LoaderContext, options: Command.Options) { diff --git a/src/commands/mod/sus.ts b/src/commands/mod/sus.ts index b61a12d..2d47570 100644 --- a/src/commands/mod/sus.ts +++ b/src/commands/mod/sus.ts @@ -39,7 +39,7 @@ import { getNote, deactivateNote, deactivateAllNotes, -} from '#utils/database/sus'; +} from '#utils/database/moderation/sus'; import { checkStaff } from '#utils/checker'; import IDs from '#utils/ids'; import { createSusLogEmbed } from '#utils/embeds'; diff --git a/src/commands/mod/vcMute.ts b/src/commands/mod/vcMute.ts index 339a995..b60c7cc 100644 --- a/src/commands/mod/vcMute.ts +++ b/src/commands/mod/vcMute.ts @@ -19,7 +19,7 @@ import { Args, Command, RegisterBehavior } from '@sapphire/framework'; import type { GuildMember, Message } from 'discord.js'; -import { addMute, removeMute, checkActive } from '#utils/database/vcMute'; +import { addMute, removeMute, checkActive } from '#utils/database/moderation/vcMute'; import { addExistingUser } from '#utils/database/dbExistingUser'; export class VCMuteCommand extends Command { diff --git a/src/commands/mod/warning/deleteWarning.ts b/src/commands/mod/warning/deleteWarning.ts index 318b613..2d80bbd 100644 --- a/src/commands/mod/warning/deleteWarning.ts +++ b/src/commands/mod/warning/deleteWarning.ts @@ -21,7 +21,7 @@ import { Args, Command, RegisterBehavior } from '@sapphire/framework'; import { EmbedBuilder, TextChannel } from 'discord.js'; import type { Message, Guild, User } from 'discord.js'; import IDs from '#utils/ids'; -import { deleteWarning, fetchWarning } from '#utils/database/warnings'; +import { deleteWarning, fetchWarning } from '#utils/database/moderation/warnings'; import { checkStaff } from '#utils/checker'; export class DeleteWarningCommand extends Command { diff --git a/src/commands/mod/warning/warn.ts b/src/commands/mod/warning/warn.ts index ad29c2f..a022318 100644 --- a/src/commands/mod/warning/warn.ts +++ b/src/commands/mod/warning/warn.ts @@ -25,7 +25,7 @@ import { } from '@sapphire/framework'; import type { User, Message, Snowflake, Guild, TextChannel } from 'discord.js'; import { updateUser } from '#utils/database/dbExistingUser'; -import { addWarn } from '#utils/database/warnings'; +import { addWarn } from '#utils/database/moderation/warnings'; import { EmbedBuilder } from 'discord.js'; import IDs from '#utils/ids'; diff --git a/src/commands/mod/warning/warnings.ts b/src/commands/mod/warning/warnings.ts index 6855570..20f5b85 100644 --- a/src/commands/mod/warning/warnings.ts +++ b/src/commands/mod/warning/warnings.ts @@ -21,7 +21,7 @@ import { Args, Command, RegisterBehavior } from '@sapphire/framework'; import { ChannelType, EmbedBuilder } from 'discord.js'; import type { Message, Guild, User } from 'discord.js'; import IDs from '#utils/ids'; -import { fetchWarnings } from '#utils/database/warnings'; +import { fetchWarnings } from '#utils/database/moderation/warnings'; import { checkStaff } from '#utils/checker'; import { createWarningsEmbed } from '#utils/embeds'; diff --git a/src/commands/xp/rank.ts b/src/commands/xp/rank.ts index 46a450c..f8fa740 100644 --- a/src/commands/xp/rank.ts +++ b/src/commands/xp/rank.ts @@ -20,7 +20,7 @@ import { Args, Command, RegisterBehavior } from '@sapphire/framework'; import type { User, Guild, Message } from 'discord.js'; import { EmbedBuilder } from 'discord.js'; -import { getRank, xpToNextLevel } from '#utils/database/xp'; +import { getRank, xpToNextLevel } from '#utils/database/fun/xp'; export class RankCommand extends Command { public constructor(context: Command.LoaderContext, options: Command.Options) { diff --git a/src/listeners/ban/ban.ts b/src/listeners/ban/ban.ts index 50293ed..d9758ba 100644 --- a/src/listeners/ban/ban.ts +++ b/src/listeners/ban/ban.ts @@ -20,7 +20,7 @@ import { Listener } from '@sapphire/framework'; import type { GuildBan } from 'discord.js'; import { AuditLogEvent, EmbedBuilder, TextChannel } from 'discord.js'; -import { addBan, checkBan } from '#utils/database/ban'; +import { addBan, checkBan } from '#utils/database/moderation/ban'; import IDs from '#utils/ids'; import { addEmptyUser, addExistingUser } from '#utils/database/dbExistingUser'; diff --git a/src/listeners/ban/banJoin.ts b/src/listeners/ban/banJoin.ts index 7a8afa7..f92d7e9 100644 --- a/src/listeners/ban/banJoin.ts +++ b/src/listeners/ban/banJoin.ts @@ -19,8 +19,8 @@ import { Listener } from '@sapphire/framework'; import type { GuildMember } from 'discord.js'; -import { checkBan, getBanReason } from '#utils/database/ban'; -import { checkTempBan } from '#utils/database/tempBan'; +import { checkBan, getBanReason } from '#utils/database/moderation/ban'; +import { checkTempBan } from '#utils/database/moderation/tempBan'; export class BanJoinListener extends Listener { public constructor( diff --git a/src/listeners/ban/unban.ts b/src/listeners/ban/unban.ts index c237b70..1e48752 100644 --- a/src/listeners/ban/unban.ts +++ b/src/listeners/ban/unban.ts @@ -20,7 +20,7 @@ import { Listener } from '@sapphire/framework'; import type { GuildBan } from 'discord.js'; import { AuditLogEvent, EmbedBuilder, TextChannel } from 'discord.js'; -import { addBan, checkBan, removeBan } from '#utils/database/ban'; +import { addBan, checkBan, removeBan } from '#utils/database/moderation/ban'; import IDs from '#utils/ids'; import { addEmptyUser, addExistingUser } from '#utils/database/dbExistingUser'; diff --git a/src/listeners/counting.ts b/src/listeners/counting.ts index 2d8feb3..b102d1b 100644 --- a/src/listeners/counting.ts +++ b/src/listeners/counting.ts @@ -21,7 +21,7 @@ import { Listener } from '@sapphire/framework'; import type { Message } from 'discord.js'; -import { getLastCount, addCount } from '#utils/database/counting'; +import { getLastCount, addCount } from '#utils/database/fun/counting'; import IDs from '#utils/ids'; export class XpListener extends Listener { diff --git a/src/listeners/modMail.ts b/src/listeners/modMail.ts index 139082d..e48817f 100644 --- a/src/listeners/modMail.ts +++ b/src/listeners/modMail.ts @@ -22,14 +22,14 @@ import { ChannelType } from 'discord.js'; import type { GuildChannel, EmbedBuilder } from 'discord.js'; import { setTimeout } from 'timers/promises'; import IDs from '#utils/ids'; -import { checkActive, getRestrictions } from '#utils/database/restriction'; -import { findNotes } from '#utils/database/sus'; +import { checkActive, getRestrictions } from '#utils/database/moderation/restriction'; +import { findNotes } from '#utils/database/moderation/sus'; import { createRestrictLogEmbed, createSusLogEmbed, createWarningsEmbed, } from '#utils/embeds'; -import { fetchWarnings } from '#utils/database/warnings'; +import { fetchWarnings } from '#utils/database/moderation/warnings'; export class ModMailCreateListener extends Listener { public constructor( diff --git a/src/listeners/rolesJoinServer.ts b/src/listeners/rolesJoinServer.ts index a07968e..495e25e 100644 --- a/src/listeners/rolesJoinServer.ts +++ b/src/listeners/rolesJoinServer.ts @@ -28,7 +28,7 @@ import type { import { ChannelType } from 'discord.js'; import { fetchRoles, getLeaveRoles } from '#utils/database/dbExistingUser'; import { blockTime } from '#utils/database/verification'; -import { checkActive, getSection } from '#utils/database/restriction'; +import { checkActive, getSection } from '#utils/database/moderation/restriction'; import { blockedRoles, blockedRolesAfterRestricted } from '#utils/blockedRoles'; import IDs from '#utils/ids'; diff --git a/src/listeners/vcMute.ts b/src/listeners/vcMute.ts index 75c882a..d393bf8 100644 --- a/src/listeners/vcMute.ts +++ b/src/listeners/vcMute.ts @@ -19,7 +19,7 @@ import { Listener } from '@sapphire/framework'; import type { VoiceState } from 'discord.js'; -import { checkActive, removeMute } from '#utils/database/vcMute'; +import { checkActive, removeMute } from '#utils/database/moderation/vcMute'; export class VCMuteListener extends Listener { public constructor( diff --git a/src/listeners/verification/joinVC.ts b/src/listeners/verification/joinVC.ts index 57089ef..b32b2e3 100644 --- a/src/listeners/verification/joinVC.ts +++ b/src/listeners/verification/joinVC.ts @@ -50,7 +50,7 @@ import { startVerification, finishVerification, } from '#utils/database/verification'; -import { findNotes } from '#utils/database/sus'; +import { findNotes } from '#utils/database/moderation/sus'; import { addExistingUser } from '#utils/database/dbExistingUser'; import { rolesToString } from '#utils/formatter'; import IDs from '#utils/ids'; diff --git a/src/listeners/xp.ts b/src/listeners/xp.ts index 32f3fe0..e84e406 100644 --- a/src/listeners/xp.ts +++ b/src/listeners/xp.ts @@ -19,7 +19,7 @@ import { Listener } from '@sapphire/framework'; import type { Message } from 'discord.js'; -import { addXp, checkCanAddXp } from '#utils/database/xp'; +import { addXp, checkCanAddXp } from '#utils/database/fun/xp'; import { randint } from '#utils/maths'; export class XpListener extends Listener { diff --git a/src/scheduled-tasks/tempBan.ts b/src/scheduled-tasks/tempBan.ts index 2f56bf2..1d21a1d 100644 --- a/src/scheduled-tasks/tempBan.ts +++ b/src/scheduled-tasks/tempBan.ts @@ -20,8 +20,8 @@ import { ScheduledTask } from '@sapphire/plugin-scheduled-tasks'; import IDs from '#utils/ids'; import { EmbedBuilder } from 'discord.js'; -import { checkBan } from '#utils/database/ban'; -import { checkTempBan, removeTempBan } from '#utils/database/tempBan'; +import { checkBan } from '#utils/database/moderation/ban'; +import { checkTempBan, removeTempBan } from '#utils/database/moderation/tempBan'; export class TempBan extends ScheduledTask { public constructor( diff --git a/src/utils/database/counting.ts b/src/utils/database/fun/counting.ts similarity index 100% rename from src/utils/database/counting.ts rename to src/utils/database/fun/counting.ts diff --git a/src/utils/database/economy.ts b/src/utils/database/fun/economy.ts similarity index 100% rename from src/utils/database/economy.ts rename to src/utils/database/fun/economy.ts diff --git a/src/utils/database/fun.ts b/src/utils/database/fun/fun.ts similarity index 100% rename from src/utils/database/fun.ts rename to src/utils/database/fun/fun.ts diff --git a/src/utils/database/xp.ts b/src/utils/database/fun/xp.ts similarity index 100% rename from src/utils/database/xp.ts rename to src/utils/database/fun/xp.ts diff --git a/src/utils/database/ban.ts b/src/utils/database/moderation/ban.ts similarity index 100% rename from src/utils/database/ban.ts rename to src/utils/database/moderation/ban.ts diff --git a/src/utils/database/restriction.ts b/src/utils/database/moderation/restriction.ts similarity index 100% rename from src/utils/database/restriction.ts rename to src/utils/database/moderation/restriction.ts diff --git a/src/utils/database/sus.ts b/src/utils/database/moderation/sus.ts similarity index 100% rename from src/utils/database/sus.ts rename to src/utils/database/moderation/sus.ts diff --git a/src/utils/database/tempBan.ts b/src/utils/database/moderation/tempBan.ts similarity index 100% rename from src/utils/database/tempBan.ts rename to src/utils/database/moderation/tempBan.ts diff --git a/src/utils/database/vcMute.ts b/src/utils/database/moderation/vcMute.ts similarity index 100% rename from src/utils/database/vcMute.ts rename to src/utils/database/moderation/vcMute.ts diff --git a/src/utils/database/warnings.ts b/src/utils/database/moderation/warnings.ts similarity index 100% rename from src/utils/database/warnings.ts rename to src/utils/database/moderation/warnings.ts diff --git a/src/utils/embeds.ts b/src/utils/embeds.ts index 9fa4e45..672649f 100644 --- a/src/utils/embeds.ts +++ b/src/utils/embeds.ts @@ -18,9 +18,9 @@ */ import type { Guild, User } from 'discord.js'; import { EmbedBuilder } from 'discord.js'; -import type { SusNotes } from '#utils/database/sus'; -import { RestrictionLogs } from '#utils/database/restriction'; -import { Warnings } from '#utils/database/warnings'; +import type { SusNotes } from '#utils/database/moderation/sus'; +import { RestrictionLogs } from '#utils/database/moderation/restriction'; +import { Warnings } from '#utils/database/moderation/warnings'; export function createSusLogEmbed(notes: SusNotes, user: User, guild: Guild) { const embed = new EmbedBuilder()