Merge pull request #107 from vb2007/dev-src

Merge dev-src to Dev
vb2007 · Dec 26, 2024 · a55ce65 · a55ce65
2 parents 3e13661 + af23eb7
commit a55ce65
Show file tree

Hide file tree

Showing 106 changed files with 23 additions and 24 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,6 +1,5 @@
 .env
 config.json
 /node_modules
-/test
-/command-logs
-/data/links.json
+/src/command-logs
+/src/data/links.json
diff --git a/.vscode/launch.json b/.vscode/launch.json
@@ -11,7 +11,7 @@
             "skipFiles": [
                 "<node_internals>/**"
             ],
-            "program": "${workspaceFolder}/index.js"
+            "program": "${workspaceFolder}/src/index.js"
         },
         {
             "name": "Deploy slash commands.",
@@ -20,7 +20,7 @@
             "skipFiles": [
                 "<node_internals>/**"
             ],
-            "program": "${workspaceFolder}/deploy-commands.js"
+            "program": "${workspaceFolder}/src/deploy-commands.js"
         },
         {
             "name": "Run unit tests.",
@@ -41,7 +41,7 @@
             "skipFiles": [
                 "<node_internals>/**"
             ],
-            "program": "${workspaceFolder}/create-tables.js"
+            "program": "${workspaceFolder}/src/create-tables.js"
         }
     ]
 }
diff --git a/README.md b/README.md
@@ -23,15 +23,15 @@ I'm hosting it, should be online 24/7.
 Do the following for setting up the application from sratch:
 
 1. Clone the repository.
-2. Create a `.env` file, or rename the existing [.env.example](./.env.example) file, and fill it out with the required data.
-3. Create a `config.json` file, or rename the existing [config.json.example](./config.json.example) file, and fill it out with the required configuration settings.
+2. Create a `.env` file, or rename the existing [.env.example](./src/.env.example) file, and fill it out with the required data.
+3. Create a `config.json` file, or rename the existing [config.json.example](./src/config.json.example) file, and fill it out with the required configuration settings.
 4. Like you would with any other node.js app, install dependencies with with the `npm i` command.
 
 ### Setting up a database for the bot
 
 Some of the bot's features **require a MariaDB database**.
 
-If you already have a working database, and have filled up the connection details in the `.env` file for the connection, you can just run `npm run create-tables`. This will automatically create the tables based on the SQL queries that can be found in the [sql folder](sql/).
+If you already have a working database, and have filled up the connection details in the `.env` file for the connection, you can just run `npm run create-tables`. This will automatically create the tables based on the SQL queries that can be found in the [sql folder](./src/sql/).
 
 Otherwise, please refer to [THIS](documentation/mariadb-setup.md) documentation for addittional help about setting up a database.
 
@@ -44,4 +44,4 @@ If everything above checks out, you can prepare for the first run:
 
 #### Running it in the background
 
-If you want to run the application on a Linux system in the background as a systemd service, you can follow [THIS](documentation/systemd-setup.md) guide.
+If you want to run the application on a Linux system in the background as a systemd service, you can follow [THIS](documentation/systemd-setup.md) guide.
diff --git a/package.json b/package.json
@@ -46,11 +46,11 @@
     "nodemon": "^3.0.2"
   },
   "scripts": {
-    "app": "node index.js",
-    "dev": "nodemon index.js",
-    "deploy": "node deploy-commands.js",
-    "create-tables": "node create-tables.js",
-    "verify-config": "node ./scripts/verify-config-syntax.js",
+    "app": "node ./src/index.js",
+    "dev": "nodemon ./src/index.js",
+    "deploy": "node ./src/deploy-commands.js",
+    "create-tables": "node ./src/create-tables.js",
+    "verify-config": "node ./src/scripts/verify-config-syntax.js",
     "test": "jest"
   }
 }
diff --git a/archived-commands/dailyreminder.js → src/archived-commands/dailyreminder.js b/archived-commands/dailyreminder.js → src/archived-commands/dailyreminder.js
diff --git a/...ands/administration/autorole-configure.js → ...ands/administration/autorole-configure.js b/...ands/administration/autorole-configure.js → ...ands/administration/autorole-configure.js
diff --git a/commands/administration/autorole-disable.js → ...mmands/administration/autorole-disable.js b/commands/administration/autorole-disable.js → ...mmands/administration/autorole-disable.js
diff --git a/commands/administration/bridge-configure.js → ...mmands/administration/bridge-configure.js b/commands/administration/bridge-configure.js → ...mmands/administration/bridge-configure.js
diff --git a/commands/administration/bridge-disable.js → ...commands/administration/bridge-disable.js b/commands/administration/bridge-disable.js → ...commands/administration/bridge-disable.js
diff --git a/commands/administration/goodbye-configure.js → ...mands/administration/goodbye-configure.js b/commands/administration/goodbye-configure.js → ...mands/administration/goodbye-configure.js
diff --git a/commands/administration/goodbye-disable.js → ...ommands/administration/goodbye-disable.js b/commands/administration/goodbye-disable.js → ...ommands/administration/goodbye-disable.js
diff --git a/commands/administration/logging-configure.js → ...mands/administration/logging-configure.js b/commands/administration/logging-configure.js → ...mands/administration/logging-configure.js
diff --git a/commands/administration/logging-disable.js → ...ommands/administration/logging-disable.js b/commands/administration/logging-disable.js → ...ommands/administration/logging-disable.js
diff --git a/commands/administration/rename.js → src/commands/administration/rename.js b/commands/administration/rename.js → src/commands/administration/rename.js
diff --git a/commands/administration/slowmode.js → src/commands/administration/slowmode.js b/commands/administration/slowmode.js → src/commands/administration/slowmode.js
diff --git a/commands/administration/welcome-configure.js → ...mands/administration/welcome-configure.js b/commands/administration/welcome-configure.js → ...mands/administration/welcome-configure.js
diff --git a/commands/administration/welcome-disable.js → ...ommands/administration/welcome-disable.js b/commands/administration/welcome-disable.js → ...ommands/administration/welcome-disable.js
diff --git a/commands/economy/balance.js → src/commands/economy/balance.js b/commands/economy/balance.js → src/commands/economy/balance.js
diff --git a/commands/economy/beg.js → src/commands/economy/beg.js b/commands/economy/beg.js → src/commands/economy/beg.js
diff --git a/commands/economy/deposit.js → src/commands/economy/deposit.js b/commands/economy/deposit.js → src/commands/economy/deposit.js
diff --git a/commands/economy/leaderboard.js → src/commands/economy/leaderboard.js b/commands/economy/leaderboard.js → src/commands/economy/leaderboard.js
diff --git a/commands/economy/pay.js → src/commands/economy/pay.js b/commands/economy/pay.js → src/commands/economy/pay.js
diff --git a/commands/economy/rob.js → src/commands/economy/rob.js b/commands/economy/rob.js → src/commands/economy/rob.js
diff --git a/commands/economy/roulette.js → src/commands/economy/roulette.js b/commands/economy/roulette.js → src/commands/economy/roulette.js
diff --git a/commands/economy/withdraw.js → src/commands/economy/withdraw.js b/commands/economy/withdraw.js → src/commands/economy/withdraw.js
diff --git a/commands/economy/work.js → src/commands/economy/work.js b/commands/economy/work.js → src/commands/economy/work.js
diff --git a/commands/fun/911-countdown.js → src/commands/fun/911-countdown.js b/commands/fun/911-countdown.js → src/commands/fun/911-countdown.js
diff --git a/commands/fun/coinflip.js → src/commands/fun/coinflip.js b/commands/fun/coinflip.js → src/commands/fun/coinflip.js
diff --git a/commands/fun/randomfeet.js → src/commands/fun/randomfeet.js b/commands/fun/randomfeet.js → src/commands/fun/randomfeet.js
diff --git a/commands/fun/randompic.js → src/commands/fun/randompic.js b/commands/fun/randompic.js → src/commands/fun/randompic.js
diff --git a/commands/moderation/ban.js → src/commands/moderation/ban.js b/commands/moderation/ban.js → src/commands/moderation/ban.js
diff --git a/commands/moderation/kick.js → src/commands/moderation/kick.js b/commands/moderation/kick.js → src/commands/moderation/kick.js
diff --git a/commands/moderation/purge.js → src/commands/moderation/purge.js b/commands/moderation/purge.js → src/commands/moderation/purge.js
diff --git a/commands/moderation/timeout.js → src/commands/moderation/timeout.js b/commands/moderation/timeout.js → src/commands/moderation/timeout.js
diff --git a/commands/moderation/warn.js → src/commands/moderation/warn.js b/commands/moderation/warn.js → src/commands/moderation/warn.js
diff --git a/commands/utility/help.js → src/commands/utility/help.js b/commands/utility/help.js → src/commands/utility/help.js
diff --git a/commands/utility/ping-db.js → src/commands/utility/ping-db.js b/commands/utility/ping-db.js → src/commands/utility/ping-db.js
diff --git a/commands/utility/ping.js → src/commands/utility/ping.js b/commands/utility/ping.js → src/commands/utility/ping.js
diff --git a/commands/utility/say.js → src/commands/utility/say.js b/commands/utility/say.js → src/commands/utility/say.js
diff --git a/commands/utility/server.js → src/commands/utility/server.js b/commands/utility/server.js → src/commands/utility/server.js
diff --git a/commands/utility/translate.js → src/commands/utility/translate.js b/commands/utility/translate.js → src/commands/utility/translate.js
diff --git a/commands/utility/user.js → src/commands/utility/user.js b/commands/utility/user.js → src/commands/utility/user.js
diff --git a/create-tables.js → src/create-tables.js b/create-tables.js → src/create-tables.js
diff --git a/data/language-codes.json → src/data/language-codes.json b/data/language-codes.json → src/data/language-codes.json
diff --git a/deploy-commands.js → src/deploy-commands.js b/deploy-commands.js → src/deploy-commands.js
diff --git a/events/channelCreate.js → src/events/channelCreate.js b/events/channelCreate.js → src/events/channelCreate.js
diff --git a/events/channelDelete.js → src/events/channelDelete.js b/events/channelDelete.js → src/events/channelDelete.js
diff --git a/events/channelPinsUpdate.js → src/events/channelPinsUpdate.js b/events/channelPinsUpdate.js → src/events/channelPinsUpdate.js
diff --git a/events/channelUpdate.js → src/events/channelUpdate.js b/events/channelUpdate.js → src/events/channelUpdate.js
diff --git a/events/emojiCreate.js → src/events/emojiCreate.js b/events/emojiCreate.js → src/events/emojiCreate.js
diff --git a/events/emojiDelete.js → src/events/emojiDelete.js b/events/emojiDelete.js → src/events/emojiDelete.js
diff --git a/events/emojiUpdate.js → src/events/emojiUpdate.js b/events/emojiUpdate.js → src/events/emojiUpdate.js
diff --git a/events/guildBanAdd.js → src/events/guildBanAdd.js b/events/guildBanAdd.js → src/events/guildBanAdd.js
diff --git a/events/guildBanRemove.js → src/events/guildBanRemove.js b/events/guildBanRemove.js → src/events/guildBanRemove.js
diff --git a/events/guildMemberAdd.js → src/events/guildMemberAdd.js b/events/guildMemberAdd.js → src/events/guildMemberAdd.js
diff --git a/events/guildMemberRemove.js → src/events/guildMemberRemove.js b/events/guildMemberRemove.js → src/events/guildMemberRemove.js
diff --git a/events/messageCreate.js → src/events/messageCreate.js b/events/messageCreate.js → src/events/messageCreate.js
diff --git a/events/messageDelete.js → src/events/messageDelete.js b/events/messageDelete.js → src/events/messageDelete.js
diff --git a/events/messageUpdate.js → src/events/messageUpdate.js b/events/messageUpdate.js → src/events/messageUpdate.js
diff --git a/...cripts/channelCreate/logEventToChannel.js → ...cripts/channelCreate/logEventToChannel.js b/...cripts/channelCreate/logEventToChannel.js → ...cripts/channelCreate/logEventToChannel.js
diff --git a/...cripts/channelDelete/logEventToChannel.js → ...cripts/channelDelete/logEventToChannel.js b/...cripts/channelDelete/logEventToChannel.js → ...cripts/channelDelete/logEventToChannel.js
diff --git a/...ts/channelPinsUpdate/logEventToChannel.js → ...ts/channelPinsUpdate/logEventToChannel.js b/...ts/channelPinsUpdate/logEventToChannel.js → ...ts/channelPinsUpdate/logEventToChannel.js
diff --git a/...cripts/channelUpdate/logEventToChannel.js → ...cripts/channelUpdate/logEventToChannel.js b/...cripts/channelUpdate/logEventToChannel.js → ...cripts/channelUpdate/logEventToChannel.js
diff --git a/.../scripts/emojiCreate/logEventToChannel.js → .../scripts/emojiCreate/logEventToChannel.js b/.../scripts/emojiCreate/logEventToChannel.js → .../scripts/emojiCreate/logEventToChannel.js
diff --git a/.../scripts/emojiDelete/logEventToChannel.js → .../scripts/emojiDelete/logEventToChannel.js b/.../scripts/emojiDelete/logEventToChannel.js → .../scripts/emojiDelete/logEventToChannel.js
diff --git a/.../scripts/emojiUpdate/logEventToChannel.js → .../scripts/emojiUpdate/logEventToChannel.js b/.../scripts/emojiUpdate/logEventToChannel.js → .../scripts/emojiUpdate/logEventToChannel.js
diff --git a/.../scripts/guildBanAdd/logEventToChannel.js → .../scripts/guildBanAdd/logEventToChannel.js b/.../scripts/guildBanAdd/logEventToChannel.js → .../scripts/guildBanAdd/logEventToChannel.js
diff --git a/...ripts/guildBanRemove/logEventToChannel.js → ...ripts/guildBanRemove/logEventToChannel.js b/...ripts/guildBanRemove/logEventToChannel.js → ...ripts/guildBanRemove/logEventToChannel.js
diff --git a/events/scripts/guildMemberAdd/autorole.js → ...events/scripts/guildMemberAdd/autorole.js b/events/scripts/guildMemberAdd/autorole.js → ...events/scripts/guildMemberAdd/autorole.js
diff --git a/...ripts/guildMemberAdd/logEventToChannel.js → ...ripts/guildMemberAdd/logEventToChannel.js b/...ripts/guildMemberAdd/logEventToChannel.js → ...ripts/guildMemberAdd/logEventToChannel.js
diff --git a/events/scripts/guildMemberAdd/welcome.js → src/events/scripts/guildMemberAdd/welcome.js b/events/scripts/guildMemberAdd/welcome.js → src/events/scripts/guildMemberAdd/welcome.js
@@ -1,5 +1,5 @@
 const db = require("../../../helpers/db");
-const { embedColors } = require("../../../config.json");
+const { embedColors } = require("../../../../config.json");
 const { embedMessage } = require("../../../helpers/embeds/embed-message");
 
 module.exports = {

diff --git a/events/scripts/guildMemberRemove/goodbye.js → ...ents/scripts/guildMemberRemove/goodbye.js b/events/scripts/guildMemberRemove/goodbye.js → ...ents/scripts/guildMemberRemove/goodbye.js
@@ -1,5 +1,5 @@
 const db = require("../../../helpers/db");
-const { embedColors } = require("../../../config.json");
+const { embedColors } = require("../../../../config.json");
 const { embedMessage } = require("../../../helpers/embeds/embed-message");
 
 module.exports = {

diff --git a/...ts/guildMemberRemove/logEventToChannel.js → ...ts/guildMemberRemove/logEventToChannel.js b/...ts/guildMemberRemove/logEventToChannel.js → ...ts/guildMemberRemove/logEventToChannel.js
diff --git a/events/scripts/messageCreate/bridge.js → src/events/scripts/messageCreate/bridge.js b/events/scripts/messageCreate/bridge.js → src/events/scripts/messageCreate/bridge.js
diff --git a/...s/scripts/messageCreate/messageLogging.js → ...s/scripts/messageCreate/messageLogging.js b/...s/scripts/messageCreate/messageLogging.js → ...s/scripts/messageCreate/messageLogging.js
@@ -1,5 +1,5 @@
 const db = require("../../../helpers/db");
-const { logMessagesToLocalDatabase } = require("../../../config.json");
+const { logMessagesToLocalDatabase } = require("../../../../config.json");
 
 module.exports = {
     async logMessagesToLocalDatabase(message) {

diff --git a/...cripts/messageDelete/logEventToChannel.js → ...cripts/messageDelete/logEventToChannel.js b/...cripts/messageDelete/logEventToChannel.js → ...cripts/messageDelete/logEventToChannel.js
diff --git a/...cripts/messageUpdate/logEventToChannel.js → ...cripts/messageUpdate/logEventToChannel.js b/...cripts/messageUpdate/logEventToChannel.js → ...cripts/messageUpdate/logEventToChannel.js
diff --git a/...pts/voiceStateUpdate/logEventToChannel.js → ...pts/voiceStateUpdate/logEventToChannel.js b/...pts/voiceStateUpdate/logEventToChannel.js → ...pts/voiceStateUpdate/logEventToChannel.js
diff --git a/events/voiceStateUpdate.js → src/events/voiceStateUpdate.js b/events/voiceStateUpdate.js → src/events/voiceStateUpdate.js
diff --git a/helpers/README.md → src/helpers/README.md b/helpers/README.md → src/helpers/README.md
diff --git a/helpers/channel-types.js → src/helpers/channel-types.js b/helpers/channel-types.js → src/helpers/channel-types.js
diff --git a/helpers/command-helper.js → src/helpers/command-helper.js b/helpers/command-helper.js → src/helpers/command-helper.js
diff --git a/helpers/db.js → src/helpers/db.js b/helpers/db.js → src/helpers/db.js
diff --git a/helpers/embeds/embed-message.js → src/helpers/embeds/embed-message.js b/helpers/embeds/embed-message.js → src/helpers/embeds/embed-message.js
@@ -1,5 +1,5 @@
 const { EmbedBuilder } = require("discord.js");
-const { embedColors } = require("../../config.json");
+const { embedColors } = require("../../../config.json");
 
 /**
  * @param {color} color - Embed's sidebar HEX Color

diff --git a/helpers/embeds/embed-reply-moderation.js → src/helpers/embeds/embed-reply-moderation.js b/helpers/embeds/embed-reply-moderation.js → src/helpers/embeds/embed-reply-moderation.js
@@ -1,5 +1,5 @@
 const { EmbedBuilder } = require("discord.js");
-const { embedColors } = require("../../config.json");
+const { embedColors } = require("../../../config.json");
 
 /**
  * @param {title} title - Embed's title

diff --git a/helpers/embeds/embed-reply.js → src/helpers/embeds/embed-reply.js b/helpers/embeds/embed-reply.js → src/helpers/embeds/embed-reply.js
@@ -1,5 +1,5 @@
 const { EmbedBuilder } = require("discord.js");
-const { embedColors } = require("../../config.json");
+const { embedColors } = require("../../../config.json");
 
 /**
  * @param {color} color - Embed's sidebar HEX Color

diff --git a/helpers/format.js → src/helpers/format.js b/helpers/format.js → src/helpers/format.js
diff --git a/helpers/generate.js → src/helpers/generate.js b/helpers/generate.js → src/helpers/generate.js
diff --git a/helpers/log-data-query.js → src/helpers/log-data-query.js b/helpers/log-data-query.js → src/helpers/log-data-query.js
diff --git a/helpers/logger.js → src/helpers/logger.js b/helpers/logger.js → src/helpers/logger.js
@@ -1,7 +1,7 @@
 const fs = require("fs");
 const path = require("path");
 const db = require("./db");
-const { logToFile, logToDatabase } = require("../config.json");
+const { logToFile, logToDatabase } = require("../../config.json");
 
 const logDirectory = path.join(__dirname, "../command-logs");
 

diff --git a/index.js → src/index.js b/index.js → src/index.js
diff --git a/scripts/README.md → src/scripts/README.md b/scripts/README.md → src/scripts/README.md
diff --git a/scripts/config-schema.json → src/scripts/config-schema.json b/scripts/config-schema.json → src/scripts/config-schema.json
diff --git a/scripts/verify-config-syntax.js → src/scripts/verify-config-syntax.js b/scripts/verify-config-syntax.js → src/scripts/verify-config-syntax.js
@@ -2,7 +2,7 @@ const fs = require("fs");
 const path = require("path");
 const Ajv = require("ajv");
 
-const configPath = path.join(__dirname, "..", "config.json");
+const configPath = path.join(__dirname, "..", "..", "config.json");
 const configSchemaPath = path.join(__dirname, "config-schema.json");
 
 const config = JSON.parse(fs.readFileSync(configPath, "utf-8"));

diff --git a/sql/commandData/table.sql → src/sql/commandData/table.sql b/sql/commandData/table.sql → src/sql/commandData/table.sql
diff --git a/sql/commandUsageLog/table.sql → src/sql/commandUsageLog/table.sql b/sql/commandUsageLog/table.sql → src/sql/commandUsageLog/table.sql
diff --git a/sql/configAutorole/table.sql → src/sql/configAutorole/table.sql b/sql/configAutorole/table.sql → src/sql/configAutorole/table.sql
diff --git a/sql/configBridging/table.sql → src/sql/configBridging/table.sql b/sql/configBridging/table.sql → src/sql/configBridging/table.sql
diff --git a/sql/configGoodbye/table.sql → src/sql/configGoodbye/table.sql b/sql/configGoodbye/table.sql → src/sql/configGoodbye/table.sql
diff --git a/sql/configLogging/table.sql → src/sql/configLogging/table.sql b/sql/configLogging/table.sql → src/sql/configLogging/table.sql
diff --git a/sql/configWelcome/table.sql → src/sql/configWelcome/table.sql b/sql/configWelcome/table.sql → src/sql/configWelcome/table.sql
diff --git a/sql/economy/table.sql → src/sql/economy/table.sql b/sql/economy/table.sql → src/sql/economy/table.sql
diff --git a/sql/messageLog/table.sql → src/sql/messageLog/table.sql b/sql/messageLog/table.sql → src/sql/messageLog/table.sql
diff --git a/systemd/discordbot.service → src/systemd/discordbot.service b/systemd/discordbot.service → src/systemd/discordbot.service
diff --git a/unit-tests/command-schema.test.js → src/unit-tests/command-schema.test.js b/unit-tests/command-schema.test.js → src/unit-tests/command-schema.test.js
@@ -1,4 +1,4 @@
-jest.mock('../config.json', () => ({
+jest.mock('../../config.json', () => ({
     databaseHostAddress: 'mock-host',
     databaseName: 'mock-db',
     databaseUser: 'mock-user',

diff --git a/unit-tests/help-commands.test.js → src/unit-tests/help-commands.test.js b/unit-tests/help-commands.test.js → src/unit-tests/help-commands.test.js