fix: SQL import in Docker images #202

Merged
Anri merged 8 commits from fix-sql into main 2024-11-02 18:26:02 +01:00
7 changed files with 17 additions and 11 deletions
Showing only changes of commit a550a8bc3f - Show all commits

View file

@ -4,7 +4,7 @@
"description": "Bot discord", "description": "Bot discord",
"main": "src/index.js", "main": "src/index.js",
"scripts": { "scripts": {
"compile": "rm -r dist 2> /dev/null; npx tsc", "compile": "rm -r dist 2> /dev/null; npx tsc; cp -r ./src/sql ./dist/sql",
"main": "npm run compile && node ./dist/index.js", "main": "npm run compile && node ./dist/index.js",
"debug": "npx tsnd --respawn ./src/index.ts", "debug": "npx tsnd --respawn ./src/index.ts",
"lint": "npx eslint src", "lint": "npx eslint src",

View file

@ -1,10 +1,10 @@
import { PlayerEvents, useMainPlayer } from "discord-player"; import { PlayerEvents, useMainPlayer } from "discord-player";
import { Client } from "discord.js"; import { Client } from "discord.js";
import { readdir } from "fs/promises"; import { readdir } from "fs/promises";
import { splitFilenameExtensions } from "../utils/misc"; import { isDev, splitFilenameExtensions } from "../utils/misc";
/** Load all the events */ /** Load all the events */
export default async (client: Client, isDev: boolean) => { export default async (client: Client) => {
const events_categories = (await readdir(__dirname, { withFileTypes: true })) const events_categories = (await readdir(__dirname, { withFileTypes: true }))
.filter((element) => element.isDirectory()) .filter((element) => element.isDirectory())
.map((element) => element.name); .map((element) => element.name);

View file

@ -1,8 +1,8 @@
const isDev = process.env.NODE_ENV !== "production"; import { isDev } from "./utils/misc";
/** Load the app */ /** Load the app */
const start_app = () => { const start_app = () => {
import("./load").then((l) => l.run(isDev).catch((error) => console.error(error))); import("./load").then((l) => l.run().catch((error) => console.error(error)));
}; };
// Load .env if not in prod // Load .env if not in prod

View file

@ -4,15 +4,15 @@ import loadEvents from "./events/loader";
import loadModals from "./modals/loader"; import loadModals from "./modals/loader";
import loadClient, { quit } from "./utils/client"; import loadClient, { quit } from "./utils/client";
import { logStart } from "./utils/misc"; import { isDev, logStart } from "./utils/misc";
/** Run the bot */ /** Run the bot */
export const run = async (isDev: boolean) => { export const run = async () => {
console.log("Starting Botanique..."); console.log("Starting Botanique...");
// Client Discord.JS // Client Discord.JS
const client_name = "Client"; const client_name = "Client";
await loadClient(isDev) await loadClient()
.then(async (client) => { .then(async (client) => {
if (isDev) { if (isDev) {
// Attach debugging listeners // Attach debugging listeners
@ -21,7 +21,7 @@ export const run = async (isDev: boolean) => {
// Events Discord.JS and Player // Events Discord.JS and Player
const events_name = "Events"; const events_name = "Events";
await loadEvents(client, isDev) await loadEvents(client)
.then(() => console.log(logStart(events_name, true))) .then(() => console.log(logStart(events_name, true)))
.catch((err) => { .catch((err) => {
console.error(err); console.error(err);

View file

@ -6,9 +6,10 @@ import "../modules/client";
import { loadLocales } from "./locales"; import { loadLocales } from "./locales";
import { YoutubeiExtractor } from "discord-player-youtubei"; import { YoutubeiExtractor } from "discord-player-youtubei";
import { readSQL } from "./db"; import { readSQL } from "./db";
import { isDev } from "./misc";
/** Creation of the client and definition of its properties */ /** Creation of the client and definition of its properties */
export default async (isDev: boolean) => { export default async () => {
const activities = isDev ? [] : [{ name: "/help", type: ActivityType.Watching }]; const activities = isDev ? [] : [{ name: "/help", type: ActivityType.Watching }];
const client: Client = new Client({ const client: Client = new Client({

View file

@ -1,7 +1,9 @@
import fs from "node:fs"; import fs from "node:fs";
import { isDev } from "./misc";
export const readSQL = (path: string) => { export const readSQL = (path: string) => {
const dir = "./src/sql/"; const root = isDev ? "./src" : "./dist";
const dir = root + "/sql/";
if (!path.startsWith(dir)) { if (!path.startsWith(dir)) {
path = dir + path; path = dir + path;
} }

View file

@ -1,5 +1,8 @@
import { GuildMember } from "discord.js"; import { GuildMember } from "discord.js";
/** Check if we are in the dev environnement */
export const isDev = process.env.NODE_ENV !== "production";
/** /**
* Log module status * Log module status
* @param {string} name Module name * @param {string} name Module name