move everything to src folder

Faithful-Resource-Pack · Aug 27, 2024 · 79218c9 · 79218c9
1 parent 760e90f
commit 79218c9
Show file tree

Hide file tree

Showing 64 changed files with 30 additions and 27 deletions.
diff --git a/package.json b/package.json
@@ -2,21 +2,21 @@
     "name": "complibot-submissions",
     "version": "1.0.0",
     "description": "Fully automated texture pushing and submission system for the Faithful Discord servers.",
-    "main": "index.ts",
+    "main": "src/index.ts",
     "scripts": {
-        "start": "node -r ts-node/register -r tsconfig-paths/register index.ts",
-        "dev": "nodemon -r tsconfig-paths/register --ignore resources/ --ignore backups/ index.ts",
+        "start": "node -r ts-node/register -r tsconfig-paths/register src/index.ts",
+        "dev": "nodemon -r tsconfig-paths/register --ignore resources/ --ignore backups/ src/index.ts",
         "prettier": "prettier \"{,!(node_modules)/**/}*.ts\" --config .prettierrc --write"
     },
     "devDependencies": {
-        "@types/node": "^22.4.1",
+        "@types/node": "^22.5.0",
         "nodemon": "^3.1.4",
         "prettier": "^3.3.3"
     },
     "dependencies": {
         "@napi-rs/canvas": "^0.1.54",
         "@octokit/rest": "^20.1.1",
-        "axios": "^1.7.4",
+        "axios": "^1.7.5",
         "cron": "^3.1.7",
         "discord.js": "^14.15.3",
         "dotenv": "^16.4.5",

diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
diff --git a/commands/bot/feedback.ts → src/commands/bot/feedback.ts b/commands/bot/feedback.ts → src/commands/bot/feedback.ts
diff --git a/commands/bot/ping.ts → src/commands/bot/ping.ts b/commands/bot/ping.ts → src/commands/bot/ping.ts
diff --git a/commands/bot/status.ts → src/commands/bot/status.ts b/commands/bot/status.ts → src/commands/bot/status.ts
diff --git a/commands/developer/backup.ts → src/commands/developer/backup.ts b/commands/developer/backup.ts → src/commands/developer/backup.ts
diff --git a/commands/developer/behave.ts → src/commands/developer/behave.ts b/commands/developer/behave.ts → src/commands/developer/behave.ts
diff --git a/commands/developer/eval.ts → src/commands/developer/eval.ts b/commands/developer/eval.ts → src/commands/developer/eval.ts
diff --git a/commands/developer/restart.ts → src/commands/developer/restart.ts b/commands/developer/restart.ts → src/commands/developer/restart.ts
diff --git a/commands/developer/say.ts → src/commands/developer/say.ts b/commands/developer/say.ts → src/commands/developer/say.ts
diff --git a/commands/developer/shutdown.ts → src/commands/developer/shutdown.ts b/commands/developer/shutdown.ts → src/commands/developer/shutdown.ts
diff --git a/commands/submission/autopush.ts → src/commands/submission/autopush.ts b/commands/submission/autopush.ts → src/commands/submission/autopush.ts
diff --git a/commands/submission/channelpush.ts → src/commands/submission/channelpush.ts b/commands/submission/channelpush.ts → src/commands/submission/channelpush.ts
diff --git a/events/buttonUsed.ts → src/events/buttonUsed.ts b/events/buttonUsed.ts → src/events/buttonUsed.ts
diff --git a/events/interactionCreate.ts → src/events/interactionCreate.ts b/events/interactionCreate.ts → src/events/interactionCreate.ts
diff --git a/events/messageCreate.ts → src/events/messageCreate.ts b/events/messageCreate.ts → src/events/messageCreate.ts
diff --git a/events/messageReactionAdd.ts → src/events/messageReactionAdd.ts b/events/messageReactionAdd.ts → src/events/messageReactionAdd.ts
diff --git a/events/modalSubmit.ts → src/events/modalSubmit.ts b/events/modalSubmit.ts → src/events/modalSubmit.ts
diff --git a/events/ready.ts → src/events/ready.ts b/events/ready.ts → src/events/ready.ts
diff --git a/events/slashCommandUsed.ts → src/events/slashCommandUsed.ts b/events/slashCommandUsed.ts → src/events/slashCommandUsed.ts
diff --git a/events/threadCreate.ts → src/events/threadCreate.ts b/events/threadCreate.ts → src/events/threadCreate.ts
diff --git a/functions/commandHandler.ts → src/functions/commandHandler.ts b/functions/commandHandler.ts → src/functions/commandHandler.ts
diff --git a/functions/feedback.ts → src/functions/feedback.ts b/functions/feedback.ts → src/functions/feedback.ts
diff --git a/functions/fetchSettings.ts → src/functions/fetchSettings.ts b/functions/fetchSettings.ts → src/functions/fetchSettings.ts
diff --git a/functions/handleError.ts → src/functions/handleError.ts b/functions/handleError.ts → src/functions/handleError.ts
diff --git a/functions/images/GIFEncoder.ts → src/functions/images/GIFEncoder.ts b/functions/images/GIFEncoder.ts → src/functions/images/GIFEncoder.ts
diff --git a/functions/images/animate.ts → src/functions/images/animate.ts b/functions/images/animate.ts → src/functions/images/animate.ts
diff --git a/functions/images/difference.ts → src/functions/images/difference.ts b/functions/images/difference.ts → src/functions/images/difference.ts
diff --git a/functions/images/magnify.ts → src/functions/images/magnify.ts b/functions/images/magnify.ts → src/functions/images/magnify.ts
diff --git a/functions/images/palette.ts → src/functions/images/palette.ts b/functions/images/palette.ts → src/functions/images/palette.ts
diff --git a/functions/images/stitch.ts → src/functions/images/stitch.ts b/functions/images/stitch.ts → src/functions/images/stitch.ts
diff --git a/functions/images/tile.ts → src/functions/images/tile.ts b/functions/images/tile.ts → src/functions/images/tile.ts
diff --git a/functions/pushToGitHub.ts → src/functions/pushToGitHub.ts b/functions/pushToGitHub.ts → src/functions/pushToGitHub.ts
diff --git a/functions/saveDB.ts → src/functions/saveDB.ts b/functions/saveDB.ts → src/functions/saveDB.ts
diff --git a/functions/submission/handleResults.ts → src/functions/submission/handleResults.ts b/functions/submission/handleResults.ts → src/functions/submission/handleResults.ts
@@ -9,6 +9,7 @@ import { mkdirSync, writeFile } from "fs";
 import axios from "axios";
 import type { Contribution, Pack, PackFile, Texture } from "@interfaces/database";
 import { TextChannel, Client, Message } from "discord.js";
+import { join, sep } from "path";
 
 export interface DownloadableMessage {
 	url: string;
@@ -127,12 +128,12 @@ export async function downloadTexture(
 		for (const path of paths) {
 			// write file to every version of a path
 			for (const version of path.versions) {
-				const fullPath = `${baseFolder}/${packFolder}/${version}/${path.name}`;
+				const fullPath = join(baseFolder, packFolder, version, path.name);
 
 				// trim last bit to get folder tree
-				mkdirSync(fullPath.slice(0, fullPath.lastIndexOf("/")), { recursive: true });
+				mkdirSync(fullPath.slice(0, fullPath.lastIndexOf(sep)), { recursive: true });
 
-				// better to use the callback version because .then and .catch are sent to the same output
+				// something is always being logged when debugging so the callback version is simpler
 				writeFile(fullPath, imageFile, (err) => {
 					if (DEBUG) return console.log(err ?? `Added texture to path: ${fullPath}`);
 				});

diff --git a/functions/submission/makeEmbed.ts → src/functions/submission/makeEmbed.ts b/functions/submission/makeEmbed.ts → src/functions/submission/makeEmbed.ts
diff --git a/functions/submission/pushTextures.ts → src/functions/submission/pushTextures.ts b/functions/submission/pushTextures.ts → src/functions/submission/pushTextures.ts
@@ -4,6 +4,7 @@ import formattedDate from "@helpers/formattedDate";
 
 import pushToGitHub from "@functions/pushToGitHub";
 import type { PackFile } from "@interfaces/database";
+import { join } from "path";
 const DEBUG = process.env.DEBUG.toLowerCase() == "true";
 
 /**
@@ -30,7 +31,7 @@ export default async function pushTextures(
 			continue;
 		}
 		for (const branch of settings.versions[edition]) {
-			const path = `${basePath}/${packGitHub.repo}/${branch}/`;
+			const path = join(basePath, packGitHub.repo, branch);
 
 			// don't create empty commits
 			if (!existsSync(path)) continue;

diff --git a/functions/submission/reactionMenu.ts → src/functions/submission/reactionMenu.ts b/functions/submission/reactionMenu.ts → src/functions/submission/reactionMenu.ts
diff --git a/functions/submission/sendToChannel.ts → src/functions/submission/sendToChannel.ts b/functions/submission/sendToChannel.ts → src/functions/submission/sendToChannel.ts
diff --git a/functions/submission/submitTexture.ts → src/functions/submission/submitTexture.ts b/functions/submission/submitTexture.ts → src/functions/submission/submitTexture.ts
diff --git a/...ns/submission/utility/cancelSubmission.ts → ...ns/submission/utility/cancelSubmission.ts b/...ns/submission/utility/cancelSubmission.ts → ...ns/submission/utility/cancelSubmission.ts
diff --git a/functions/submission/utility/changeStatus.ts → ...ctions/submission/utility/changeStatus.ts b/functions/submission/utility/changeStatus.ts → ...ctions/submission/utility/changeStatus.ts
diff --git a/functions/submission/utility/choiceEmbed.ts → ...nctions/submission/utility/choiceEmbed.ts b/functions/submission/utility/choiceEmbed.ts → ...nctions/submission/utility/choiceEmbed.ts
diff --git a/.../submission/utility/generateComparison.ts → .../submission/utility/generateComparison.ts b/.../submission/utility/generateComparison.ts → .../submission/utility/generateComparison.ts
diff --git a/functions/submission/utility/getAuthors.ts → ...unctions/submission/utility/getAuthors.ts b/functions/submission/utility/getAuthors.ts → ...unctions/submission/utility/getAuthors.ts
diff --git a/...ns/submission/utility/getPackByChannel.ts → ...ns/submission/utility/getPackByChannel.ts b/...ns/submission/utility/getPackByChannel.ts → ...ns/submission/utility/getPackByChannel.ts
diff --git a/functions/submission/utility/instapass.ts → ...functions/submission/utility/instapass.ts b/functions/submission/utility/instapass.ts → ...functions/submission/utility/instapass.ts
diff --git a/functions/submission/utility/invalidate.ts → ...unctions/submission/utility/invalidate.ts b/functions/submission/utility/invalidate.ts → ...unctions/submission/utility/invalidate.ts
diff --git a/.../submission/utility/retrieveSubmission.ts → .../submission/utility/retrieveSubmission.ts b/.../submission/utility/retrieveSubmission.ts → .../submission/utility/retrieveSubmission.ts
diff --git a/helpers/addDeleteButton.ts → src/helpers/addDeleteButton.ts b/helpers/addDeleteButton.ts → src/helpers/addDeleteButton.ts
diff --git a/helpers/devLogger.ts → src/helpers/devLogger.ts b/helpers/devLogger.ts → src/helpers/devLogger.ts
diff --git a/helpers/formattedDate.ts → src/helpers/formattedDate.ts b/helpers/formattedDate.ts → src/helpers/formattedDate.ts
diff --git a/helpers/getImages.ts → src/helpers/getImages.ts b/helpers/getImages.ts → src/helpers/getImages.ts
diff --git a/helpers/getMessages.ts → src/helpers/getMessages.ts b/helpers/getMessages.ts → src/helpers/getMessages.ts
diff --git a/helpers/interactions.ts → src/helpers/interactions.ts b/helpers/interactions.ts → src/helpers/interactions.ts
diff --git a/helpers/minecraftSorter.ts → src/helpers/minecraftSorter.ts b/helpers/minecraftSorter.ts → src/helpers/minecraftSorter.ts
diff --git a/helpers/permissions.ts → src/helpers/permissions.ts b/helpers/permissions.ts → src/helpers/permissions.ts
diff --git a/helpers/walkSync.ts → src/helpers/walkSync.ts b/helpers/walkSync.ts → src/helpers/walkSync.ts
diff --git a/helpers/warnUser.ts → src/helpers/warnUser.ts b/helpers/warnUser.ts → src/helpers/warnUser.ts
diff --git a/index.ts → src/index.ts b/index.ts → src/index.ts
@@ -13,6 +13,7 @@ import { fetchSettings } from "@functions/fetchSettings";
 import handleError from "@functions/handleError";
 import { Client, GatewayIntentBits, Partials } from "discord.js";
 import type { Event } from "@interfaces/discord";
+import { join } from "path";
 
 export default function startBot() {
 	const client = new Client({
@@ -47,9 +48,9 @@ export default function startBot() {
 	 * EVENT HANDLER
 	 * - see the ./events folder
 	 */
-	const eventsFiles = readdirSync("./events").filter((f) => f.endsWith(".ts"));
+	const eventsFiles = readdirSync(join(__dirname, "events")).filter((f) => f.endsWith(".ts"));
 	for (const file of eventsFiles) {
-		const event: Event = require(`./events/${file}`).default;
+		const event: Event = require(join(__dirname, "events", file)).default;
 
 		// catch invalid events
 		if (typeof event !== "object") continue;

diff --git a/interfaces/database.ts → src/interfaces/database.ts b/interfaces/database.ts → src/interfaces/database.ts
diff --git a/interfaces/discord.ts → src/interfaces/discord.ts b/interfaces/discord.ts → src/interfaces/discord.ts
diff --git a/interfaces/images.ts → src/interfaces/images.ts b/interfaces/images.ts → src/interfaces/images.ts
diff --git a/tsconfig.json b/tsconfig.json
@@ -6,7 +6,7 @@
 		"module": "commonjs",
 		"moduleResolution": "node",
 		"target": "ESNEXT",
-		"baseUrl": ".",
+		"baseUrl": "src",
 		"paths": {
 			"@functions/*": ["./functions/*"],
 			"@helpers/*": ["./helpers/*"],
@@ -15,7 +15,7 @@
 			"@submission/*": ["./functions/submission/*"],
 			"@images/*": ["./functions/images/*"],
 			"@interfaces/*": ["./interfaces/*"],
-			"@resources/*": ["./resources/*"],
+			"@resources/*": ["../resources/*"],
 			"@index": ["./index.ts"],
 		}
 	}