From af3759caf428fada3b3f4a51852543d6fb280018 Mon Sep 17 00:00:00 2001 From: PalmDevs Date: Thu, 4 Jul 2024 20:51:30 +0700 Subject: [PATCH] fix(bots/discord): use env for initializing database --- bots/discord/.env.example | 3 ++- bots/discord/drizzle.config.ts | 2 +- bots/discord/src/context.ts | 4 ++-- bots/discord/src/index.ts | 7 +++---- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/bots/discord/.env.example b/bots/discord/.env.example index 2a9d1fb..f1eefc5 100644 --- a/bots/discord/.env.example +++ b/bots/discord/.env.example @@ -1 +1,2 @@ -DISCORD_TOKEN="YOUR-TOKEN-HERE" \ No newline at end of file +DISCORD_TOKEN="YOUR-TOKEN-HERE" +DATABASE_URL=file:./db.sqlite3 \ No newline at end of file diff --git a/bots/discord/drizzle.config.ts b/bots/discord/drizzle.config.ts index 719d1d8..f50247d 100644 --- a/bots/discord/drizzle.config.ts +++ b/bots/discord/drizzle.config.ts @@ -4,6 +4,6 @@ export default defineConfig({ dialect: 'sqlite', schema: './src/database/schemas.ts', dbCredentials: { - url: 'file:./db.sqlite', + url: process.env['DATABASE_URL'], }, }) diff --git a/bots/discord/src/context.ts b/bots/discord/src/context.ts index 3c8bfc7..9568561 100644 --- a/bots/discord/src/context.ts +++ b/bots/discord/src/context.ts @@ -19,7 +19,7 @@ export const api = { client: new APIClient({ api: { websocket: { - url: config.api.websocketUrl, + url: config.api.url, }, }, }), @@ -27,7 +27,7 @@ export const api = { disconnectCount: 0, } -const db = new Database('db.sqlite') +const db = new Database(process.env['DATABASE_URL']) export const database = drizzle(db, { schema: schemas, diff --git a/bots/discord/src/index.ts b/bots/discord/src/index.ts index f385732..8b80c9f 100644 --- a/bots/discord/src/index.ts +++ b/bots/discord/src/index.ts @@ -1,10 +1,9 @@ -// import { listAllFilesRecursive, pathJoinCurrentDir } from '$utils/fs' +import { api, discord, logger } from '$/context' +import { listAllFilesRecursive, pathJoinCurrentDir } from '$utils/fs' import { getMissingEnvironmentVariables } from '@revanced/bot-shared' -import { api, discord, logger } from './context' -import { listAllFilesRecursive, pathJoinCurrentDir } from './utils/fs' // Check if token exists -const missingEnvs = getMissingEnvironmentVariables(['DISCORD_TOKEN']) +const missingEnvs = getMissingEnvironmentVariables(['DISCORD_TOKEN', 'DATABASE_URL']) if (missingEnvs.length) { for (const env of missingEnvs) logger.fatal(`${env} is not defined in environment variables`) process.exit(1)