From c622243f703776cff23d76cb2240abf995e0a8d7 Mon Sep 17 00:00:00 2001
From: "CATERPILLAR\\Braxen" <braxen@braxnet.org>
Date: Wed, 17 Apr 2024 10:33:02 +0200
Subject: [PATCH] restrict config values to keys of fields

---
 .../components/forms/ChannelUpdateForm.vue    |   2 +-
 .../src/components/forms/SettingsForm.vue     |  26 ++--
 client-vue/src/components/menu/SideMenu.vue   |   2 +-
 .../src/components/vod/VodItemStatus.vue      |   4 +-
 client-vue/src/store/index.ts                 |   4 +-
 common/Config.ts                              |   6 +
 common/ServerConfig.ts                        |  12 +-
 server/src/Controllers/Channels.ts            |   7 +-
 server/src/Controllers/Settings.ts            |  28 +++-
 server/src/Core/Config.ts                     | 143 +++++++++++-------
 server/src/Core/LiveStreamDVR.ts              |  23 ++-
 .../Core/Providers/YouTube/YouTubeChannel.ts  |   2 +-
 server/src/Providers/TikTok.ts                |  10 +-
 server/tests/api.test.ts                      |   5 +-
 server/tests/config.test.ts                   |   6 +-
 15 files changed, 177 insertions(+), 103 deletions(-)

diff --git a/client-vue/src/components/forms/ChannelUpdateForm.vue b/client-vue/src/components/forms/ChannelUpdateForm.vue
index c5d493f1..99918057 100644
--- a/client-vue/src/components/forms/ChannelUpdateForm.vue
+++ b/client-vue/src/components/forms/ChannelUpdateForm.vue
@@ -376,7 +376,7 @@ function deleteChannel() {
 }
 
 function subscribeChannel() {
-    if ((!store.cfg("app_url") || store.cfg("app_url") == "debug") && store.cfg("twitchapi.twitchapi.eventsub_type") === "webhook") {
+    if ((!store.cfg("app_url") || store.cfg("app_url") == "debug") && store.cfg("twitchapi.eventsub_type") === "webhook") {
         alert("Please set the app url in the settings");
         return;
     }
diff --git a/client-vue/src/components/forms/SettingsForm.vue b/client-vue/src/components/forms/SettingsForm.vue
index ac4dc99e..1fb6a8b1 100644
--- a/client-vue/src/components/forms/SettingsForm.vue
+++ b/client-vue/src/components/forms/SettingsForm.vue
@@ -9,8 +9,8 @@
             </h3>
             <ul>
                 <li v-for="(setting, key) of newAndInterestingSettings" :key="key">
-                    Under <strong>{{ setting.group }}</strong
-                    >: {{ setting.text }} ({{ setting.help }})
+                    Under <strong>{{ setting?.group }}</strong
+                    >: {{ setting?.text }} ({{ setting !== undefined && "help" in setting ? setting.help : "No help" }})
                 </li>
             </ul>
         </div>
@@ -197,7 +197,7 @@ const { t, te } = useI18n();
 const formStatusText = ref<string>("Ready");
 const formStatus = ref<FormStatus>("IDLE");
 const formData = ref<{ config: Record<string, string | number | boolean> }>({ config: {} });
-const fetchedSettingsFields = ref<typeof settingsFields>({});
+const fetchedSettingsFields = ref<typeof settingsFields>();
 const loading = ref<boolean>(false);
 const searchText = ref<string>("");
 
@@ -205,13 +205,14 @@ const searchText = ref<string>("");
 const settingsGroups = computed((): SettingsGroup[] => {
     if (!fetchedSettingsFields.value) return [];
     const groups: Record<string, SettingsGroup> = {};
-    for (const key in fetchedSettingsFields.value) {
+    for (const rawKey in fetchedSettingsFields.value) {
+        const key = rawKey as keyof typeof fetchedSettingsFields.value;
         const field = fetchedSettingsFields.value[key];
         if (!field.group) continue;
         if (searchText.value) {
             if (
                 !key.toLowerCase().includes(searchText.value.toLowerCase()) &&
-                !field.help?.toLowerCase().includes(searchText.value.toLowerCase()) &&
+                ("help" in field && !field.help?.toLowerCase().includes(searchText.value.toLowerCase())) &&
                 !field.text?.toLowerCase().includes(searchText.value.toLowerCase())
             )
                 continue;
@@ -232,11 +233,14 @@ const settingsGroups = computed((): SettingsGroup[] => {
     */
 });
 
-const newAndInterestingSettings = computed((): typeof settingsFields => {
-    const newSettings: typeof settingsFields = {};
-    for (const key in fetchedSettingsFields.value) {
+const newAndInterestingSettings = computed((): Record<keyof typeof settingsFields, SettingField & { new: boolean }> => {
+    const newSettings: Record<keyof typeof settingsFields, SettingField & { new: boolean }> = {} as any;
+    for (const rawKey in fetchedSettingsFields.value) {
+        const key = rawKey as keyof typeof fetchedSettingsFields.value;
         const field = fetchedSettingsFields.value[key];
-        if (field.new) newSettings[key] = field;
+        if (field !== undefined && "new" in field && field.new) {
+            newSettings[key] = field;
+        }
     }
     return newSettings;
     // return fetchedSettingsFields.value.filter((field) => field.new);
@@ -286,8 +290,8 @@ function fetchData(): void {
 
             // set defaults
             for (const key in fetchedSettingsFields.value) {
-                const field = fetchedSettingsFields.value[key];
-                if (field.default !== undefined && formData.value.config[key] === undefined) {
+                const field = fetchedSettingsFields.value[key as keyof typeof fetchedSettingsFields.value];
+                if ("default" in field && field.default !== undefined && formData.value.config[key] === undefined) {
                     formData.value.config[key] = field.default;
                 }
             }
diff --git a/client-vue/src/components/menu/SideMenu.vue b/client-vue/src/components/menu/SideMenu.vue
index b93c4667..1095a84c 100644
--- a/client-vue/src/components/menu/SideMenu.vue
+++ b/client-vue/src/components/menu/SideMenu.vue
@@ -4,7 +4,7 @@
             <div v-if="store.config" class="top-menu-item title" :class="{ fancy: store.clientCfg('animationsEnabled') }">
                 <router-link to="/dashboard" class="link" aria-label="Go to dashboard">
                     <div class="bg" />
-                    <img src="../../assets/logo.png" class="favicon" width="24" height="24" :alt="store.cfg('app_name', 'TA') ?? 'TA'" aria-hidden="true" />
+                    <img src="../../assets/logo.png" class="favicon" width="24" height="24" :alt="store.app_name ?? 'TA'" aria-hidden="true" />
                     <h1 class="title" :title="verboseVersion">
                         <span>{{ store.app_name }}</span>
                         <template v-if="isDevelopmentBranch">
diff --git a/client-vue/src/components/vod/VodItemStatus.vue b/client-vue/src/components/vod/VodItemStatus.vue
index bd800d91..6117d3a6 100644
--- a/client-vue/src/components/vod/VodItemStatus.vue
+++ b/client-vue/src/components/vod/VodItemStatus.vue
@@ -68,7 +68,7 @@
                             </strong>
                         </span>
                     </em>
-                    <template v-if="store.cfg('chat_dump')">
+                    <!-- <template v-if="store.cfg('chat_dump')">
                         <br /><em>
                             <span v-if="vod.getChatDumpStatus()">
                                 <span class="icon"><fa icon="sync" spin /></span>
@@ -82,7 +82,7 @@
                                 </strong>
                             </span>
                         </em>
-                    </template>
+                    </template> -->
                 </template>
             </template>
             <template v-else-if="!vod.is_capturing && !vod.is_converting && !vod.is_finalized">
diff --git a/client-vue/src/store/index.ts b/client-vue/src/store/index.ts
index dd1cc2cf..04bc1b55 100644
--- a/client-vue/src/store/index.ts
+++ b/client-vue/src/store/index.ts
@@ -65,7 +65,7 @@ export const useStore = defineStore("twitchAutomator", {
             streamerList: [],
             streamerListLoaded: false,
             jobList: [],
-            config: {},
+            config: {} as Record<keyof typeof settingsFields, any> | null,
             favourite_games: [],
             version: "?",
             clientConfig: undefined,
@@ -462,7 +462,7 @@ export const useStore = defineStore("twitchAutomator", {
             // console.debug(job_name, job.dt_started_at, elapsedSeconds, job.progress, calc);
             return calc;
         },
-        updateConfig(data: Record<string, any> | null) {
+        updateConfig(data: Record<keyof typeof settingsFields, any> | null) {
             this.config = data;
         },
         updateClientConfig(data: ClientSettings) {
diff --git a/common/Config.ts b/common/Config.ts
index 1292958f..5f6519c6 100644
--- a/common/Config.ts
+++ b/common/Config.ts
@@ -86,6 +86,7 @@ export interface StringSettingField extends BaseSettingField {
     stripslash?: boolean;
     pattern?: string;
     multiline?: boolean;
+    help?: string; // TODO: why is this here twice?
 }
 
 export interface NumberSettingField extends BaseSettingField {
@@ -93,23 +94,27 @@ export interface NumberSettingField extends BaseSettingField {
     default?: number;
     min?: number;
     max?: number;
+    help?: string; // TODO: why is this here twice?
 }
 
 export interface BooleanSettingField extends BaseSettingField {
     type: "boolean";
     default?: boolean;
+    help?: string; // TODO: why is this here twice?
 }
 
 export interface ArraySettingField extends BaseSettingField {
     type: "array";
     default?: string;
     choices: Array<string>;
+    help?: string; // TODO: why is this here twice?
 }
 
 export interface ObjectSettingField extends BaseSettingField {
     type: "object";
     default?: string;
     choices: Record<string, string>;
+    help?: string; // TODO: why is this here twice?
 }
 
 export interface TemplateSettingField extends BaseSettingField {
@@ -121,6 +126,7 @@ export interface TemplateSettingField extends BaseSettingField {
         { display: string; description?: string; deprecated?: boolean }
     >;
     context?: string;
+    help?: string; // TODO: why is this here twice?
 }
 
 export type SettingField =
diff --git a/common/ServerConfig.ts b/common/ServerConfig.ts
index c5deb33f..2f36a688 100644
--- a/common/ServerConfig.ts
+++ b/common/ServerConfig.ts
@@ -7,7 +7,15 @@ import {
 } from "./ReplacementsConsts";
 import { YouTubeCategories } from "./YouTube";
 
-export const settingsFields: Record<string, SettingField> = {
+// export type SettingKey = keyof typeof settingsFields;
+
+function createSettingsFields<T extends Record<string, SettingField>>(
+    fields: T
+): T {
+    return fields;
+}
+
+export const settingsFields = createSettingsFields({
     bin_dir: {
         group: "Binaries",
         text: "Python binary directory",
@@ -1098,4 +1106,4 @@ export const settingsFields: Record<string, SettingField> = {
         choices: ["jpg", "png", "webp"] as string[],
         default: "jpg",
     },
-} as const;
+});
diff --git a/server/src/Controllers/Channels.ts b/server/src/Controllers/Channels.ts
index b7a6c132..9d5a97f1 100644
--- a/server/src/Controllers/Channels.ts
+++ b/server/src/Controllers/Channels.ts
@@ -816,7 +816,12 @@ export async function DownloadVideo(
             game_id: extraData.game_id || "",
         };
 
-        return formatString(Config.getInstance().cfg(what), variables);
+        return formatString(
+            Config.getInstance().cfg(
+                what as keyof typeof Config.settingsFields
+            ),
+            variables
+        );
     };
 
     if (isTwitchChannel(channel)) {
diff --git a/server/src/Controllers/Settings.ts b/server/src/Controllers/Settings.ts
index 76a4349f..4a358992 100644
--- a/server/src/Controllers/Settings.ts
+++ b/server/src/Controllers/Settings.ts
@@ -2,6 +2,7 @@ import { AppName } from "@/Core/BaseConfig";
 import { Config } from "@/Core/Config";
 import { KeyValue } from "@/Core/KeyValue";
 import { LiveStreamDVR } from "@/Core/LiveStreamDVR";
+import { LOGLEVEL, log } from "@/Core/Log";
 import { TwitchGame } from "@/Core/Providers/Twitch/TwitchGame";
 import type { ApiSettingsResponse } from "@common/Api/Api";
 import type express from "express";
@@ -17,10 +18,11 @@ export async function GetSettings(
         !req.session.authenticated;
 
     const config: Record<string, any> = {};
-    for (const key in Config.settingsFields) {
-        const field = Config.settingsFields[key];
+    for (const rawKey in Config.settingsFields) {
+        const key = rawKey as keyof typeof Config.settingsFields;
+        const field = Config.getSettingField(key);
         // if (field.secret) continue;
-        if (is_guest && !field.guest) continue;
+        if (is_guest && field !== undefined && !field.guest) continue;
         config[key] = Config.getInstance().cfg(key);
     }
 
@@ -86,8 +88,14 @@ export function SaveSettings(
 
     let fields = 0;
     for (const key in Config.settingsFields) {
-        const setting = Config.settingsFields[key];
-        if (setting.required && postConfig[key] === undefined) {
+        const setting = Config.getSettingField(
+            key as keyof typeof Config.settingsFields
+        );
+        if (
+            setting !== undefined &&
+            setting.required &&
+            postConfig[key] === undefined
+        ) {
             res.api(400, {
                 status: "ERROR",
                 message: `Missing required setting: ${key}`,
@@ -107,8 +115,14 @@ export function SaveSettings(
         return;
     }
 
-    for (const key in Config.settingsFields) {
-        const setting = Config.settingsFields[key];
+    // validate and save settings
+    for (const rawKey in Config.settingsFields) {
+        const key = rawKey as keyof typeof Config.settingsFields;
+        const setting = Config.getSettingField(key);
+        if (setting === undefined) {
+            log(LOGLEVEL.ERROR, "Settings", `Setting not found: ${key}`);
+            continue;
+        }
         if (setting.type === "boolean") {
             Config.getInstance().setConfig<boolean>(key, postConfig[key]);
         } else if (setting.type === "number") {
diff --git a/server/src/Core/Config.ts b/server/src/Core/Config.ts
index 676e22b6..6e09d941 100644
--- a/server/src/Core/Config.ts
+++ b/server/src/Core/Config.ts
@@ -32,46 +32,48 @@ import { Scheduler } from "./Scheduler";
 const argv = minimist(process.argv.slice(2));
 
 export class Config {
-    initialised = false;
-    config: Record<string, string | number | boolean | string[]> | undefined;
+    public initialised = false;
+    public config:
+        | Record<string, string | number | boolean | string[]>
+        | undefined;
     private _writeConfig = false;
-    watcher: fs.FSWatcher | undefined;
+    private watcher: fs.FSWatcher | undefined;
 
-    gitHash?: string;
-    gitBranch?: string;
+    public gitHash?: string;
+    public gitBranch?: string;
 
-    sessionParser?: express.RequestHandler;
+    public sessionParser?: express.RequestHandler;
 
-    static readonly streamerCacheTime = 2592000 * 1000; // 30 days
-    static readonly settingsFields = settingsFields;
+    public static readonly streamerCacheTime = 2592000 * 1000; // 30 days
+    public static readonly settingsFields = settingsFields;
 
-    static MigrateOptions = [
+    public static MigrateOptions = [
         { from: "youtube_client_id", to: "youtube.client_id" },
         { from: "youtube_client_secret", to: "youtube.client_secret" },
     ];
 
-    static readonly AudioContainer = "m4a";
+    public static readonly AudioContainer = "m4a";
 
-    static readonly SeasonFormat = "yyyyMM";
+    public static readonly SeasonFormat = "yyyyMM";
 
-    static instance: Config | undefined;
+    public static instance: Config | undefined;
 
-    static getInstance(): Config {
+    public static getInstance(): Config {
         if (this.instance === undefined) {
             this.instance = new Config();
         }
         return this.instance;
     }
 
-    static getCleanInstance(): Config {
+    public static getCleanInstance(): Config {
         return new Config();
     }
 
-    static destroyInstance() {
+    public static destroyInstance() {
         this.instance = undefined;
     }
 
-    cfg<T>(key: keyof typeof settingsFields, defaultValue?: T): T {
+    public cfg<T>(key: keyof typeof settingsFields, defaultValue?: T): T {
         if (this.config === undefined) {
             console.error("Config not loaded", key, defaultValue);
             throw new Error("Config not loaded");
@@ -125,7 +127,7 @@ export class Config {
         return <T>this.config[key]; // return value
     }
 
-    hasValue(key: keyof typeof settingsFields): boolean {
+    public hasValue(key: keyof typeof settingsFields): boolean {
         if (this.config === undefined) {
             console.error("Config not loaded", key);
             throw new Error("Config not loaded");
@@ -176,7 +178,7 @@ export class Config {
      * @test disable
      * @returns
      */
-    loadConfig() {
+    public loadConfig() {
         console.log(chalk.blue("Loading config..."));
 
         if (!fs.existsSync(BaseConfigPath.config)) {
@@ -215,7 +217,9 @@ export class Config {
 
             // migrate old settings through migrate field
             for (const key in config) {
-                const field = Config.getSettingField(key);
+                const field = Config.getSettingField(
+                    key as keyof typeof settingsFields
+                );
                 if (field && field.migrate) {
                     config[field.migrate] = config[key];
                     delete config[key];
@@ -230,7 +234,7 @@ export class Config {
 
         // delete invalid settings
         for (const key in config) {
-            if (!Config.settingExists(key)) {
+            if (!Config.settingExists(key as keyof typeof settingsFields)) {
                 console.warn(
                     chalk.yellow(
                         `Saved setting '${key}' does not exist, deprecated? Discarding.`
@@ -244,10 +248,17 @@ export class Config {
             throw new Error("Config is empty even after reading it");
         }
 
+        // check for missing default values
         let changed = false;
         for (const key in Config.settingsFields) {
-            const setting = Config.settingsFields[key];
-            if (config[key] === undefined && setting.default !== undefined) {
+            const setting = Config.getSettingField(
+                key as keyof typeof settingsFields
+            );
+            if (
+                setting !== undefined &&
+                config[key] === undefined &&
+                setting.default !== undefined
+            ) {
                 config[key] = setting.default;
                 console.log(
                     chalk.yellow(
@@ -274,7 +285,11 @@ export class Config {
 
         for (const env_var of Object.keys(process.env)) {
             if (env_var.startsWith("TCD_")) {
-                const val = this.cfg(env_var.substring(4).toLowerCase());
+                const val = this.cfg(
+                    env_var
+                        .substring(4)
+                        .toLowerCase() as keyof typeof settingsFields
+                ); // TODO: this is a bit hacky
                 console.log(
                     chalk.green(
                         `Overriding setting '${env_var.substring(
@@ -286,14 +301,17 @@ export class Config {
         }
     }
 
-    generateConfig() {
+    public generateConfig() {
         console.log("Generating config");
 
         const example: Record<string, string | boolean | number | string[]> =
             {};
         for (const key in Config.settingsFields) {
-            const field = Config.settingsFields[key];
-            if (field["default"] !== undefined) example[key] = field["default"];
+            const field = Config.getSettingField(
+                key as keyof typeof settingsFields
+            );
+            if (field !== undefined && field["default"] !== undefined)
+                example[key] = field["default"];
         }
         // example["favourites"] = [];
         // example["streamers"] = [];
@@ -302,16 +320,27 @@ export class Config {
         this.saveConfig("generate config");
     }
 
-    static settingExists(key: string): boolean {
+    /**
+     *
+     * @obsolete ? // TODO: check if this is still needed
+     * @param key
+     * @returns
+     */
+    public static settingExists(key: keyof typeof settingsFields): boolean {
         return this.getSettingField(key) !== undefined;
     }
 
-    static getSettingField(key: string): SettingField | undefined {
-        // return this.settingsFields.find(field => field["key"] === key);
+    public static getSettingField(
+        key: keyof typeof settingsFields
+    ): SettingField | undefined {
         return this.settingsFields[key];
     }
 
-    setConfig<T extends number | string | boolean>(
+    /* public static getSettingKeys(): keyof typeof settingsFields[] {
+        return Object.keys(this.settingsFields) as unknown as keyof typeof settingsFields[];
+    } */
+
+    public setConfig<T extends number | string | boolean>(
         key: keyof typeof settingsFields,
         value: T
     ): void {
@@ -403,7 +432,7 @@ export class Config {
         }
     }
 
-    unsetConfig(key: keyof typeof settingsFields): void {
+    public unsetConfig(key: keyof typeof settingsFields): void {
         if (!this.config) {
             throw new Error("Config not loaded");
         }
@@ -418,7 +447,7 @@ export class Config {
      * @param source
      * @returns
      */
-    saveConfig(source = "unknown"): boolean {
+    public saveConfig(source = "unknown"): boolean {
         this._writeConfig = true;
         this.stopWatchingConfig();
 
@@ -463,7 +492,7 @@ export class Config {
         return success;
     }
 
-    async postSaveConfig() {
+    private async postSaveConfig() {
         await TwitchHelper.setupAxios();
         Scheduler.restartScheduler();
         await YouTubeHelper.setupClient();
@@ -473,7 +502,7 @@ export class Config {
         i18next.changeLanguage(this.cfg("basic.language", "en"));
     }
 
-    backupConfig() {
+    private backupConfig() {
         if (fs.existsSync(BaseConfigPath.config)) {
             fs.copyFileSync(
                 BaseConfigPath.config,
@@ -482,7 +511,7 @@ export class Config {
         }
     }
 
-    static createFolders() {
+    public static createFolders() {
         for (const folder of Object.values(BaseConfigFolder)) {
             if (!fs.existsSync(folder)) {
                 console.warn(
@@ -518,7 +547,7 @@ export class Config {
         }
     }
 
-    generateEventSubSecret() {
+    public generateEventSubSecret() {
         if (this.hasValue("eventsub_secret")) return;
         console.log(chalk.yellow("Generating eventsub secret..."));
         const secret = crypto.randomBytes(16).toString("hex");
@@ -526,7 +555,7 @@ export class Config {
         this.saveConfig("eventsub_secret not set");
     }
 
-    getWebsocketClientUrl(): string | undefined {
+    public getWebsocketClientUrl(): string | undefined {
         if (!this.cfg("websocket_enabled")) return undefined;
 
         // override
@@ -567,7 +596,7 @@ export class Config {
     /**
      * @test disable
      */
-    startWatchingConfig() {
+    public startWatchingConfig() {
         if (this.watcher) this.stopWatchingConfig();
 
         // no blocks in testing
@@ -599,11 +628,11 @@ export class Config {
         );
     }
 
-    stopWatchingConfig() {
+    public stopWatchingConfig() {
         if (this.watcher) this.watcher.close();
     }
 
-    checkPermissions() {
+    public checkPermissions() {
         const folder = DataRoot;
         const testfile = `${folder}/perm`;
         try {
@@ -620,7 +649,7 @@ export class Config {
     /**
      * @test disable
      */
-    static checkBuiltDependencies() {
+    public static checkBuiltDependencies() {
         // check if the client is built before starting the server
         if (!fs.existsSync(path.join(BaseConfigFolder.client, "index.html"))) {
             console.error(
@@ -704,7 +733,7 @@ export class Config {
     /**
      * @test disable
      */
-    static checkAppRoot() {
+    public static checkAppRoot() {
         // check that the app root is not outside of the root
         if (
             !fs.existsSync(path.join(BaseConfigFolder.server, "tsconfig.json"))
@@ -727,7 +756,7 @@ export class Config {
         }
     }
 
-    static async resetChannels() {
+    public static async resetChannels() {
         TwitchChannel.channels_cache = {};
         LiveStreamDVR.getInstance().channels_config = [];
         LiveStreamDVR.getInstance()
@@ -741,7 +770,7 @@ export class Config {
         await LiveStreamDVR.getInstance().loadChannels();
     }
 
-    async validateExternalURL(test_url = ""): Promise<boolean> {
+    public async validateExternalURL(test_url = ""): Promise<boolean> {
         const url = test_url !== "" ? test_url : this.cfg<string>("app_url");
 
         Config.validateExternalURLRules(url);
@@ -797,7 +826,7 @@ export class Config {
         return true;
     }
 
-    static validateExternalURLRules(url: string) {
+    public static validateExternalURLRules(url: string) {
         debugLog(`Validating external url: ${url}`);
 
         // no url
@@ -829,7 +858,7 @@ export class Config {
 
     private static _debug = false;
 
-    static get debug(): boolean {
+    public static get debug(): boolean {
         // if (argv.debug) return true;
         // if (!Config.getInstance().initialised) return false;
         // if (Config.getInstance().forceDebug) return true;
@@ -837,12 +866,12 @@ export class Config {
         return this._debug;
     }
 
-    static set debug(value: boolean) {
+    public static set debug(value: boolean) {
         this._debug = value;
         setLogDebug(value);
     }
 
-    static updateDebug() {
+    public static updateDebug() {
         if (argv.debug) {
             Config.debug = true;
         } else if (!Config.getInstance().initialised) {
@@ -852,7 +881,7 @@ export class Config {
         }
     }
 
-    static get can_shutdown(): boolean {
+    public static get can_shutdown(): boolean {
         if (
             !LiveStreamDVR.getInstance().getChannels() ||
             LiveStreamDVR.getInstance().getChannels().length === 0
@@ -864,7 +893,7 @@ export class Config {
             .some((c) => c.is_live); // if there are any live channels, don't allow shutdown
     }
 
-    async getGitHash() {
+    public async getGitHash() {
         let ret;
         try {
             ret = await execSimple(
@@ -898,7 +927,7 @@ export class Config {
         }
     }
 
-    async getGitBranch() {
+    public async getGitBranch() {
         let ret;
         try {
             ret = await execSimple(
@@ -932,18 +961,18 @@ export class Config {
         }
     }
 
-    static debugLocalUrl() {
+    public static debugLocalUrl() {
         if (is_docker()) {
             return "localhost:8082";
         }
         return "localhost:8080";
     }
 
-    get dateFormat() {
-        return this.cfg("date_format", "yyyy-MM-dd"); // if you're crazy enough to not use ISO8601
+    public get dateFormat() {
+        return this.cfg("locale.date-format", "yyyy-MM-dd"); // if you're crazy enough to not use ISO8601
     }
 
-    hasEnvVar(key: keyof typeof settingsFields): boolean {
+    public hasEnvVar(key: keyof typeof settingsFields): boolean {
         const val =
             process.env[`TCD_${key.toUpperCase().replaceAll(".", "_")}`];
 
@@ -953,11 +982,11 @@ export class Config {
         return true;
     }
 
-    envVarValue(key: keyof typeof settingsFields): string | undefined {
+    private envVarValue(key: keyof typeof settingsFields): string | undefined {
         return process.env[`TCD_${key.toUpperCase().replaceAll(".", "_")}`];
     }
 
-    static getBasePath(): string {
+    public static getBasePath(): string {
         if (!Config.getInstance().initialised)
             return process.env.BASE_PATH ?? "";
         return Config.getInstance().cfg<string>("basepath", "");
diff --git a/server/src/Core/LiveStreamDVR.ts b/server/src/Core/LiveStreamDVR.ts
index fb2b17df..b7853c51 100644
--- a/server/src/Core/LiveStreamDVR.ts
+++ b/server/src/Core/LiveStreamDVR.ts
@@ -843,10 +843,16 @@ export class LiveStreamDVR {
         if (!Helper.path_mediainfo()) errors.push("Failed to find mediainfo");
 
         for (const key in Config.settingsFields) {
-            const field = Config.settingsFields[key];
+            const field = Config.getSettingField(
+                key as keyof typeof Config.settingsFields
+            );
             if (
+                field !== undefined &&
+                "deprecated" in field &&
                 field.deprecated &&
-                Config.getInstance().cfg(key) !== field.default
+                Config.getInstance().cfg(
+                    key as keyof typeof Config.settingsFields
+                ) !== field.default
             ) {
                 if (typeof field.deprecated === "string") {
                     errors.push(`${key} is deprecated: ${field.deprecated}`);
@@ -970,7 +976,7 @@ export class LiveStreamDVR {
 
         // check for ts files in storage
         for (const channel of this.getInstance().getChannels()) {
-            if ( channel.is_capturing ) continue; // skip currently capturing channels
+            if (channel.is_capturing) continue; // skip currently capturing channels
             const basePath = channel.getFolder();
             const files = readdirRecursive(basePath);
             for (const file of files) {
@@ -982,10 +988,13 @@ export class LiveStreamDVR {
                         )}`
                     );
                 }
-            }            
+            }
         }
 
-        if (Config.getInstance().cfg("capture.twitch-ttv-lol-plugin") && !this.ttvLolPluginAvailable) {
+        if (
+            Config.getInstance().cfg("capture.twitch-ttv-lol-plugin") &&
+            !this.ttvLolPluginAvailable
+        ) {
             errors.push("Twitch TTV LOL plugin is enabled but not available.");
         }
 
@@ -1074,12 +1083,12 @@ export class LiveStreamDVR {
 
     public static ttvLolPluginAvailable = false;
     public static async checkTTVLolPlugin() {
-        if ( !Config.getInstance().cfg("capture.twitch-ttv-lol-plugin") ) return false; // not enabled
+        if (!Config.getInstance().cfg("capture.twitch-ttv-lol-plugin"))
+            return false; // not enabled
         this.ttvLolPluginAvailable = await TwitchHelper.checkTTVLolPlugin();
         return this.ttvLolPluginAvailable;
     }
 
-
     public static async checkPythonVirtualEnv() {
         log(
             LOGLEVEL.INFO,
diff --git a/server/src/Core/Providers/YouTube/YouTubeChannel.ts b/server/src/Core/Providers/YouTube/YouTubeChannel.ts
index 5d2aa852..3460f90e 100644
--- a/server/src/Core/Providers/YouTube/YouTubeChannel.ts
+++ b/server/src/Core/Providers/YouTube/YouTubeChannel.ts
@@ -300,7 +300,7 @@ export class YouTubeChannel extends BaseChannel {
         return await this.getUserDataProxy("username", username, force);
     }
 
-    static async getUserDataProxy(
+    public static async getUserDataProxy(
         method: "id" | "username",
         identifier: string,
         force = false
diff --git a/server/src/Providers/TikTok.ts b/server/src/Providers/TikTok.ts
index ffcf681b..afc4eb7e 100644
--- a/server/src/Providers/TikTok.ts
+++ b/server/src/Providers/TikTok.ts
@@ -1,16 +1,14 @@
 import { BaseConfigCacheFolder } from "@/Core/BaseConfig";
 import path from "node:path";
-import { Config } from "@/Core/Config";
-import { log, LOGLEVEL } from "@/Core/Log";
 
 export class TikTokHelper {
-    static readonly accessTokenFile = path.join(
+    public static readonly accessTokenFile = path.join(
         BaseConfigCacheFolder.cache,
         "tiktok_oauth.json"
     );
-    static authenticated: boolean;
+    public static authenticated: boolean;
 
-    static async setupClient() {
+    /* public static async setupClient() {
         const client_id = Config.getInstance().cfg<string>("tiktok.client_id");
         const client_secret = Config.getInstance().cfg<string>(
             "tiktok.client_secret"
@@ -31,5 +29,5 @@ export class TikTokHelper {
             );
             return;
         }
-    }
+    } */
 }
diff --git a/server/tests/api.test.ts b/server/tests/api.test.ts
index e708bf92..9eb4089c 100644
--- a/server/tests/api.test.ts
+++ b/server/tests/api.test.ts
@@ -109,8 +109,9 @@ describe("settings", () => {
 
         const fields = Config.settingsFields;
         for (const key in fields) {
-            const field = fields[key];
-            if (!field.default) continue;
+            const field = fields[key as keyof typeof fields];
+            if (field === undefined || ("default" in field && !field.default))
+                continue;
             expect(res.body.data.config[key]).toBeDefined();
         }
 
diff --git a/server/tests/config.test.ts b/server/tests/config.test.ts
index 6da58979..ae4674b8 100644
--- a/server/tests/config.test.ts
+++ b/server/tests/config.test.ts
@@ -34,7 +34,7 @@ describe("Config", () => {
         config.config = {};
         config.setConfig("app_url", "https://example.com");
         expect(config.cfg("app_url")).toBe("https://example.com");
-        expect(config.cfg("app_url1")).toBeUndefined();
+        expect(config.cfg("app_url1" as any)).toBeUndefined();
 
         // automatic type casting
         config.setConfig("trust_proxy", "1");
@@ -210,8 +210,8 @@ describe("Config", () => {
 
     it("setting exists", () => {
         expect(Config.settingExists("app_url")).toBe(true);
-        expect(Config.settingExists("app_url1")).toBe(false);
+        expect(Config.settingExists("app_url1" as any)).toBe(false);
         expect(Config.getSettingField("app_url")).toHaveProperty("text");
-        expect(Config.getSettingField("app_url1")).toBeUndefined();
+        expect(Config.getSettingField("app_url1" as any)).toBeUndefined();
     });
 });