diff --git a/build/installer.nsh b/build/installer.nsh deleted file mode 100644 index 06b5934..0000000 --- a/build/installer.nsh +++ /dev/null @@ -1,8 +0,0 @@ -!macro preInit - SetRegView 64 - WriteRegExpandStr HKLM "${INSTALL_REGISTRY_KEY}" InstallLocation "$LocalAppData\ArmCord" - WriteRegExpandStr HKCU "${INSTALL_REGISTRY_KEY}" InstallLocation "$LocalAppData\ArmCord" - SetRegView 32 - WriteRegExpandStr HKLM "${INSTALL_REGISTRY_KEY}" InstallLocation "$LocalAppData\ArmCord" - WriteRegExpandStr HKCU "${INSTALL_REGISTRY_KEY}" InstallLocation "$LocalAppData\ArmCord" -!macroend \ No newline at end of file diff --git a/package.json b/package.json index 512a130..92abc28 100644 --- a/package.json +++ b/package.json @@ -40,17 +40,6 @@ "ws": "^8.8.1" }, "build": { - "nsis": { - "include": "build/installer.nsh" - }, - "files": [ - "!*", - "assets", - "node_modules", - "ts-out", - "package.json", - "LICENSE" - ], "appId": "com.smartfridge.armcord", "productName": "ArmCord", "mac": { diff --git a/src/extensions/mods.ts b/src/extensions/mods.ts index 9821a12..fb2c5c2 100644 --- a/src/extensions/mods.ts +++ b/src/extensions/mods.ts @@ -28,7 +28,7 @@ const unstrictCSP = () => { "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" + "https://localhost:1234/dist.js" ]; electron.session.defaultSession.webRequest.onHeadersReceived(({responseHeaders, url}, done) => { diff --git a/src/preload/preload.ts b/src/preload/preload.ts index 52cf93e..ac6ccf7 100644 --- a/src/preload/preload.ts +++ b/src/preload/preload.ts @@ -3,7 +3,7 @@ import "./capturer"; import "./patch"; import * as fs from "fs"; import * as path from "path"; -import {injectHummusTitlebar, injectTitlebar} from "./titlebar"; +import {injectTitlebar} from "./titlebar"; import {sleep, addStyle, injectJS, addScript} from "../utils"; import {ipcRenderer} from "electron"; import {injectMobileStuff} from "./mobile"; @@ -25,8 +25,7 @@ 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" + flicker: "https://raw.githubusercontent.com/FlickerMod/dist/main/build.js" }; console.log("ArmCord " + version); @@ -37,11 +36,7 @@ if (window.location.href.indexOf("splash.html") > -1) { console.log("Skipping titlebar injection and client mod injection."); } else { if (ipcRenderer.sendSync("titlebar")) { - if (ipcRenderer.sendSync("channel")) { - injectHummusTitlebar(); - } else { - injectTitlebar(); - } + injectTitlebar(); } if (ipcRenderer.sendSync("mobileMode")) { injectMobileStuff(); @@ -66,11 +61,6 @@ if (window.location.href.indexOf("splash.html") > -1) { console.log("Loading FlickerMod..."); await updateLang(); break; - case "cordwood": - injectJS(clientMods.cordwood); - console.log("Loading Cordwood..."); - await updateLang(); - break; } }); } diff --git a/src/preload/titlebar.ts b/src/preload/titlebar.ts index bd54ef6..a3fe1bc 100644 --- a/src/preload/titlebar.ts +++ b/src/preload/titlebar.ts @@ -54,42 +54,3 @@ export function injectTitlebar() { }); }); } -export function injectHummusTitlebar() { - document.addEventListener("DOMContentLoaded", function (event) { - var elem = document.createElement("div"); - elem.innerHTML = ` - - `; - elem.classList.add("win-buttons"); - elem.classList.add("win-buttons-light"); - document.getElementsByClassName("titlebar")[0].appendChild(elem); - document.body.setAttribute("customTitlebar", ""); - document.body.setAttribute("armcord-platform", os.platform()); - addStyle(".chat>.title-wrap {width: 87% !important;}"); - addStyle(".friends-header {width: 91% !important;}"); - var minimize = document.getElementById("minimize"); - var maximize = document.getElementById("maximize"); - var quit = document.getElementById("quit"); - - minimize!.addEventListener("click", () => { - ipcRenderer.send("win-minimize"); - }); - - maximize!.addEventListener("click", () => { - if (ipcRenderer.sendSync("win-isMaximized") == true) { - ipcRenderer.send("win-unmaximize"); - document.body.removeAttribute("isMaximized"); - } else if (ipcRenderer.sendSync("win-isNormal") == true) { - ipcRenderer.send("win-maximize"); - } - }); - - quit!.addEventListener("click", () => { - if (ipcRenderer.sendSync("minimizeToTray") === true) { - ipcRenderer.send("win-hide"); - } else if (ipcRenderer.sendSync("minimizeToTray") === false) { - ipcRenderer.send("win-quit"); - } - }); - }); -} diff --git a/src/settings/settings.html b/src/settings/settings.html index 355e8ff..a75a8d2 100644 --- a/src/settings/settings.html +++ b/src/settings/settings.html @@ -112,9 +112,8 @@ PTB - public test build. Receives features earlier than stable but is a bit older than Canary.
- Hummus - unofficial instance of Discord that takes you back to 2016! Only client mod - available to run alongside with it is Cordwood. It's run by community, so you take all the risk by - using it. + Hummus - unofficial instance of Discord that takes you back to 2016! None of the client mods + bundled with ArmCord work with it. It's run by community, so you take all the risk by using it.

@@ -169,13 +168,6 @@

⚠️Advanced user zone⚠️

-
- - - -

Skips ArmCord splash screen when you start up the app.

-
-

@@ -214,7 +206,6 @@ document.getElementById("tray").checked = await settings.get("minimizeToTray"); document.getElementById("websocket").checked = await settings.get("inviteWebsocket"); document.getElementById("alternativePaste").checked = await settings.get("alternativePaste"); - document.getElementById("skipSplash").checked = await settings.get("skipSplash"); document.getElementById("mobile").checked = await settings.get("mobileMode"); document.getElementById("patches").value = await settings.get("automaticPatches"); document.getElementById("mod").value = await settings.get("mods"); @@ -231,7 +222,6 @@ armcordCSP: document.getElementById("csp").checked, minimizeToTray: document.getElementById("tray").checked, alternativePaste: document.getElementById("alternativePaste").checked, - skipSplash: document.getElementById("skipSplash").checked, automaticPatches: document.getElementById("patches").checked, mods: document.getElementById("mod").value, mobileMode: document.getElementById("mobile").checked, diff --git a/src/utils.ts b/src/utils.ts index 9e7b619..759c1c9 100644 --- a/src/utils.ts +++ b/src/utils.ts @@ -42,7 +42,6 @@ export function setup() { alternativePaste: false, mods: "cumcord", performanceMode: "none", - skipSplash: false, inviteWebsocket: true, mobileMode: false, trayIcon: "ac_plug_colored", @@ -192,7 +191,6 @@ export interface Settings { alternativePaste: boolean; mods: string; mobileMode: boolean, - skipSplash: boolean, performanceMode: string; inviteWebsocket: boolean; trayIcon: string; diff --git a/src/window.ts b/src/window.ts index 0a09cd2..2ca3fdf 100644 --- a/src/window.ts +++ b/src/window.ts @@ -126,29 +126,7 @@ async function doAfterDefiningTheWindow() { mainWindow.setSize(390, 470); await mainWindow.loadFile(path.join(__dirname, "/content/setup.html")); } else { - if (await getConfig("skipSplash") == true) { - switch (await getConfig("channel")) { - case "stable": - mainWindow.loadURL("https://discord.com/app"); - break; - case "canary": - mainWindow.loadURL("https://canary.discord.com/app"); - break; - case "ptb": - mainWindow.loadURL("https://ptb.discord.com/app"); - break; - case "hummus": - mainWindow.loadURL("https://hummus.sys42.net/"); - break; - case undefined: - mainWindow.loadURL("https://discord.com/app"); - break; - default: - mainWindow.loadURL("https://discord.com/app"); - } - } else { - await mainWindow.loadFile(path.join(__dirname, "/content/splash.html")); - } + await mainWindow.loadFile(path.join(__dirname, "/content/splash.html")); } } export function createCustomWindow() {