remember stream resolution & fps settings

src/renderer/components/ScreenSharePicker.tsx

@@ -22,7 +22,7 @@ import {
 import { Node } from "@vencord/venmic";
 import type { Dispatch, SetStateAction } from "react";
 import { addPatch } from "renderer/patches/shared";
-import { useSettings } from "renderer/settings";
+import { State, useSettings, useVesktopState } from "renderer/settings";
 import { classNameFactory, isLinux, isWindows } from "renderer/utils";
 
 const StreamResolutions = ["480", "720", "1080", "1440", "2160"] as const;
@@ -46,8 +46,6 @@ interface AudioItem {
 }
 
 interface StreamSettings {
-    resolution: StreamResolution;
-    fps: StreamFps;
     audio: boolean;
     contentHint?: string;
     includeSources?: AudioSources;
@@ -79,10 +77,11 @@ addPatch({
         }
     ],
     patchStreamQuality(opts: any) {
-        if (!currentSettings) return;
+        const { screenshareQuality } = State.store;
+        if (!screenshareQuality) return;
 
-        const framerate = Number(currentSettings.fps);
+        const framerate = Number(screenshareQuality.frameRate);
-        const height = Number(currentSettings.resolution);
+        const height = Number(screenshareQuality.resolution);
         const width = Math.round(height * (16 / 9));
 
         Object.assign(opts, {
@@ -316,14 +315,14 @@ function AudioSettingsModal({
     );
 }
 
-function OptionRadio(props: {
+function OptionRadio<Settings extends object, Key extends keyof Settings>(props: {
     options: Array<string> | ReadonlyArray<string>;
     labels?: Array<string>;
-    settingsKey: string;
+    settings: Settings;
-    settings: StreamSettings;
+    settingsKey: Key;
-    setSettings: Dispatch<SetStateAction<StreamSettings>>;
+    onChange: (option: string) => void;
 }) {
-    const { options, setSettings, settings, settingsKey, labels } = props;
+    const { options, settings, settingsKey, labels, onChange } = props;
 
     return (
         <div className={cl("option-radios")}>
@@ -336,7 +335,7 @@ function OptionRadio(props: {
                         name="fps"
                         value={option}
                         checked={settings[settingsKey] === option}
-                        onChange={() => setSettings(s => ({ ...s, [settingsKey]: option }))}
+                        onChange={() => onChange(option)}
                     />
                 </label>
             ))}
@@ -344,7 +343,7 @@ function OptionRadio(props: {
     );
 }
 
-function StreamSettings({
+function StreamSettingsUi({
     source,
     settings,
     setSettings,
@@ -356,6 +355,7 @@ function StreamSettings({
     skipPicker: boolean;
 }) {
     const Settings = useSettings();
+    const qualitySettings = State.store.screenshareQuality!;
 
     const [thumb] = useAwaiter(
         () => (skipPicker ? Promise.resolve(source.url) : VesktopNative.capturer.getLargeThumbnail(source.id)),
@@ -393,9 +393,9 @@ function StreamSettings({
                         <Forms.FormTitle>Resolution</Forms.FormTitle>
                         <OptionRadio
                             options={StreamResolutions}
+                            settings={qualitySettings}
                             settingsKey="resolution"
-                            settings={settings}
+                            onChange={value => (qualitySettings.resolution = value)}
-                            setSettings={setSettings}
                         />
                     </section>
 
@@ -403,9 +403,9 @@ function StreamSettings({
                         <Forms.FormTitle>Frame Rate</Forms.FormTitle>
                         <OptionRadio
                             options={StreamFps}
-                            settingsKey="fps"
+                            settings={qualitySettings}
-                            settings={settings}
+                            settingsKey="frameRate"
-                            setSettings={setSettings}
+                            onChange={value => (qualitySettings.frameRate = value)}
                         />
                     </section>
                 </div>
@@ -416,9 +416,9 @@ function StreamSettings({
                             <OptionRadio
                                 options={["motion", "detail"]}
                                 labels={["Prefer Smoothness", "Prefer Clarity"]}
-                                settingsKey="contentHint"
                                 settings={settings}
-                                setSettings={setSettings}
+                                settingsKey="contentHint"
+                                onChange={option => setSettings(s => ({ ...s, contentHint: option }))}
                             />
                             <div className={cl("hint-description")}>
                                 <p>
@@ -696,12 +696,14 @@ function ModalComponent({
 }) {
     const [selected, setSelected] = useState<string | undefined>(skipPicker ? screens[0].id : void 0);
     const [settings, setSettings] = useState<StreamSettings>({
-        resolution: "720",
-        fps: "30",
         contentHint: "motion",
         audio: true,
         includeSources: "None"
     });
+    const qualitySettings = (useVesktopState().screenshareQuality ??= {
+        resolution: "720",
+        frameRate: "30"
+    });
 
     return (
         <Modals.ModalRoot {...modalProps} size={ModalSize.MEDIUM}>
@@ -713,7 +715,7 @@ function ModalComponent({
                 {!selected ? (
                     <ScreenPicker screens={screens} chooseScreen={setSelected} />
                 ) : (
-                    <StreamSettings
+                    <StreamSettingsUi
                         source={screens.find(s => s.id === selected)!}
                         settings={settings}
                         setSettings={setSettings}
@@ -727,8 +729,8 @@ function ModalComponent({
                     onClick={() => {
                         currentSettings = settings;
                         try {
-                            const frameRate = Number(settings.fps);
+                            const frameRate = Number(qualitySettings.frameRate);
-                            const height = Number(settings.resolution);
+                            const height = Number(qualitySettings.resolution);
                             const width = Math.round(height * (16 / 9));
 
                             const conn = [...MediaEngineStore.getMediaEngine().connections].find(

src/renderer/patches/screenShareFixes.ts

@@ -6,6 +6,7 @@
 
 import { Logger } from "@vencord/types/utils";
 import { currentSettings } from "renderer/components/ScreenSharePicker";
+import { State } from "renderer/settings";
 import { isLinux } from "renderer/utils";
 
 const logger = new Logger("VesktopStreamFixes");
@@ -27,8 +28,8 @@ if (isLinux) {
         const stream = await original.call(this, opts);
         const id = await getVirtmic();
 
-        const frameRate = Number(currentSettings?.fps);
+        const frameRate = Number(State.store.screenshareQuality?.frameRate ?? 30);
-        const height = Number(currentSettings?.resolution);
+        const height = Number(State.store.screenshareQuality?.resolution ?? 720);
         const width = Math.round(height * (16 / 9));
         const track = stream.getVideoTracks()[0];
 

src/renderer/settings.ts

@@ -7,6 +7,9 @@
 import { useEffect, useReducer } from "@vencord/types/webpack/common";
 import { SettingsStore } from "shared/utils/SettingsStore";
 
+import { VesktopLogger } from "./logger";
+import { localStorage } from "./utils";
+
 export const Settings = new SettingsStore(VesktopNative.settings.get());
 Settings.addGlobalChangeListener((o, p) => VesktopNative.settings.set(o, p));
 
@@ -28,3 +31,38 @@ export function getValueAndOnChange(key: keyof typeof Settings.store) {
         onChange: (value: any) => (Settings.store[key] = value)
     };
 }
+
+interface TState {
+    screenshareQuality?: {
+        resolution: string;
+        frameRate: string;
+    };
+}
+
+const stateKey = "VesktopState";
+
+const currentState: TState = (() => {
+    const stored = localStorage.getItem(stateKey);
+    if (!stored) return {};
+    try {
+        return JSON.parse(stored);
+    } catch (e) {
+        VesktopLogger.error("Failed to parse stored state", e);
+        return {};
+    }
+})();
+
+export const State = new SettingsStore<TState>(currentState);
+State.addGlobalChangeListener((o, p) => localStorage.setItem(stateKey, JSON.stringify(o)));
+
+export function useVesktopState() {
+    const [, update] = useReducer(x => x + 1, 0);
+
+    useEffect(() => {
+        State.addGlobalChangeListener(update);
+
+        return () => State.removeGlobalChangeListener(update);
+    }, []);
+
+    return State.store;
+}

src/renderer/utils.ts

@@ -4,6 +4,7 @@
  * Copyright (c) 2023 Vendicated and Vencord contributors
  */
 
+// Discord deletes this from the window so we need to capture it in a variable
 export const { localStorage } = window;
 
 export const isFirstRun = (() => {