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

1 files changed, 22 insertions, 25 deletions

diff --git a/src/lib/models/Level.ts b/src/lib/models/Level.ts
index 7f418fd..6499bff 100644
--- a/src/lib/models/Level.ts
+++ b/src/lib/models/Level.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';
 
 export interface LevelModel {
@@ -14,20 +14,25 @@ export interface LevelModelCreationAttributes {
 	xp?: number;
 }
 
-// declaration merging so that the fields don't override Sequelize's getters
-export interface Level {
-	/** The user's id. */
-	user: Snowflake;
+export class Level extends BaseModel<LevelModel, LevelModelCreationAttributes> implements LevelModel {
+	/** 
+	 * The user's id. 
+	 */
+	public declare user: Snowflake;
 
-	/** The guild where the user is gaining xp. */
-	guild: Snowflake;
+	/** 
+	 * The guild where the user is gaining xp. 
+	 */
+	public declare guild: Snowflake;
 
-	/**The user's xp.*/
-	xp: number;
-}
+	/**
+	 * The user's xp.
+	 */
+	public declare xp: number;
 
-export class Level extends BaseModel<LevelModel, LevelModelCreationAttributes> implements LevelModel {
-	/** The user's level. */
+	/** 
+	 * The user's level. 
+	 */
 	public get level(): number {
 		return Level.convertXpToLevel(this.xp);
 	}
@@ -44,19 +49,11 @@ export class Level extends BaseModel<LevelModel, LevelModelCreationAttributes> i
 	}
 
 	public static convertXpToLevel(xp: number): number {
-		let i = 1;
-		let lvl: number;
-		// eslint-disable-next-line no-constant-condition
-		while (true) {
-			const neededXp = Level.convertLevelToXp(i);
-			if (neededXp > xp) {
-				lvl = i;
-				break;
-			} else {
-				i++;
-			}
+		let i = 0;
+		while (Level.convertLevelToXp(i + 1) < xp) {
+			i++;
 		}
-		return lvl - 1; // I have to do this don't question it ok
+		return i;
 	}
 
 	public static convertLevelToXp(level: number): number {