prune things I don't want

SomeAspy · Sep 15, 2024 · c1d8582 · c1d8582
1 parent da80b8b
commit c1d8582
Show file tree

Hide file tree

Showing 10 changed files with 85 additions and 27 deletions.
diff --git a/electron.vite.config.js b/electron.vite.config.js
@@ -1,3 +1,4 @@
+// @ts-check
 import { defineConfig } from "electron-vite";
 
 export default defineConfig(() => {
@@ -10,9 +11,6 @@ export default defineConfig(() => {
                     entry: "src/preload/preload.mts",
                 }
             }
-        },
-        renderer: {
-
         }
     }
 })
diff --git a/eslint.config.js b/eslint.config.js
@@ -12,7 +12,7 @@ export default tseslint.config(
         languageOptions: {
             parserOptions: {
                 project: true,
-                tsconfigRootDir: import.meta.dirname
+                tsconfigRootDir: "./tsconfig.json"
             }
         },
         rules: {

diff --git a/package.json b/package.json
@@ -17,7 +17,6 @@
         "electron-builder": "^25.0.5",
         "electron-vite": "^2.3.0",
         "eslint": "^9.10.0",
-        "eslint-config-prettier": "^9.1.0",
         "prettier": "^3.3.3",
         "typescript": "^5.6.2",
         "typescript-eslint": "^8.5.0"

diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
diff --git a/src/@types/config.d.ts b/src/@types/config.d.ts
@@ -3,6 +3,5 @@ export interface Config {
     channel: "stable" | "ptb" | "canary";
     multiInstance: boolean;
     mods: "vencord"[];
-    autoHideMenuBar: boolean;
     tray: boolean;
 }
diff --git a/src/main/discord/discordWindow.ts b/src/main/discord/discordWindow.ts
@@ -9,7 +9,7 @@ export async function createDiscordWindow() {
             preload: join(import.meta.dirname, "../preload/preload.mjs"),
             nodeIntegration: true
         },
-        autoHideMenuBar: getConfig("autoHideMenuBar")
+        autoHideMenuBar: true
     });
 
     const channel = getConfig("channel");

diff --git a/src/main/tray.ts b/src/main/tray.ts
@@ -2,6 +2,7 @@ import {app, Menu, nativeImage, Tray, type WebContents} from "electron";
 import icon from "../../resources/placeholderTrayIcon.png?asset";
 
 export function startTray(pageData: WebContents) {
+    // Strange ESLint and TSC fighting here
     // eslint-disable-next-line @typescript-eslint/no-unnecessary-type-assertion
     const tray = new Tray(icon as string);
     tray.setToolTip("Acorn");
@@ -17,9 +18,13 @@ export function startTray(pageData: WebContents) {
     );
     pageData.on("page-favicon-updated", (_, favicons) => {
         try {
-            tray.setImage(nativeImage.createFromDataURL(favicons[0]!));
+            let favicon = nativeImage.createFromDataURL(favicons[0]!);
+            if (process.platform === "win32") {
+                favicon = favicon.resize({height: 32}); // Windows scaling disaster
+            }
+            tray.setImage(favicon);
         } catch {
-            return; // NOTE - Discord will send a URL before fully loaded
+            return; // Discord will send a URL before fully loaded
         }
     });
 }
diff --git a/src/renderer/index.html b/src/renderer/index.html
diff --git a/src/renderer/index.ts b/src/renderer/index.ts
diff --git a/src/shared/config.ts b/src/shared/config.ts
@@ -10,7 +10,6 @@ function makeConfig() {
         channel: "stable",
         multiInstance: false,
         mods: ["vencord"],
-        autoHideMenuBar: true,
         tray: true
     } as Config;
     writeFileSync(configLocation, JSON.stringify(config, null, 2), {encoding: "utf8", flag: "w"});