From b81f9e8b73cb520ad5ae916c3e571ea55f4ca489 Mon Sep 17 00:00:00 2001
From: IRONM00N <64110067+IRONM00N@users.noreply.github.com>
Date: Sat, 20 Aug 2022 23:07:02 -0400
Subject: fix ts composite shit, replace got with native fetch, update deps

---
 lib/models/instance/ActivePunishment.ts | 3 +--
 lib/models/instance/Guild.ts            | 6 ++----
 lib/models/instance/Highlight.ts        | 3 +--
 lib/models/instance/Level.ts            | 3 +--
 lib/models/instance/ModLog.ts           | 3 +--
 lib/models/instance/Reminder.ts         | 3 +--
 lib/models/instance/StickyRole.ts       | 3 +--
 7 files changed, 8 insertions(+), 16 deletions(-)

(limited to 'lib/models/instance')

diff --git a/lib/models/instance/ActivePunishment.ts b/lib/models/instance/ActivePunishment.ts
index 38012ca..9bd9d01 100644
--- a/lib/models/instance/ActivePunishment.ts
+++ b/lib/models/instance/ActivePunishment.ts
@@ -1,8 +1,7 @@
 import { type Snowflake } from 'discord.js';
 import { nanoid } from 'nanoid';
-import { type Sequelize } from 'sequelize';
+import { DataTypes, type Sequelize } from 'sequelize';
 import { BaseModel } from '../BaseModel.js';
-const { DataTypes } = (await import('sequelize')).default;
 
 export enum ActivePunishmentType {
 	BAN = 'BAN',
diff --git a/lib/models/instance/Guild.ts b/lib/models/instance/Guild.ts
index f258d48..1d645e9 100644
--- a/lib/models/instance/Guild.ts
+++ b/lib/models/instance/Guild.ts
@@ -1,9 +1,9 @@
+import config from '#config';
 import { ChannelType, Constants, type Snowflake } from 'discord.js';
-import { type Sequelize } from 'sequelize';
+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';
-const { DataTypes } = (await import('sequelize')).default;
 
 export interface GuildModel {
 	id: Snowflake;
@@ -199,8 +199,6 @@ const asGuildSetting = <T>(et: { [K in keyof T]: PartialBy<GuildSetting, 'config
 	return et as { [K in keyof T]: GuildSetting };
 };
 
-const { default: config } = await import('../../../config/options.js');
-
 export const guildSettingsObj = asGuildSetting({
 	prefix: {
 		name: 'Prefix',
diff --git a/lib/models/instance/Highlight.ts b/lib/models/instance/Highlight.ts
index 5889fad..38c7990 100644
--- a/lib/models/instance/Highlight.ts
+++ b/lib/models/instance/Highlight.ts
@@ -1,8 +1,7 @@
 import { type Snowflake } from 'discord.js';
 import { nanoid } from 'nanoid';
-import { type Sequelize } from 'sequelize';
+import { DataTypes, type Sequelize } from 'sequelize';
 import { BaseModel } from '../BaseModel.js';
-const { DataTypes } = (await import('sequelize')).default;
 
 export interface HighlightModel {
 	pk: string;
diff --git a/lib/models/instance/Level.ts b/lib/models/instance/Level.ts
index d8d16f0..e22d63b 100644
--- a/lib/models/instance/Level.ts
+++ b/lib/models/instance/Level.ts
@@ -1,7 +1,6 @@
 import { type Snowflake } from 'discord.js';
-import { type Sequelize } from 'sequelize';
+import { DataTypes, type Sequelize } from 'sequelize';
 import { BaseModel } from '../BaseModel.js';
-const { DataTypes } = (await import('sequelize')).default;
 
 export interface LevelModel {
 	user: Snowflake;
diff --git a/lib/models/instance/ModLog.ts b/lib/models/instance/ModLog.ts
index c25f043..324ad83 100644
--- a/lib/models/instance/ModLog.ts
+++ b/lib/models/instance/ModLog.ts
@@ -1,8 +1,7 @@
 import { type Snowflake } from 'discord.js';
 import { nanoid } from 'nanoid';
-import { type Sequelize } from 'sequelize';
+import { DataTypes, type Sequelize } from 'sequelize';
 import { BaseModel } from '../BaseModel.js';
-const { DataTypes } = (await import('sequelize')).default;
 
 export enum ModLogType {
 	PERM_BAN = 'PERM_BAN',
diff --git a/lib/models/instance/Reminder.ts b/lib/models/instance/Reminder.ts
index 964ea63..8d46edb 100644
--- a/lib/models/instance/Reminder.ts
+++ b/lib/models/instance/Reminder.ts
@@ -1,8 +1,7 @@
 import { Snowflake } from 'discord.js';
 import { nanoid } from 'nanoid';
-import { type Sequelize } from 'sequelize';
+import { DataTypes, type Sequelize } from 'sequelize';
 import { BaseModel } from '../BaseModel.js';
-const { DataTypes } = (await import('sequelize')).default;
 
 export interface ReminderModel {
 	id: string;
diff --git a/lib/models/instance/StickyRole.ts b/lib/models/instance/StickyRole.ts
index 00e98ce..90ded0e 100644
--- a/lib/models/instance/StickyRole.ts
+++ b/lib/models/instance/StickyRole.ts
@@ -1,7 +1,6 @@
 import { type Snowflake } from 'discord.js';
-import { type Sequelize } from 'sequelize';
+import { DataTypes, type Sequelize } from 'sequelize';
 import { BaseModel } from '../BaseModel.js';
-const { DataTypes } = (await import('sequelize')).default;
 
 export interface StickyRoleModel {
 	user: Snowflake;
-- 
cgit