diff --git a/.github/workflows/dev.yml b/.github/workflows/dev.yml
index b1429d2..0c540d3 100644
--- a/.github/workflows/dev.yml
+++ b/.github/workflows/dev.yml
@@ -113,40 +113,7 @@ jobs:
with:
name: ArmCordWindows.zip
path: dist/ArmCord-3.1.0-win.zip
- build-windowsOnARM:
- runs-on: windows-latest
-
- steps:
- - uses: actions/setup-node@v3
- with:
- node-version: '18'
-
- - name: Checkout code
- uses: actions/checkout@v2
-
- - name: Set architecture
- run: set npm_config_arch=arm64
-
- - uses: pnpm/action-setup@v2 # Install pnpm using packageManager key in package.json
-
- - name: Install Node dependencies
- run: pnpm install -g cargo-cp-artifact && pnpm install
-
- - name: Install Electron-Builder
- run: pnpm install -g electron-builder
-
- - name: Replace the version number
- run: (Get-Content src/utils.ts) -replace "\d\.\d\.\d", "DEV" | Out-File src/utils.ts
-
- - name: Build
- run: npm run build && electron-builder --windows zip --arm64
- env:
- GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
- - name: Upload artifact
- uses: actions/upload-artifact@v2
- with:
- name: ArmCordWindowsArm64.zip
- path: dist/ArmCord-3.1.0-win.zip
+
release:
runs-on: ubuntu-latest
diff --git a/package.json b/package.json
index 98ed1b3..8ddec2f 100644
--- a/package.json
+++ b/package.json
@@ -28,21 +28,18 @@
"homepage": "https://github.com/armcord/armcord#readme",
"devDependencies": {
"@types/node": "^17.0.42",
- "@types/node-fetch": "^2.6.2",
"@types/ws": "^8.5.3",
"chalk-cli": "^5.0.0",
"copyfiles": "^2.4.1",
"electron": "^20.1.0",
- "electron-builder": "^23.6.0",
+ "electron-builder": "^23.0.3",
"husky": "^8.0.1",
"prettier": "^2.7.0",
"typescript": "^4.7.3"
},
"dependencies": {
- "@pyke/vibe": "github:pykeio/vibe#11984868ce9e007859ed91ff159c7f7f0a34e7ae",
+ "@pyke/vibe": "^0.3.1",
"electron-context-menu": "github:ArmCord/electron-context-menu",
- "extract-zip": "^2.0.1",
- "node-fetch": "v2",
"os-locale": "^6.0.2",
"v8-compile-cache": "^2.3.0",
"ws": "^8.8.0"
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index d4dd7f3..1c83e3e 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -1,18 +1,15 @@
lockfileVersion: 5.4
specifiers:
- '@pyke/vibe': github:pykeio/vibe#11984868ce9e007859ed91ff159c7f7f0a34e7ae
+ '@pyke/vibe': ^0.3.1
'@types/node': ^17.0.42
- '@types/node-fetch': ^2.6.2
'@types/ws': ^8.5.3
chalk-cli: ^5.0.0
copyfiles: ^2.4.1
electron: ^20.1.0
- electron-builder: ^23.6.0
+ electron-builder: ^23.0.3
electron-context-menu: github:ArmCord/electron-context-menu
- extract-zip: ^2.0.1
husky: ^8.0.1
- node-fetch: v2
os-locale: ^6.0.2
prettier: ^2.7.0
typescript: ^4.7.3
@@ -20,17 +17,14 @@ specifiers:
ws: ^8.8.0
dependencies:
- '@pyke/vibe': github.com/pykeio/vibe/11984868ce9e007859ed91ff159c7f7f0a34e7ae_electron@20.3.1
+ '@pyke/vibe': 0.3.1_electron@20.3.1
electron-context-menu: github.com/ArmCord/electron-context-menu/280c81398c02a063f46e3285a9708d8db1a7ce32
- extract-zip: 2.0.1
- node-fetch: 2.6.7
os-locale: 6.0.2
v8-compile-cache: 2.3.0
ws: 8.9.0
devDependencies:
'@types/node': 17.0.45
- '@types/node-fetch': 2.6.2
'@types/ws': 8.5.3
chalk-cli: 5.0.0
copyfiles: 2.4.1
@@ -126,6 +120,16 @@ packages:
- supports-color
dev: true
+ /@pyke/vibe/0.3.1_electron@20.3.1:
+ resolution: {integrity: sha512-qgYtiN3cjJUdzBPHYXHILLiug//g1QXw7jLtDCi6HqCPxeIcn8zMslGlAAwS5i9e14UrHaSTUWkLEFEhWidfeQ==}
+ requiresBuild: true
+ peerDependencies:
+ electron: '>=11.0'
+ dependencies:
+ cargo-cp-artifact: 0.1.6
+ electron: 20.3.1
+ dev: false
+
/@sindresorhus/is/0.14.0:
resolution: {integrity: sha512-9NET910DNaIPngYnLLPeg+Ogzqsi9uM4mSboU5y6p8S5DzMTVEsJZrawi+BoDNUVBa2DhJqQYUFvMDfgU062LQ==}
engines: {node: '>=6'}
@@ -180,13 +184,6 @@ packages:
resolution: {integrity: sha512-iiUgKzV9AuaEkZqkOLDIvlQiL6ltuZd9tGcW3gwpnX8JbuiuhFlEGmmFXEXkN50Cvq7Os88IY2v0dkDqXYWVgA==}
dev: true
- /@types/node-fetch/2.6.2:
- resolution: {integrity: sha512-DHqhlq5jeESLy19TYhLakJ07kNumXWjcDdxXsLUMJZ6ue8VZJj4kLPQVE/2mdHh3xZziNF1xppu5lwmS53HR+A==}
- dependencies:
- '@types/node': 17.0.45
- form-data: 3.0.1
- dev: true
-
/@types/node/16.11.64:
resolution: {integrity: sha512-z5hPTlVFzNwtJ2LNozTpJcD1Cu44c4LNuzaq1mwxmiHWQh2ULdR6Vjwo1UGldzRpzL0yUEdZddnfqGW2G70z6Q==}
@@ -338,7 +335,6 @@ packages:
/asar/3.2.0:
resolution: {integrity: sha512-COdw2ZQvKdFGFxXwX3oYh2/sOsJWJegrdJCGxnN4MZ7IULgRBp9P6665aqj9z1v9VwP4oP1hRBojRDQ//IGgAg==}
engines: {node: '>=10.12.0'}
- deprecated: Please use @electron/asar moving forward. There is no API change, just a package name change
hasBin: true
dependencies:
chromium-pickle-js: 0.2.0
@@ -384,7 +380,6 @@ packages:
/base64-js/1.5.1:
resolution: {integrity: sha512-AKpaYlHn8t4SVbOHCy+b5+KKgvR4vrsD8vbvrbiQJps7fKDTkjkDry6ji0rUJjC0kzbNePLwzxq8iypo41qeWA==}
- requiresBuild: true
dev: true
/bluebird-lst/1.0.9:
@@ -981,12 +976,10 @@ packages:
/fast-deep-equal/3.1.3:
resolution: {integrity: sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q==}
- requiresBuild: true
dev: true
/fast-json-stable-stringify/2.1.0:
resolution: {integrity: sha512-lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw==}
- requiresBuild: true
dev: true
/fd-slicer/1.1.0:
@@ -1008,15 +1001,6 @@ packages:
path-exists: 4.0.0
dev: true
- /form-data/3.0.1:
- resolution: {integrity: sha512-RHkBKtLWUVwd7SqRIvCZMEvAMoGUp0XU+seQiZejj0COz3RI3hWP4sCv3gZWWLjJTd7rGwcsF5eKZGii0r/hbg==}
- engines: {node: '>= 6'}
- dependencies:
- asynckit: 0.4.0
- combined-stream: 1.0.8
- mime-types: 2.1.35
- dev: true
-
/form-data/4.0.0:
resolution: {integrity: sha512-ETEklSGi5t0QMZuiXoA/Q6vcnxcLQP5vdugSpuAyi6SVGi2clPPp+xgEhuMaHC+zGgn31Kd235W35f7Hykkaww==}
engines: {node: '>= 6'}
@@ -1367,7 +1351,6 @@ packages:
/json-schema-traverse/0.4.1:
resolution: {integrity: sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==}
- requiresBuild: true
dev: true
/json-stringify-safe/5.0.1:
@@ -1574,18 +1557,6 @@ packages:
dev: true
optional: true
- /node-fetch/2.6.7:
- resolution: {integrity: sha512-ZjMPFEfVx5j+y2yF35Kzx5sF7kDzxuDj6ziH4FFbOp87zKDZNx8yExJIb05OGF4Nlt9IHFIMBkRl41VdvcNdbQ==}
- engines: {node: 4.x || >=6.0.0}
- peerDependencies:
- encoding: ^0.1.0
- peerDependenciesMeta:
- encoding:
- optional: true
- dependencies:
- whatwg-url: 5.0.0
- dev: false
-
/noms/0.0.0:
resolution: {integrity: sha512-lNDU9VJaOPxUmXcLb+HQFeUgQQPtMI24Gt6hgfuMHRJgMRHMF/qZ4HJD3GDru4sSw9IQl2jPjAYnQrdIeLbwow==}
dependencies:
@@ -1721,7 +1692,6 @@ packages:
/punycode/2.1.1:
resolution: {integrity: sha512-XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A==}
engines: {node: '>=6'}
- requiresBuild: true
dev: true
/pupa/2.1.1:
@@ -2056,10 +2026,6 @@ packages:
resolution: {integrity: sha512-Iq25XBt6zD5npPhlLVXGFN3/gyR2/qODcKNNyTMd4vbm39HUaOiAM4PMq0eMVC/Tkxz+Zjdsc55g9yyz+Yq00Q==}
engines: {node: '>=6'}
- /tr46/0.0.3:
- resolution: {integrity: sha512-N3WMsuqV66lT30CrXNbEjx4GEwlow3v6rr4mCcv6prnfwhS01rkgyFdjPNBYd9br7LpXV1+Emh01fHnq2Gdgrw==}
- dev: false
-
/trim-newlines/4.0.2:
resolution: {integrity: sha512-GJtWyq9InR/2HRiLZgpIKv+ufIKrVrvjQWEj7PxAXNc5dwbNJkqhAUoAGgzRmULAnoOM5EIpveYd3J2VeSAIew==}
engines: {node: '>=12'}
@@ -2116,7 +2082,6 @@ packages:
/uri-js/4.4.1:
resolution: {integrity: sha512-7rKUyy33Q1yc98pQ1DAmLtwX109F7TIfWlW1Ydo8Wl1ii1SeHieeh0HHfPeL2fMXK6z0s8ecKs9frCuLJvndBg==}
- requiresBuild: true
dependencies:
punycode: 2.1.1
dev: true
@@ -2157,17 +2122,6 @@ packages:
dev: true
optional: true
- /webidl-conversions/3.0.1:
- resolution: {integrity: sha512-2JAn3z8AR6rjK8Sm8orRC0h/bcl/DqL7tRPdGZ4I1CjdF+EaMLmYxBHyXuKL849eucPFhvBoxMsflfOb8kxaeQ==}
- dev: false
-
- /whatwg-url/5.0.0:
- resolution: {integrity: sha512-saE57nupxk6v3HY35+jzBwYa0rKSy0XR8JSxZPwgLr7ys0IBzhGviA1/TUGJLmSVqs8pb9AnvICXEuOHLprYTw==}
- dependencies:
- tr46: 0.0.3
- webidl-conversions: 3.0.1
- dev: false
-
/which/2.0.2:
resolution: {integrity: sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==}
engines: {node: '>= 8'}
@@ -2204,7 +2158,6 @@ packages:
/xmlbuilder/15.1.1:
resolution: {integrity: sha512-yMqGBqtXyeN1e3TGYvgNgDVZ3j84W4cwkOXQswghol6APgZWaff9lnbvN7MHYJOiXsvGPXtjTYJEiC9J2wv9Eg==}
engines: {node: '>=8.0'}
- requiresBuild: true
dev: true
/xtend/4.0.2:
@@ -2276,16 +2229,3 @@ packages:
electron-dl: 3.3.1
electron-is-dev: 2.0.0
dev: false
-
- github.com/pykeio/vibe/11984868ce9e007859ed91ff159c7f7f0a34e7ae_electron@20.3.1:
- resolution: {tarball: https://codeload.github.com/pykeio/vibe/tar.gz/11984868ce9e007859ed91ff159c7f7f0a34e7ae}
- id: github.com/pykeio/vibe/11984868ce9e007859ed91ff159c7f7f0a34e7ae
- name: '@pyke/vibe'
- version: 0.3.1
- requiresBuild: true
- peerDependencies:
- electron: '>=11.0'
- dependencies:
- cargo-cp-artifact: 0.1.6
- electron: 20.3.1
- dev: false
diff --git a/src/.npmrc b/src/.npmrc
deleted file mode 100644
index 048b75f..0000000
--- a/src/.npmrc
+++ /dev/null
@@ -1,3 +0,0 @@
-node-linker=hoisted
-public-hoist-pattern=*
-shamefully-hoist=true
\ No newline at end of file
diff --git a/src/content/setup.html b/src/content/setup.html
index 75048c5..47ecd70 100644
--- a/src/content/setup.html
+++ b/src/content/setup.html
@@ -53,9 +53,7 @@
Select a client mod you want to install:
- Vencord
- Shelter
- None
+ None (check Discord)
diff --git a/src/content/splash.html b/src/content/splash.html
index 383b934..f4771d6 100644
--- a/src/content/splash.html
+++ b/src/content/splash.html
@@ -47,25 +47,6 @@
console.log("ArmCord is up to date.");
}
}
-
- function check() {
- if (armcordinternal.installState === "installing") {
- text.innerHTML = "Installing mods";
- } else if (armcordinternal.installState === "done") {
- return true;
- } else if (armcordinternal.installState === "modDownload") {
- text.innerHTML = "Updating " + armcord.mods;
- } else if (armcordinternal.installState === "none") {
- text.innerHTML = "Nothing to install. Starting ArmCord";
- return true;
- } else {
- return true;
- }
- }
-
- while (check() == false) {
- console.log("Installing");
- }
setTimeout(() => {
window.armcord.splashEnd();
switch (window.armcord.channel) {
@@ -87,7 +68,7 @@
default:
window.location.replace("https://discord.com/app");
}
- }, 3000);
+ }, 5000);
}
}
diff --git a/src/extensions/mods.ts b/src/extensions/mods.ts
index ad3cae2..690396e 100644
--- a/src/extensions/mods.ts
+++ b/src/extensions/mods.ts
@@ -21,11 +21,7 @@ const unstrictCSP = () => {
const cspAllowAll = ["connect-src", "style-src", "img-src", "font-src"];
- const corsAllowUrls = [
- "https://raw.githubusercontent.com/Cordwood/builds/master/index.js",
- "https://github.com/Vendicated/Vencord/releases/download/devbuild/browser.js",
- "https://cors.armcord.xyz/raw.githubusercontent.com/uwu/shelter-builds/main/shelter.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/extensions/plugin.ts b/src/extensions/plugin.ts
index b68be0b..cb1a064 100644
--- a/src/extensions/plugin.ts
+++ b/src/extensions/plugin.ts
@@ -12,7 +12,7 @@ app.whenReady().then(() => {
const manifest = fs.readFileSync(`${userDataPath}/plugins/${file}/manifest.json`, "utf8");
var pluginFile = JSON.parse(manifest);
session.defaultSession.loadExtension(`${userDataPath}/plugins/${file}`);
- console.log(`[Mod loader] Loaded ${pluginFile.name} made by ${pluginFile.author}`);
+ console.log(`%cLoaded ${pluginFile.name} made by ${pluginFile.author}`, "color:red");
} catch (err) {
console.error(err);
}
diff --git a/src/ipc.ts b/src/ipc.ts
index 1dd9080..0fbaf1f 100644
--- a/src/ipc.ts
+++ b/src/ipc.ts
@@ -9,14 +9,11 @@ import {
getLang,
getWindowState,
packageVersion,
- getDisplayVersion,
- modInstallState,
- installModLoader
+ getDisplayVersion
} from "./utils";
import {customTitlebar} from "./main";
import {createSettingsWindow} from "./settings/main";
import os from "os";
-import fs from "fs"
import path from "path";
export function registerIpc() {
ipcMain.on("get-app-path", (event, arg) => {
@@ -76,9 +73,6 @@ export function registerIpc() {
ipcMain.on("displayVersion", (event) => {
event.returnValue = getDisplayVersion();
});
- ipcMain.on("modInstallState", (event) => {
- event.returnValue = modInstallState;
- });
ipcMain.on("get-package-version", (event) => {
event.returnValue = packageVersion;
});
diff --git a/src/main.ts b/src/main.ts
index 6bcd596..d3e8b00 100644
--- a/src/main.ts
+++ b/src/main.ts
@@ -1,10 +1,11 @@
// Modules to control application life and create native browser window
import {app, BrowserWindow, session} from "electron";
import "v8-compile-cache";
-import {getConfig, checkIfConfigExists, injectElectronFlags, installModLoader} from "./utils";
+import {getConfig, checkIfConfigExists, injectElectronFlags} from "./utils";
import "./extensions/mods";
+import "./extensions/plugin";
import "./tray";
-import {createCustomWindow, createNativeWindow, createTransparentWindow, mainWindow} from "./window";
+import {createCustomWindow, createNativeWindow, createTransparentWindow} from "./window";
import path from "path";
export var iconPath: string;
export var settings: any;
@@ -52,7 +53,6 @@ app.whenReady().then(async () => {
}
}
await init();
- await installModLoader()
session.fromPartition("some-partition").setPermissionRequestHandler((webContents, permission, callback) => {
if (permission === "notifications") {
// Approves the permissions request
diff --git a/src/preload/bridge.ts b/src/preload/bridge.ts
index 1b9f32c..1697584 100644
--- a/src/preload/bridge.ts
+++ b/src/preload/bridge.ts
@@ -22,7 +22,6 @@ contextBridge.exposeInMainWorld("armcord", {
return result;
}),
version: ipcRenderer.sendSync("get-app-version", "app-version"),
- mods: ipcRenderer.sendSync("clientmod"),
packageVersion: ipcRenderer.sendSync("get-package-version", "app-version"),
getDisplayMediaSelector: getDisplayMediaSelector,
splashEnd: () => ipcRenderer.send("splashEnd"),
@@ -32,7 +31,6 @@ contextBridge.exposeInMainWorld("armcord", {
if (window.location.href.indexOf("splash.html") > -1 || window.location.href.indexOf("setup.html") > -1) {
contextBridge.exposeInMainWorld("armcordinternal", {
restart: () => ipcRenderer.send("restart"),
- installState: ipcRenderer.sendSync("modInstallState"),
saveSettings: (...args: any) => ipcRenderer.send("saveSettings", ...args)
});
}
diff --git a/src/preload/preload.ts b/src/preload/preload.ts
index 8ab16e2..d93dca0 100644
--- a/src/preload/preload.ts
+++ b/src/preload/preload.ts
@@ -1,11 +1,11 @@
-import {ipcRenderer} from "electron";
import "./bridge";
import "./capturer";
import "./patch";
import * as fs from "fs";
import * as path from "path";
import {injectHummusTitlebar, injectTitlebar} from "./titlebar";
-import {sleep, addStyle} from "../utils";
+import {sleep, addStyle, injectJS} from "../utils";
+import {ipcRenderer} from "electron";
import {injectMobileStuff} from "./mobile";
var version = ipcRenderer.sendSync("displayVersion");
var channel = ipcRenderer.sendSync("channel");
@@ -23,6 +23,10 @@ declare global {
armcord: any;
}
}
+const clientMods = {
+ goosemod: "https://api.goosemod.com/inject.js",
+ cordwood: "https://raw.githubusercontent.com/Cordwood/builds/master/index.js"
+};
console.log("ArmCord " + version);
ipcRenderer.on("themeLoader", (event, message) => {
@@ -44,7 +48,19 @@ if (window.location.href.indexOf("splash.html") > -1) {
sleep(5000).then(async () => {
const cssPath = path.join(__dirname, "../", "/content/css/discord.css");
addStyle(fs.readFileSync(cssPath, "utf8"));
- await updateLang();
+
+ switch (ipcRenderer.sendSync("clientmod")) {
+ case "goosemod":
+ injectJS(clientMods.goosemod);
+ console.log("Loading GooseMod...");
+ await updateLang();
+ break;
+ case "cordwood":
+ injectJS(clientMods.cordwood);
+ console.log("Loading Cordwood...");
+ await updateLang();
+ break;
+ }
});
}
/*
diff --git a/src/settings/main.ts b/src/settings/main.ts
index a2b4983..d2d8f42 100644
--- a/src/settings/main.ts
+++ b/src/settings/main.ts
@@ -74,15 +74,15 @@ export function createSettingsWindow() {
setConfigBulk(args);
});
ipcMain.on("openStorageFolder", async (event) => {
- shell.showItemInFolder(storagePath);
+ shell.openPath(storagePath);
await sleep(1000);
});
ipcMain.on("openThemesFolder", async (event) => {
- shell.showItemInFolder(themesPath);
+ shell.openPath(themesPath);
await sleep(1000);
});
ipcMain.on("openPluginsFolder", async (event) => {
- shell.showItemInFolder(pluginsPath);
+ shell.openPath(pluginsPath);
await sleep(1000);
});
ipcMain.on("getLangName", async (event) => {
diff --git a/src/settings/settings.html b/src/settings/settings.html
index 603d2cd..e3aecbf 100644
--- a/src/settings/settings.html
+++ b/src/settings/settings.html
@@ -123,8 +123,7 @@
- Vencord
- Shelter
+ GooseMod
None
@@ -132,9 +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!
Vencord - lightweight, and easy to use client mod. Features a built-in store for plugins.
- Shelter - is a new generation client mod built to be essentially bulletproof.
+ GooseMod - light, secure, and easy to use, with out of the box experience. Features a built-in
+ store for plugins.