From 4613f77f30f718f590229a990ee81742f7993129 Mon Sep 17 00:00:00 2001
From: smartfrigde <37928912+smartfrigde@users.noreply.github.com>
Date: Tue, 27 Sep 2022 11:11:56 +0000
Subject: [PATCH] Remove EOL mods

---
 src/content/css/setup.css  |  1 -
 src/content/setup.html     |  8 +++-----
 src/content/splash.html    |  2 +-
 src/extensions/mods.ts     | 10 +---------
 src/preload/preload.ts     | 19 ++++---------------
 src/settings/hummus.html   |  6 +++---
 src/settings/settings.html | 11 ++---------
 src/utils.ts               |  2 +-
 8 files changed, 15 insertions(+), 44 deletions(-)
diff --git a/src/content/css/setup.css b/src/content/css/setup.css
index a32aaf7..e33a2dc 100644
--- a/src/content/css/setup.css
+++ b/src/content/css/setup.css
@@ -111,7 +111,6 @@ div {
     width: 292px;
 }
 
-
 [armcord-platform="win32"] .titlebar #window-controls-container #maximize,
 [armcord-platform="linux"] .titlebar #window-controls-container #maximize {
     display: none;
diff --git a/src/content/setup.html b/src/content/setup.html
index f20030a..47ecd70 100644
--- a/src/content/setup.html
+++ b/src/content/setup.html
@@ -2,7 +2,7 @@
 <html lang="en">
     <head>
         <meta charset="UTF-8" />
-        <link rel="icon" type="image/ico" href="./favicon.ico">
+        <link rel="icon" type="image/ico" href="./favicon.ico" />
         <meta http-equiv="X-UA-Compatible" content="IE=edge" />
         <meta name="viewport" content="width=device-width, initial-scale=1.0" />
         <title>ArmCord Setup</title>
@@ -53,9 +53,7 @@
                     <p class="text-center setup-ask" id="setup_question4">Select a client mod you want to install:</p>
                     <div class="center">
                         <select name="mod" id="mod" class="dropdown-button">
-                            <option value="cumcord">Cumcord</option>
-                            <option value="goosemod">GooseMod</option>
-                            <option value="flicker">Flicker (Heavily WIP)</option>
+                            <option value="none">None (check Discord)</option>
                         </select>
                     </div>
                     <p class="text-center" id="setup_question4_clientmodnotice">
@@ -120,7 +118,7 @@
                     minimizeToTray: true,
                     alternativePaste: false,
                     automaticPatches: false,
-                    mods: "cumcord",
+                    mods: "none",
                     inviteWebsocket: true,
                     mobileMode: false,
                     trayIcon: "default",
diff --git a/src/content/splash.html b/src/content/splash.html
index 728417a..f4771d6 100644
--- a/src/content/splash.html
+++ b/src/content/splash.html
@@ -2,7 +2,7 @@
 <html lang="en">
     <head>
         <meta charset="UTF-8" />
-        <link rel="icon" type="image/ico" href="./favicon.ico">
+        <link rel="icon" type="image/ico" href="./favicon.ico" />
         <title>ArmCord</title>
         <style>
             @import url("css/splash.css");
diff --git a/src/extensions/mods.ts b/src/extensions/mods.ts
index 9821a12..690396e 100644
--- a/src/extensions/mods.ts
+++ b/src/extensions/mods.ts
@@ -21,15 +21,7 @@ const unstrictCSP = () => {
 
     const cspAllowAll = ["connect-src", "style-src", "img-src", "font-src"];
 
-    const corsAllowUrls = [
-        "https://github.com/GooseMod/GooseMod/releases/download/dev/index.js",
-        "https://github-releases.githubusercontent.com/",
-        "https://api.goosemod.com/inject.js",
-        "https://raw.githubusercontent.com/Cumcord/Cumcord/stable/dist/build.js",
-        "https://raw.githubusercontent.com/Cumcord/Cumcord/master/dist/build.js",
-        "https://raw.githubusercontent.com/FlickerMod/dist/main/build.js",
-        "https://raw.githubusercontent.com/Cordwood/builds/master/index.js"
-    ];
+    const corsAllowUrls = ["https://raw.githubusercontent.com/Cordwood/builds/master/index.js"];
 
     electron.session.defaultSession.webRequest.onHeadersReceived(({responseHeaders, url}, done) => {
         let csp = responseHeaders!["content-security-policy"];
diff --git a/src/preload/preload.ts b/src/preload/preload.ts
index d0963a1..f581fdf 100644
--- a/src/preload/preload.ts
+++ b/src/preload/preload.ts
@@ -13,9 +13,10 @@ async function updateLang() {
     if (window.location.href.indexOf("setup.html") > -1) {
         console.log("Setup, skipping lang update");
     } else {
-        addScript(`function getDiscordLang() {
-            {const _w=webpackChunkdiscord_app;let lang;_w.push([[Symbol()],{},e=>{for(const k in e.c){const m=e.c[k].exports;const mDef=m?.default&&m.__esModule?m.default:m;if(mDef?._chosenLocale&&!lang)lang=mDef}}]);_w.pop();window.armcord.setLang(lang._chosenLocale);return lang._chosenLocale;void 0}}
-            getDiscordLang();`);
+        // addScript(`function getDiscordLang() {
+        //     {const _w=webpackChunkdiscord_app;let lang;_w.push([[Symbol()],{},e=>{for(const k in e.c){const m=e.c[k].exports;const mDef=m?.default&&m.__esModule?m.default:m;if(mDef?._chosenLocale&&!lang)lang=mDef}}]);_w.pop();window.armcord.setLang(lang._chosenLocale);return lang._chosenLocale;void 0}}
+        //     getDiscordLang();`);
+        // haha get patched kid
     }
 }
 declare global {
@@ -25,8 +26,6 @@ declare global {
 }
 const clientMods = {
     goosemod: "https://api.goosemod.com/inject.js",
-    cumcord: "https://raw.githubusercontent.com/Cumcord/Cumcord/stable/dist/build.js",
-    flicker: "https://raw.githubusercontent.com/FlickerMod/dist/main/build.js",
     cordwood: "https://raw.githubusercontent.com/Cordwood/builds/master/index.js"
 };
 
@@ -57,16 +56,6 @@ if (window.location.href.indexOf("splash.html") > -1) {
                 console.log("Loading GooseMod...");
                 await updateLang();
                 break;
-            case "cumcord":
-                injectJS(clientMods.cumcord);
-                console.log("Loading Cumcord...");
-                await updateLang();
-                break;
-            case "flicker":
-                injectJS(clientMods.flicker);
-                console.log("Loading FlickerMod...");
-                await updateLang();
-                break;
             case "cordwood":
                 injectJS(clientMods.cordwood);
                 console.log("Loading Cordwood...");
diff --git a/src/settings/hummus.html b/src/settings/hummus.html
index 75ef6d7..852310b 100644
--- a/src/settings/hummus.html
+++ b/src/settings/hummus.html
@@ -143,8 +143,8 @@
         <br />
         <div class="switch acAdvSettings">
             <h1 class="center advancedText">⚠️ Advanced User Zone ⚠️</h1>
-            <br>
-            <br>
+            <br />
+            <br />
             <label class="header" id="settings-skipSplash">Skip Splash Screen (Experimental)</label>
             <input class="tgl tgl-light left" id="skipSplash" type="checkbox" />
             <label class="tgl-btn left" for="skipSplash"></label>
@@ -210,7 +210,7 @@
                 doneSetup: true
             });
             alert(`Your settings have been saved!
-Some changes may require the app to restart before taking effect.`)
+Some changes may require the app to restart before taking effect.`);
         });
         document.getElementById("settings-restart").addEventListener("click", function () {
             settings.restart();
diff --git a/src/settings/settings.html b/src/settings/settings.html
index 7727e25..e3aecbf 100644
--- a/src/settings/settings.html
+++ b/src/settings/settings.html
@@ -123,9 +123,7 @@
         <br />
         <div class="switch acClientMod">
             <select name="mod" id="mod" class="left dropdown">
-                <option value="cumcord">Cumcord</option>
                 <option value="goosemod">GooseMod</option>
-                <option value="flicker">Flicker</option>
                 <option value="none">None</option>
             </select>
             <p class="header" id="settings-mod">Client mod</p>
@@ -133,13 +131,8 @@
                 Client mods are programs that allow you customize your Discord experience. They can change appearance of
                 the client, modify behaviours or add new features!
                 <br />
-                <b>Cumcord</b> - focuses on making the Discord plugin development experience easier. Minimal and
-                lightweight.
-                <br />
                 <b>GooseMod</b> - light, secure, and easy to use, with out of the box experience. Features a built-in
                 store for plugins.
-                <br />
-                <b>Flicker</b> - heavily work in progress, doesn't have a working UI.
             </p>
         </div>
         <br />
@@ -178,8 +171,8 @@
         <br />
         <div class="switch acAdvSettings">
             <h1 class="center advancedText">⚠️ Advanced User Zone ⚠️</h1>
-            <br>
-            <br>
+            <br />
+            <br />
             <label class="header" id="settings-skipSplash">Skip Splash Screen (Experimental)</label>
             <input class="tgl tgl-light left" id="skipSplash" type="checkbox" />
             <label class="tgl-btn left" for="skipSplash"></label>
diff --git a/src/utils.ts b/src/utils.ts
index ec32b77..5d0adcb 100644
--- a/src/utils.ts
+++ b/src/utils.ts
@@ -40,7 +40,7 @@ export function setup() {
         minimizeToTray: true,
         automaticPatches: false,
         alternativePaste: false,
-        mods: "cumcord",
+        mods: "none",
         performanceMode: "none",
         skipSplash: false,
         inviteWebsocket: true,
