diff --git a/package.json b/package.json index a49192b..2bba826 100644 --- a/package.json +++ b/package.json @@ -7,6 +7,7 @@ "build": "tsc && copyfiles -u 1 src/**/*.html src/**/**/*.css ts-out/ && copyfiles package.json ts-out/ && copyfiles assets/**/** ts-out/", "watch": "tsc -w", "start": "npm run build && electron ./ts-out/main.js", + "startNoSandbox": "npm run build && electron ./ts-out/main.js --no-sandbox", "package": "npm run build && electron-builder", "packageQuick": "npm run build && electron-builder --dir", "format": "prettier --write src/**/*", diff --git a/src/preload/bridge.ts b/src/preload/bridge.ts index 1365f1e..1697584 100644 --- a/src/preload/bridge.ts +++ b/src/preload/bridge.ts @@ -15,7 +15,6 @@ contextBridge.exposeInMainWorld("armcord", { }, electron: process.versions.electron, channel: ipcRenderer.sendSync("channel"), - setLang: (lang: string) => ipcRenderer.send("setLang", lang), setPingCount: (pingCount: number) => ipcRenderer.send("setPing", pingCount), setTrayIcon: (favicon: string) => ipcRenderer.send("sendTrayIcon", favicon), getLang: (toGet: string) => diff --git a/src/preload/preload.ts b/src/preload/preload.ts index f581fdf..d93dca0 100644 --- a/src/preload/preload.ts +++ b/src/preload/preload.ts @@ -4,7 +4,7 @@ import "./patch"; import * as fs from "fs"; import * as path from "path"; import {injectHummusTitlebar, injectTitlebar} from "./titlebar"; -import {sleep, addStyle, injectJS, addScript} from "../utils"; +import {sleep, addStyle, injectJS} from "../utils"; import {ipcRenderer} from "electron"; import {injectMobileStuff} from "./mobile"; var version = ipcRenderer.sendSync("displayVersion"); @@ -13,10 +13,9 @@ 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();`); - // haha get patched kid + const value = `; ${document.cookie}`; + const parts: any = value.split(`; locale=`); + if (parts.length === 2) ipcRenderer.send("setLang", parts.pop().split(";").shift()); } } declare global {