Update import to match new database folder

Merge branch 'develop' into feature/98-timeout-command
Update dependency typeorm to v0.3.16 (#237 )
2023-06-12 17:23:40 +01:00 · 2023-06-12 17:22:19 +01:00 · 2023-06-12 17:19:58 +01:00 · 2023-05-26 17:59:22 +01:00 · 2023-05-22 18:07:24 +01:00
40 changed files with 166 additions and 182 deletions
--- a/.dev.env
+++ b/.dev.env
@ -15,3 +15,11 @@ BOT_CLIENTID=682942374040961060

 ABOUT_FUNDING=https://ko-fi.com/vylpes
 ABOUT_REPO=https://gitea.vylpes.xyz/RabbitLabs/vylbot-app
+
+DB_HOST=127.0.0.1
+DB_PORT=3101
+DB_NAME=vylbot
+DB_AUTH_USER=dev
+DB_AUTH_PASS=dev
+DB_SYNC=true
+DB_LOGGING=true
--- a/.prod.env
+++ b/.prod.env
@ -14,3 +14,11 @@ BOT_CLIENTID=680083120896081954

 ABOUT_FUNDING=https://ko-fi.com/vylpes
 ABOUT_REPO=https://gitea.vylpes.xyz/RabbitLabs/vylbot-app
+
+DB_HOST=127.0.0.1
+DB_PORT=3121
+DB_NAME=vylbot
+DB_AUTH_USER=prod
+DB_AUTH_PASS=prod
+DB_SYNC=false
+DB_LOGGING=false
--- a/.stage.env
+++ b/.stage.env
@ -14,3 +14,11 @@ BOT_CLIENTID=1016767908740857949

 ABOUT_FUNDING=https://ko-fi.com/vylpes
 ABOUT_REPO=https://gitea.vylpes.xyz/RabbitLabs/vylbot-app
+
+DB_HOST=127.0.0.1
+DB_PORT=3111
+DB_NAME=vylbot
+DB_AUTH_USER=stage
+DB_AUTH_PASS=stage
+DB_SYNC=false
+DB_LOGGING=false
--- a/ormconfig.dev.json
+++ b/ormconfig.dev.json
@ -1,24 +0,0 @@
-{
-   "type": "mysql",
-   "host": "localhost",
-   "port": 3101,
-   "username": "dev",
-   "password": "dev",
-   "database": "vylbot",
-   "synchronize": false,
-   "logging": false,
-   "entities": [
-      "dist/entity/**/*.js"
-   ],
-   "migrations": [
-      "dist/migration/**/*.js"
-   ],
-   "subscribers": [
-      "dist/subscriber/**/*.js"
-   ],
-   "cli": {
-      "entitiesDir": "dist/entity",
-      "migrationsDir": "dist/migration",
-      "subscribersDir": "dist/subscriber"
-   }
-}
--- a/ormconfig.prod.json
+++ b/ormconfig.prod.json
@ -1,24 +0,0 @@
-{
-   "type": "mysql",
-   "host": "localhost",
-   "port": 3121,
-   "username": "prod",
-   "password": "prod",
-   "database": "vylbot",
-   "synchronize": false,
-   "logging": false,
-   "entities": [
-      "dist/entity/**/*.js"
-   ],
-   "migrations": [
-      "dist/migration/**/*.js"
-   ],
-   "subscribers": [
-      "dist/subscriber/**/*.js"
-   ],
-   "cli": {
-      "entitiesDir": "dist/entity",
-      "migrationsDir": "dist/migration",
-      "subscribersDir": "dist/subscriber"
-   }
-}
--- a/ormconfig.stage.json
+++ b/ormconfig.stage.json
@ -1,24 +0,0 @@
-{
-   "type": "mysql",
-   "host": "localhost",
-   "port": 3111,
-   "username": "stage",
-   "password": "stage",
-   "database": "vylbot",
-   "synchronize": false,
-   "logging": false,
-   "entities": [
-      "dist/entity/**/*.js"
-   ],
-   "migrations": [
-      "dist/migration/**/*.js"
-   ],
-   "subscribers": [
-      "dist/subscriber/**/*.js"
-   ],
-   "cli": {
-      "entitiesDir": "dist/entity",
-      "migrationsDir": "dist/migration",
-      "subscribersDir": "dist/subscriber"
-   }
-}
--- a/package.json
+++ b/package.json
@ -9,8 +9,8 @@
    "build": "tsc",
    "start": "node ./dist/vylbot",
    "test": "jest",
-    "db:up": "typeorm migration:run",
-    "db:down": "typeorm migration:revert"
+    "db:up": "typeorm migration:run -d dist/database/dataSources/appDataSource.js",
+    "db:down": "typeorm migration:revert -d dist/database/dataSources/appDataSource.js"
  },
  "repository": {
    "type": "git",
@ -33,11 +33,11 @@
    "emoji-regex": "^10.0.0",
    "jest": "^29.0.0",
    "jest-mock-extended": "^3.0.0",
-    "minimatch": "7.4.6",
+    "minimatch": "9.0.1",
    "mysql": "^2.18.1",
    "random-bunny": "^2.0.5",
    "ts-jest": "^29.0.0",
-    "typeorm": "0.3.14"
+    "typeorm": "0.3.16"
  },
  "devDependencies": {
    "@types/node": "^20.0.0",
--- a/scripts/deploy_prod.sh
+++ b/scripts/deploy_prod.sh
@ -13,7 +13,6 @@ cd ~/apps/vylbot/vylbot_prod \
 && (pm2 stop vylbot_prod || true) \
 && (pm2 delete vylbot_prod || true) \
 && cp .prod.env .env \
-&& cp ormconfig.prod.json ormconfig.json \
 && yarn clean \
 && yarn install --frozen-lockfile \
 && yarn build \
--- a/scripts/deploy_stage.sh
+++ b/scripts/deploy_stage.sh
@ -13,7 +13,6 @@ cd ~/apps/vylbot/vylbot_stage \
 && (pm2 stop vylbot_stage || true) \
 && (pm2 delete vylbot_stage || true) \
 && cp .stage.env .env \
-&& cp ormconfig.stage.json ormconfig.json \
 && yarn clean \
 && yarn install --frozen-lockfile \
 && yarn build \
--- a/src/client/client.ts
+++ b/src/client/client.ts
@ -8,6 +8,7 @@ import { Command } from "../type/command";

 import { Events } from "./events";
 import { Util } from "./util";
+import AppDataSource from "../database/dataSources/appDataSource";

 export class CoreClient extends Client {
    private static _commandItems: ICommandItem[];
@ -41,10 +42,9 @@ export class CoreClient extends Client {
            return;
        }

-        await createConnection().catch(e => {
-            console.error(e);
-            return;
-        });
+        await AppDataSource.initialize()
+            .then(() => console.log("Data Source Initialized"))
+            .catch((err) => console.error("Error Initialising Data Source", err));

        super.on("interactionCreate", this._events.onInteractionCreate);
        super.on("ready", this._events.onReady);
--- a/src/commands/501231711271780357/Lobby/add.ts
+++ b/src/commands/501231711271780357/Lobby/add.ts
@ -1,6 +1,6 @@
 import { CommandInteraction, PermissionsBitField, SlashCommandBuilder } from "discord.js";
 import { Command } from "../../../type/command";
-import { default as eLobby } from "../../../entity/501231711271780357/Lobby";
+import { default as eLobby } from "../../../database/entities/501231711271780357/Lobby";

 export default class AddRole extends Command {
    constructor() {
--- a/src/commands/501231711271780357/Lobby/list.ts
+++ b/src/commands/501231711271780357/Lobby/list.ts
@ -1,6 +1,6 @@
 import { CacheType, CommandInteraction, EmbedBuilder, GuildBasedChannel, PermissionsBitField, SlashCommandBuilder } from "discord.js";
 import { Command } from "../../../type/command";
-import { default as eLobby } from "../../../entity/501231711271780357/Lobby";
+import { default as eLobby } from "../../../database/entities/501231711271780357/Lobby";
 import EmbedColours from "../../../constants/EmbedColours";

 export default class ListLobby extends Command {
--- a/src/commands/501231711271780357/Lobby/lobby.ts
+++ b/src/commands/501231711271780357/Lobby/lobby.ts
@ -1,6 +1,6 @@
 import { CommandInteraction, SlashCommandBuilder } from "discord.js";
 import { Command } from "../../../type/command";
-import { default as eLobby } from "../../../entity/501231711271780357/Lobby";
+import { default as eLobby } from "../../../database/entities/501231711271780357/Lobby";

 export default class Lobby extends Command {
    constructor() {
--- a/src/commands/501231711271780357/Lobby/remove.ts
+++ b/src/commands/501231711271780357/Lobby/remove.ts
@ -1,6 +1,6 @@
 import { CommandInteraction, PermissionsBitField, SlashCommandBuilder } from "discord.js";
 import { Command } from "../../../type/command";
-import { default as eLobby } from "../../../entity/501231711271780357/Lobby";
+import { default as eLobby } from "../../../database/entities/501231711271780357/Lobby";
 import BaseEntity from "../../../contracts/BaseEntity";

 export default class RemoveLobby extends Command {
--- a/src/commands/Role/config.ts
+++ b/src/commands/Role/config.ts
@ -1,7 +1,7 @@
 import { CommandInteraction, PermissionsBitField, SlashCommandBuilder } from "discord.js";
 import { Command } from "../../type/command";
-import { default as eRole } from "../../entity/Role";
-import Server from "../../entity/Server";
+import { default as eRole } from "../../database/entities/Role";
+import Server from "../../database/entities/Server";

 export default class ConfigRole extends Command {
    constructor() {
--- a/src/commands/Role/role.ts
+++ b/src/commands/Role/role.ts
@ -1,6 +1,6 @@
 import { CommandInteraction, EmbedBuilder, GuildMemberRoleManager, SlashCommandBuilder } from "discord.js";
 import { Command } from "../../type/command";
-import { default as eRole } from "../../entity/Role";
+import { default as eRole } from "../../database/entities/Role";
 import EmbedColours from "../../constants/EmbedColours";

 export default class Role extends Command {
--- a/src/commands/audits.ts
+++ b/src/commands/audits.ts
@ -1,4 +1,4 @@
-import Audit from "../entity/Audit";
+import Audit from "../database/entities/Audit";
 import AuditTools from "../helpers/AuditTools";
 import { Command } from "../type/command";
 import { CommandInteraction, EmbedBuilder, PermissionsBitField, SlashCommandBuilder } from "discord.js";
--- a/src/commands/ban.ts
+++ b/src/commands/ban.ts
@ -1,5 +1,5 @@
 import { Command } from "../type/command";
-import Audit from "../entity/Audit";
+import Audit from "../database/entities/Audit";
 import { AuditType } from "../constants/AuditType";
 import { CommandInteraction, EmbedBuilder, GuildMember, PermissionsBitField, SlashCommandBuilder, TextChannel } from "discord.js";
 import EmbedColours from "../constants/EmbedColours";
--- a/src/commands/config.ts
+++ b/src/commands/config.ts
@ -2,8 +2,8 @@ import { CommandInteraction, EmbedBuilder, PermissionsBitField, SlashCommandBuil
 import { readFileSync } from "fs";
 import DefaultValues from "../constants/DefaultValues";
 import EmbedColours from "../constants/EmbedColours";
-import Server from "../entity/Server";
-import Setting from "../entity/Setting";
+import Server from "../database/entities/Server";
+import Setting from "../database/entities/Setting";
 import { Command } from "../type/command";

 export default class Config extends Command {
--- a/src/commands/ignore.ts
+++ b/src/commands/ignore.ts
@ -1,5 +1,5 @@
 import { CommandInteraction, PermissionsBitField, SlashCommandBuilder } from "discord.js";
-import IgnoredChannel from "../entity/IgnoredChannel";
+import IgnoredChannel from "../database/entities/IgnoredChannel";
 import { Command } from "../type/command";

 export default class Ignore extends Command {
--- a/src/commands/kick.ts
+++ b/src/commands/kick.ts
@ -1,5 +1,5 @@
 import { Command } from "../type/command";
-import Audit from "../entity/Audit";
+import Audit from "../database/entities/Audit";
 import { AuditType } from "../constants/AuditType";
 import { CommandInteraction, EmbedBuilder, GuildMember, PermissionsBitField, SlashCommandBuilder, TextChannel } from "discord.js";
 import EmbedColours from "../constants/EmbedColours";
--- a/src/commands/mute.ts
+++ b/src/commands/mute.ts
@ -1,7 +1,7 @@
 import { CommandInteraction, EmbedBuilder, GuildMember, PermissionsBitField, SlashCommandBuilder, TextChannel } from "discord.js";
 import { AuditType } from "../constants/AuditType";
 import EmbedColours from "../constants/EmbedColours";
-import Audit from "../entity/Audit";
+import Audit from "../database/entities/Audit";
 import SettingsHelper from "../helpers/SettingsHelper";
 import { Command } from "../type/command";

--- a/src/commands/setup.ts
+++ b/src/commands/setup.ts
@ -1,5 +1,5 @@
 import { CommandInteraction, PermissionsBitField, SlashCommandBuilder } from "discord.js";
-import Server from "../entity/Server";
+import Server from "../database/entities/Server";
 import { Command } from "../type/command";

 export default class Setup extends Command {
--- a/src/commands/timeout.ts
+++ b/src/commands/timeout.ts
@ -1,7 +1,7 @@
 import { CacheType, CommandInteraction, EmbedBuilder, GuildMember, PermissionsBitField, SlashCommandBuilder, TextChannel } from "discord.js";
 import { AuditType } from "../constants/AuditType";
 import EmbedColours from "../constants/EmbedColours";
-import Audit from "../entity/Audit";
+import Audit from "../database/entities/Audit";
 import SettingsHelper from "../helpers/SettingsHelper";
 import TimeLengthInput from "../helpers/TimeLengthInput";
 import { Command } from "../type/command";
--- a/src/commands/warn.ts
+++ b/src/commands/warn.ts
@ -1,7 +1,7 @@
 import { CommandInteraction, EmbedBuilder, GuildMember, PermissionsBitField, SlashCommandBuilder, TextChannel } from "discord.js";
 import { AuditType } from "../constants/AuditType";
 import EmbedColours from "../constants/EmbedColours";
-import Audit from "../entity/Audit";
+import Audit from "../database/entities/Audit";
 import SettingsHelper from "../helpers/SettingsHelper";
 import { Command } from "../type/command";

--- a/src/contracts/BaseEntity.ts
+++ b/src/contracts/BaseEntity.ts
@ -1,5 +1,6 @@
-import { Column, DeepPartial, EntityTarget, getConnection, PrimaryColumn, ObjectLiteral, FindOptionsWhere } from "typeorm";
+import { Column, DeepPartial, EntityTarget, PrimaryColumn, ObjectLiteral, FindOptionsWhere } from "typeorm";
 import { v4 } from "uuid";
+import AppDataSource from "../database/dataSources/appDataSource";

 export default class BaseEntity {
    constructor() {
@ -21,25 +22,19 @@ export default class BaseEntity {
    public async Save<T extends BaseEntity>(target: EntityTarget<T>, entity: DeepPartial<T>): Promise<void> {
        this.WhenUpdated = new Date();

-        const connection = getConnection();
-
-        const repository = connection.getRepository<T>(target);
+        const repository = AppDataSource.getRepository<T>(target);

        await repository.save(entity);
    }

    public static async Remove<T extends BaseEntity>(target: EntityTarget<T>, entity: T): Promise<void> {
-        const connection = getConnection();
-
-        const repository = connection.getRepository<T>(target);
+        const repository = AppDataSource.getRepository<T>(target);

        await repository.remove(entity);
    }

    public static async FetchAll<T extends BaseEntity>(target: EntityTarget<T>, relations?: string[]): Promise<T[]> {
-        const connection = getConnection();
-
-        const repository = connection.getRepository<T>(target);
+        const repository = AppDataSource.getRepository<T>(target);

        const all = await repository.find({ relations: relations || [] });

@ -47,9 +42,7 @@ export default class BaseEntity {
    }

    public static async FetchOneById<T extends BaseEntity>(target: EntityTarget<T>, id: string, relations?: string[]): Promise<T | null> {
-        const connection = getConnection();
-
-        const repository = connection.getRepository<T>(target);
+        const repository = AppDataSource.getRepository<T>(target);

        const single = await repository.findOne({ where: ({ Id: id } as FindOptionsWhere<T>), relations: relations || {} });

@ -57,9 +50,7 @@ export default class BaseEntity {
    }

    public static async Any<T extends ObjectLiteral>(target: EntityTarget<T>): Promise<boolean> {
-        const connection = getConnection();
-
-        const repository = connection.getRepository<T>(target);
+        const repository = AppDataSource.getRepository<T>(target);

        const any = await repository.find();

--- a/src/database/dataSources/appDataSource.ts
+++ b/src/database/dataSources/appDataSource.ts
@ -0,0 +1,26 @@
+import { DataSource } from "typeorm";
+import * as dotenv from "dotenv";
+
+dotenv.config();
+
+const AppDataSource = new DataSource({
+    type: "mysql",
+    host: process.env.DB_HOST,
+    port: Number(process.env.DB_PORT),
+    username: process.env.DB_AUTH_USER,
+    password: process.env.DB_AUTH_PASS,
+    database: process.env.DB_NAME,
+    synchronize: process.env.DB_SYNC == "true",
+    logging: process.env.DB_LOGGING == "true",
+    entities: [
+        "dist/database/entities/**/*.js",
+    ],
+    migrations: [
+        "dist/database/migrations/**/*.js",
+    ],
+    subscribers: [
+        "dist/database/subscribers/**/*.js",
+    ],
+});
+
+export default AppDataSource;
--- a/src/database/entities/501231711271780357/Lobby.ts
+++ b/src/database/entities/501231711271780357/Lobby.ts
@ -1,5 +1,6 @@
-import { Column, Entity, getConnection } from "typeorm";
-import BaseEntity from "../../contracts/BaseEntity";
+import { Column, Entity } from "typeorm";
+import BaseEntity from "../../../contracts/BaseEntity";
+import AppDataSource from "../../dataSources/appDataSource";

@Entity()
 export default class Lobby extends BaseEntity {
@ -34,9 +35,7 @@ export default class Lobby extends BaseEntity {
    }

    public static async FetchOneByChannelId(channelId: string, relations?: string[]): Promise<Lobby | null> {
-        const connection = getConnection();
-
-        const repository = connection.getRepository(Lobby);
+        const repository = AppDataSource.getRepository(Lobby);

        const single = await repository.findOne({ where: { ChannelId: channelId }, relations: relations || [] });

--- a/src/database/entities/Audit.ts
+++ b/src/database/entities/Audit.ts
@ -1,7 +1,8 @@
-import { Column, Entity, getConnection } from "typeorm";
-import { AuditType } from "../constants/AuditType";
-import BaseEntity from "../contracts/BaseEntity";
-import StringTools from "../helpers/StringTools";
+import { Column, Entity } from "typeorm";
+import { AuditType } from "../../constants/AuditType";
+import BaseEntity from "../../contracts/BaseEntity";
+import StringTools from "../../helpers/StringTools";
+import AppDataSource from "../dataSources/appDataSource";

@Entity()
 export default class Audit extends BaseEntity {
@ -35,9 +36,7 @@ export default class Audit extends BaseEntity {
    ServerId: string;

    public static async FetchAuditsByUserId(userId: string, serverId: string): Promise<Audit[] | null> {
-        const connection = getConnection();
-
-        const repository = connection.getRepository(Audit);
+        const repository = AppDataSource.getRepository(Audit);

        const all = await repository.find({ where: { UserId: userId, ServerId: serverId } });

@ -45,9 +44,7 @@ export default class Audit extends BaseEntity {
    }

    public static async FetchAuditByAuditId(auditId: string, serverId: string): Promise<Audit | null> {
-        const connection = getConnection();
-
-        const repository = connection.getRepository(Audit);
+        const repository = AppDataSource.getRepository(Audit);

        const single = await repository.findOne({ where: { AuditId: auditId, ServerId: serverId } });

--- a/src/database/entities/IgnoredChannel.ts
+++ b/src/database/entities/IgnoredChannel.ts
@ -1,5 +1,6 @@
-import { Entity, getConnection } from "typeorm";
-import BaseEntity from "../contracts/BaseEntity";
+import { Entity } from "typeorm";
+import BaseEntity from "../../contracts/BaseEntity";
+import AppDataSource from "../dataSources/appDataSource";

@Entity()
 export default class IgnoredChannel extends BaseEntity {
@ -10,9 +11,7 @@ export default class IgnoredChannel extends BaseEntity {
    }

    public static async IsChannelIgnored(channelId: string): Promise<boolean> {
-        const connection = getConnection();
-
-        const repository = connection.getRepository(IgnoredChannel);
+        const repository = AppDataSource.getRepository(IgnoredChannel);

        const single = await repository.findOne({ where: { Id: channelId } });

--- a/src/database/entities/Role.ts
+++ b/src/database/entities/Role.ts
@ -1,6 +1,7 @@
-import { Column, Entity, getConnection, ManyToOne } from "typeorm";
-import BaseEntity from "../contracts/BaseEntity"
+import { Column, Entity, ManyToOne } from "typeorm";
+import BaseEntity from "../../contracts/BaseEntity"
 import Server from "./Server";
+import AppDataSource from "../dataSources/appDataSource";

@Entity()
 export default class Role extends BaseEntity {
@ -21,9 +22,7 @@ export default class Role extends BaseEntity {
    }

    public static async FetchOneByRoleId(roleId: string, relations?: string[]): Promise<Role | null> {
-        const connection = getConnection();
-
-        const repository = connection.getRepository(Role);
+        const repository = AppDataSource.getRepository(Role);

        const single = await repository.findOne({ where: { RoleId: roleId }, relations: relations || []});

@ -31,9 +30,7 @@ export default class Role extends BaseEntity {
    }

    public static async FetchAllByServerId(serverId: string): Promise<Role[]> {
-        const connection = getConnection();
-
-        const repository = connection.getRepository(Server);
+        const repository = AppDataSource.getRepository(Server);

        const all = await repository.findOne({ where: { Id: serverId }, relations: [
            "Roles",
--- a/src/database/entities/Server.ts
+++ b/src/database/entities/Server.ts
@ -1,5 +1,5 @@
 import { Entity, OneToMany } from "typeorm";
-import BaseEntity from "../contracts/BaseEntity";
+import BaseEntity from "../../contracts/BaseEntity";
 import Role from "./Role";
 import Setting from "./Setting";

--- a/src/database/entities/Setting.ts
+++ b/src/database/entities/Setting.ts
@ -1,6 +1,7 @@
-import { Column, Entity, getConnection, ManyToOne } from "typeorm";
-import BaseEntity from "../contracts/BaseEntity";
+import { Column, Entity, ManyToOne } from "typeorm";
+import BaseEntity from "../../contracts/BaseEntity";
 import Server from "./Server";
+import AppDataSource from "../dataSources/appDataSource";

@Entity()
 export default class Setting extends BaseEntity {
@ -26,9 +27,7 @@ export default class Setting extends BaseEntity {
    }

    public static async FetchOneByKey(key: string, relations?: string[]): Promise<Setting | null> {
-        const connection = getConnection();
-
-        const repository = connection.getRepository(Setting);
+        const repository = AppDataSource.getRepository(Setting);

        const single = await repository.findOne({ where: { Key: key }, relations: relations || {} });

--- a/src/database/migrations/3.1/1662399171315-CreateBase.ts
+++ b/src/database/migrations/3.1/1662399171315-CreateBase.ts
@ -1,5 +1,5 @@
 import { MigrationInterface, QueryRunner } from "typeorm"
-import MigrationHelper from "../../helpers/MigrationHelper"
+import MigrationHelper from "../../../helpers/MigrationHelper"

 export class vylbot1662399171315 implements MigrationInterface {

--- a/src/events/MessageEvents/MessageDelete.ts
+++ b/src/events/MessageEvents/MessageDelete.ts
@ -1,6 +1,6 @@
 import { EmbedBuilder, Message, TextChannel } from "discord.js";
 import EmbedColours from "../../constants/EmbedColours";
-import IgnoredChannel from "../../entity/IgnoredChannel";
+import IgnoredChannel from "../../database/entities/IgnoredChannel";
 import SettingsHelper from "../../helpers/SettingsHelper";

 export default async function MessageDelete(message: Message) {
--- a/src/events/MessageEvents/MessageUpdate.ts
+++ b/src/events/MessageEvents/MessageUpdate.ts
@ -1,6 +1,6 @@
 import { EmbedBuilder, Message, TextChannel } from "discord.js";
 import EmbedColours from "../../constants/EmbedColours";
-import IgnoredChannel from "../../entity/IgnoredChannel";
+import IgnoredChannel from "../../database/entities/IgnoredChannel";
 import SettingsHelper from "../../helpers/SettingsHelper";

 export default async function MessageUpdate(oldMessage: Message, newMessage: Message) {
--- a/src/helpers/SettingsHelper.ts
+++ b/src/helpers/SettingsHelper.ts
@ -1,6 +1,6 @@
 import DefaultValues from "../constants/DefaultValues";
-import Server from "../entity/Server";
-import Setting from "../entity/Setting";
+import Server from "../database/entities/Server";
+import Setting from "../database/entities/Setting";

 export default class SettingsHelper {
    public static async GetSetting(key: string, serverId: string): Promise<string | undefined> {
--- a/src/vylbot.ts
+++ b/src/vylbot.ts
@ -11,6 +11,12 @@ const requiredConfigs: string[] = [
    "BOT_AUTHOR",
    "BOT_OWNERID",
    "BOT_CLIENTID",
+    "DB_HOST",
+    "DB_PORT",
+    "DB_AUTH_USER",
+    "DB_AUTH_PASS",
+    "DB_SYNC",
+    "DB_LOGGING",
 ];

 requiredConfigs.forEach(config => {
--- a/tests/commands/timeout.test.ts
+++ b/tests/commands/timeout.test.ts
@ -2,7 +2,7 @@ import { APIEmbed, CacheType, CommandInteraction, CommandInteractionOption, DMCh
 import { mock } from "jest-mock-extended";
 import Timeout from "../../src/commands/timeout";
 import SettingsHelper from "../../src/helpers/SettingsHelper";
-import Audit from "../../src/entity/Audit";
+import Audit from "../../src/database/entities/Audit";
 import EmbedColours from "../../src/constants/EmbedColours";
 import { DeepPartial, EntityTarget } from "typeorm";
 import BaseEntity from "../../src/contracts/BaseEntity";
--- a/yarn.lock
+++ b/yarn.lock
@ -265,6 +265,13 @@
  dependencies:
    "@babel/helper-plugin-utils" "^7.20.2"

+"@babel/runtime@^7.21.0":
+  version "7.21.5"
+  resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.21.5.tgz#8492dddda9644ae3bda3b45eabe87382caee7200"
+  integrity sha512-8jI69toZqqcsnqGGqwGS4Qb1VwLOEp4hz+CXPywcvjs60u3B4Pom/U/7rm4W8tMOYEB+E9wgD0mW1l3r8qlI9Q==
+  dependencies:
+    regenerator-runtime "^0.13.11"
+
 "@babel/template@^7.20.7", "@babel/template@^7.3.3":
  version "7.20.7"
  resolved "https://registry.yarnpkg.com/@babel/template/-/template-7.20.7.tgz#a15090c2839a83b02aa996c0b4994005841fd5a8"
@ -1166,6 +1173,13 @@ cross-spawn@^7.0.3:
    shebang-command "^2.0.0"
    which "^2.0.1"

+date-fns@^2.29.3:
+  version "2.30.0"
+  resolved "https://registry.yarnpkg.com/date-fns/-/date-fns-2.30.0.tgz#f367e644839ff57894ec6ac480de40cae4b0f4d0"
+  integrity sha512-fnULvOpxnC5/Vg3NCiWelDsLiUc9bRwAPs/+LfTLNvetFCtCTN+yQz15C/fs4AwX1R9K5GLtLfn8QW+dWisaAw==
+  dependencies:
+    "@babel/runtime" "^7.21.0"
+
 debug@^4.1.0, debug@^4.1.1, debug@^4.3.4:
  version "4.3.4"
  resolved "https://registry.yarnpkg.com/debug/-/debug-4.3.4.tgz#1319f6579357f2338d3337d2cdd4914bb5dcc865"
@ -2154,10 +2168,10 @@ mimic-response@^3.1.0:
  resolved "https://registry.yarnpkg.com/mimic-response/-/mimic-response-3.1.0.tgz#2d1d59af9c1b129815accc2c46a022a5ce1fa3c9"
  integrity sha512-z0yWI+4FDrrweS8Zmt4Ej5HdJmky15+L2e6Wgn3+iK5fWzb6T3fhNFq2+MeTRb064c6Wr4N/wv0DzQTjNzHNGQ==

-minimatch@7.4.6:
-  version "7.4.6"
-  resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-7.4.6.tgz#845d6f254d8f4a5e4fd6baf44d5f10c8448365fb"
-  integrity sha512-sBz8G/YjVniEz6lKPNpKxXwazJe4c19fEfV2GDMX6AjFz+MX9uDWIZW8XreVhkFW3fkIdTv/gxWr/Kks5FFAVw==
+minimatch@9.0.1:
+  version "9.0.1"
+  resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-9.0.1.tgz#8a555f541cf976c622daf078bb28f29fb927c253"
+  integrity sha512-0jWhJpD/MdhPXwPuiRkCbfYfSKp2qnn2eOc279qI7f+osl/l+prKSrvhg157zSYvx/1nmgn2NqdT6k2Z7zSH9w==
  dependencies:
    brace-expansion "^2.0.1"

@ -2448,6 +2462,11 @@ reflect-metadata@^0.1.13:
  resolved "https://registry.yarnpkg.com/reflect-metadata/-/reflect-metadata-0.1.13.tgz#67ae3ca57c972a2aa1642b10fe363fe32d49dc08"
  integrity sha512-Ts1Y/anZELhSsjMcU605fU9RE4Oi3p5ORujwbIKXfWa+0Zxs510Qrmrce5/Jowq3cHSZSJqBjypxmHarc+vEWg==

+regenerator-runtime@^0.13.11:
+  version "0.13.11"
+  resolved "https://registry.yarnpkg.com/regenerator-runtime/-/regenerator-runtime-0.13.11.tgz#f6dca3e7ceec20590d07ada785636a90cdca17f9"
+  integrity sha512-kY1AZVr2Ra+t+piVaJ4gxaFaReZVH40AKNo7UCX6W+dEwBo/2oZJzqfuN1qLq1oL45o56cPaTXELwrTh8Fpggg==
+
 require-directory@^2.1.1:
  version "2.1.1"
  resolved "https://registry.yarnpkg.com/require-directory/-/require-directory-2.1.1.tgz#8c64ad5fd30dab1c976e2344ffe7f792a6a6df42"
@ -2764,16 +2783,17 @@ type-fest@^0.21.3:
  resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-0.21.3.tgz#d260a24b0198436e133fa26a524a6d65fa3b2e37"
  integrity sha512-t0rzBq87m3fVcduHDUFhKmyyX+9eo6WQjZvf51Ea/M0Q7+T374Jp1aUiyUl0GKxp8M/OETVHSDvmkyPgvX+X2w==

-typeorm@0.3.14:
-  version "0.3.14"
-  resolved "https://registry.yarnpkg.com/typeorm/-/typeorm-0.3.14.tgz#d46bc685aa92d0caf910849f22753ef319822327"
-  integrity sha512-tEPEN8qmA2a2wmjkaDcWBZ6LsECHofJW2vaCQMklYs+4JRJMAJ5FfbPIWMbhJ3ANJGMtLAmU1GfC8rLFIpbWsg==
+typeorm@0.3.16:
+  version "0.3.16"
+  resolved "https://registry.yarnpkg.com/typeorm/-/typeorm-0.3.16.tgz#a001d77b36cfaaf9ff495e15805dd17883116b7b"
+  integrity sha512-wJ4Qy1oqRKNDdZiBTTaVMqwo/XxC52Q7uNPTjltPgLhvIW173bL6Iad0lhptMOsFlpixFPaUu3PNziaRBwX2Zw==
  dependencies:
    "@sqltools/formatter" "^1.2.5"
    app-root-path "^3.1.0"
    buffer "^6.0.3"
    chalk "^4.1.2"
    cli-highlight "^2.1.11"
+    date-fns "^2.29.3"
    debug "^4.3.4"
    dotenv "^16.0.3"
    glob "^8.1.0"
Author	SHA1	Message	Date
Ethan Lane	f95cb380c6	Update import to match new database folder Some checks failed continuous-integration/drone/push Build is failing Details continuous-integration/drone/pr Build is failing Details	2023-06-12 17:23:40 +01:00
Ethan Lane	eaf6838864	Merge branch 'develop' into feature/98-timeout-command	2023-06-12 17:22:19 +01:00
RenovateBot	6c334cea81	Update dependency typeorm to v0.3.16 (#237 ) Some checks failed continuous-integration/drone/push Build is failing Details This PR contains the following updates: \| Package \| Type \| Update \| Change \| \|---\|---\|---\|---\| \| [typeorm](https://typeorm.io) ([source](https://github.com/typeorm/typeorm)) \| dependencies \| patch \| [`0.3.14` -> `0.3.16`](https://renovatebot.com/diffs/npm/typeorm/0.3.14/0.3.16) \| --- ### Release Notes <details> <summary>typeorm/typeorm</summary> ### [`v0.3.16`](https://github.com/typeorm/typeorm/blob/HEAD/CHANGELOG.md#0316-httpsgithubcomtypeormtypeormcompare03150316-2023-05-09) [Compare Source](https://github.com/typeorm/typeorm/compare/0.3.15...0.3.16) ##### Bug Fixes - add `trustServerCertificate` option to `SqlServerConnectionOptions` ([#9985](https://github.com/typeorm/typeorm/issues/9985)) ([0305805](`03058055df`)), closes [#8093](https://github.com/typeorm/typeorm/issues/8093) - add directConnection options to MongoDB connection ([#9955](https://github.com/typeorm/typeorm/issues/9955)) ([e0165e7](`e0165e75ee`)) - add onDelete option validation for oracle ([#9786](https://github.com/typeorm/typeorm/issues/9786)) ([938f94b](`938f94bded`)), closes [#9189](https://github.com/typeorm/typeorm/issues/9189) - added instanceName to options ([#9968](https://github.com/typeorm/typeorm/issues/9968)) ([7c5627f](`7c5627f272`)) - added transaction retry logic in cockroachdb ([#10032](https://github.com/typeorm/typeorm/issues/10032)) ([607d6f9](`607d6f9595`)) - allow json as alias for longtext mariadb ([#10018](https://github.com/typeorm/typeorm/issues/10018)) ([2a2bb4b](`2a2bb4bdc1`)) - convert the join table ID to the referenceColumn ID type ([#9887](https://github.com/typeorm/typeorm/issues/9887)) ([9460296](`9460296147`)) - correct encode mongodb auth credentials ([#10024](https://github.com/typeorm/typeorm/issues/10024)) ([96b7ee4](`96b7ee44b2`)), closes [#9885](https://github.com/typeorm/typeorm/issues/9885) - create correct children during cascade saving entities with STI ([#9034](https://github.com/typeorm/typeorm/issues/9034)) ([06c1e98](`06c1e98ae2`)), closes [#7758](https://github.com/typeorm/typeorm/issues/7758) [#7758](https://github.com/typeorm/typeorm/issues/7758) [#9033](https://github.com/typeorm/typeorm/issues/9033) [#9033](https://github.com/typeorm/typeorm/issues/9033) [#7758](https://github.com/typeorm/typeorm/issues/7758) [#7758](https://github.com/typeorm/typeorm/issues/7758) - express option bug in init command ([#10022](https://github.com/typeorm/typeorm/issues/10022)) ([5be20e2](`5be20e2bcd`)) - for running cli-ts-node-esm use exit code from child process ([#10030](https://github.com/typeorm/typeorm/issues/10030)) ([a188b1d](`a188b1d9f4`)), closes [#10029](https://github.com/typeorm/typeorm/issues/10029) - mongodb typings breaks the browser version ([#9962](https://github.com/typeorm/typeorm/issues/9962)) ([99bef49](`99bef49128`)), closes [#9959](https://github.com/typeorm/typeorm/issues/9959) - RelationIdLoader has access to queryPlanner when wrapped in transaction ([#9990](https://github.com/typeorm/typeorm/issues/9990)) ([21a9d67](`21a9d67fcf`)), closes [#9988](https://github.com/typeorm/typeorm/issues/9988) - resolve duplicate subscriber updated columns ([#9958](https://github.com/typeorm/typeorm/issues/9958)) ([3d67901](`3d67901fde`)), closes [#9948](https://github.com/typeorm/typeorm/issues/9948) - select + addOrderBy broke in 0.3.14 ([#9961](https://github.com/typeorm/typeorm/issues/9961)) ([0e56f0f](`0e56f0fcf8`)), closes [#9960](https://github.com/typeorm/typeorm/issues/9960) - support More/LessThanOrEqual in relations ([#9978](https://github.com/typeorm/typeorm/issues/9978)) ([8795c86](`8795c864e8`)) ##### Features - mariadb uuid inet4 inet6 column data type support ([#9845](https://github.com/typeorm/typeorm/issues/9845)) ([d8a2e37](`d8a2e3730f`)) ##### Reverts - "refactor: remove date-fns package ([#9634](https://github.com/typeorm/typeorm/issues/9634))" ([54f4f89](`54f4f8986a`)) ### [`v0.3.15`](https://github.com/typeorm/typeorm/blob/HEAD/CHANGELOG.md#0315-httpsgithubcomtypeormtypeormcompare03140315-2023-04-15) [Compare Source](https://github.com/typeorm/typeorm/compare/0.3.14...0.3.15) ##### Bug Fixes - make cache optional fields optional ([#9942](https://github.com/typeorm/typeorm/issues/9942)) ([159c60a](`159c60a6e8`)) - prevent unique index identical to primary key (all sql dialects) ([#9940](https://github.com/typeorm/typeorm/issues/9940)) ([51eecc2](`51eecc2aa0`)) - SelectQueryBuilder builds incorrectly escaped alias in Oracle when used on entity with composite key ([#9668](https://github.com/typeorm/typeorm/issues/9668)) ([83c6c0e](`83c6c0ed80`)) ##### Features - support for the latest mongodb v5 ([#9925](https://github.com/typeorm/typeorm/issues/9925)) ([f6a3ce7](`f6a3ce732d`)), closes [#7907](https://github.com/typeorm/typeorm/issues/7907) [#7907](https://github.com/typeorm/typeorm/issues/7907) </details> --- ### Configuration 📅 Schedule: Branch creation - At any time (no schedule defined), Automerge - At any time (no schedule defined). 🚦 Automerge: Disabled by config. Please merge this manually once you are satisfied. ♻ Rebasing: Whenever PR becomes conflicted, or you tick the rebase/retry checkbox. 🔕 Ignore: Close this PR and you won't be reminded about this update again. --- - [ ] <!-- rebase-check -->If you want to rebase/retry this PR, check this box --- This PR has been generated by [Renovate Bot](https://github.com/renovatebot/renovate). <!--renovate-debug:eyJjcmVhdGVkSW5WZXIiOiIzNC43NC4yIiwidXBkYXRlZEluVmVyIjoiMzQuNzQuMiJ9--> Co-authored-by: Renovate Bot <renovate@vylpes.com> Co-authored-by: Ethan Lane <ethan@vylpes.com> Reviewed-on: https://gitea.vylpes.xyz/RabbitLabs/vylbot-app/pulls/237 Co-authored-by: RenovateBot <renovate@vylpes.com> Co-committed-by: RenovateBot <renovate@vylpes.com>	2023-06-12 17:19:58 +01:00
Vylpes	e6c845e3b2	Switch to TypeORM's DataSource API (#299 ) Some checks failed continuous-integration/drone/push Build is failing Details - Switch to TypeORM's DataSource API, rather than using the now deprecated ormconfig.json - This will fix stage deployment not knowing how to deploy the database migrations #297 > NOTE: This change requires the deployment scripts to be updated, please update them on the server before merging Co-authored-by: Ethan Lane <ethan@vylpes.com> Reviewed-on: https://gitea.vylpes.xyz/RabbitLabs/vylbot-app/pulls/299	2023-05-26 17:59:22 +01:00
RenovateBot	c2418381ea	Update dependency minimatch to v9 (#286 ) Some checks failed continuous-integration/drone/push Build is failing Details This PR contains the following updates: \| Package \| Type \| Update \| Change \| \|---\|---\|---\|---\| \| [minimatch](https://github.com/isaacs/minimatch) \| dependencies \| major \| [`7.4.6` -> `9.0.1`](https://renovatebot.com/diffs/npm/minimatch/7.4.6/9.0.1) \| --- ### Release Notes <details> <summary>isaacs/minimatch</summary> ### [`v9.0.1`](https://github.com/isaacs/minimatch/compare/v9.0.0...v9.0.1) [Compare Source](https://github.com/isaacs/minimatch/compare/v9.0.0...v9.0.1) ### [`v9.0.0`](https://github.com/isaacs/minimatch/compare/v8.0.4...v9.0.0) [Compare Source](https://github.com/isaacs/minimatch/compare/v8.0.4...v9.0.0) ### [`v8.0.4`](https://github.com/isaacs/minimatch/compare/v8.0.3...v8.0.4) [Compare Source](https://github.com/isaacs/minimatch/compare/v8.0.3...v8.0.4) ### [`v8.0.3`](https://github.com/isaacs/minimatch/compare/v8.0.2...v8.0.3) [Compare Source](https://github.com/isaacs/minimatch/compare/v8.0.2...v8.0.3) ### [`v8.0.2`](https://github.com/isaacs/minimatch/compare/v8.0.1...v8.0.2) [Compare Source](https://github.com/isaacs/minimatch/compare/v8.0.1...v8.0.2) ### [`v8.0.1`](https://github.com/isaacs/minimatch/compare/v8.0.0...v8.0.1) [Compare Source](https://github.com/isaacs/minimatch/compare/v8.0.0...v8.0.1) ### [`v8.0.0`](https://github.com/isaacs/minimatch/compare/v7.4.6...v8.0.0) [Compare Source](https://github.com/isaacs/minimatch/compare/v7.4.6...v8.0.0) </details> --- ### Configuration 📅 Schedule: Branch creation - At any time (no schedule defined), Automerge - At any time (no schedule defined). 🚦 Automerge: Disabled by config. Please merge this manually once you are satisfied. ♻ Rebasing: Whenever PR becomes conflicted, or you tick the rebase/retry checkbox. 🔕 Ignore: Close this PR and you won't be reminded about this update again. --- - [ ] <!-- rebase-check -->If you want to rebase/retry this PR, check this box --- This PR has been generated by [Renovate Bot](https://github.com/renovatebot/renovate). <!--renovate-debug:eyJjcmVhdGVkSW5WZXIiOiIzNC43NC4yIiwidXBkYXRlZEluVmVyIjoiMzQuNzQuMiJ9--> Co-authored-by: Renovate Bot <renovate@vylpes.com> Reviewed-on: https://gitea.vylpes.xyz/RabbitLabs/vylbot-app/pulls/286 Co-authored-by: RenovateBot <renovate@vylpes.com> Co-committed-by: RenovateBot <renovate@vylpes.com>	2023-05-22 18:07:24 +01:00