Merge branch 'dev' into 'main'

Dev

See merge request illegitimate/illegitimate-bot!248

.gitignore

@@ -4,3 +4,4 @@ node_modules/*
 .env
 dist/
 data/
+dev/

dev-compose.yml

@@ -0,0 +1,14 @@
+version: '3.7'
+services:
+  db:
+    container_name: postgres
+    image: postgres
+    restart: unless-stopped
+    ports:
+      - 5432:5432
+    volumes:
+      - ./data:/var/lib/postgresql/data
+    environment:
+      - POSTGRES_PASSWORD=dev
+      - POSTGRES_USER=dev
+      - POSTGRES_DB=illegitimate

docker-compose.yml

@@ -9,11 +9,22 @@ services:
     restart: unless-stopped
     logging:
       driver: journald
-    volumes:
-      - ${DB_PATH}:/app/data
     environment:
       - TOKEN=${TOKEN}
       - MONGOURI=${MONGOURI}
       - DEV=${DEV}
       - HYPIXELAPIKEY=${HYPIXELAPIKEY}
       - REDISURI=${REDISURI}
+      - POSTGRESURI=${POSTGRESURI}
+  db:
+    container_name: postgres
+    image: postgres
+    restart: unless-stopped
+    logging:
+      driver: journald
+    volumes:
+      - ${DB_PATH}:/app/data
+    environment:
+      - POSTGRES_PASSWORD=${PG_PASSWD}
+      - POSTGRES_USER=${PG_USER}
+      - POSTGRES_DB=illegitimate

package.json

@@ -37,14 +37,15 @@
         "ioredis": "^5.3.2",
         "mongoose": "^8.2.1",
         "ms": "^2.1.3",
+        "pg": "^8.11.5",
         "pretty-ms": "^9.0.0",
         "sequelize": "^6.37.2",
-        "sqlite3": "^5.1.7",
         "youtube-ext": "^1.1.16"
     },
     "devDependencies": {
         "@types/ms": "^0.7.34",
         "@types/node": "^20.11.28",
+        "@types/pg": "^8",
         "@typescript-eslint/eslint-plugin": "^7.2.0",
         "@typescript-eslint/parser": "^7.2.0",
         "concurrently": "^8.2.2",

src/interfaces/IEnv.ts

@@ -4,6 +4,7 @@ interface ProdEnv {
     dev: string | undefined
     hypixelapikey: string | undefined
     redisURI: string | undefined
+    postgresURI: string | undefined
 }
 
 interface DevEnv {

src/schemas/waitinglistTag.ts

@@ -17,7 +17,7 @@ const tag = sequelize.define<WaitingList>("waitingList", {
         allowNull: false
     },
     timestamp: {
-        type: Sequelize.INTEGER,
+        type: Sequelize.BIGINT,
         allowNull: false
     }
 })

src/utils/Env.ts

@@ -7,13 +7,14 @@ const env: IEnv = {
         mongoURI: process.env.MONGOURI,
         dev: process.env.DEV,
         hypixelapikey: process.env.HYPIXELAPIKEY,
-        redisURI: process.env.REDISURI
+        redisURI: process.env.REDISURI,
+        postgresURI: process.env.POSTGRESURI
     },
     dev: {
         devtoken: process.env.DEVTOKEN,
         clientid: process.env.CLIENTID,
         devid: process.env.DEVID,
-        guildid: process.env.GUILDID
+        guildid: process.env.GUILDID,
     }
 }
 

src/utils/Illegitimate.ts

@@ -2,7 +2,7 @@ import { ExtendedClient as Client } from "utils/Client"
 import color from "utils/functions/colors"
 import { Redis } from "ioredis"
 import env from "utils/Env"
-import { connect } from "mongoose"
+// import { connect } from "mongoose"
 import loadAllEvents from "./Events"
 import { Player } from "discord-player"
 import { Sequelize } from "sequelize"
@@ -10,12 +10,7 @@ import { Sequelize } from "sequelize"
 const client = new Client()
 const redis = new Redis(env.prod.redisURI!)
 const player = new Player(client)
-const sequelize = new Sequelize("illegitimate", "root", "password", {
-    host: "localhost",
-    dialect: "sqlite",
-    logging: false,
-    storage: "data/database.sqlite",
-})
+const sequelize = new Sequelize(env.prod.postgresURI!, { dialect: "postgres" })
 
 let ft: "js" | "ts"
 if (process.env.NODE_ENV === "dev" && process.env.TYPESCRIPT === "true") {
@@ -37,11 +32,11 @@ class Illegitimate {
         redis.on("ready", () => {
             console.log(color("Connected to Redis", "green"))
         })
-        connect(env.prod.mongoURI!, {}).then(() => {
-            console.log(color("Connected to MongoDB", "green"))
-        })
+        // connect(env.prod.mongoURI!, {}).then(() => {
+        //     console.log(color("Connected to MongoDB", "green"))
+        // })
         sequelize.sync().then(() => {
-            console.log(color("Connected to SQLite", "green"))
+            console.log(color("Connected to Postgres", "green"))
         })
     }