docker-compose.yml

@@ -1,47 +0,0 @@
-# These are supposed to run and tested indenpendently, not at the same time. Please
-# build them however you like, but always run each at a time if testing for GUI.
-
-services:
-  debian-bookworm:
-    build:
-      context: .
-      dockerfile: ./docker/Dockerfile.bookworm
-    ports:
-      - "5900:5900"
-    volumes:
-      - ./docker/start.sh:/start.sh
-    command: ["/bin/bash", "/start.sh"]
-
-  archlinux:
-    build:
-      context: .
-      dockerfile: ./docker/Dockerfile.pacman
-    ports:
-      - "5901:5900"
-    volumes:
-      - ./docker/start.sh:/start.sh
-    command: ["/bin/bash", "/start.sh"]
-
-  ubuntu:
-    build:
-      context: .
-      dockerfile: ./docker/Dockerfile.ubuntu
-    ports:
-      - "5902:5900"
-    volumes:
-      - ./docker/start.sh:/start.sh
-    command: ["/bin/bash", "/start.sh"]
-
-  debian-trixie:
-    build:
-      context: .
-      dockerfile: ./docker/Dockerfile.trixie
-    ports:
-      - "5900:5900"
-    volumes:
-      - ./docker/start.sh:/start.sh
-    command: ["/bin/bash", "/start.sh"]
-
-networks:
-  default:
-    driver: bridge

docker/Dockerfile.bookworm

@@ -1,21 +0,0 @@
-FROM debian:bookworm
-
-WORKDIR /app
-
-COPY ./dist/*.deb .
-
-RUN <<EOF
-apt-get update -y && apt-get upgrade -y
-apt-get install ./*.deb -y
-apt-get install -qqy x11-apps x11vnc xvfb
-
-EOF
-
-RUN mkdir ~/.vnc && x11vnc -storepasswd 1234 ~/.vnc/passwd
-
-COPY docker/start.sh /start.sh
-RUN chmod +x /start.sh
-
-EXPOSE 5900
-
-CMD ["/start.sh"]

docker/Dockerfile.deb

@@ -0,0 +1,21 @@
+FROM ubuntu
+
+WORKDIR /app
+
+COPY ./dist/*.deb .
+
+RUN apt-get update -y && apt-get upgrade -y
+
+RUN apt-get install ./*.deb -y
+
+RUN apt-get install -qqy x11-apps x11vnc xvfb
+
+RUN mkdir ~/.vnc
+RUN x11vnc -storepasswd 1234 ~/.vnc/passwd
+
+COPY docker/start.sh /start.sh
+RUN chmod +x /start.sh
+
+EXPOSE 5900
+
+CMD ["/start.sh"]

docker/Dockerfile.pacman

@@ -4,14 +4,14 @@ WORKDIR /app
 
 COPY ./dist/*.pacman .
 
-RUN <<EOF
-pacman -Syu --noconfirm
-pacman -U --noconfirm ./*.pacman
-pacman -Syu --noconfirm x11vnc xorg-server-xvfb
+RUN pacman -Syu --noconfirm
 
-EOF
+RUN pacman -U --noconfirm ./*.pacman
 
-RUN mkdir ~/.vnc && x11vnc -storepasswd 1234 ~/.vnc/passwd
+RUN pacman -Syu --noconfirm x11vnc xorg-server-xvfb
+
+RUN mkdir ~/.vnc
+RUN x11vnc -storepasswd 1234 ~/.vnc/passwd
 
 COPY docker/start.sh /start.sh
 RUN chmod +x /start.sh

docker/Dockerfile.trixie

@@ -1,21 +0,0 @@
-FROM debian:trixie
-
-WORKDIR /app
-
-COPY ./dist/*.deb .
-
-RUN <<EOF
-apt-get update -y && apt-get upgrade -y
-apt-get install ./*.deb -y
-apt-get install -qqy x11-apps x11vnc xvfb
-
-EOF
-
-RUN mkdir ~/.vnc && x11vnc -storepasswd 1234 ~/.vnc/passwd
-
-COPY docker/start.sh /start.sh
-RUN chmod +x /start.sh
-
-EXPOSE 5900
-
-CMD ["/start.sh"]

docker/Dockerfile.ubuntu

@@ -1,21 +0,0 @@
-FROM ubuntu
-
-WORKDIR /app
-
-COPY ./dist/*.deb .
-
-RUN <<EOF
-apt-get update -y && apt-get upgrade -y
-apt-get install ./*.deb -y
-apt-get install -qqy x11-apps x11vnc xvfb
-
-EOF
-
-RUN mkdir ~/.vnc && x11vnc -storepasswd 1234 ~/.vnc/passwd
-
-COPY docker/start.sh /start.sh
-RUN chmod +x /start.sh
-
-EXPOSE 5900
-
-CMD ["/start.sh"]

electron-builder.ts

@@ -102,19 +102,7 @@ export const config: Configuration = {
     deb: {
         category: "Network",
         icon: "build/icon.icns",
-        depends: [
-            "libasound2",
-            "libnspr4",
-            "libnss3",
-            "libasound2-plugins",
-            "libatk1.0-0 | libatk1.0-0t64",
-            "libatk-bridge2.0-0",
-            "libgbm1",
-            "libasound2t64 | libasound2",
-            "libcups2",
-            "libgtk3.0 | libgtk-3-0",
-            "at-spi2-common",
-        ],
+        depends: ["libasound2", "libnspr4", "libnss3", "libasound2t64", "libasound2-plugins"],
         desktop: {
             entry: {
                 Actions: availableActions,

src/discord/preload/patches.mts

@@ -264,22 +264,20 @@ async function load() {
         addStyle("legcord://assets/css/discord.css");
     });
     injectJS("legcord://assets/js/patchVencordQuickCSS.js");
-
     // Settings info version injection
-    addScript(`(() => {
-        const versionElm = document.createElement("style");
-        versionElm.appendChild(document.createTextNode(\`
-            div[class*="compactInfo"] {
-                margin-bottom: 15px;
-            }
-            div[class*="compactInfo"] > span::before {
-                content: "Legcord Version: ${version}";
-                color: inherit;
-                position: absolute;
-                margin-top: 20px;
-            }
-        \`));
-        document.body.append(versionElm);
-    })()`);
+    const observer = new MutationObserver(() => {
+        if (document.body.querySelector("#ac-ver")) return;
+
+        const info = document.body.querySelector('[class*="sidebar"] [class*="compactInfo"]');
+        const host = info?.parentElement;
+        if (!host || !/(stable|ptb|canary) \d+|Electron|Chromium/i.test(host.textContent)) return;
+
+        const el = host.querySelector("span")!.cloneNode() as HTMLSpanElement;
+        el.id = "ac-ver";
+        el.textContent = `Legcord Version: ${version}`;
+        info.after(el);
+        observer.disconnect();
+    });
+    observer.observe(document.body, { childList: true, subtree: true });
 }
 load();