From 950bbb1a6474c5e0eab25d74b868c641a6233e2b Mon Sep 17 00:00:00 2001
From: dumbmoron <log@riseup.net>
Date: Sun, 10 Mar 2024 17:21:33 +0000
Subject: [PATCH] api: remove env aliasing

---
 api/modules/util/alias-envs.js | 23 -----------------------
 api/server.js                  |  3 +--
 src/test/test.js               |  1 -
 3 files changed, 1 insertion(+), 26 deletions(-)
 delete mode 100644 api/modules/util/alias-envs.js

diff --git a/api/modules/util/alias-envs.js b/api/modules/util/alias-envs.js
deleted file mode 100644
index 24f6a856..00000000
--- a/api/modules/util/alias-envs.js
+++ /dev/null
@@ -1,23 +0,0 @@
-import { Red } from "./consoleText.js";
-
-const mapping = {
-    apiPort: 'API_PORT',
-    apiURL: 'API_URL',
-    apiName: 'API_NAME',
-    cors: 'CORS_WILDCARD',
-    cookiePath: 'COOKIE_PATH',
-    webPort: 'WEB_PORT',
-    webURL: 'WEB_URL',
-    showSponsors: 'SHOW_SPONSORS',
-    isBeta: 'IS_BETA'
-}
-
-for (const [ oldEnv, newEnv ] of Object.entries(mapping)) {
-    if (process.env[oldEnv] && !process.env[newEnv]) {
-        process.env[newEnv] = process.env[oldEnv];
-        console.error(`${Red('[!]')} ${oldEnv} is deprecated and will be removed in a future version.`);
-        console.error(`    You should use ${newEnv} instead.`);
-        console.error();
-        delete process.env[oldEnv];
-    }
-}
diff --git a/api/server.js b/api/server.js
index d902cbf7..80ddbd75 100644
--- a/api/server.js
+++ b/api/server.js
@@ -1,5 +1,4 @@
 import "dotenv/config";
-import "./modules/util/alias-envs.js";
 
 import express from "express";
 
@@ -20,7 +19,7 @@ const __dirname = path.dirname(__filename).slice(0, -4);
 
 app.disable('x-powered-by');
 
-if (process.env.API_URL) {
+if (process.env.API_URL && !process.env.WEB_URL) {
     runAPI(express, app, gitCommit, gitBranch, __dirname)
 } else {
     console.log(
diff --git a/src/test/test.js b/src/test/test.js
index d8373ff7..15b28cca 100644
--- a/src/test/test.js
+++ b/src/test/test.js
@@ -1,5 +1,4 @@
 import "dotenv/config";
-import "../modules/sub/alias-envs.js";
 
 import { getJSON } from "../modules/api.js";
 import { services } from "../modules/config.js";