upgrade typescript, improve workflow, bunch of bug fixes and some other things

1 files changed, 27 insertions, 18 deletions

diff --git a/src/lib/models/Global.ts b/src/lib/models/Global.ts
index c5c680d..6b6ebae 100644
--- a/src/lib/models/Global.ts
+++ b/src/lib/models/Global.ts
@@ -1,5 +1,5 @@
-import { Snowflake } from 'discord.js';
-import { DataTypes, Sequelize } from 'sequelize';
+import { type Snowflake } from 'discord.js';
+import { DataTypes, type Sequelize } from 'sequelize';
 import { BaseModel } from './BaseModel';
 import { jsonArray } from './__helpers';
 
@@ -21,28 +21,37 @@ export interface GlobalModelCreationAttributes {
 	blacklistedChannels?: Snowflake[];
 }
 
-// declaration merging so that the fields don't override Sequelize's getters
-export interface Global {
-	/** The bot's environment. */
-	environment: 'production' | 'development' | 'beta';
+export class Global extends BaseModel<GlobalModel, GlobalModelCreationAttributes> implements GlobalModel {
+	/** 
+	 * The bot's environment. 
+	 */
+	public declare environment: 'production' | 'development' | 'beta';
 
-	/** Trusted users. */
-	superUsers: Snowflake[];
+	/** 
+	 * Trusted users. 
+	 */
+	public declare superUsers: Snowflake[];
 
-	/** Globally disabled commands. */
-	disabledCommands: string[];
+	/** 
+	 * Globally disabled commands. 
+	 */
+	public declare disabledCommands: string[];
 
-	/** Globally blacklisted users. */
-	blacklistedUsers: Snowflake[];
+	/** 
+	 * Globally blacklisted users. 
+	 */
+	public declare blacklistedUsers: Snowflake[];
 
-	/** Guilds blacklisted from using the bot. */
-	blacklistedGuilds: Snowflake[];
+	/** 
+	 * Guilds blacklisted from using the bot. 
+	 */
+	public declare blacklistedGuilds: Snowflake[];
 
-	/** Channels where the bot is prevented from running. */
-	blacklistedChannels: Snowflake[];
-}
+	/** 
+	 * Channels where the bot is prevented from running commands in.
+	 */
+	public declare blacklistedChannels: Snowflake[];
 
-export class Global extends BaseModel<GlobalModel, GlobalModelCreationAttributes> implements GlobalModel {
 	public static initModel(sequelize: Sequelize): void {
 		Global.init(
 			{