fetch and linux fixes

src/common/config.ts

@@ -126,8 +126,9 @@ export async function checkIfConfigIsBroken(): Promise<void> {
 
 export function setup(): void {
     console.log("Setting up temporary ArmCord settings.");
+    const isLinux = process.platform === "linux";
     const defaults: Settings = {
-        windowStyle: "default",
+        windowStyle: isLinux ? "native" : "default",
         channel: "stable",
         armcordCSP: true,
         minimizeToTray: true,

src/common/dom.ts

@@ -1,3 +1,5 @@
+import fetch from "cross-fetch";
+
 export function addStyle(styleString: string): void {
     const style = document.createElement("style");
     style.textContent = styleString;

src/common/version.ts

@@ -7,8 +7,5 @@ export function getVersion(): string {
     return app.getVersion();
 }
 export function getDisplayVersion(): string {
-    if ((app.getVersion() == process.versions.electron) == true) {
-        return "Dev Build";
-    }
-    return app.getVersion();
+    return getVersion();
 }

src/discord/extensions/mods.ts

@@ -1,6 +1,7 @@
 import {app, dialog} from "electron";
 import extract from "extract-zip";
 import path from "path";
+import fetch from "cross-fetch";
 import {getConfig} from "../../common/config";
 import fs from "fs";
 import util from "util";

src/discord/window.ts

@@ -79,7 +79,7 @@ async function doAfterDefiningTheWindow(): Promise<void> {
         mainWindow.hide(); // please don't flashbang the user
     }
     if ((await getConfig("windowStyle")) == "transparency" && process.platform === "win32") {
-        // mainWindow.setBackgroundMaterial("mica");
+        //mainWindow.setBackgroundMaterial("mica");
         if ((await getConfig("startMinimized")) == false) {
             mainWindow.show();
         }

src/setup/setup.html

@@ -127,9 +127,15 @@
                         "linuxNotice"
                     ).innerHTML = `Linux may not work well with tray icons. Depending on your system configuration, you may not be able to see the tray icon. Enable at your own risk. Can be changed later.`;
                 }
+                let useNativeLinux;
+                if (window.armcordinternal.getOS == "linux") {
+                    useNativeLinux = "native";
+                } else {
+                    useNativeLinux = "default";
+                }
                 document.getElementById("next-page4").addEventListener("click", () => {
                     window.armcordinternal.saveSettings({
-                        windowStyle: "default",
+                        windowStyle: useNativeLinux,
                         channel: options.channel,
                         armcordCSP: true,
                         minimizeToTray: true,

src/themeManager/main.ts

@@ -1,6 +1,7 @@
 import {BrowserWindow, app, dialog, ipcMain, shell} from "electron";
 import path from "path";
 import fs from "fs";
+import fetch from "cross-fetch";
 import {sleep} from "../common/sleep";
 import {createInviteWindow, mainWindow} from "../discord/window";
 let themeWindow: BrowserWindow;