Merge branch 'dev' into 'main'

Dev

See merge request illegitimate/illegitimate-bot!260
This commit is contained in:
2024-08-12 21:00:15 +00:00
3 changed files with 1326 additions and 15 deletions

View File

@@ -38,6 +38,7 @@
"mongoose": "^8.5.2",
"ms": "^2.1.3",
"pg": "^8.12.0",
"pg-hstore": "^2.3.4",
"pretty-ms": "^9.1.0",
"sequelize": "^6.37.3",
"youtube-ext": "^1.1.25"
@@ -51,6 +52,7 @@
"concurrently": "^8.2.2",
"cross-env": "^7.0.3",
"eslint": "^8.57.0",
"sqlite3": "^5.1.7",
"ts-node": "^10.9.2",
"typescript": "^5.5.4"
},

View File

@@ -10,7 +10,16 @@ import { Sequelize } from "sequelize"
const client = new Client()
const redis = new Redis(env.prod.redisURI!)
const player = new Player(client)
const sequelize = new Sequelize(env.prod.postgresURI!, { dialect: "postgres" })
let sequelize: Sequelize
if (process.env.NODE_ENV === "dev") {
sequelize = new Sequelize({
dialect: "sqlite",
storage: "data/db.sqlite"
})
} else {
sequelize = new Sequelize(env.prod.postgresURI!, { dialect: "postgres" })
}
let ft: "js" | "ts"
if (process.env.NODE_ENV === "dev" && process.env.TYPESCRIPT === "true") {

1328
yarn.lock

File diff suppressed because it is too large Load Diff