diff --git a/assets/lang/en-US.json b/assets/lang/en-US.json
index 7dc1551..05132cc 100644
--- a/assets/lang/en-US.json
+++ b/assets/lang/en-US.json
@@ -31,7 +31,7 @@
"settings-channel-desc2": "you're probably most familiar with this one. It's the one you see in default Discord\n client!",
"settings-channel-desc3": "this is alpha test release of Discord. By using it you gain access to the newest\n features and fixes.",
"settings-channel-desc4": "public test build. Receives features earlier than stable but is a bit older than Canary.",
- "settings-channel-desc5": "unofficial instance of Discord that takes you back to 2016! Only client mod\n available to run alongside with it is Cordwood. It's run by community, so you take all the risk by\n using it.",
+ "settings-channel-desc5": "unofficial instance of Discord that takes you back to 2016! None of the client mods\n bundled with ArmCord work with it. It's run by community, so you take all the risk by using it.",
"settings-invitewebsocket": "Invite Websocket",
"settings-invitewebsocket-desc": "When enabled ArmCord will support Discord.gg links which means that if you open an invite link in your\n browser, ArmCord will automatically accept the invite. Can be unresponsive at times.",
"settings-altPaste": "Alternative Paste",
diff --git a/assets/lang/th-TH.json b/assets/lang/th-TH.json
index 73455c6..116c768 100644
--- a/assets/lang/th-TH.json
+++ b/assets/lang/th-TH.json
@@ -14,7 +14,7 @@
"setup_question4": "เลือกไคลเอนต์มอดที่ต้องการติดตั้ง:",
"settings-prfmMode-battery": "ประหยัดแบตเตอรี่",
"setup_question4_clientmodnotice": "ทำไมไม่ใช้พร้อมกันทั้งหมดล่ะ? การมีไคลเอนต์มอดหลายตัวพร้อมกันอาจทำให้เกิดปัญหาได้ หากต้องการที่จะทำจริงๆ ให้ไปดูใน Discord ของเรา",
- "settings-theme": "ธีม ArmCord",
+ "settings-theme": "ธีม ArmCord:",
"settings-theme-default": "ค่าเริ่มต้น",
"settings-theme-native": "ดั้งเดิม",
"settings-tray": "ย่อขนาดหน้าต่าง",
@@ -28,17 +28,17 @@
"settings-save": "บันทึกการตั้งค่า",
"settings-updater": "ตรวจหาการอัปเดต",
"settings-mobileMode": "โหมดมือถือ",
- "settings-theme-desc1": "\"ธีม\" ของ ArmCord เป็นการจัดการลักษณะและการทำงานของแอป",
+ "settings-theme-desc1": "ArmCord \"themes\" manage apps behaviour and looks.",
"settings-patches-desk": "Fetches automatic patches that are distributed if release turns out to have bugs after release. Usually\n you don't have to keep this enabled, unless notified in support Discord.",
"settings-mobileMode-desc": "If you're on a device with touch-screen this feature is for you! It activates Discord's hidden mobile\n mode meant for phones and tablets. Only major feature missing is voice chat support. This is ideal for\n users on PinePhone and similar.",
"settings-channel-desc1": "You can use this setting to change current instance of Discord:",
"settings-channel-desc2": "you're probably most familiar with this one. It's the one you see in default Discord\n client!",
"settings-altPaste": "Alternative Paste",
"settings-trayIcon": "Tray icon",
- "settings-theme-desc2": "นี่คือหน้าตา ArmCord ตอนที่เปิดครั้งแรก เป็นการปรับปรุงจากหน้าตาเดิมของ Discord\n แถบชื่อหน้าต่างและหน้าตาใหม่ ๆ ที่ ArmCord เปลี่ยน Discord",
- "settings-theme-desc3": "ใช้แถบชื่อหน้าต่างเริ่มต้นของระบบปฏิบัติการที่กำลังใช้อยู่ (เช่น Windows 7/10) ตัวเลือกคล้ายกันกับ\n แอป Discord ใน Linux",
- "settings-csp-desc": "ArmCord CSP คือระบบที่จัดการการโหลดเนื้อหากำหนดเองลงไปในแอป Discord สิ่งอย่างเช่น สิ่งอย่างเช่น\n ไคลแอนต์มอด ธีม ต้องใช้มัน สามารถปิดใช้งานได้หากต้องการปิดมอดและหน้าตากำหนดเอง",
- "settings-tray-desc": "เมื่อปิด ArmCord จะปิดเหมือนหน้าตาอื่น ๆ เมื่อปิด ไม่อย่างนั้นมันจะนั่งนิ่ง\n ในถาดระบบภายหลัง",
+ "settings-theme-desc2": "this is how ArmCord looks when you first launch it. It includes recreation of Discord's\n custom titlebar and ArmCord specific styles injected into Discord.",
+ "settings-theme-desc3": "uses native titlebar of OS you're currently running (e.g Windows 7/10). Functions more\n similar to actual Discord app on Linux.",
+ "settings-csp-desc": "ArmCord CSP is our system that manages loading custom content loading into the Discord app. Stuff like\n client mods and themes depend on it. Disable if you want to get rid of mods and custom styles.",
+ "settings-tray-desc": "When disabled, ArmCord will close like any other window when closed, otherwise it'll sit back and relax\n in your system tray for later.",
"settings-channel-desc3": "this is alpha test release of Discord. By using it you gain access to the newest\n features and fixes.",
"settings-channel-desc4": "public test build. Receives features earlier than stable but is a bit older than Canary.",
"settings-channel-desc5": "unofficial instance of Discord that takes you back to 2016! None of the client mods\n bundled with ArmCord work with it. It's run by community, so you take all the risk by using it.",
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 9d64bfe..2cf0a0b 100644
--- a/package.json
+++ b/package.json
@@ -40,17 +40,6 @@
"ws": "^8.8.0"
},
"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.