From 66dc111ea4a56fdfd66370c64922d74721fa6886 Mon Sep 17 00:00:00 2001
From: Lukian <lulul7018@gmail.com>
Date: Tue, 24 Dec 2024 17:48:09 +0100
Subject: [PATCH] Fixed quota reset

---
 .gitignore             |  5 ++---
 package                | 24 ------------------------
 src/libs/mysql.ts      |  2 +-
 src/libs/quotaReset.ts | 27 ++++++++++++++++-----------
 tsconfig.json          | 12 ------------
 5 files changed, 19 insertions(+), 51 deletions(-)
 delete mode 100644 package
 delete mode 100644 tsconfig.json

diff --git a/.gitignore b/.gitignore
index a9022ad..ab793cc 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1,3 @@
 node_modules
-package-lock.json
-dist
-.env
\ No newline at end of file
+.env
+deno.lock
diff --git a/package b/package
deleted file mode 100644
index 251116f..0000000
--- a/package
+++ /dev/null
@@ -1,24 +0,0 @@
-{
-  "name": "chaise_bot_3.0",
-  "version": "3.1.0",
-  "description": "",
-  "main": "index.js",
-  "type": "module",
-  "scripts": {
-    "dev": "tsx watch src",
-    "build": "tsc",
-    "start": "node dist"
-  },
-  "keywords": [],
-  "author": "",
-  "license": "ISC",
-  "dependencies": {
-    "@mistralai/mistralai": "^0.1.3",
-    "@types/mysql": "^2.15.26",
-    "@types/node": "^20.16.0",
-    "canvas": "^2.11.2",
-    "discord.js": "^14.14.1",
-    "dotenv": "^16.4.5",
-    "mysql": "^2.18.1"
-  }
-}
diff --git a/src/libs/mysql.ts b/src/libs/mysql.ts
index 71135bc..154ba32 100644
--- a/src/libs/mysql.ts
+++ b/src/libs/mysql.ts
@@ -162,7 +162,7 @@ export function setWelcomePropertiy(connection: mysql.Connection, guild_id: Stri
 
 export function getLastReset(connection: mysql.Connection) {
 	return new Promise((resolve, reject) => {
-		connection.query("SELECT MAX(date) FROM resets", (error, result) => {
+		connection.query("SELECT MAX(date) AS date FROM resets", (error, result) => {
 			if (error) {
 				reject(error);
 			}
diff --git a/src/libs/quotaReset.ts b/src/libs/quotaReset.ts
index b615e57..319fe9b 100644
--- a/src/libs/quotaReset.ts
+++ b/src/libs/quotaReset.ts
@@ -1,21 +1,26 @@
 import { connectToDb, resetQuota, getLastReset, addReset } from "./mysql.ts";
+import { sendLog } from "./discord.ts";
 
 export async function checkReset() {
 	const connection = await connectToDb();
 	const lastReset = await getLastReset(connection);
-	const now = Date.now() / 1000;
-
-	// @ts-ignore
-	if (lastReset[0] && now - lastReset[0].date > 1000 * 60 * 60 * 24 * 30) {
-		await resetQuota(connection);
-		await addReset(connection, now)
-
-		connection.end();
+  const now = Date.now()
 
+  if (!lastReset[0]) {
 		return;
-	} else {
-		connection.end();
+  }
 
-		return false;
+  if (lastReset[0].date == null) {
+		await resetQuota(connection);
+		await addReset(connection, now);
+
+		return connection.end();
+  }
+
+	if (now - lastReset[0].date > 1000 * 60 * 60 * 24 * 30) {
+		await resetQuota(connection);
+		await addReset(connection, now);
+
+		return connection.end();
 	}
 }
diff --git a/tsconfig.json b/tsconfig.json
deleted file mode 100644
index 623b499..0000000
--- a/tsconfig.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-    "compilerOptions": {
-        "target": "ES5",
-        "module": "NodeNext",
-        "moduleResolution": "NodeNext",
-        "resolveJsonModule": true,
-        "outDir": "./dist",
-        "skipLibCheck": true,
-        "noImplicitAny": true,
-    },
-    "include": ["src"],
-}
\ No newline at end of file