fix

test qt6
change config file location
2023-03-05 22:24:10 +01:00 · 2023-03-05 22:15:23 +01:00 · 2023-03-04 13:29:30 +01:00 · 2023-03-04 13:15:11 +01:00 · 2023-03-02 23:15:41 +01:00 · 2023-03-02 17:29:10 +01:00
31 changed files with 7426 additions and 260 deletions
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,3 @@
 /build
+.vscode
+/submodules/arrpc
--- a/.gitmodules
+++ b/.gitmodules
@@ -0,0 +1,3 @@
+[submodule "submodules/rohrkabel"]
+	path = submodules/rohrkabel
+	url = https://github.com/Soundux/rohrkabel
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,17 +1,41 @@
 cmake_minimum_required(VERSION 3.0)
 project(discord-screenaudio)

+include(version.cmake)
+determine_version("${CMAKE_CURRENT_SOURCE_DIR}" DISCORD_SCEENAUDIO)
+add_definitions( -DDISCORD_SCEENAUDIO_VERSION_FULL="${DISCORD_SCEENAUDIO_VERSION_FULL}" )
+
 set(CMAKE_CXX_STANDARD 17)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 set(CMAKE_AUTOMOC ON)
 set(CMAKE_AUTORCC ON)
 set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -DDEBUG")
+string(TIMESTAMP TIMESTAMP %s)
 # set(CMAKE_AUTOUIC ON)

-find_package(Qt5 CONFIG REQUIRED COMPONENTS 
-  Widgets
-  WebEngineWidgets
-)
+find_package(Qt5 COMPONENTS Widgets)
+if (Qt5_FOUND AND NOT DEFINED USE_QT6)
+  message(STATUS "Using Qt 5")
+  find_package(Qt5 CONFIG REQUIRED COMPONENTS Widgets WebEngineWidgets)
+else()
+  message(STATUS "Using Qt 6")
+  find_package(Qt6 CONFIG REQUIRED COMPONENTS Widgets WebEngineWidgets)
+endif()
+
+find_package(KF5Notifications)
+if(KF5Notifications_FOUND)
+  add_definitions( -DKNOTIFICATIONS )
+endif()
+
+find_package(KF5XmlGui)
+if(KF5XmlGui_FOUND)
+  add_definitions( -DKXMLGUI )
+endif()
+
+find_package(KF5GlobalAccel)
+if(KF5GlobalAccel_FOUND)
+  add_definitions( -DKGLOBALACCEL )
+endif()

 set(discord-screenaudio_SRC
  src/main.cpp
@@ -19,21 +43,50 @@ set(discord-screenaudio_SRC
  src/virtmic.cpp
  src/discordpage.cpp
  src/streamdialog.cpp
+  src/log.cpp
+  src/userscript.cpp
+  src/centralwidget.cpp
  resources.qrc
 )

-include(FetchContent)
+# Adapted from https://cliutils.gitlab.io/modern-cmake/chapters/projects/submodule.html
+find_package(Git QUIET)
+if(GIT_FOUND AND EXISTS "${PROJECT_SOURCE_DIR}/.git")
+  option(GIT_SUBMODULE "Check submodules during build" ON)
+  if(GIT_SUBMODULE)
+    message(STATUS "Updating submodules")
+    execute_process(COMMAND ${GIT_EXECUTABLE} submodule update --init --recursive --checkout
+                    WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
+                    RESULT_VARIABLE GIT_SUBMOD_RESULT)
+    if(NOT GIT_SUBMOD_RESULT EQUAL "0")
+      message(FATAL_ERROR "`git submodule update --init --recursive --checkout` failed with ${GIT_SUBMOD_RESULT}, please provide the submodules manually")
+    endif()
+  endif()
+endif()

-FetchContent_Declare(
-  rohrkabel 
-  GIT_REPOSITORY "https://github.com/Soundux/rohrkabel" 
-  GIT_TAG "d87403f48d3a95aa4bcf4cd60112d9e4bb090d5d"
-)
-FetchContent_MakeAvailable(rohrkabel)
+if(NOT EXISTS "${PROJECT_SOURCE_DIR}/submodules/rohrkabel/CMakeLists.txt")
+  message(FATAL_ERROR "Rohrkabel was not found since you are not in a Git checkout or have GIT_SUBMODULE disabled. Please provide rohrkabel manually to `./submodules/rohrkabel`.")
+endif()
+
+add_subdirectory(submodules/rohrkabel)

 add_executable(discord-screenaudio ${discord-screenaudio_SRC})

-target_link_libraries(discord-screenaudio Qt5::Widgets Qt5::WebEngineWidgets rohrkabel)
+target_link_libraries(discord-screenaudio Qt::Widgets Qt::WebEngineWidgets rohrkabel)
+
+if(KF5Notifications_FOUND)
+  target_link_libraries(discord-screenaudio KF5::Notifications)
+  install(FILES assets/discord-screenaudio.notifyrc DESTINATION ${CMAKE_INSTALL_PREFIX}/share/knotifications5)
+endif()
+if(KF5XmlGui_FOUND)
+  target_link_libraries(discord-screenaudio KF5::XmlGui)
+endif()
+if(KF5GlobalAccel_FOUND)
+  target_link_libraries(discord-screenaudio KF5::GlobalAccel)
+endif()

 install(TARGETS discord-screenaudio DESTINATION bin)
-install(PROGRAMS assets/discord-screenaudio.desktop DESTINATION ${CMAKE_INSTALL_PREFIX}/share/applications)
+install(FILES assets/de.shorsh.discord-screenaudio.png DESTINATION ${CMAKE_INSTALL_PREFIX}/share/icons/hicolor/256x256/apps)
+install(PROGRAMS assets/de.shorsh.discord-screenaudio.desktop DESTINATION ${CMAKE_INSTALL_PREFIX}/share/applications)
+configure_file(assets/de.shorsh.discord-screenaudio.metainfo.xml.in de.shorsh.discord-screenaudio.metainfo.xml)
+install(FILES ${CMAKE_BINARY_DIR}/de.shorsh.discord-screenaudio.metainfo.xml DESTINATION ${CMAKE_INSTALL_PREFIX}/share/metainfo)
--- a/README.md
+++ b/README.md
@@ -1,36 +1,77 @@
 # discord-screenaudio

-A very WIP custom discord client that supports streaming with audio on Linux,
-made possible by the
+A custom discord client that supports streaming with audio on Linux, made
+possible by the
 [great work](https://github.com/edisionnano/Screenshare-with-audio-on-Discord-with-Linux)
 of [@edisionnano](https://github.com/edisionnano) and the
 [Rohrkabel library](https://github.com/Soundux/rohrkabel) by
 [@Curve](https://github.com/Curve).

-![Screenshot_20220718_194357](https://user-images.githubusercontent.com/48161361/179571245-11ea05f3-fb5e-4aef-9132-2736e122ef04.png)
+Unlike a lot of other solutions, the audio here is directly fed into the
+screenshare and not passed to the user microphone
+([see explanation](#how-does-this-work)).
+
+![Screenshot_20221211_185028](https://user-images.githubusercontent.com/48161361/206920213-58a8091a-d8f9-4bb7-ae3d-3f8581b84d24.png)
+
+The purpose of this project is **not** to provide an alternative to the original
+Discord client. Rather, it should be used in addition to the original client in
+case you want to stream something, maybe used with a second account. For
+anything else, this client has way too many things that work less well than in
+the original client.
+
+Technically this could be against
+[Discord's TOS](https://discord.com/terms#software-in-discord%E2%80%99s-services),
+so be warned. Discord probably won't ban you for using this, but if they do I
+told you and it's not my fault.
+
+## Known Issues
+
+- Only works with **PipeWire**
+- Can only share primary screen on X11 (no other screens or specific
+  applications) (see
+  [#1](https://github.com/maltejur/discord-screenaudio/issues/1))

 ## Installation

-If you are using Arch, you can build and install
-[from the AUR](https://aur.archlinux.org/packages/discord-screenaudio). If you
-aren't, you will have to [build it yourself](#building-from-source).
+You have multiple options:
+
+- Install the Flatpak (recommended):
+  `flatpak install de.shorsh.discord-screenaudio`
+- If you are on Arch, you can build and install
+  [`discord-screenaudio`](https://aur.archlinux.org/packages/discord-screenaudio)
+  from the AUR
+- If you are on openSUSE, you can use the
+  [Open Build Service package](https://software.opensuse.org//download.html?project=games%3Atools&package=discord-screenaudio)
+  by [@VortexAcherontic](https://github.com/VortexAcherontic)
+- You can [build it yourself](#building-from-source)

 ## Building from Source

 ### Requirements

 - Basic building tools
+- An up-to-date system (I can't guarantee that it works on Debian or Ubuntu
+  20/21)
 - CMake
 - Qt5 and QtWebEngine
 - **PipeWire** (it currently doesn't work with PulseAudio)
 - Git
+- _Kf5Notifications (optional, for better notifications)_
+- _KXMLGui and KGlobalAccel (optional, for keybinds)_

-On Debian:
-`apt install -y build-essential cmake qtbase5-dev qtwebengine5-dev pkg-config libpipewire-0.3-dev git`
+With apt:
+`apt install -y build-essential cmake qtbase5-dev qtwebengine5-dev libkf5notifications-dev libkf5xmlgui-dev libkf5globalaccel-dev pkg-config libpipewire-0.3-dev git`

 ### Building

-To build the program, run this in the source directory:
+First, clone the repository:
+
+```bash
+git clone https://github.com/maltejur/discord-screenaudio.git
+cd discord-screenaudio
+```
+
+Then, to build the program, run this in the source directory:

 ```bash
 cmake -B build
@@ -43,7 +84,9 @@ And then to optionally install it, run:
 sudo cmake --install build
 ```

-## How it works
+## FAQ
+
+### How does this work?

 This whole project is based on
 [this](https://github.com/edisionnano/Screenshare-with-audio-on-Discord-with-Linux)
@@ -52,6 +95,23 @@ Discord. Basically: a virtual microphone is created which captures the
 application audio, and this microphone is then fed to the Discord stream by
 intercepting a API call of Discord.

+### Drag and drop doesn't work in the Flatpak
+
+This is due to sandboxing limitations of Flatpak. The main Discord Flatpak has
+the same problem. If you still want to use drag and drop, you can disable most
+of Flatpak's sandboxing by installing
+[Flatseal](https://flathub.org/apps/details/com.github.tchx84.Flatseal) and
+allowing access to "All system files" under the "Filesystem" section.
+
+### Is there any way to add custom CSS / a theme?
+
+Yes, you can add all your styles into
+`~/.config/discord-screenaudio/userstyles.css` (or
+`~/.var/app/de.shorsh.discord-screenaudio/config/discord-screenaudio/userstyles.css`
+if you are using the Flatpak). But please note that due to QtWebEngine
+limitations concerning content security policies, you can't use any external
+files (like `@import` or `url()`).
+
 ## License

 Copyright (C) 2022 Malte Jürgens
--- a/assets/arrpc.js
+++ b/assets/arrpc.js
--- a/assets/arrpc_bridge_mod.js
+++ b/assets/arrpc_bridge_mod.js
@@ -0,0 +1,65 @@
+setTimeout(e => {
+    let Dispatcher, lookupAsset, lookupApp, apps = {};
+
+    const ws = new WebSocket('ws://127.0.0.1:1337'); // connect to arRPC bridge websocket
+    ws.onmessage = async x => {
+        msg = JSON.parse(x.data);
+        console.log(msg);
+
+        if (!Dispatcher) {
+            const wpRequire = window.webpackChunkdiscord_app.push([[Symbol()], {}, x => x]);
+            const cache = wpRequire.c;
+            window.webpackChunkdiscord_app.pop();
+
+            for (const id in cache) {
+                let mod = cache[id].exports;
+                mod = mod && (mod.Z ?? mod.ZP);
+
+                if (mod && mod.register && mod.wait) {
+                    Dispatcher = mod;
+                    break;
+                }
+            }
+
+            const factories = wpRequire.m;
+            for (const id in factories) {
+                if (factories[id].toString().includes('getAssetImage: size must === [number, number] for Twitch')) {
+                    const mod = wpRequire(id);
+
+                    const _lookupAsset = Object.values(mod).find(e => typeof e === "function" && e.toString().includes("apply("));
+                    lookupAsset = async (appId, name) => (await _lookupAsset(appId, [name, undefined]))[0];
+
+                    break;
+                }
+            }
+
+            for (const id in factories) {
+                if (factories[id].toString().includes(`e.application={`)) {
+                    const mod = wpRequire(id);
+
+                    const _lookupApp = Object.values(mod).find(e => typeof e === "function" && e.toString().includes(`e.application={`));
+                    lookupApp = async appId => {
+                        let socket = {};
+                        await _lookupApp(socket, appId);
+                        return socket.application;
+                    };
+
+                    break;
+                }
+            }
+        }
+
+        if (msg.activity?.assets?.large_image) msg.activity.assets.large_image = await lookupAsset(msg.activity.application_id, msg.activity.assets.large_image);
+        if (msg.activity?.assets?.small_image) msg.activity.assets.small_image = await lookupAsset(msg.activity.application_id, msg.activity.assets.small_image);
+
+        if (msg.activity) {
+            const appId = msg.activity.application_id;
+            if (!apps[appId]) apps[appId] = await lookupApp(appId);
+
+            const app = apps[appId];
+            if (!msg.activity.name) msg.activity.name = app.name;
+        }
+
+        Dispatcher.dispatch({ type: "LOCAL_ACTIVITY_UPDATE", ...msg }); // set RPC status
+    };
+}, 10000)
--- a/assets/de.shorsh.discord-screenaudio.desktop
+++ b/assets/de.shorsh.discord-screenaudio.desktop
@@ -0,0 +1,8 @@
+[Desktop Entry]
+Type=Application
+Name=discord-screenaudio
+Exec=discord-screenaudio
+Comment=A custom discord client that supports streaming with audio on Linux.
+Icon=de.shorsh.discord-screenaudio
+Categories=Network;InstantMessaging;
+Terminal=false
--- a/assets/de.shorsh.discord-screenaudio.metainfo.xml.in
+++ b/assets/de.shorsh.discord-screenaudio.metainfo.xml.in
@@ -0,0 +1,51 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<component type="desktop-application">
+  <id>de.shorsh.discord-screenaudio</id>
+  <metadata_license>CC0-1.0</metadata_license>
+  <project_license>GPL-3.0+</project_license>
+  <name>discord-screenaudio</name>
+  <developer_name>Malte Jürgens</developer_name>
+  <releases>
+    <release version="${DISCORD_SCEENAUDIO_VERSION_FULL}" timestamp="${TIMESTAMP}" />
+  </releases>
+
+  <summary>A custom discord client that supports streaming with audio on Linux</summary>
+
+  <description>
+    <p>A custom discord client that supports streaming with audio on Linux, made possible by the great work of @edisionnano and the Rohrkabel library by @Curve.</p>
+    <p>Unlike a lot of other solutions, the audio here is directly fed into the screenshare and not passed to the user microphone.</p>
+    <p>The purpose of this project is not to provide an alternative to the original Discord client. Rather, it should be used in addition to the original client in case you want to stream something, maybe used with a second account. For anything else, this client has way too many things that work less well than in the original client.</p>
+    <p>Technically this could be against Discord's TOS, so be warned. Discord probably won't ban you for using this, but if they do I told you and it's not my fault.</p>
+    <p>Known issues:</p>
+    <ul>
+      <li>Only works with PipeWire</li>
+      <li>Can only share primary screen on X11</li>
+    </ul>
+  </description>
+
+  <launchable type="desktop-id">
+    de.shorsh.discord-screenaudio.desktop
+  </launchable>
+
+  <screenshots>
+    <screenshot type="default">
+      <image>
+        https://user-images.githubusercontent.com/48161361/192137080-33466cf7-8c56-4373-90c6-01ea74b6fb83.png
+      </image>
+    </screenshot>
+  </screenshots>
+
+  <url type="homepage">https://github.com/maltejur/discord-screenaudio</url>
+
+  <provides>
+    <binary>discord-screenaudio</binary>
+  </provides>
+
+  <content_rating type="oars-1.0">
+    <content_attribute id="social-chat">intense</content_attribute>
+    <content_attribute id="social-info">intense</content_attribute>
+    <content_attribute id="social-audio">intense</content_attribute>
+    <content_attribute id="social-contacts">intense</content_attribute>
+    <content_attribute id="money-purchasing">mild</content_attribute>
+  </content_rating>
+</component>
--- a/assets/de.shorsh.discord-screenaudio.png
+++ b/assets/de.shorsh.discord-screenaudio.png
--- a/assets/discord-screenaudio.desktop
+++ b/assets/discord-screenaudio.desktop
@@ -1,6 +0,0 @@
-[Desktop Entry]
-Type=Application
-Name=discord-screenaudio
-Exec=discord-screenaudio
-Icon=discord
-Terminal=false
--- a/assets/discord-screenaudio.notifyrc
+++ b/assets/discord-screenaudio.notifyrc
@@ -0,0 +1,8 @@
+[Global]
+IconName=de.shorsh.discord-screenaudio
+Name=discord-screenaudio
+DesktopEntry=de.shorsh.discord-screenaudio.desktop
+
+[Event/discordNotification]
+Name=Discord Notification
+Action=Popup
--- a/assets/userscript.js
+++ b/assets/userscript.js
@@ -1,18 +1,29 @@
-// From v0.4
-
 navigator.mediaDevices.chromiumGetDisplayMedia =
  navigator.mediaDevices.getDisplayMedia;

+function sleep(ms) {
+  return new Promise((resolve) => setTimeout(resolve, ms));
+}
+
 const getAudioDevice = async (nameOfAudioDevice) => {
  await navigator.mediaDevices.getUserMedia({
    audio: true,
  });
-  let devices = await navigator.mediaDevices.enumerateDevices();
-  let audioDevice = devices.find(({ label }) => label === nameOfAudioDevice);
+  let audioDevice;
+  while (audioDevice === undefined) {
+    let devices = await navigator.mediaDevices.enumerateDevices();
+    audioDevice = devices.find(({ label }) => label === nameOfAudioDevice);
+    if (!audioDevice)
+      userscript.log(
+        `Did not find '${nameOfAudioDevice}', trying again in 100ms`
+      );
+    await sleep(100);
+  }
+  userscript.log(`Found '${nameOfAudioDevice}'`);
  return audioDevice;
 };

-function setGetDisplayMedia(overrideArgs = undefined) {
+function setGetDisplayMedia(video = true, overrideArgs = undefined) {
  const getDisplayMedia = async (...args) => {
    var id;
    try {
@@ -50,6 +61,7 @@ function setGetDisplayMedia(overrideArgs = undefined) {
        : args || [{ video: true, audio: true }])
    );
    gdm.addTrack(track);
+    if (!video) for (const track of gdm.getVideoTracks()) track.enabled = false;
    return gdm;
  };
  navigator.mediaDevices.getDisplayMedia = getDisplayMedia;
@@ -57,75 +69,304 @@ function setGetDisplayMedia(overrideArgs = undefined) {

 setGetDisplayMedia();

+let userscript;
+let muteBtn;
+let deafenBtn;
+let streamStartBtn;
+let streamStartBtnInitialDisplay;
+let streamStartBtnClone;
+let resolutionString;
 const clonedElements = [];
 const hiddenElements = [];
 let wasStreamActive = false;

-setInterval(() => {
-  const streamActive =
-    document.getElementsByClassName("panel-2ZFCRb activityPanel-9icbyU")
-      .length > 0;
+function createButton(text, onClick) {
+  const button = document.createElement("button");
+  button.style.marginBottom = "20px";
+  button.classList =
+    "button-ejjZWC lookFilled-1H2Jvj colorBrand-2M3O3N sizeSmall-3R2P2p grow-2T4nbg";
+  button.innerText = text;
+  button.addEventListener("click", onClick);
+  return button;
+}

-  if (!streamActive && wasStreamActive)
-    console.log("!discord-screenaudio-stream-stopped");
-  wasStreamActive = streamActive;
+function createSwitch(text, enabled, onClick) {
+  const container = document.createElement("div");
+  container.style.marginBottom = "20px";
+  container.className = "labelRow-NnoUIp";

-  if (streamActive) {
-    clonedElements.forEach((el) => {
-      el.remove();
+  const label = document.createElement("label");
+  label.innerText = text;
+  label.className = "title-2yADjX";
+  container.appendChild(label);
+
+  const svg = document.createElement("div");
+  container.appendChild(svg);
+
+  function setSvgDisabled() {
+    svg.innerHTML = `<div class="container-1QtPKm default-colors" style="opacity: 1; background-color: rgb(114, 118, 125);"><svg class="slider-HJFN2i" viewBox="0 0 28 20" preserveAspectRatio="xMinYMid meet" aria-hidden="true" style="left: -3px;"><rect fill="white" x="4" y="0" height="20" width="20" rx="10"></rect><svg viewBox="0 0 20 20" fill="none"><path fill="rgba(114, 118, 125, 1)" d="M5.13231 6.72963L6.7233 5.13864L14.855 13.2704L13.264 14.8614L5.13231 6.72963Z"></path><path fill="rgba(114, 118, 125, 1)" d="M13.2704 5.13864L14.8614 6.72963L6.72963 14.8614L5.13864 13.2704L13.2704 5.13864Z"></path></svg></svg><input id="uid_84" type="checkbox" class="input-125oad" tabindex="0"></div>`;
+  }
+
+  function setSvgEnabled() {
+    svg.innerHTML = `<div class="container-1QtPKm default-colors checked-16gMAN" style="opacity: 1; background-color: rgb(59, 165, 92);"><svg class="slider-HJFN2i" viewBox="0 0 28 20" preserveAspectRatio="xMinYMid meet" aria-hidden="true" style="left: 12px;"><rect fill="white" x="4" y="0" height="20" width="20" rx="10"></rect><svg viewBox="0 0 20 20" fill="none"><path fill="rgba(59, 165, 92, 1)" d="M7.89561 14.8538L6.30462 13.2629L14.3099 5.25755L15.9009 6.84854L7.89561 14.8538Z"></path><path fill="rgba(59, 165, 92, 1)" d="M4.08643 11.0903L5.67742 9.49929L9.4485 13.2704L7.85751 14.8614L4.08643 11.0903Z"></path></svg></svg><input id="uid_74" type="checkbox" class="input-125oad" tabindex="0" checked=""></div>`;
+  }
+
+  function updateSvg() {
+    if (enabled) setSvgEnabled();
+    else setSvgDisabled();
+  }
+
+  container.addEventListener("click", () => {
+    enabled = !enabled;
+    updateSvg();
+    onClick(enabled);
+  });
+  updateSvg();
+
+  return container;
+}
+
+// Fix for broken discord notifications after restart
+// (https://github.com/maltejur/discord-screenaudio/issues/17)
+Notification.requestPermission();
+
+setTimeout(() => {
+  new QWebChannel(qt.webChannelTransport, (channel) => {
+    userscript = channel.objects.userscript;
+    main();
+  });
+});
+
+function main() {
+  userscript.muteToggled.connect(() => {
+    console.log("Toggling mute");
+    muteBtn && muteBtn.click();
+  });
+
+  userscript.deafenToggled.connect(() => {
+    console.log("Toggling deafen");
+    deafenBtn && deafenBtn.click();
+  });
+
+  userscript.streamStarted.connect((video, width, height, frameRate) => {
+    resolutionString = video ? `${height}p ${frameRate}FPS` : "Audio Only";
+    setGetDisplayMedia(video, {
+      audio: true,
+      video: { width, height, frameRate },
    });
-    clonedElements.length = 0;
+    streamStartBtn.click();
+    streamStartBtn.style.display = streamStartBtnInitialDisplay;
+    streamStartBtnClone.remove();
+  });

-    hiddenElements.forEach((el) => {
-      el.style.display = "block";
-    });
-    hiddenElements.length = 0;
-  } else {
-    for (const el of document.querySelectorAll(
-      '[aria-label="Share Your Screen"]'
-    )) {
-      elClone = el.cloneNode(true);
-      elClone.ariaLabel = "Share Your Screen with Audio";
-      elClone.title = "Share Your Screen with Audio";
-      elClone.addEventListener("click", () => {
-        console.log("!discord-screenaudio-start-stream");
+  function updateUserstyles() {
+    userscript.log("Loading userstyles...");
+    userscript.loadingMessage = "Loading userstyles...";
+    let stylesheet = document.getElementById("discordScreenaudioUserstyles");
+    if (stylesheet) {
+      userscript.log("Removing old userstyles...");
+      stylesheet.remove();
+    }
+    stylesheet = document.createElement("style");
+    stylesheet.id = "discordScreenaudioUserstyles";
+    stylesheet.innerText = userscript.userstyles;
+    document.head.appendChild(stylesheet);
+    userscript.log("Finished loading userstyles");
+    userscript.loadingMessage = "";
+  }
+
+  userscript.userstylesChanged.connect(updateUserstyles);
+  setTimeout(() => updateUserstyles());
+
+  setInterval(async () => {
+    const streamActive =
+      document.getElementsByClassName("panel-2ZFCRb activityPanel-9icbyU")
+        .length > 0;
+
+    if (!streamActive && wasStreamActive) userscript.stopVirtmic();
+    wasStreamActive = streamActive;
+
+    if (streamActive) {
+      clonedElements.forEach((el) => {
+        el.remove();
      });
+      clonedElements.length = 0;

-      const initialDisplay = el.style.display;
+      hiddenElements.forEach((el) => {
+        el.style.display = "block";
+      });
+      hiddenElements.length = 0;
+    } else {
+      for (const el of [
+        document.getElementsByClassName("actionButtons-2vEOUh")?.[0]
+          ?.children[1],
+        document.querySelector(
+          ".wrapper-3t3Yqv > div > div > div > div > .controlButton-2PMNom"
+        ),
+      ]) {
+        if (!el) continue;
+        if (el.classList.contains("discord-screenaudio-cloned")) continue;
+        streamStartBtn = el;
+        streamStartBtn.classList.add("discord-screenaudio-cloned");

-      window.discordScreenaudioStartStream = (width, height, frameRate) => {
-        setGetDisplayMedia({
-          audio: true,
-          video: { width, height, frameRate },
+        streamStartBtnClone = streamStartBtn.cloneNode(true);
+        streamStartBtnClone.title = "Share Your Screen with Audio";
+        streamStartBtnClone.addEventListener("click", () => {
+          userscript.showStreamDialog();
        });
-        el.click();
-        el.style.display = initialDisplay;
-        elClone.remove();
-      };

-      el.style.display = "none";
-      el.parentNode.insertBefore(elClone, el);
+        streamStartBtnInitialDisplay = streamStartBtn.style.display;

-      clonedElements.push(elClone);
-      hiddenElements.push(el);
+        streamStartBtn.style.display = "none";
+        streamStartBtn.parentNode.insertBefore(streamStartBtnClone, el);
+
+        clonedElements.push(streamStartBtnClone);
+        hiddenElements.push(streamStartBtn);
+      }
    }
-  }

-  // Add about text in settings
-  if (
-    document.getElementsByClassName("dirscordScreenaudioAboutText").length == 0
-  ) {
-    for (const el of document.getElementsByClassName("info-3pQQBb")) {
-      const aboutEl = document.createElement("div");
-      aboutEl.innerText = "discord-screenaudio v1.0.0-rc.5";
-      aboutEl.style.fontSize = "12px";
-      aboutEl.style.color = "var(--text-muted)";
-      aboutEl.classList.add("dirscordScreenaudioAboutText");
-      el.appendChild(aboutEl);
+    // Add about text in settings
+    if (
+      document.getElementsByClassName("dirscordScreenaudioAboutText").length ==
+      0
+    ) {
+      for (const el of document.getElementsByClassName("info-3pQQBb")) {
+        let aboutEl;
+        if (userscript.kxmlgui) {
+          aboutEl = document.createElement("a");
+          aboutEl.addEventListener("click", () => {
+            userscript.showHelpMenu();
+          });
+        } else {
+          aboutEl = document.createElement("div");
+        }
+        aboutEl.innerText = `discord-screenaudio ${userscript.version}`;
+        aboutEl.style.fontSize = "12px";
+        aboutEl.style.color = "var(--text-muted)";
+        aboutEl.style.textTransform = "none";
+        aboutEl.style.display = "inline-block";
+        aboutEl.style.width = "100%";
+        aboutEl.classList.add("dirscordScreenaudioAboutText");
+        aboutEl.style.cursor = "pointer";
+        el.appendChild(aboutEl);
+      }
    }
-  }

-  // Remove stream settings if stream is active
-  document.getElementById("manage-streams-change-windows")?.remove();
-  document.querySelector(`[aria-label="Stream Settings"]`)?.remove();
-}, 1000);
+    // Remove stream settings if stream is active
+    document.getElementById("manage-streams-change-windows")?.remove();
+    document.querySelector(`[aria-label="Stream Settings"]`)?.remove();
+
+    // Add event listener for keybind tab
+    if (
+      document
+        .getElementById("keybinds-tab")
+        ?.getElementsByClassName(
+          "container-3jbRo5 info-1hMolH browserNotice-1u-Y5o"
+        ).length
+    ) {
+      const el = document
+        .getElementById("keybinds-tab")
+        .getElementsByClassName("children-1xdcWE")[0];
+      const div = document.createElement("div");
+      div.style.marginBottom = "50px";
+      div.appendChild(
+        createButton("Edit Global Keybinds", () => {
+          userscript.showShortcutsDialog();
+        })
+      );
+      el.innerHTML = "";
+      el.appendChild(div);
+    }
+
+    const buttonContainer =
+      document.getElementsByClassName("container-YkUktl")[0];
+    if (!buttonContainer) {
+      userscript.log(
+        "Cannot locate Mute/Deafen/Settings button container, please report this on GitHub"
+      );
+    }
+
+    muteBtn = buttonContainer
+      ? buttonContainer.getElementsByTagName("button")[0]
+      : null;
+
+    deafenBtn = buttonContainer
+      ? buttonContainer.getElementsByTagName("button")[1]
+      : null;
+
+    if (resolutionString) {
+      for (const el of document.getElementsByClassName(
+        "qualityIndicator-39wQDy"
+      )) {
+        el.innerHTML = resolutionString;
+      }
+    }
+
+    const accountTab = document.getElementById("my-account-tab");
+    if (accountTab) {
+      const discordScreenaudioSettings = document.getElementById(
+        "discord-screenaudio-settings"
+      );
+      if (!discordScreenaudioSettings) {
+        const firstDivider = accountTab.getElementsByClassName(
+          "divider-3nqZNm marginTop40-Q4o1tS"
+        )[0];
+        if (firstDivider) {
+          const section = document.createElement("div");
+          section.className = "marginTop40-Q4o1tS";
+          section.id = "discord-screenaudio-settings";
+
+          const title = document.createElement("h2");
+          title.className =
+            "h1-3iMExa title-lXcL8p defaultColor-3Olr-9 defaultMarginh1-1UYutH";
+          title.innerText = "discord-screenaudio";
+          section.appendChild(title);
+
+          section.appendChild(
+            createButton("Edit Global Keybinds", () => {
+              userscript.showShortcutsDialog();
+            })
+          );
+
+          // section.appendChild(
+          //   createButton("Install Theme", () => {
+          //     userscript.showThemeDialog();
+          //   })
+          // );
+
+          // section.appendChild(
+          //   createButton("Uninstall Theme", () => {
+          //     userscript.installUserStyles("");
+          //   })
+          // );
+
+          section.appendChild(
+            createSwitch(
+              "Move discord-screenaudio to the system tray instead of closing",
+              await userscript.getBoolPref("trayIcon", false),
+              (enabled) => {
+                userscript.setTrayIcon(enabled);
+              }
+            )
+          );
+
+          section.appendChild(
+            createSwitch(
+              "Start discord-screenaudio hidden to tray",
+              await userscript.getPref("startHidden", false),
+              (hidden) => {
+                userscript.setPref("startHidden", hidden);
+              }
+            )
+          );
+
+          const divider = document.createElement("div");
+          divider.className = "divider-3nqZNm marginTop40-Q4o1tS";
+
+          firstDivider.after(section);
+          section.after(divider);
+        }
+      }
+    }
+  }, 500);
+}
--- a/resources.qrc
+++ b/resources.qrc
@@ -2,5 +2,8 @@
 <RCC>
  <qresource>
    <file>assets/userscript.js</file>
+    <file>assets/arrpc_bridge_mod.js</file>
+    <file>assets/arrpc.js</file>
+    <file>assets/de.shorsh.discord-screenaudio.png</file>
  </qresource>
 </RCC>
--- a/scripts/build_arrpc.sh
+++ b/scripts/build_arrpc.sh
@@ -0,0 +1,36 @@
+#!/usr/bin/bash
+set -e
+
+cd "$(dirname "$0")/../submodules"
+
+echo_status() {
+  echo
+  echo
+  echo "-> $1..."
+}
+
+if [ ! -d "arrpc" ]; then
+  echo_status "Cloning arRPC"
+  git clone https://github.com/OpenAsar/arrpc.git
+  cd arrpc
+else
+  echo_status "Fetching arRPC changes"
+  cd arrpc
+  git fetch
+fi
+
+echo_status "Checking out latest commit"
+git reset --hard HEAD
+git checkout main
+
+echo_status "Installing dependencies"
+pnpm i -D @vercel/ncc
+
+echo_status "Patching arRPC"
+sed -i 's/"type": "module",//' package.json
+
+echo_status "Building arRPC"
+pnpm exec ncc build src/index.js
+
+echo_status "Copying built file"
+cp -v ./dist/index.js ../../assets/arrpc.js
--- a/src/centralwidget.cpp
+++ b/src/centralwidget.cpp
@@ -0,0 +1,83 @@
+#include "centralwidget.h"
+#include "discordpage.h"
+#include "mainwindow.h"
+
+#include <QWebEngineNotification>
+#include <QWebEngineProfile>
+#include <QWebEngineScript>
+#include <QWebEngineScriptCollection>
+#include <QWebEngineSettings>
+
+CentralWidget::CentralWidget(QWidget *parent) : QWidget(parent) {
+  setStyleSheet("background-color:#313338;");
+  m_layout = new QVBoxLayout(this);
+  m_layout->setSpacing(0);
+  setupWebView();
+}
+
+void CentralWidget::setupWebView() {
+  auto page = new DiscordPage(this);
+
+  m_webView = new QWebEngineView(this);
+  m_webView->setPage(page);
+
+  bool useNotifySend = MainWindow::instance()
+                           ->settings()
+                           ->value("useNotifySend", false)
+                           .toBool();
+  if (m_useKF5Notifications || useNotifySend)
+    QWebEngineProfile::defaultProfile()->setNotificationPresenter(
+        [&](std::unique_ptr<QWebEngineNotification> notificationInfo) {
+          if (useNotifySend) {
+            auto title = notificationInfo->title();
+            auto message = notificationInfo->message();
+            auto image_path =
+                QString("/tmp/discord-screenaudio-%1.png").arg(title);
+            notificationInfo->icon().save(image_path);
+            QProcess::execute("notify-send",
+                              {"--icon", image_path, "--app-name",
+                               "discord-screenaudio", title, message});
+          } else if (m_useKF5Notifications) {
+#ifdef KNOTIFICATIONS
+            KNotification *notification =
+                new KNotification("discordNotification");
+            notification->setTitle(notificationInfo->title());
+            notification->setText(notificationInfo->message());
+            notification->setPixmap(
+                QPixmap::fromImage(notificationInfo->icon()));
+            notification->setDefaultAction("View");
+            connect(notification, &KNotification::defaultActivated,
+                    [&, notificationInfo = std::move(notificationInfo)]() {
+                      notificationInfo->click();
+                      show();
+                      activateWindow();
+                    });
+            notification->sendEvent();
+#endif
+          }
+        });
+
+  connect(page->userScript(), &UserScript::loadingMessageChanged, this,
+          &CentralWidget::setLoadingIndicator);
+
+  m_layout->addWidget(m_webView);
+}
+
+void CentralWidget::setLoadingIndicator(QString text) {
+  if (text != "") {
+    if (m_loadingLabel == nullptr) {
+      m_loadingLabel = new QLabel(this);
+      m_loadingLabel->setMaximumHeight(20);
+      m_loadingLabel->setAlignment(Qt::AlignHCenter);
+      m_loadingLabel->setStyleSheet("color:#dedede;");
+      m_layout->addWidget(m_loadingLabel);
+    }
+    m_loadingLabel->setText(text.mid(0, 100));
+  } else {
+    if (m_loadingLabel != nullptr) {
+      m_layout->removeWidget(m_loadingLabel);
+      m_loadingLabel->deleteLater();
+      m_loadingLabel = nullptr;
+    }
+  }
+}
--- a/src/centralwidget.h
+++ b/src/centralwidget.h
@@ -0,0 +1,29 @@
+#pragma once
+
+#include <QLabel>
+#include <QVBoxLayout>
+#include <QWebEnginePage>
+#include <QWebEngineProfile>
+#include <QWebEngineView>
+#include <QWidget>
+
+class CentralWidget : public QWidget {
+  Q_OBJECT
+
+public:
+  CentralWidget(QWidget *parent = nullptr);
+
+private:
+  void setupWebView();
+  QVBoxLayout *m_layout;
+  QWebEngineView *m_webView;
+#ifdef KNOTIFICATIONS
+  bool m_useKF5Notifications = true;
+#else
+  bool m_useKF5Notifications = false;
+#endif
+  QLabel *m_loadingLabel = nullptr;
+
+public Q_SLOTS:
+  void setLoadingIndicator(QString text);
+};
--- a/src/discordpage.cpp
+++ b/src/discordpage.cpp
@@ -1,9 +1,15 @@
 #include "discordpage.h"
+#include "log.h"
+#include "mainwindow.h"
 #include "virtmic.h"

 #include <QApplication>
 #include <QDesktopServices>
 #include <QFile>
+#include <QFileInfo>
+#include <QMessageBox>
+#include <QNetworkReply>
+#include <QTemporaryFile>
 #include <QTimer>
 #include <QWebChannel>
 #include <QWebEngineScript>
@@ -11,12 +17,31 @@
 #include <QWebEngineSettings>

 DiscordPage::DiscordPage(QWidget *parent) : QWebEnginePage(parent) {
-  setBackgroundColor(QColor("#202225"));
-  m_virtmicProcess.setProcessChannelMode(QProcess::ForwardedChannels);
+  setBackgroundColor(QColor("#313338"));

  connect(this, &QWebEnginePage::featurePermissionRequested, this,
          &DiscordPage::featurePermissionRequested);
+  connect(this, &DiscordPage::fullScreenRequested, MainWindow::instance(),
+          &MainWindow::fullScreenRequested);

+  setupPermissions();
+
+  injectFile(&DiscordPage::injectScript, "qwebchannel.js",
+             ":/qtwebchannel/qwebchannel.js");
+
+  setUrl(QUrl("https://discord.com/app"));
+
+  setWebChannel(new QWebChannel(this));
+  webChannel()->registerObject("userscript", &m_userScript);
+
+  injectFile(&DiscordPage::injectScript, "userscript.js",
+             ":/assets/userscript.js");
+
+  setupUserStyles();
+  setupArrpc();
+}
+
+void DiscordPage::setupPermissions() {
  settings()->setAttribute(QWebEngineSettings::ScreenCaptureEnabled, true);
  settings()->setAttribute(QWebEngineSettings::JavascriptCanOpenWindows, true);
  settings()->setAttribute(QWebEngineSettings::AllowRunningInsecureContent,
@@ -26,35 +51,126 @@ DiscordPage::DiscordPage(QWidget *parent) : QWebEnginePage(parent) {
  settings()->setAttribute(QWebEngineSettings::FullScreenSupportEnabled, true);
  settings()->setAttribute(QWebEngineSettings::PlaybackRequiresUserGesture,
                           false);
-
-  setUrl(QUrl("https://discord.com/app"));
-
-  injectScript(":/assets/userscript.js");
-
-  connect(&m_streamDialog, &StreamDialog::requestedStreamStart, this,
-          &DiscordPage::startStream);
+  settings()->setAttribute(QWebEngineSettings::JavascriptCanOpenWindows, false);
+  settings()->setAttribute(QWebEngineSettings::ScrollAnimatorEnabled, true);
 }

-void DiscordPage::injectScript(QString source) {
-  qDebug() << "[main   ] Injecting " << source;
+void DiscordPage::setupUserStyles() {
+  qDebug(userstylesLog).noquote()
+      << "Looking for userstyles in" << m_configLocation.absolutePath();
+  m_userStylesFile =
+      new QFile(m_configLocation.absoluteFilePath("userstyles.css"));
+  if (m_userStylesFile->exists()) {
+    qDebug(userstylesLog).noquote()
+        << "Found userstyles:" << m_userStylesFile->fileName();
+    m_userStylesFile->open(QIODevice::ReadOnly);
+    m_userStylesContent = m_userStylesFile->readAll();
+    m_userStylesFile->close();
+    fetchUserStyles();
+  }
+  connect(&m_userScript, &UserScript::shouldInstallUserStyles, this,
+          &DiscordPage::getUserStyles);
+}

-  QFile userscript(source);
+const QRegularExpression importRegex(
+    R"r(@import (?:url\(|)['"]{0,1}(?!.*usrbgs?\.css)([^'"]+?)['"]{0,1}(?:|\));)r");
+const QRegularExpression urlRegex(
+    R"r(url\(['"]{0,1}((?!https:\/\/fonts.gstatic.com)(?!data:)(?!.*\.woff2)(?!.*\.ttf)[^'"]+?)['"]{0,1}\))r");

-  if (!userscript.open(QIODevice::ReadOnly)) {
+void DiscordPage::fetchUserStyles() {
+  m_userScript.setProperty(
+      "loadingMessage", "Loading userstyles: Fetching additional resources...");
+  bool foundImport = true;
+  auto match = importRegex.match(m_userStylesContent);
+  if (!match.hasMatch()) {
+    foundImport = false;
+    match = urlRegex.match(m_userStylesContent);
+  }
+  if (match.hasMatch()) {
+    auto url = match.captured(1);
+    qDebug(userstylesLog) << "Fetching" << url;
+    m_userScript.setProperty(
+        "loadingMessage",
+        QString("Loading userstyles: Fetching %1...").arg(url));
+    QNetworkRequest request(url);
+    auto reply = m_networkAccessManager.get(request);
+    connect(reply, &QNetworkReply::finished, [=]() {
+      QByteArray content = "";
+      if (reply->error() == QNetworkReply::NoError) {
+        if (!reply->attribute(QNetworkRequest::RedirectionTargetAttribute)
+                 .isNull())
+          content =
+              reply->attribute(QNetworkRequest::RedirectionTargetAttribute)
+                  .toByteArray();
+        else
+          content = reply->readAll();
+      } else
+        qDebug(userstylesLog) << reply->errorString().toUtf8().constData();
+      reply->deleteLater();
+      m_userStylesContent = m_userStylesContent.replace(
+          match.captured(0), foundImport
+                                 ? content
+                                 : "url(data:application/octet-stream;base64," +
+                                       content.toBase64() + ")");
+      fetchUserStyles();
+    });
+    return;
+  }
+  qDebug(userstylesLog) << "Injecting userstyles";
+  m_userScript.setProperty("userstyles", m_userStylesContent);
+  m_userScript.setProperty("loadingMessage", "");
+  if (!m_configLocation.exists())
+    m_configLocation.mkpath(".");
+  m_userStylesFile->open(QIODevice::WriteOnly);
+  m_userStylesFile->write(m_userStylesContent.toUtf8());
+  m_userStylesFile->close();
+}
+
+void DiscordPage::getUserStyles(QString url) {
+  m_userStylesContent = url == "" ? "" : QString("@import url(%1);").arg(url);
+  fetchUserStyles();
+}
+
+void DiscordPage::injectScript(
+    QString name, QString content,
+    QWebEngineScript::InjectionPoint injectionPoint) {
+  qDebug(mainLog) << "Injecting " << name;
+
+  QWebEngineScript script;
+
+  script.setSourceCode(content);
+  script.setName(name);
+  script.setWorldId(QWebEngineScript::MainWorld);
+  script.setInjectionPoint(injectionPoint);
+  script.setRunsOnSubFrames(false);
+
+  scripts().insert(script);
+}
+
+void DiscordPage::injectScript(QString name, QString content) {
+  injectScript(name, content, QWebEngineScript::DocumentCreation);
+}
+
+void DiscordPage::injectStylesheet(QString name, QString content) {
+  auto script = QString(R"(const stylesheet = document.createElement("style");
+stylesheet.id = "%1";
+stylesheet.innerText = `%2`;
+document.head.appendChild(stylesheet);
+)")
+                    .arg(name)
+                    .arg(content);
+  injectScript(name, script, QWebEngineScript::DocumentReady);
+}
+
+void DiscordPage::injectFile(void (DiscordPage::*inject)(QString, QString),
+                             QString name, QString source) {
+  QFile file(source);
+
+  if (!file.open(QIODevice::ReadOnly)) {
    qFatal("Failed to load %s with error: %s", source.toLatin1().constData(),
-           userscript.errorString().toLatin1().constData());
+           file.errorString().toLatin1().constData());
  } else {
-    QByteArray userscriptJs = userscript.readAll();
-
-    QWebEngineScript script;
-
-    script.setSourceCode(userscriptJs);
-    script.setName("userscript.js");
-    script.setWorldId(QWebEngineScript::MainWorld);
-    script.setInjectionPoint(QWebEngineScript::DocumentCreation);
-    script.setRunsOnSubFrames(false);
-
-    scripts().insert(script);
+    (this->*inject)(name, file.readAll());
  }
 }

@@ -63,12 +179,19 @@ void DiscordPage::featurePermissionRequested(const QUrl &securityOrigin,
  // Allow every permission asked
  setFeaturePermission(securityOrigin, feature,
                       QWebEnginePage::PermissionGrantedByUser);
+
+  if (feature == QWebEnginePage::Feature::MediaAudioCapture) {
+    if (!m_userScript.isVirtmicRunning()) {
+      qDebug(virtmicLog) << "Starting Virtmic with no target to make sure "
+                            "Discord can find all the audio devices";
+      m_userScript.startVirtmic("None");
+    }
+  }
 }

 bool DiscordPage::acceptNavigationRequest(const QUrl &url,
                                          QWebEnginePage::NavigationType type,
                                          bool isMainFrame) {
-  qDebug() << url;
  if (type == QWebEnginePage::NavigationTypeLinkClicked) {
    QDesktopServices::openUrl(url);
    return false;
@@ -76,45 +199,113 @@ bool DiscordPage::acceptNavigationRequest(const QUrl &url,
  return true;
 };

-void DiscordPage::stopVirtmic() {
-  if (m_virtmicProcess.state() == QProcess::Running) {
-    qDebug() << "[virtmic] Stopping Virtmic";
-    m_virtmicProcess.kill();
-  }
+bool ExternalPage::acceptNavigationRequest(const QUrl &url,
+                                           QWebEnginePage::NavigationType type,
+                                           bool isMainFrame) {
+  QDesktopServices::openUrl(url);
+  deleteLater();
+  return false;
 }

-void DiscordPage::startVirtmic(QString target) {
-  if (target != "None") {
-    qDebug() << "[virtmic] Starting Virtmic with target" << target;
-    m_virtmicProcess.start(QApplication::arguments()[0], {"--virtmic", target});
-  }
+QWebEnginePage *DiscordPage::createWindow(QWebEnginePage::WebWindowType type) {
+  return new ExternalPage;
 }

+const QMap<QString, QString> cssAnsiColorMap = {{"black", "30"},
+                                                {"red", "31"},
+                                                {"green", "32"},
+                                                {"yellow", "33"},
+                                                {"blue", "34"},
+                                                {"magenta", "35"},
+                                                {"cyan", "36"},
+                                                {"white", "37"},
+                                                {"gray", "90"},
+                                                {"bright-red", "91"},
+                                                {"bright-green", "92"},
+                                                {"bright-yellow", "93"},
+                                                {"bright-blue", "94"},
+                                                {"bright-magenta", "95"},
+                                                {"bright-cyan", "96"},
+                                                {"bright-white", "97"},
+                                                {"orange", "38;5;208"},
+                                                {"pink", "38;5;205"},
+                                                {"brown", "38;5;94"},
+                                                {"light-gray", "38;5;251"},
+                                                {"dark-gray", "38;5;239"},
+                                                {"light-red", "38;5;203"},
+                                                {"light-green", "38;5;83"},
+                                                {"light-yellow", "38;5;227"},
+                                                {"light-blue", "38;5;75"},
+                                                {"light-magenta", "38;5;207"},
+                                                {"light-cyan", "38;5;87"},
+                                                {"turquoise", "38;5;80"},
+                                                {"violet", "38;5;92"},
+                                                {"purple", "38;5;127"},
+                                                {"lavender", "38;5;183"},
+                                                {"maroon", "38;5;124"},
+                                                {"beige", "38;5;230"},
+                                                {"olive", "38;5;142"},
+                                                {"indigo", "38;5;54"},
+                                                {"teal", "38;5;30"},
+                                                {"gold", "38;5;220"},
+                                                {"silver", "38;5;7"},
+                                                {"navy", "38;5;17"},
+                                                {"steel", "38;5;188"},
+                                                {"salmon", "38;5;173"},
+                                                {"peach", "38;5;217"},
+                                                {"khaki", "38;5;179"},
+                                                {"coral", "38;5;209"},
+                                                {"crimson", "38;5;160"}};
+
 void DiscordPage::javaScriptConsoleMessage(
    QWebEnginePage::JavaScriptConsoleMessageLevel level, const QString &message,
    int lineNumber, const QString &sourceID) {
-  if (message == "!discord-screenaudio-start-stream") {
-    if (m_streamDialog.isHidden())
-      m_streamDialog.setHidden(false);
-    else
-      m_streamDialog.activateWindow();
-    m_streamDialog.updateTargets();
-  } else if (message == "!discord-screenaudio-stream-stopped") {
-    stopVirtmic();
-  } else {
-    qDebug() << "[discord]" << message;
+  auto colorSegments = message.split("%c");
+  if (colorSegments[0] != "") {
+    for (auto line : colorSegments[0].split("\n"))
+      qDebug(discordLog) << line.toUtf8().constData();
+  }
+  for (auto segment : colorSegments.mid(1)) {
+    auto lines = segment.split("\n");
+    QString ansi;
+    uint endOfStyles = lines.length();
+    for (auto line = 1; line < lines.length(); line++) {
+      if (!lines[line].endsWith(";")) {
+        endOfStyles = line;
+        break;
+      }
+      if (lines[line] == "font-weight: bold;")
+        ansi += "\033[1m";
+      else if (lines[line].startsWith("color: ")) {
+        auto color = lines[line].mid(7).chopped(1);
+        if (cssAnsiColorMap.find(color) != cssAnsiColorMap.end())
+          ansi += "\033[" + cssAnsiColorMap[color] + "m";
+      }
+    }
+    qDebug(discordLog) << (ansi + lines[0].trimmed() + "\033[0m " +
+                           lines[endOfStyles].trimmed())
+                              .toUtf8()
+                              .constData();
+    for (auto line : lines.mid(endOfStyles + 1)) {
+      qDebug(discordLog) << line.toUtf8().constData();
+    }
  }
 }

-void DiscordPage::startStream(QString target, uint width, uint height,
-                              uint frameRate) {
-  stopVirtmic();
-  startVirtmic(target);
-  // Wait a bit for the virtmic to start
-  QTimer::singleShot(target == "None" ? 0 : 200, [=]() {
-    runJavaScript(QString("window.discordScreenaudioStartStream(%1, %2, %3);")
-                      .arg(width)
-                      .arg(height)
-                      .arg(frameRate));
-  });
+UserScript *DiscordPage::userScript() { return &m_userScript; }
+
+void DiscordPage::setupArrpc() {
+  QFile nodejs("/usr/bin/node");
+  if (nodejs.exists()) {
+    auto arrpcSource = QTemporaryFile::createNativeFile(":/assets/arrpc.js");
+    qDebug(mainLog).noquote()
+        << "NodeJS found, starting arRPC located at" << arrpcSource->fileName();
+    m_arrpcProcess.setProcessChannelMode(QProcess::ForwardedChannels);
+    m_arrpcProcess.setProgram(nodejs.fileName());
+    m_arrpcProcess.setArguments(QStringList{arrpcSource->fileName()});
+    m_arrpcProcess.start();
+
+    injectFile(&DiscordPage::injectScript, "arrpc_bridge_mod.js",
+               ":/assets/arrpc_bridge_mod.js");
+  }
 }
--- a/src/discordpage.h
+++ b/src/discordpage.h
@@ -1,33 +1,66 @@
 #pragma once

-#include "streamdialog.h"
-#include "virtmic.h"
+#include "userscript.h"

+#include <QDir>
+#include <QFile>
+#include <QNetworkAccessManager>
 #include <QProcess>
+#include <QStandardPaths>
+#include <QWebEngineFullScreenRequest>
 #include <QWebEnginePage>
+#include <QWebEngineScript>

 class DiscordPage : public QWebEnginePage {
  Q_OBJECT

 public:
  explicit DiscordPage(QWidget *parent = nullptr);
+  UserScript *userScript();

 private:
-  StreamDialog m_streamDialog;
-  QProcess m_virtmicProcess;
+  UserScript m_userScript;
+  QFile *m_userStylesFile;
+  QString m_userStylesContent;
+  QNetworkAccessManager m_networkAccessManager;
+  QProcess m_arrpcProcess;
+  const QDir m_configLocation =
+      QStandardPaths::writableLocation(QStandardPaths::AppConfigLocation);
+  void setupPermissions();
+  void setupUserStyles();
+  void setupArrpc();
+  void fetchUserStyles();
  bool acceptNavigationRequest(const QUrl &url,
                               QWebEnginePage::NavigationType type,
                               bool isMainFrame) override;
+  QWebEnginePage *createWindow(QWebEnginePage::WebWindowType type) override;
  void
  javaScriptConsoleMessage(QWebEnginePage::JavaScriptConsoleMessageLevel level,
                           const QString &message, int lineNumber,
                           const QString &sourceID) override;
-  void injectScript(QString source);
-  void stopVirtmic();
-  void startVirtmic(QString target);
+  void injectScript(QString name, QString content,
+                    QWebEngineScript::InjectionPoint injectionPoint);
+  void injectScript(QString name, QString content);
+  void injectStylesheet(QString name, QString content);
+  void injectFile(void (DiscordPage::*inject)(QString, QString), QString name,
+                  QString source);

 private Q_SLOTS:
  void featurePermissionRequested(const QUrl &securityOrigin,
                                  QWebEnginePage::Feature feature);
-  void startStream(QString target, uint width, uint height, uint frameRate);
+
+public Q_SLOTS:
+  void getUserStyles(QString url);
+};
+
+// Will immediately get destroyed again but is needed for navigation to
+// target="_blank" links, since QWebEnginePage::newWindowRequested is
+// only available sinec Qt 6.3.
+class ExternalPage : public QWebEnginePage {
+  Q_OBJECT
+
+private:
+  bool acceptNavigationRequest(const QUrl &url,
+                               QWebEnginePage::NavigationType type,
+                               bool isMainFrame) override;
 };
--- a/src/log.cpp
+++ b/src/log.cpp
@@ -0,0 +1,8 @@
+#include "log.h"
+
+Q_LOGGING_CATEGORY(mainLog, "main");
+Q_LOGGING_CATEGORY(discordLog, "discord");
+Q_LOGGING_CATEGORY(userscriptLog, "userscript");
+Q_LOGGING_CATEGORY(virtmicLog, "virtmic");
+Q_LOGGING_CATEGORY(shortcutLog, "shortcut");
+Q_LOGGING_CATEGORY(userstylesLog, "userstyles");
--- a/src/log.h
+++ b/src/log.h
@@ -0,0 +1,10 @@
+#pragma once
+
+#include <QLoggingCategory>
+
+Q_DECLARE_LOGGING_CATEGORY(mainLog);
+Q_DECLARE_LOGGING_CATEGORY(discordLog);
+Q_DECLARE_LOGGING_CATEGORY(userscriptLog);
+Q_DECLARE_LOGGING_CATEGORY(virtmicLog);
+Q_DECLARE_LOGGING_CATEGORY(shortcutLog);
+Q_DECLARE_LOGGING_CATEGORY(userstylesLog);
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -1,13 +1,23 @@
 #include "mainwindow.h"
 #include "virtmic.h"

+#ifdef KXMLGUI
+#include <KAboutData>
+#endif
+
 #include <QApplication>
 #include <QCommandLineParser>
+#include <QLoggingCategory>

 int main(int argc, char *argv[]) {
  QApplication app(argc, argv);
  QApplication::setApplicationName("discord-screenaudio");
-  QApplication::setApplicationVersion("1.0.0-rc.5");
+  QApplication::setWindowIcon(
+      QIcon(":assets/de.shorsh.discord-screenaudio.png"));
+  QApplication::setApplicationVersion(DISCORD_SCEENAUDIO_VERSION_FULL);
+  QApplication::setDesktopFileName("de.shorsh.discord-screenaudio");
+
+  qSetMessagePattern("[%{category}] %{message}");

  QCommandLineParser parser;
  parser.setApplicationDescription(
@@ -17,17 +27,29 @@ int main(int argc, char *argv[]) {
  QCommandLineOption virtmicOption("virtmic", "Start the Virtual Microphone",
                                   "target");
  parser.addOption(virtmicOption);
-#ifdef DEBUG
-  parser.addOption(QCommandLineOption(
-      "remote-debugging-port", "Chromium Remote Debugging Port", "port"));
-#endif
+  QCommandLineOption degubOption("remote-debugging",
+                                 "Open Chromium Remote Debugging on port 9222");
+  parser.addOption(degubOption);
+  QCommandLineOption notifySendOption(
+      "notify-send", "Use notify-send instead of QT/KF5 notifications");
+  parser.addOption(notifySendOption);
+
  parser.process(app);

  if (parser.isSet(virtmicOption)) {
    Virtmic::start(parser.value(virtmicOption));
  }

-  MainWindow w;
+  qputenv("QTWEBENGINE_CHROMIUM_FLAGS",
+          "--enable-features=WebRTCPipeWireCapturer " +
+              qgetenv("QTWEBENGINE_CHROMIUM_FLAGS"));
+
+  if (parser.isSet(degubOption))
+    qputenv("QTWEBENGINE_CHROMIUM_FLAGS",
+            "--remote-debugging-port=9222 " +
+                qgetenv("QTWEBENGINE_CHROMIUM_FLAGS"));
+
+  MainWindow w(parser.isSet(notifySendOption));
  w.show();

  return app.exec();
--- a/src/mainwindow.cpp
+++ b/src/mainwindow.cpp
@@ -1,6 +1,10 @@
 #include "mainwindow.h"
 #include "virtmic.h"

+#ifdef KNOTIFICATIONS
+#include <KNotification>
+#endif
+
 #include <QApplication>
 #include <QColor>
 #include <QComboBox>
@@ -10,21 +14,119 @@
 #include <QPushButton>
 #include <QSpacerItem>
 #include <QThread>
+#include <QTimer>
 #include <QUrl>
-#include <QWebEngineScript>
-#include <QWebEngineScriptCollection>
-#include <QWebEngineSettings>
+#include <QWebEngineFullScreenRequest>
 #include <QWidget>

-MainWindow::MainWindow(QWidget *parent) : QMainWindow(parent) {
-  setupWebView();
-  resize(1000, 700);
-  showMaximized();
+MainWindow *MainWindow::m_instance = nullptr;
+
+MainWindow::MainWindow(bool useNotifySend, QWidget *parent)
+    : QMainWindow(parent) {
+  assert(MainWindow::m_instance == nullptr);
+  MainWindow::m_instance = this;
+  setupSettings();
+  m_settings->setValue("useNotifySend", useNotifySend);
+  m_centralWidget = new CentralWidget(this);
+  setCentralWidget(m_centralWidget);
+  setupTrayIcon();
+  if (m_settings->contains("geometry")) {
+    restoreGeometry(m_settings->value("geometry").toByteArray());
+  } else {
+    resize(1000, 700);
+    showMaximized();
+  }
+  if (m_settings->value("trayIcon", false).toBool() &&
+      m_settings->value("startHidden", false).toBool()) {
+    hide();
+    QTimer::singleShot(0, [=]() { hide(); });
+  }
 }

-void MainWindow::setupWebView() {
-  m_webView = new QWebEngineView(this);
-  auto page = new DiscordPage(this);
-  m_webView->setPage(page);
-  setCentralWidget(m_webView);
+void MainWindow::fullScreenRequested(
+    QWebEngineFullScreenRequest fullScreenRequest) {
+  fullScreenRequest.accept();
+  if (fullScreenRequest.toggleOn()) {
+    m_wasMaximized = isMaximized();
+    showFullScreen();
+  } else {
+    m_wasMaximized ? showMaximized() : showNormal();
+  }
 }
+
+void MainWindow::setupTrayIcon() {
+  if (m_settings->value("trayIcon", false).toBool() == false ||
+      m_trayIcon != nullptr)
+    return;
+
+  auto aboutAction = new QAction(
+      "discord-screenaudio v" + QString(DISCORD_SCEENAUDIO_VERSION_FULL), this);
+  aboutAction->setIcon(QIcon(":assets/de.shorsh.discord-screenaudio.png"));
+  aboutAction->setEnabled(false);
+
+  auto exitAction = new QAction("Exit", this);
+  connect(exitAction, &QAction::triggered, []() { QApplication::quit(); });
+
+  m_trayIconMenu = new QMenu(this);
+  m_trayIconMenu->addAction(aboutAction);
+  m_trayIconMenu->addAction(exitAction);
+
+  m_trayIcon = new QSystemTrayIcon(this);
+  m_trayIcon->setContextMenu(m_trayIconMenu);
+  m_trayIcon->setIcon(QIcon(":assets/de.shorsh.discord-screenaudio.png"));
+  m_trayIcon->show();
+
+  connect(m_trayIcon, &QSystemTrayIcon::activated, [this](auto reason) {
+    if (reason == QSystemTrayIcon::Trigger) {
+      if (isVisible()) {
+        hide();
+      } else {
+        show();
+        activateWindow();
+      }
+    }
+  });
+}
+
+void MainWindow::cleanTrayIcon() {
+  if (m_trayIcon == nullptr)
+    return;
+  m_trayIcon->hide();
+  m_trayIconMenu->deleteLater();
+  m_trayIcon->deleteLater();
+  m_trayIconMenu = nullptr;
+  m_trayIcon = nullptr;
+}
+
+void MainWindow::setupSettings() {
+  m_settings =
+      new QSettings("discord-screenaudio", "discord-screenaudio", this);
+  m_settings->beginGroup("settings");
+  m_settings->endGroup();
+}
+
+QSettings *MainWindow::settings() const { return m_settings; }
+
+void MainWindow::setTrayIcon(bool enabled) {
+  m_settings->setValue("trayIcon", enabled);
+  if (enabled) {
+    setupTrayIcon();
+  } else {
+    cleanTrayIcon();
+  }
+}
+
+void MainWindow::closeEvent(QCloseEvent *event) {
+  if (m_settings->value("trayIcon", false).toBool()) {
+    hide();
+  } else {
+    m_settings->setValue("geometry", saveGeometry());
+    QApplication::quit();
+  }
+}
+
+MainWindow *MainWindow::instance() { return m_instance; }
+
+CentralWidget *MainWindow::centralWidget() {
+  return instance()->m_centralWidget;
+};
--- a/src/mainwindow.h
+++ b/src/mainwindow.h
@@ -1,24 +1,39 @@
 #pragma once

-#include "discordpage.h"
+#include "centralwidget.h"

 #include <QMainWindow>
+#include <QMenu>
 #include <QScopedPointer>
+#include <QSettings>
 #include <QString>
+#include <QSystemTrayIcon>
+#include <QVBoxLayout>
 #include <QVector>
-#include <QWebEnginePage>
-#include <QWebEngineProfile>
-#include <QWebEngineView>

 class MainWindow : public QMainWindow {
  Q_OBJECT

 public:
-  explicit MainWindow(QWidget *parent = nullptr);
+  explicit MainWindow(bool useNotifySend = false, QWidget *parent = nullptr);
+  static MainWindow *instance();
+  QSettings *settings() const;
+  static CentralWidget *centralWidget();

 private:
-  void setupWebView();
-  QWebEngineView *m_webView;
+  void setupTrayIcon();
+  void cleanTrayIcon();
+  void setupSettings();
  QWebEngineProfile *prepareProfile();
-  DiscordPage *m_discordPage;
+  void closeEvent(QCloseEvent *event) override;
+  QSystemTrayIcon *m_trayIcon = nullptr;
+  QMenu *m_trayIconMenu;
+  QSettings *m_settings;
+  bool m_wasMaximized;
+  static MainWindow *m_instance;
+  CentralWidget *m_centralWidget;
+
+public Q_SLOTS:
+  void setTrayIcon(bool enabled);
+  void fullScreenRequested(QWebEngineFullScreenRequest fullScreenRequest);
 };
--- a/src/streamdialog.cpp
+++ b/src/streamdialog.cpp
@@ -9,70 +9,109 @@
 #include <QSizePolicy>
 #include <QVBoxLayout>

-StreamDialog::StreamDialog() : QWidget() {
+StreamDialog::StreamDialog(QWidget *parent) : QDialog(parent) {
  setAttribute(Qt::WA_QuitOnClose, false);

-  auto layout = new QVBoxLayout(this);
+  {
+    auto layout = new QVBoxLayout(this);
+    layout->setSizeConstraint(QLayout::SetFixedSize);

-  auto targetLabel = new QLabel(this);
-  targetLabel->setText("Which app do you want to stream sound from?");
-  layout->addWidget(targetLabel);
+    m_videoGroupBox = new QGroupBox(this);
+    m_videoGroupBox->setTitle("Video");
+    m_videoGroupBox->setCheckable(true);
+    layout->addWidget(m_videoGroupBox);

-  m_targetComboBox = new QComboBox(this);
-  updateTargets();
-  layout->addWidget(m_targetComboBox);
+    {
+      auto videoLayout = new QVBoxLayout(m_videoGroupBox);

-  auto qualityLabel = new QLabel(this);
-  qualityLabel->setText("Stream Quality");
-  layout->addWidget(qualityLabel);
+      auto resolutionLabel = new QLabel(this);
+      resolutionLabel->setText("Resolution");
+      videoLayout->addWidget(resolutionLabel);

-  auto qualityHBox = new QHBoxLayout(this);
-  layout->addLayout(qualityHBox);
+      m_resolutionComboBox = new QComboBox(this);
+      m_resolutionComboBox->addItem("2160p", "3840x2160");
+      m_resolutionComboBox->addItem("1440p", "2560x1440");
+      m_resolutionComboBox->addItem("1080p", "1920x1080");
+      m_resolutionComboBox->addItem("720p", "1280x720");
+      m_resolutionComboBox->addItem("480p", "854x480");
+      m_resolutionComboBox->addItem("360p", "640x360");
+      m_resolutionComboBox->addItem("240p", "426x240");
+      m_resolutionComboBox->setCurrentText("720p");
+      videoLayout->addWidget(m_resolutionComboBox);

-  m_qualityResolutionComboBox = new QComboBox(this);
-  m_qualityResolutionComboBox->addItem("2160p", "3840x2160");
-  m_qualityResolutionComboBox->addItem("1440p", "2560x1440");
-  m_qualityResolutionComboBox->addItem("1080p", "1920x1080");
-  m_qualityResolutionComboBox->addItem("720p", "1280x720");
-  m_qualityResolutionComboBox->addItem("480p", "854x480");
-  m_qualityResolutionComboBox->addItem("360p", "640x360");
-  m_qualityResolutionComboBox->addItem("240p", "426x240");
-  m_qualityResolutionComboBox->setCurrentText("720p");
-  qualityHBox->addWidget(m_qualityResolutionComboBox);
+      auto framerateLabel = new QLabel(this);
+      framerateLabel->setText("Framerate");
+      videoLayout->addWidget(framerateLabel);

-  m_qualityFPSComboBox = new QComboBox(this);
-  m_qualityFPSComboBox->addItem("144 FPS", 144);
-  m_qualityFPSComboBox->addItem("60 FPS", 60);
-  m_qualityFPSComboBox->addItem("30 FPS", 30);
-  m_qualityFPSComboBox->addItem("15 FPS", 15);
-  m_qualityFPSComboBox->addItem("5 FPS", 5);
-  m_qualityFPSComboBox->setCurrentText("30 FPS");
-  qualityHBox->addWidget(m_qualityFPSComboBox);
+      m_framerateComboBox = new QComboBox(this);
+      m_framerateComboBox->addItem("144 FPS", 144);
+      m_framerateComboBox->addItem("60 FPS", 60);
+      m_framerateComboBox->addItem("30 FPS", 30);
+      m_framerateComboBox->addItem("15 FPS", 15);
+      m_framerateComboBox->addItem("5 FPS", 5);
+      m_framerateComboBox->setCurrentText("30 FPS");
+      videoLayout->addWidget(m_framerateComboBox);
+    }

-  auto button = new QPushButton(this);
-  button->setText("Start Stream");
-  connect(button, &QPushButton::clicked, this, &StreamDialog::startStream);
-  layout->addWidget(button, Qt::AlignRight | Qt::AlignBottom);
+    m_audioGroupBox = new QGroupBox(this);
+    m_audioGroupBox->setCheckable(true);
+    m_audioGroupBox->setTitle("Audio");
+    layout->addWidget(m_audioGroupBox);

-  setLayout(layout);
+    {
+      auto audioLayout = new QVBoxLayout(m_audioGroupBox);
+
+      auto targetLabel = new QLabel(this);
+      targetLabel->setText("Audio Source");
+      audioLayout->addWidget(targetLabel);
+
+      {
+        auto targetLayout = new QHBoxLayout();
+        audioLayout->addLayout(targetLayout);
+
+        m_targetComboBox = new QComboBox(this);
+        updateTargets();
+        targetLayout->addWidget(m_targetComboBox);
+
+        auto refreshTargetsButton = new QPushButton(this);
+        refreshTargetsButton->setFixedSize(30, 30);
+        refreshTargetsButton->setIcon(QIcon::fromTheme("view-refresh"));
+        connect(refreshTargetsButton, &QPushButton::clicked, this,
+                &StreamDialog::updateTargets);
+        targetLayout->addWidget(refreshTargetsButton);
+      }
+    }
+
+    auto button = new QPushButton(this);
+    button->setText("Start Stream");
+    connect(button, &QPushButton::clicked, this, &StreamDialog::startStream);
+    layout->addWidget(button, Qt::AlignRight | Qt::AlignBottom);
+  }

  setWindowTitle("discord-screenaudio Stream Dialog");
-  setFixedSize(0, 0);
 }

 void StreamDialog::startStream() {
-  auto resolution =
-      m_qualityResolutionComboBox->currentData().toString().split('x');
-  emit requestedStreamStart(m_targetComboBox->currentText(),
-                            resolution[0].toUInt(), resolution[1].toUInt(),
-                            m_qualityFPSComboBox->currentData().toUInt());
+  auto resolution = m_resolutionComboBox->currentData().toString().split('x');
+  emit requestedStreamStart(m_videoGroupBox->isChecked(),
+                            m_audioGroupBox->isChecked(), resolution[0].toInt(),
+                            resolution[1].toInt(),
+                            m_framerateComboBox->currentData().toInt(),
+                            m_targetComboBox->currentText());
  setHidden(true);
 }

 void StreamDialog::updateTargets() {
+  auto lastTarget = m_targetComboBox->currentText();
+
  m_targetComboBox->clear();
-  m_targetComboBox->addItem("None");
+  m_targetComboBox->addItem("[All Desktop Audio]");
  for (auto target : Virtmic::getTargets()) {
    m_targetComboBox->addItem(target);
  }
+
+  if (m_targetComboBox->findText(lastTarget) != -1)
+    m_targetComboBox->setCurrentText(lastTarget);
+  else
+    m_targetComboBox->setCurrentText("[All Desktop Audio]");
 }
--- a/src/streamdialog.h
+++ b/src/streamdialog.h
@@ -2,22 +2,25 @@

 #include <QComboBox>
 #include <QDialog>
+#include <QGroupBox>
 #include <QWidget>

-class StreamDialog : public QWidget {
+class StreamDialog : public QDialog {
  Q_OBJECT

 public:
-  explicit StreamDialog();
+  explicit StreamDialog(QWidget *parent = nullptr);

 private:
  QComboBox *m_targetComboBox;
-  QComboBox *m_qualityResolutionComboBox;
-  QComboBox *m_qualityFPSComboBox;
+  QComboBox *m_resolutionComboBox;
+  QComboBox *m_framerateComboBox;
+  QGroupBox *m_videoGroupBox;
+  QGroupBox *m_audioGroupBox;

 Q_SIGNALS:
-  void requestedStreamStart(QString target, uint width, uint height,
-                            uint frameRate);
+  void requestedStreamStart(bool video, bool audio, int width, int height,
+                            int frameRate, QString target);

 public Q_SLOTS:
  void updateTargets();
--- a/src/userscript.cpp
+++ b/src/userscript.cpp
@@ -0,0 +1,180 @@
+#include "userscript.h"
+#include "log.h"
+#include "mainwindow.h"
+
+#include <QApplication>
+#include <QDebug>
+#include <QFile>
+#include <QInputDialog>
+#include <QMessageBox>
+#include <QStandardPaths>
+#include <QTimer>
+
+#ifdef KXMLGUI
+#include <KActionCollection>
+#endif
+
+UserScript::UserScript() : QObject() {
+  setupHelpMenu();
+  setupShortcutsDialog();
+  setupStreamDialog();
+  setupVirtmic();
+}
+
+void UserScript::setupHelpMenu() {
+#ifdef KXMLGUI
+  m_kxmlgui = true;
+
+  KAboutData aboutData(
+      "discord-screenaudio", "discord-screenaudio",
+      QApplication::applicationVersion(),
+      "Custom Discord client with the ability to stream audio on Linux",
+      KAboutLicense::GPL_V3, "Copyright 2022 (C) Malte Jürgens");
+  aboutData.setBugAddress("https://github.com/maltejur/discord-screenaudio");
+  aboutData.addAuthor("Malte Jürgens", "Author", "maltejur@dismail.de",
+                      "https://github.com/maltejur");
+  aboutData.addCredit("edisionnano",
+                      "For creating and documenting the approach for streaming "
+                      "audio in Discord used in this project.",
+                      QString(),
+                      "https://github.com/edisionnano/"
+                      "Screenshare-with-audio-on-Discord-with-Linux");
+  aboutData.addCredit(
+      "Curve", "For creating the Rohrkabel library used in this project.",
+      QString(), "https://github.com/Curve");
+  aboutData.addComponent("Rohrkabel", "A C++ RAII Pipewire-API Wrapper", "1.3",
+                         "https://github.com/Soundux/rohrkabel");
+  m_helpMenu = new KHelpMenu(MainWindow::instance(), aboutData);
+#endif
+}
+
+void UserScript::setupShortcutsDialog() {
+#ifdef KXMLGUI
+#ifdef KGLOBALACCEL
+  m_kglobalaccel = true;
+
+  auto toggleMuteAction = new QAction(this);
+  toggleMuteAction->setText("Toggle Mute");
+  toggleMuteAction->setIcon(QIcon::fromTheme("microphone-sensitivity-muted"));
+  connect(toggleMuteAction, &QAction::triggered, this,
+          &UserScript::muteToggled);
+
+  auto toggleDeafenAction = new QAction(this);
+  toggleDeafenAction->setText("Toggle Deafen");
+  toggleDeafenAction->setIcon(QIcon::fromTheme("audio-volume-muted"));
+  connect(toggleDeafenAction, &QAction::triggered, this,
+          &UserScript::deafenToggled);
+
+  m_actionCollection = new KActionCollection(this);
+  m_actionCollection->addAction("toggleMute", toggleMuteAction);
+  KGlobalAccel::setGlobalShortcut(toggleMuteAction, QList<QKeySequence>{});
+  m_actionCollection->addAction("toggleDeafen", toggleDeafenAction);
+  KGlobalAccel::setGlobalShortcut(toggleDeafenAction, QList<QKeySequence>{});
+
+  m_shortcutsDialog = new KShortcutsDialog(KShortcutsEditor::GlobalAction);
+  m_shortcutsDialog->addCollection(m_actionCollection);
+#endif
+#endif
+}
+
+void UserScript::setupStreamDialog() {
+  m_streamDialog = new StreamDialog(MainWindow::instance());
+  connect(m_streamDialog, &StreamDialog::requestedStreamStart, this,
+          &UserScript::startStream);
+}
+
+void UserScript::setupVirtmic() {
+  m_virtmicProcess.setProcessChannelMode(QProcess::ForwardedChannels);
+}
+
+bool UserScript::isVirtmicRunning() {
+  return m_virtmicProcess.state() != QProcess::NotRunning;
+}
+
+QString UserScript::version() { return QApplication::applicationVersion(); }
+
+QVariant UserScript::getPref(QString name, QVariant fallback) {
+  return MainWindow::instance()->settings()->value(name, fallback);
+}
+
+bool UserScript::getBoolPref(QString name, bool fallback) {
+  return getPref(name, fallback).toBool();
+}
+
+void UserScript::setPref(QString name, QVariant value) {
+  return MainWindow::instance()->settings()->setValue(name, value);
+}
+
+void UserScript::setTrayIcon(bool value) {
+  setPref("trayIcon", value);
+  MainWindow::instance()->setTrayIcon(value);
+}
+
+void UserScript::log(QString message) {
+  qDebug(userscriptLog) << message.toUtf8().constData();
+}
+
+void UserScript::showShortcutsDialog() {
+#ifdef KXMLGUI
+#ifdef KGLOBALACCEL
+  m_shortcutsDialog->show();
+#else
+  QMessageBox::information(MainWindow::instance(), "discord-screenaudio",
+                           "Keybinds are not supported on this platform "
+                           "(KGlobalAccel is not available).",
+                           QMessageBox::Ok);
+#endif
+#else
+  QMessageBox::information(MainWindow::instance(), "discord-screenaudio",
+                           "Keybinds are not supported on this platform "
+                           "(KXmlGui and KGlobalAccel are not available).",
+                           QMessageBox::Ok);
+#endif
+}
+
+void UserScript::showHelpMenu() {
+#ifdef KXMLGUI
+  m_helpMenu->aboutApplication();
+#endif
+}
+
+void UserScript::stopVirtmic() {
+  if (m_virtmicProcess.state() == QProcess::Running) {
+    qDebug(virtmicLog) << "Stopping Virtmic";
+    m_virtmicProcess.kill();
+    m_virtmicProcess.waitForFinished();
+  }
+}
+
+void UserScript::startVirtmic(QString target) {
+  qDebug(virtmicLog) << "Starting Virtmic with target" << target;
+  m_virtmicProcess.start(QApplication::arguments()[0], {"--virtmic", target});
+}
+
+void UserScript::startStream(bool video, bool audio, int width, int height,
+                             int frameRate, QString target) {
+  stopVirtmic();
+  startVirtmic(audio ? target : "[None]");
+  // Wait a bit for the virtmic to start
+  QTimer::singleShot(
+      200, [=]() { emit streamStarted(video, width, height, frameRate); });
+}
+
+void UserScript::showStreamDialog() {
+  if (m_streamDialog->isHidden())
+    m_streamDialog->setHidden(false);
+  else
+    m_streamDialog->activateWindow();
+  m_streamDialog->updateTargets();
+}
+
+void UserScript::showThemeDialog() {
+  auto url = QInputDialog::getText(MainWindow::instance(), "Theme Installation",
+                                   "Please enter the URL of the Theme");
+  if (url != "")
+    emit shouldInstallUserStyles(url);
+}
+
+void UserScript::installUserStyles(QString url) {
+  emit shouldInstallUserStyles(url);
+}
--- a/src/userscript.h
+++ b/src/userscript.h
@@ -0,0 +1,83 @@
+#pragma once
+
+#include "streamdialog.h"
+
+#include <QObject>
+#include <QProcess>
+
+#ifdef KXMLGUI
+#include <KAboutData>
+#include <KHelpMenu>
+#include <KShortcutsDialog>
+#include <KXmlGuiWindow>
+#include <QAction>
+
+#ifdef KGLOBALACCEL
+#include <KGlobalAccel>
+#endif
+
+#endif
+
+#ifdef KNOTIFICATIONS
+#include <KNotification>
+#endif
+
+class UserScript : public QObject {
+  Q_OBJECT
+
+public:
+  UserScript();
+  bool isVirtmicRunning();
+  Q_PROPERTY(QString version READ version CONSTANT);
+  Q_PROPERTY(bool kxmlgui MEMBER m_kxmlgui CONSTANT);
+  Q_PROPERTY(bool kglobalaccel MEMBER m_kglobalaccel CONSTANT);
+  Q_PROPERTY(QString userstyles MEMBER m_userstyles NOTIFY userstylesChanged);
+  Q_PROPERTY(QString loadingMessage MEMBER m_loadingMessage NOTIFY
+                 loadingMessageChanged);
+
+private:
+  QProcess m_virtmicProcess;
+  StreamDialog *m_streamDialog;
+  bool m_kxmlgui = false;
+  bool m_kglobalaccel = false;
+  QString m_userstyles;
+  QString m_loadingMessage;
+#ifdef KXMLGUI
+  KHelpMenu *m_helpMenu;
+#ifdef KGLOBALACCEL
+  KActionCollection *m_actionCollection;
+  KShortcutsDialog *m_shortcutsDialog;
+#endif
+#endif
+  void setupHelpMenu();
+  void setupShortcutsDialog();
+  void setupStreamDialog();
+  void setupVirtmic();
+
+Q_SIGNALS:
+  void muteToggled();
+  void deafenToggled();
+  void streamStarted(bool video, int width, int height, int frameRate);
+  void userstylesChanged();
+  void loadingMessageChanged(QString message);
+  void shouldInstallUserStyles(QString url);
+
+public Q_SLOTS:
+  void log(QString message);
+  QString version();
+  QVariant getPref(QString name, QVariant fallback);
+  bool getBoolPref(QString name, bool fallback);
+  void setPref(QString name, QVariant value);
+  void setTrayIcon(bool value);
+  void showShortcutsDialog();
+  void showHelpMenu();
+  void showStreamDialog();
+  void stopVirtmic();
+  void startVirtmic(QString target);
+  void showThemeDialog();
+  void installUserStyles(QString url);
+
+private Q_SLOTS:
+  void startStream(bool video, bool audio, int width, int height, int frameRate,
+                   QString target);
+};
--- a/src/virtmic.cpp
+++ b/src/virtmic.cpp
@@ -1,7 +1,13 @@
 #include "virtmic.h"
+#include "log.h"
+
+#include <rohrkabel/loop/main.hpp>
+#include <rohrkabel/registry/registry.hpp>

 namespace Virtmic {

+const QStringList EXCLUDE_TARGETS{"Chromium input", "discord-screenaudio"};
+
 QVector<QString> getTargets() {
  auto main_loop = pipewire::main_loop();
  auto context = pipewire::context(main_loop);
@@ -16,15 +22,21 @@ QVector<QString> getTargets() {
        if (global.type == pipewire::node::type) {
          auto node = reg.bind<pipewire::node>(global.id);
          auto info = node.info();
+          QString name;
+          if (info.props.count("application.name") &&
+              info.props["application.name"] != "")
+            name = QString::fromStdString(info.props["application.name"]);
+          else
+            name = QString::fromStdString(
+                info.props["application.process.binary"]);

-          if (info.props.count("node.name")) {
-            auto name = QString::fromStdString(info.props["node.name"]);
-            if (!targets.contains(name))
-              targets.append(name);
+          if (name != "" && !EXCLUDE_TARGETS.contains(name) &&
+              !targets.contains(name)) {
+            targets.append(name);
          }
        }
      });
-  core.sync();
+  core.update();

  return targets;
 }
@@ -61,43 +73,68 @@ void start(QString _target) {
        continue;

      auto &parent = nodes.at(parent_id);
+      std::string name;
+      if (parent.props.count("application.name") &&
+          parent.props["application.name"] != "")
+        name = parent.props["application.name"];
+      else
+        name = parent.props["application.process.binary"];

-      if (parent.props["node.name"].find(target) != std::string::npos) {
-        std::cout << "[virtmic] "
-                  << "Link   : " << target << ":" << port_id << " -> ";
-
-        if (port.info().props["audio.channel"] == "FL") {
-          links.emplace(port_id, core.create<pipewire::link_factory>(
-                                     {virt_fl->info().id, port_id}));
-          std::cout << "[virtmic] " << virt_fl->info().id << std::endl;
-        } else {
-          links.emplace(port_id, core.create<pipewire::link_factory>(
-                                     {virt_fr->info().id, port_id}));
-          std::cout << "[virtmic] " << virt_fr->info().id << std::endl;
-        }
+      if (name == target ||
+          (target == "[All Desktop Audio]" &&
+           !EXCLUDE_TARGETS.contains(QString::fromStdString(name)))) {
+        auto fl = port.info().props["audio.channel"] == "FL";
+        links.emplace(
+            port_id,
+            core.create<pipewire::link_factory>(
+                {fl ? virt_fl->info().id : virt_fr->info().id, port_id}));
+        qDebug(virtmicLog) << QString("Link: %1:%2 -> %3")
+                                  .arg(QString::fromStdString(name))
+                                  .arg(port_id)
+                                  .arg(fl ? virt_fl->info().id
+                                          : virt_fr->info().id)
+                                  .toUtf8()
+                                  .data();
      }
    }
  };

  std::string target = _target.toLatin1().toStdString();

-  auto virtual_mic =
-      core.create("adapter",
-                  {{"node.name", "discord-screenaudio-virtmic"},
-                   {"media.class", "Audio/Source/Virtual"},
-                   {"factory.name", "support.null-audio-sink"},
-                   {"audio.channels", "2"},
-                   {"audio.position", "FL,FR"}},
-                  pipewire::node::type, pipewire::node::version, false);
+  auto virtual_mic = core.create("adapter",
+                                 {{"node.name", "discord-screenaudio-virtmic"},
+                                  {"media.class", "Audio/Source/Virtual"},
+                                  {"factory.name", "support.null-audio-sink"},
+                                  {"audio.channels", "2"},
+                                  {"audio.position", "FL,FR"}},
+                                 pipewire::node::type, pipewire::node::version,
+                                 pipewire::update_strategy::none);
+
+  if (target == "[None]") {
+    while (true) {
+      main_loop.run();
+    }
+    return;
+  }

  auto reg_events = reg.listen<pipewire::registry_listener>();
  reg_events.on<pipewire::registry_event::global>(
      [&](const pipewire::global &global) {
        if (global.type == pipewire::node::type) {
          auto node = reg.bind<pipewire::node>(global.id);
-          std::cout << "[virtmic] "
-                    << "Added  : " << node.info().props["node.name"]
-                    << std::endl;
+          auto info = node.info();
+          std::string name;
+          if (info.props.count("application.name") &&
+              info.props["application.name"] != "")
+            name = info.props["application.name"];
+          else if (info.props.count("application.process.binary")) {
+            name = info.props["application.process.binary"];
+          } else
+            return;
+          qDebug(virtmicLog) << QString("Added: %1")
+                                    .arg(QString::fromStdString(name))
+                                    .toUtf8()
+                                    .data();

          if (!nodes.count(global.id)) {
            nodes.emplace(global.id, node.info());
@@ -131,8 +168,16 @@ void start(QString _target) {
      [&](const std::uint32_t id) {
        if (nodes.count(id)) {
          auto info = nodes.at(id);
-          std::cout << "[virtmic] "
-                    << "Removed: " << info.props["node.name"] << std::endl;
+          std::string name;
+          if (info.props.count("application.name") &&
+              info.props["application.name"] != "")
+            name = info.props["application.name"];
+          else
+            name = info.props["application.process.binary"];
+          qDebug(virtmicLog) << QString("Removed: %1")
+                                    .arg(QString::fromStdString(name))
+                                    .toUtf8()
+                                    .data();
          nodes.erase(id);
        }
        if (ports.count(id)) {
--- a/src/virtmic.h
+++ b/src/virtmic.h
@@ -3,7 +3,6 @@
 #include <QString>
 #include <QVector>
 #include <iostream>
-#include <rohrkabel/registry/registry.hpp>

 namespace Virtmic {

--- a/submodules/rohrkabel
+++ b/submodules/rohrkabel
--- a/version.cmake
+++ b/version.cmake
@@ -0,0 +1,164 @@
+# Copyright (c) 2018-2021 Ribose Inc.
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions
+# are met:
+# 1. Redistributions of source code must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+# 2. Redistributions in binary form must reproduce the above copyright
+#    notice, this list of conditions and the following disclaimer in the
+#    documentation and/or other materials provided with the distribution.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+# ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
+# TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+# PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDERS OR CONTRIBUTORS
+# BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+# CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+# SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+# INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+# CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+# ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+# POSSIBILITY OF SUCH DAMAGE.
+
+# desired length of commit hash
+set(GIT_REV_LEN 7)
+
+# call git, store output in var (can fail)
+macro(_git var)
+  execute_process(
+    COMMAND "${GIT_EXECUTABLE}" ${ARGN}
+    WORKING_DIRECTORY "${source_dir}"
+    RESULT_VARIABLE _git_ec
+    OUTPUT_VARIABLE ${var}
+    OUTPUT_STRIP_TRAILING_WHITESPACE
+    ERROR_QUIET
+  )
+endmacro()
+
+function(extract_version_info version var_prefix)
+  # extract the main components
+  #   v1.9.0-3-g5b92266+1546836556
+  #   v1.9.0-3-g5b92266-dirty+1546836556
+  string(REGEX MATCH "^v?([0-9]+\\.[0-9]+\\.[0-9]+)(-([0-9]+)-g([0-9a-f]+)(-dirty)?)?(\\+([0-9]+))?$" matches "${version}")
+  if (NOT matches)
+    message(FATAL_ERROR "Failed to extract version components from ${version}.")
+  endif()
+  set(${var_prefix}_VERSION "${CMAKE_MATCH_1}" PARENT_SCOPE) # 1.9.0
+  if (NOT CMAKE_MATCH_3)
+    set(CMAKE_MATCH_3 "0")
+  endif()
+  set(${var_prefix}_VERSION_NCOMMITS "${CMAKE_MATCH_3}" PARENT_SCOPE) # 3
+  if (NOT CMAKE_MATCH_4)
+    set(CMAKE_MATCH_4 "0")
+  endif()
+  set(${var_prefix}_VERSION_GIT_REV "${CMAKE_MATCH_4}" PARENT_SCOPE) # 5b92266
+  if (CMAKE_MATCH_5 STREQUAL "-dirty")
+    set(${var_prefix}_VERSION_IS_DIRTY TRUE PARENT_SCOPE)
+  else()
+    set(${var_prefix}_VERSION_IS_DIRTY FALSE PARENT_SCOPE)
+  endif()
+  # timestamp is optional, default to 0
+  if (NOT CMAKE_MATCH_7)
+    set(CMAKE_MATCH_7 "0")
+  endif()
+  set(${var_prefix}_VERSION_COMMIT_TIMESTAMP "${CMAKE_MATCH_7}" PARENT_SCOPE) # 1546836556
+endfunction()
+
+function(determine_version source_dir var_prefix)
+  set(has_release_tag NO)
+  set(has_version_txt NO)
+  set(local_prefix "_determine_ver")
+  # find out base version via version.txt
+  set(base_version "0.0.0")
+  if (EXISTS "${source_dir}/version.txt")
+    set(has_version_txt YES)
+    file(STRINGS "${source_dir}/version.txt" version_file)
+    extract_version_info("${version_file}" "${local_prefix}")
+    set(base_version "${${local_prefix}_VERSION}")
+    message(STATUS "Found version.txt with ${version_file}")
+  else()
+    message(STATUS "Found no version.txt.")
+  endif()
+  # for GIT_EXECUTABLE
+  find_package(Git)
+  # get a description of the version, something like:
+  #   v1.9.1-0-g38ffe82        (a tagged release)
+  #   v1.9.1-0-g38ffe82-dirty  (a tagged release with local modifications)
+  #   v1.9.0-3-g5b92266        (post-release snapshot)
+  #   v1.9.0-3-g5b92266-dirty  (post-release snapshot with local modifications)
+  _git(version describe --abbrev=${GIT_REV_LEN} --match "v[0-9]*" --long --dirty)
+  if (NOT _git_ec EQUAL 0)
+    # no annotated tags, fake one
+    message(STATUS "Found no annotated tags.")
+    _git(revision rev-parse --short=${GIT_REV_LEN} --verify HEAD)
+    if (_git_ec EQUAL 0)
+      set(version "v${base_version}-0-g${revision}")
+      # check if dirty (this won't detect untracked files, but should be ok)
+      _git(changes diff-index --quiet HEAD --)
+      if (NOT _git_ec EQUAL 0)
+        string(APPEND version "-dirty")
+      endif()
+      # append the commit timestamp of the most recent commit (only
+      # in non-release branches -- typically master)
+      _git(commit_timestamp show -s --format=%ct)
+      if (_git_ec EQUAL 0)
+        string(APPEND version "+${commit_timestamp}")
+      endif()
+    elseif(has_version_txt)
+      # Nothing to get from git - so use version.txt completely
+      set(version "${version_file}")
+    else()
+      # Sad case - no git, no version.txt
+      set(version "v${base_version}")
+    endif()
+  else()
+    set(has_release_tag YES)
+    message(STATUS "Found annotated tag ${version}")
+  endif()
+  extract_version_info("${version}" "${local_prefix}")
+  if ("${has_version_txt}" AND NOT ${base_version} STREQUAL ${local_prefix}_VERSION)
+    message(WARNING "Tagged version ${${local_prefix}_VERSION} doesn't match one from the version.txt: ${base_version}")
+    if (${base_version} VERSION_GREATER ${local_prefix}_VERSION)
+      set(${local_prefix}_VERSION ${base_version})
+    endif()
+  endif()
+  foreach(suffix VERSION VERSION_NCOMMITS VERSION_GIT_REV VERSION_IS_DIRTY VERSION_COMMIT_TIMESTAMP)
+    if (NOT DEFINED ${local_prefix}_${suffix})
+      message(FATAL_ERROR "Unable to determine version.")
+    endif()
+    set(${var_prefix}_${suffix} "${${local_prefix}_${suffix}}" PARENT_SCOPE)
+    message(STATUS "${var_prefix}_${suffix}: ${${local_prefix}_${suffix}}")
+  endforeach()
+  # Set VERSION_SUFFIX and VERSION_FULL. When making changes, be aware that
+  # this is used in packaging as well and will affect ordering.
+  # | state                 | version_full                |
+  # |-----------------------------------------------------|
+  # | exact tag             | 0.9.0                       |
+  # | exact tag, dirty      | 0.9.0+git20180604           |
+  # | after tag             | 0.9.0+git20180604.1.085039f |
+  # | no tag, version.txt   | 0.9.0                       |
+  # | no tag, no version.txt| 0.0.0+git20180604.2ee02af   |
+  string(TIMESTAMP date "%Y%m%d" UTC)
+  set(version_suffix "")
+  if (has_version_txt)
+  elseif (NOT ${local_prefix}_VERSION_NCOMMITS EQUAL 0)
+    # 0.9.0+git20150604.4.289818b
+    string(APPEND version_suffix "+git${date}.${${local_prefix}_VERSION_NCOMMITS}.${${local_prefix}_VERSION_GIT_REV}")
+  elseif ((NOT has_release_tag) AND ((NOT has_version_txt) OR ("${base_version}" STREQUAL "0.0.0") OR (NOT "${revision}" STREQUAL "")))
+    # 0.9.0+git20150604.289818b
+    string(APPEND version_suffix "+git${date}.${${local_prefix}_VERSION_GIT_REV}")
+  elseif(${local_prefix}_VERSION_IS_DIRTY)
+    # 0.9.0+git20150604
+    string(APPEND version_suffix "+git${date}")
+  endif()
+  set(version_full "${${local_prefix}_VERSION}${version_suffix}")
+  # set the results
+  set(${var_prefix}_VERSION_SUFFIX "${version_suffix}" PARENT_SCOPE)
+  set(${var_prefix}_VERSION_FULL "${version_full}" PARENT_SCOPE)
+  # for informational purposes
+  message(STATUS "${var_prefix}_VERSION_SUFFIX: ${version_suffix}")
+  message(STATUS "${var_prefix}_VERSION_FULL: ${version_full}")
+endfunction()
+
Author	SHA1	Message	Date
Malte Jürgens	37c1482407	fix	2023-03-05 22:24:10 +01:00
Malte Jürgens	565eef7327	test qt6	2023-03-05 22:15:23 +01:00
Malte Jürgens	87e84dec5c	change config file location	2023-03-04 13:29:30 +01:00
Malte Jürgens	4b782133ae	Merge branch 'arrpc'	2023-03-04 13:15:11 +01:00
Malte Jürgens	d5257207bc	dont show theme buttons for now	2023-03-02 23:15:41 +01:00
Malte Jürgens	423884ae0c	remove channel submodule	2023-03-02 17:29:10 +01:00
Malte Jürgens	7ea3d0aab1	remove arrpc submodule	2023-03-02 17:25:00 +01:00
Malte Jürgens	18b15f5cf4	Merge branch 'master' into arrpc	2023-03-02 17:23:08 +01:00
Malte Jürgens	96bca52d0d	fix keybinds	2023-03-02 17:21:04 +01:00
Malte Jürgens	3540774c82	testing arrpc server	2023-03-02 16:43:42 +01:00
Malte Jürgens	b5435acdd8	Merge pull request #114 from AndreasYNY/master Add arrpc bridge_mod	2023-03-01 11:20:57 +00:00
Andreas	38c2b92e2d	Add arrpc bridge_mod This is a very bad way to do it, but why not still need ARRPC to be running.	2023-02-28 21:36:02 +07:00
Malte Jürgens	e447206082	remember geometry	2023-02-27 20:38:14 +01:00
Malte Jürgens	77f31b63aa	fix path for flatpak in faq	2023-02-19 00:38:33 +01:00
Malte Jürgens	0b9fc100c2	fix	2023-02-19 00:36:27 +01:00
Malte Jürgens	f73524de27	create config dir if it doesn't exist	2023-02-19 00:35:09 +01:00
Malte Jürgens	8a8690fe53	console log config location	2023-02-18 23:53:17 +01:00
Malte Jürgens	259e6dc75d	remove kjob	2023-02-18 15:24:58 +01:00
Malte Jürgens	9cbdca0441	Merge branch 'master' of https://github.com/maltejur/discord-screenaudio	2023-02-18 15:24:30 +01:00
Malte Jürgens	a9ddc0216f	Merge pull request #107 from llyyr/fix-various-build Fix various build issues	2023-02-18 14:23:29 +00:00
Malte Jürgens	b39e23d462	make themes work better	2023-02-18 15:23:14 +01:00
llyyr	331fb8f4ca	fix comparison of different signedness	2023-02-18 08:42:09 +05:30
llyyr	335a4456ed	KJob is part of Kf5Notifications and optional	2023-02-18 08:41:17 +05:30
llyyr	26a2ca7b05	add missing include	2023-02-18 08:40:19 +05:30
Malte Jürgens	30c0526ff7	filter out stuff we dont want better	2023-02-17 17:13:49 +01:00
Malte Jürgens	3119e1df19	show userstyles status on the bottom of the page	2023-02-17 16:20:29 +01:00
Malte Jürgens	63180f5d53	load userstyles on demand	2023-02-17 15:47:36 +01:00
Malte Jürgens	78d43991ab	Merge pull request #106 from alvesvaren/patch-1 Fix link in readme	2023-02-16 11:41:56 +00:00
Alve Svarén	193b69f45f	Fix link in readme	2023-02-16 11:32:47 +01:00
Malte Jürgens	485ff9634b	fix log	2023-02-15 15:49:04 +01:00
Malte Jürgens	74fdef683f	try to prefetch external userstyle urls	2023-02-15 15:19:43 +01:00
Malte Jürgens	02fdc62fbe	add faq about `userstyles.css`	2023-02-15 02:35:48 +01:00
Malte Jürgens	d9e3704176	fix about styles	2023-02-15 02:27:23 +01:00
Malte Jürgens	36c8cfedb7	fix qlayout error	2023-02-15 02:21:41 +01:00
Malte Jürgens	c52daab420	allow for custom user styles	2023-02-15 01:59:22 +01:00
Malte Jürgens	8c4fae3410	fix keybind button	2023-02-15 01:35:23 +01:00
Malte Jürgens	ac71e9bbcb	make discord log look better	2023-02-15 01:30:22 +01:00
Malte Jürgens	fc0dbb5b34	make userscript properties constant	2023-02-15 00:33:52 +01:00
Malte Jürgens	5df24629e6	add faq about drag and drop in flatpak	2023-02-12 17:21:10 +01:00
Malte Jürgens	1477a9d4c0	use qtwebchannel to communicate with userscript	2023-02-12 17:20:33 +01:00
Malte Jürgens	0b12487dfd	add setting to start hidden to tray	2023-02-07 11:53:10 +01:00
Malte Jürgens	a10cfda56d	fix usage of `application.process.binary`	2023-01-26 01:19:38 +01:00
Malte Jürgens	2a809e163e	fix class names for tray settings	2023-01-26 00:45:14 +01:00
Malte Jürgens	bc317d5531	use `application.process.binary` if `application.name` is not available	2023-01-25 18:47:08 +01:00
Malte Jürgens	b4db987217	fix tray settings	2023-01-23 18:59:25 +01:00
Malte Jürgens	9f46e710a9	fix tray bug	2023-01-14 16:28:23 +01:00
Malte Jürgens	d6641a7a6e	Merge pull request #88 from maltejur/tray Implement Tray Icon	2023-01-14 14:51:46 +00:00
Malte Jürgens	b836be6530	Implement Tray Icon	2023-01-13 23:33:47 +01:00
Malte Jürgens	bfb0714b13	fix keybinds query selector	2023-01-09 22:20:11 +01:00
Malte Jürgens	374b854261	Update README	2023-01-09 22:19:45 +01:00
Malte Jürgens	1f6105f76b	allow for building with qt6	2022-12-27 19:00:10 +01:00
Malte Jürgens	3071159332	Update screenshot	2022-12-11 17:55:04 +00:00
Malte Jürgens	f2de080e1b	update labels	2022-11-22 16:39:58 +01:00
Malte Jürgens	f4a60f281d	reworked stream dialog	2022-11-22 16:35:47 +01:00
Malte Jürgens	d693535d53	Revert "add clipboard permission" This reverts commit `b0a8815bb8`.	2022-11-09 22:13:34 +01:00
Malte Jürgens	e41af697f7	fix error	2022-11-05 00:08:25 +01:00
Malte Jürgens	b0a8815bb8	add clipboard permission	2022-11-04 23:20:46 +01:00
Malte Jürgens	150fd4364e	add `--notify-send` option	2022-11-04 23:16:49 +01:00
Malte Jürgens	a0a2924796	remove Vencord folder	2022-11-04 20:45:55 +00:00
Malte Jürgens	3c48621427	add developer field to metainfo	2022-10-28 21:57:32 +02:00
Malte Jürgens	9faabe1f3e	Merge pull request #66 from kherchel/fix/keybinds Fix mute and deafen keybinds disconnecting from the call	2022-10-25 18:18:08 +00:00
Kacper Herchel	68473d04d8	Fix mute and deafen keybinds disconnecting from the call instead of performing their appropriate action	2022-10-25 17:01:10 +02:00
Malte Jürgens	7c8f72b8d8	fix	2022-10-11 22:17:53 +02:00
Malte Jürgens	27cdd9f9a5	code fixes	2022-10-11 19:48:57 +02:00
Malte Jürgens	d184823ee9	Enable smooth scrolling	2022-10-10 21:54:26 +02:00
Malte Jürgens	dd2beed4eb	Implement Keybinds (#57 )	2022-10-10 19:50:26 +00:00
Malte Jürgens	3740553aba	Merge pull request #54 from D3SOX/improve-desktop-entry Improve desktop entry	2022-09-29 16:47:49 +00:00
Nico	555f5c62f5	feat(desktop-entry): add categories and comment	2022-09-29 18:45:08 +02:00
Malte Jürgens	af3c62c263	update screenshot	2022-09-25 11:32:23 +02:00
Malte Jürgens	c4f6c33f9d	display correct steam resolution	2022-09-21 17:32:41 +02:00
Malte Jürgens	758ffa8cb5	Update README (#48 )	2022-09-18 12:04:04 +02:00
Malte Jürgens	753da8b1d3	automatically detect if kf5notifications is installed	2022-08-29 14:23:00 +02:00
Vortex Acherontic	5f37ab314f	Changed location of openSUSE package (#34 )	2022-08-21 07:21:18 +02:00
Malte Jürgens	c7bff3f428	add refresh button to stream dialog	2022-08-04 15:51:03 +02:00
Malte Jürgens	34e23f7187	cmake: use version from text file without suffix	2022-08-04 15:47:04 +02:00
Malte Jürgens	c325dd6798	allow sharing all desktop audio	2022-08-04 15:27:39 +02:00
Malte Jürgens	b42fde85d1	only allow to share application audio	2022-08-04 14:57:09 +02:00
Malte Jürgens	cc379ada85	fix metainfo again	2022-08-04 11:10:29 +02:00
Malte Jürgens	fdb6145bbd	improve logging	2022-08-02 12:41:32 +02:00
Malte Jürgens	8bd4d1896a	poll for `enumerateDevices()` to get available	2022-08-02 11:56:08 +02:00
Malte Jürgens	1a2d09fe3d	remove useless main.h again	2022-08-02 11:46:37 +02:00
Malte Jürgens	f01c941c90	add timeout to getAudioDevice	2022-08-01 22:26:44 +02:00
Malte Jürgens	95d391e869	fix remote debugging	2022-08-01 19:59:01 +02:00
Malte Jürgens	af107168db	update metainfo description	2022-07-31 21:12:53 +02:00
Malte Jürgens	e7e6c5d82b	update readme	2022-07-30 21:14:56 +02:00
Malte Jürgens	ee0c66762d	add `--enable-features=WebRTCPipeWireCapturer` Co-authored-by: edisionnano <samantas5855@gmail.com>	2022-07-30 21:09:30 +02:00
LukeVader	c3483a42db	disclaimer (#23 ) * disclaimer add a disclaimer that no responsibility is on the developers in the case of any repercussions of breaking discord TOS * Update disclaimer Co-authored-by: Malte Jürgens <maltejur@dismail.de> Co-authored-by: Malte Jürgens <maltejur@dismail.de>	2022-07-29 21:01:11 +00:00
Malte Jürgens	d68797cebb	make KF5Notifications optional	2022-07-29 16:31:04 +02:00
Malte Jürgens	ef221d4574	implement better notifications	2022-07-29 16:08:19 +02:00
Malte Jürgens	3fa2e3fa3c	update installation instructions	2022-07-29 14:41:00 +02:00
Malte Jürgens	bda1bc0df6	fixed invisible stream dialog	2022-07-29 01:03:25 +02:00
Malte Jürgens	cb0f084d42	fix metainfo	2022-07-29 01:02:20 +02:00
Malte Jürgens	674ac146f2	use icon for window	2022-07-28 18:36:09 +02:00
Malte Jürgens	1ab00ee774	include timestamp in metainfo	2022-07-28 18:23:26 +02:00
Malte Jürgens	38bcc30ed4	display version number correctly	2022-07-28 18:13:18 +02:00
Malte Jürgens	204439af94	implement automatic versioning	2022-07-28 17:34:54 +02:00
Malte Jürgens	8fc529102c	bump version to 1.0.0-rc.11	2022-07-28 16:41:49 +02:00
Malte Jürgens	a7a8346b63	change icon location	2022-07-28 16:41:29 +02:00
Malte Jürgens	88b129f863	bump version to 1.0.0-rc.10	2022-07-28 16:39:27 +02:00
Malte Jürgens	f4fc2e1f19	change desktop file name	2022-07-28 16:39:02 +02:00
Malte Jürgens	e1b35e3ca8	bump version to 1.0.0-rc.9	2022-07-28 16:08:45 +02:00
Malte Jürgens	a773795e38	fix metainfo	2022-07-28 16:08:24 +02:00
Malte Jürgens	c8695ca5ff	bump version to 1.0.0-rc.8	2022-07-28 15:59:57 +02:00
Malte Jürgens	bc23d3423a	add metainfo	2022-07-28 15:58:50 +02:00
Malte Jürgens	f5217dfdfa	remove dependency on aria-label	2022-07-28 15:09:06 +02:00
Malte Jürgens	6ef16b9625	bump version to 1.0.0-rc.7	2022-07-27 21:24:31 +02:00
Malte Jürgens	b62f1bab1f	update readme	2022-07-27 19:49:49 +02:00
Malte Jürgens	5f9211f98f	remember is window was maximised before fullscreen	2022-07-27 19:38:09 +02:00
Malte Jürgens	cfbb4152c3	ensure application is closed when window is closed	2022-07-27 15:11:53 +02:00
Malte Jürgens	fa83e2d9a8	fix broken discord notifications after restart	2022-07-27 15:02:51 +02:00
Malte Jürgens	58ecbbc6f4	Allow navigation to external links	2022-07-27 14:53:16 +02:00
Malte Jürgens	77300ed178	allow discord to go fullscreen	2022-07-27 14:13:59 +02:00
Malte Jürgens	99df18ef89	add scope of project to readme	2022-07-27 13:09:15 +02:00
Malte Jürgens	6fc6140ce2	bump version to 1.0.0-rc.6	2022-07-27 00:36:33 +02:00
Malte Jürgens	84c12a752e	fix virtmic code for rohrkabel v1.2	2022-07-26 21:35:51 +02:00
Malte Jürgens	1199381803	fix git submodule update command	2022-07-26 16:53:13 +02:00
Malte Jürgens	bce32e2ba1	fix submodule version	2022-07-26 16:50:36 +02:00
Malte Jürgens	bc59458e19	use rohrkabel as submodule and update it to v1.2	2022-07-26 16:33:34 +02:00
Malte Jürgens	6492cb9a35	start virtmic with no target when audio capture is requested	2022-07-26 16:02:36 +02:00
Malte Jürgens	a814d9cc1b	decrease update interval to 500ms	2022-07-26 15:48:01 +02:00
Malte Jürgens	dd107c6767	Merge pull request #5 from teppyboy/patch-1 readme: add issue #1 to 3rd known issue	2022-07-25 20:03:46 +00:00
tretrauit	50be25d7db	readme: add issue #1 to 3rd known issue So people can trace down more information about this issue.	2022-07-26 03:02:41 +07:00
Malte Jürgens	fd894fb63e	Add "Known Issues"	2022-07-25 18:37:00 +00:00