refactor models

12 files changed, 32 insertions, 32 deletions

diff --git a/src/lib/extensions/discord-akairo/BushClient.ts b/src/lib/extensions/discord-akairo/BushClient.ts
index 7acd3df..0fc8896 100644
--- a/src/lib/extensions/discord-akairo/BushClient.ts
+++ b/src/lib/extensions/discord-akairo/BushClient.ts
@@ -47,15 +47,15 @@ import type { Options as SequelizeOptions, Sequelize as SequelizeType } from 'se
 import { fileURLToPath } from 'url';
 import UpdateCacheTask from '../../../tasks/updateCache.js';
 import UpdateStatsTask from '../../../tasks/updateStats.js';
-import { ActivePunishment } from '../../models/ActivePunishment.js';
-import { Global } from '../../models/Global.js';
-import { Guild as GuildModel } from '../../models/Guild.js';
-import { Level } from '../../models/Level.js';
-import { ModLog } from '../../models/ModLog.js';
-import { Reminder } from '../../models/Reminder.js';
-import { Shared } from '../../models/Shared.js';
-import { Stat } from '../../models/Stat.js';
-import { StickyRole } from '../../models/StickyRole.js';
+import { ActivePunishment } from '../../models/instance/ActivePunishment.js';
+import { Guild as GuildModel } from '../../models/instance/Guild.js';
+import { Level } from '../../models/instance/Level.js';
+import { ModLog } from '../../models/instance/ModLog.js';
+import { Reminder } from '../../models/instance/Reminder.js';
+import { StickyRole } from '../../models/instance/StickyRole.js';
+import { Global } from '../../models/shared/Global.js';
+import { Shared } from '../../models/shared/Shared.js';
+import { Stat } from '../../models/shared/Stat.js';
 import { AllowedMentions } from '../../utils/AllowedMentions.js';
 import { BushCache } from '../../utils/BushCache.js';
 import { BushConstants } from '../../utils/BushConstants.js';
diff --git a/src/lib/extensions/discord.js/BushGuild.ts b/src/lib/extensions/discord.js/BushGuild.ts
index 4aacc73..b13d0f8 100644
--- a/src/lib/extensions/discord.js/BushGuild.ts
+++ b/src/lib/extensions/discord.js/BushGuild.ts
@@ -22,8 +22,8 @@ import { Collection, Guild, PermissionFlagsBits, Snowflake, type MessageOptions,
 import type { RawGuildData } from 'discord.js/typings/rawDataTypes';
 import _ from 'lodash';
 import { Moderation } from '../../common/util/Moderation.js';
-import { Guild as GuildDB } from '../../models/Guild.js';
-import { ModLogType } from '../../models/ModLog.js';
+import { Guild as GuildDB } from '../../models/instance/Guild.js';
+import { ModLogType } from '../../models/instance/ModLog.js';
 
 /**
  * Represents a guild (or a server) on Discord.
diff --git a/src/lib/index.ts b/src/lib/index.ts
index 79bc553..0c73875 100644
--- a/src/lib/index.ts
+++ b/src/lib/index.ts
@@ -66,16 +66,16 @@ export type { BushUserManager } from './extensions/discord.js/BushUserManager.js
 export * from './extensions/discord.js/BushVoiceChannel.js';
 export * from './extensions/discord.js/BushVoiceState.js';
 export * from './extensions/discord.js/other.js';
-export * from './models/ActivePunishment.js';
 export * from './models/BaseModel.js';
-export * from './models/Global.js';
-export * from './models/Guild.js';
-export * from './models/Level.js';
-export * from './models/ModLog.js';
-export * from './models/Reminder.js';
-export * from './models/Shared.js';
-export * from './models/Stat.js';
-export * from './models/StickyRole.js';
+export * from './models/instance/ActivePunishment.js';
+export * from './models/instance/Guild.js';
+export * from './models/instance/Level.js';
+export * from './models/instance/ModLog.js';
+export * from './models/instance/Reminder.js';
+export * from './models/instance/StickyRole.js';
+export * from './models/shared/Global.js';
+export * from './models/shared/Shared.js';
+export * from './models/shared/Stat.js';
 export * from './utils/AllowedMentions.js';
 export * from './utils/BushCache.js';
 export * from './utils/BushConstants.js';
diff --git a/src/lib/models/ActivePunishment.ts b/src/lib/models/instance/ActivePunishment.ts
index 5fae2ac..1d6104f 100644
--- a/src/lib/models/ActivePunishment.ts
+++ b/src/lib/models/instance/ActivePunishment.ts
@@ -1,7 +1,7 @@
 import { type Snowflake } from 'discord.js';
 import { nanoid } from 'nanoid';
 import { type Sequelize } from 'sequelize';
-import { BaseModel } from './BaseModel.js';
+import { BaseModel } from '../BaseModel.js';
 const { DataTypes } = (await import('sequelize')).default;
 
 export enum ActivePunishmentType {
diff --git a/src/lib/models/Guild.ts b/src/lib/models/instance/Guild.ts
index 7e67e21..11469d2 100644
--- a/src/lib/models/Guild.ts
+++ b/src/lib/models/instance/Guild.ts
@@ -1,8 +1,8 @@
 import { ChannelType, type Snowflake } from 'discord.js';
 import { type Sequelize } from 'sequelize';
-import { BadWordDetails } from '../common/AutoMod.js';
-import { type BushClient } from '../extensions/discord-akairo/BushClient.js';
-import { BaseModel } from './BaseModel.js';
+import { BadWordDetails } from '../../common/AutoMod.js';
+import { type BushClient } from '../../extensions/discord-akairo/BushClient.js';
+import { BaseModel } from '../BaseModel.js';
 const { DataTypes } = (await import('sequelize')).default;
 
 export interface GuildModel {
diff --git a/src/lib/models/Level.ts b/src/lib/models/instance/Level.ts
index e247779..e18753d 100644
--- a/src/lib/models/Level.ts
+++ b/src/lib/models/instance/Level.ts
@@ -1,6 +1,6 @@
 import { type Snowflake } from 'discord.js';
 import { type Sequelize } from 'sequelize';
-import { BaseModel } from './BaseModel.js';
+import { BaseModel } from '../BaseModel.js';
 const { DataTypes } = (await import('sequelize')).default;
 
 export interface LevelModel {
diff --git a/src/lib/models/ModLog.ts b/src/lib/models/instance/ModLog.ts
index 8d6a08c..bcccbb4 100644
--- a/src/lib/models/ModLog.ts
+++ b/src/lib/models/instance/ModLog.ts
@@ -1,7 +1,7 @@
 import { type Snowflake } from 'discord.js';
 import { nanoid } from 'nanoid';
 import { type Sequelize } from 'sequelize';
-import { BaseModel } from './BaseModel.js';
+import { BaseModel } from '../BaseModel.js';
 const { DataTypes } = (await import('sequelize')).default;
 
 export enum ModLogType {
diff --git a/src/lib/models/Reminder.ts b/src/lib/models/instance/Reminder.ts
index d1460bf..9ca78f1 100644
--- a/src/lib/models/Reminder.ts
+++ b/src/lib/models/instance/Reminder.ts
@@ -1,7 +1,7 @@
 import { Snowflake } from 'discord.js';
 import { nanoid } from 'nanoid';
 import { type Sequelize } from 'sequelize';
-import { BaseModel } from './BaseModel.js';
+import { BaseModel } from '../BaseModel.js';
 const { DataTypes } = (await import('sequelize')).default;
 
 export interface ReminderModel {
diff --git a/src/lib/models/StickyRole.ts b/src/lib/models/instance/StickyRole.ts
index 4beb4cf..fb1c30d 100644
--- a/src/lib/models/StickyRole.ts
+++ b/src/lib/models/instance/StickyRole.ts
@@ -1,6 +1,6 @@
 import { type Snowflake } from 'discord.js';
 import { type Sequelize } from 'sequelize';
-import { BaseModel } from './BaseModel.js';
+import { BaseModel } from '../BaseModel.js';
 const { DataTypes } = (await import('sequelize')).default;
 
 export interface StickyRoleModel {
diff --git a/src/lib/models/Global.ts b/src/lib/models/shared/Global.ts
index 8e467f6..6dfc36f 100644
--- a/src/lib/models/Global.ts
+++ b/src/lib/models/shared/Global.ts
@@ -1,6 +1,6 @@
 import { type Snowflake } from 'discord.js';
 import { type Sequelize } from 'sequelize';
-import { BaseModel } from './BaseModel.js';
+import { BaseModel } from '../BaseModel.js';
 const { DataTypes } = (await import('sequelize')).default;
 
 export interface GlobalModel {
diff --git a/src/lib/models/Shared.ts b/src/lib/models/shared/Shared.ts
index acb5c1e..642ff85 100644
--- a/src/lib/models/Shared.ts
+++ b/src/lib/models/shared/Shared.ts
@@ -1,7 +1,7 @@
 import { Snowflake } from 'discord.js';
 import type { Sequelize } from 'sequelize';
-import type { BadWords } from '../common/AutoMod.js';
-import { BaseModel } from './BaseModel.js';
+import type { BadWords } from '../../common/AutoMod.js';
+import { BaseModel } from '../BaseModel.js';
 const { DataTypes } = (await import('sequelize')).default;
 
 export interface SharedModel {
diff --git a/src/lib/models/Stat.ts b/src/lib/models/shared/Stat.ts
index 8f90724..8f77b58 100644
--- a/src/lib/models/Stat.ts
+++ b/src/lib/models/shared/Stat.ts
@@ -1,5 +1,5 @@
 import { type Sequelize } from 'sequelize';
-import { BaseModel } from './BaseModel.js';
+import { BaseModel } from '../BaseModel.js';
 const { DataTypes } = (await import('sequelize')).default;
 
 type Environment = 'production' | 'development' | 'beta';