Merge pull request #2 from thororen1234/main

Fix Equicord Building & Tweaks

Author: nin0-dev

build.mjs

@@ -32,11 +32,24 @@ function applyChanges(sourceDir) {
 	}
 }
 
+function copyFiles(clientMod) {
+	const dir = clientMod === "vencord" ? "working/dist" : "working/dist/browser";
+	cpSync(`${dir}/browser.js`, "dist/browser.js", {
+		recursive: true
+	});
+	cpSync(`${dir}/browser.css`, "dist/browser.css", {
+		recursive: true
+	});
+	cpSync(`${dir}/browser.js.LEGAL.txt`, "dist/browser.js.LEGAL.txt", {
+		recursive: true
+	});
+}
+
 /**
  * @param {string} cloneURL
- * @param {string} dirToLookAt
+ * @param {string} clientMod
  */
-export function buildVencord(cloneURL, dirToLookAt = "vencord") {
+export function buildVencord(cloneURL, clientMod) {
 	if (
 		!/^https:\/\/(github\.com|codeberg\.org|git\.nin0\.dev)\/[a-zA-Z0-9-]+\/[a-zA-Z0-9-\._]+(?:\.git)?\/?$/.test(
 			cloneURL
@@ -74,27 +87,19 @@ export function buildVencord(cloneURL, dirToLookAt = "vencord") {
 
 	console.log("Applying common files");
 	applyChanges("src/common");
-	console.log("Applying", dirToLookAt, "files");
-	applyChanges(`src/${dirToLookAt}`);
+	console.log("Applying", clientMod, "files");
+	applyChanges(`src/${clientMod}`);
 
 	console.log("Building Vencord");
 	execSync("cd working && pnpm buildWeb", {
 		stdio: "inherit"
 	});
 
 	console.log("Releasing");
-	cpSync("working/dist/browser.js", "dist/browser.js", {
-		recursive: true
-	});
-	cpSync("working/dist/browser.css", "dist/browser.css", {
-		recursive: true
-	});
-	cpSync("working/dist/browser.js.LEGAL.txt", "dist/browser.js.LEGAL.txt", {
-		recursive: true
-	});
+	copyFiles(clientMod);
 	execSync(
 		`export GH_TOKEN=${process.env.GH_TOKEN} && gh release upload ${
-			cloneURL.includes("Vencord") ? "devbuild" : "devbuild-equi"
+			clientMod === "vencord" ? "devbuild" : "devbuild-equi"
 		} --clobber dist/*`,
 		{
 			stdio: "ignore"

index.mjs

@@ -84,7 +84,7 @@ try {
 
 switch (chosenMod) {
 	case "vencord": {
-		buildVencord("https://github.com/Vendicated/Vencord");
+		buildVencord("https://github.com/Vendicated/Vencord", "vencord");
 		const commitInfo = execSync(
 			'cd working && git log -1 --pretty=format:"\\`%h\\` ~ %s"'
 		)

src/common/src_components_VendroidTab.tsx

@@ -0,0 +1,25 @@
+diff --git a/src/plugins/_core/settings.tsx b/src/plugins/_core/settings.tsx
+index 83e791425..e3a016b6e 100644
+--- a/src/plugins/_core/settings.tsx
++++ b/src/plugins/_core/settings.tsx
+@@ -24,6 +24,7 @@ import PatchHelperTab from "@components/VencordSettings/PatchHelperTab";
+ import PluginsTab from "@components/VencordSettings/PluginsTab";
+ import UpdaterTab from "@components/VencordSettings/UpdaterTab";
+ import VencordTab from "@components/VencordSettings/VencordTab";
++import VendroidTab from "@components/VencordSettings/VendroidTab";
+ import { Devs } from "@utils/constants";
+ import { getIntlMessage } from "@utils/discord";
+ import definePlugin, { OptionType } from "@utils/types";
+@@ -131,6 +132,12 @@ export default definePlugin({
+                 element: BackupAndRestoreTab,
+                 className: "vc-backup-restore"
+             },
++            {
++                section: "VendroidSettings",
++                label: "Vendroid Settings",
++                element: VendroidTab,
++                className: "vc-vendroid"
++            },
+             IS_DEV && {
+                 section: "EquicordPatchHelper",
+                 label: "Patch Helper",