Merge branch 'fosscord:master' into milestoneV1/routes/implement/emojis

2 files changed, 1 insertions, 4 deletions

diff --git a/bundle/scripts/build.js b/bundle/scripts/build.js

index 05cf37ce..4266942f 100644
--- a/bundle/scripts/build.js
+++ b/bundle/scripts/build.js
@@ -89,7 +89,7 @@ function walk(dir) {
 	var results = [];
 	var list = fs.readdirSync(dir);
 	list.forEach(function (file) {
-		file = dir + "/" + file;
+		file = path.join(dir, file);
 		var stat = fs.statSync(file);
 		if (stat && stat.isDirectory()) {
 			/* Recurse into a subdirectory */
diff --git a/bundle/src/Server.ts b/bundle/src/Server.ts

index 662b9008..5dda2d02 100644
--- a/bundle/src/Server.ts
+++ b/bundle/src/Server.ts
@@ -30,9 +30,6 @@ async function main() {
 		cdn: {
 			endpointClient: "${location.host}",
 			endpointPrivate: `http://localhost:${port}`,
-			...(!Config.get().cdn.endpointPublic && {
-				endpointPublic: `http://localhost:${port}`,
-			}),
 		},
 		gateway: {
 			endpointClient: