From 53c4fd5bed08a285d98323e586adde0c8019180e Mon Sep 17 00:00:00 2001
From: thororen1234 <78185467+thororen1234@users.noreply.github.com>
Date: Thu, 18 Jul 2024 01:47:37 -0400
Subject: [PATCH] Fixes

---
 .../components/MicrophoneSettingsModal.tsx                  | 2 +-
 .../components/ScreenshareSettingsModal.tsx                 | 2 +-
 src/equicordplugins/betterScreenshare/components/index.tsx  | 1 -
 src/equicordplugins/betterScreenshare/stores/index.ts       | 1 -
 .../betterScreenshare/stores/screenshareAudioStore.ts       | 6 +++---
 src/equicordplugins/philsPluginLibrary/patches/audio.ts     | 2 +-
 src/equicordplugins/philsPluginLibrary/patches/video.ts     | 2 +-
 src/equicordplugins/philsPluginLibrary/store/index.ts       | 1 -
 8 files changed, 7 insertions(+), 10 deletions(-)

diff --git a/src/equicordplugins/betterScreenshare/components/MicrophoneSettingsModal.tsx b/src/equicordplugins/betterScreenshare/components/MicrophoneSettingsModal.tsx
index b031fc0d..5762a442 100644
--- a/src/equicordplugins/betterScreenshare/components/MicrophoneSettingsModal.tsx
+++ b/src/equicordplugins/betterScreenshare/components/MicrophoneSettingsModal.tsx
@@ -22,6 +22,7 @@ import { ModalSize } from "@utils/modal";
 import { Card, Forms, Select, Slider, TextInput, useEffect, useState } from "@webpack/common";
 import { SelectOption } from "@webpack/types";
 
+import { MicrophoneProfile, MicrophoneStore } from "../../betterMicrophone/stores";
 import {
     ProfilableStore,
     SettingsModal,
@@ -33,7 +34,6 @@ import {
     validateTextInputNumber
 } from "../../philsPluginLibrary";
 import { Styles } from "../../philsPluginLibrary/styles";
-import { MicrophoneProfile, MicrophoneStore } from "../stores";
 
 const simpleVoiceBitrates: readonly SelectOption[] = [
     {
diff --git a/src/equicordplugins/betterScreenshare/components/ScreenshareSettingsModal.tsx b/src/equicordplugins/betterScreenshare/components/ScreenshareSettingsModal.tsx
index 42e1cbdc..c3bb1bc3 100644
--- a/src/equicordplugins/betterScreenshare/components/ScreenshareSettingsModal.tsx
+++ b/src/equicordplugins/betterScreenshare/components/ScreenshareSettingsModal.tsx
@@ -22,6 +22,7 @@ import { ModalSize, openModalLazy } from "@utils/modal";
 import { Button, Card, Forms, React, Select, Slider, TextInput, useEffect, useState } from "@webpack/common";
 import { SelectOption } from "@webpack/types";
 
+import { MicrophoneSettingsModal } from "../../betterMicrophone/components";
 import {
     MediaEngineStore,
     openURL,
@@ -38,7 +39,6 @@ import {
 import { Styles } from "../../philsPluginLibrary/styles";
 import { PluginInfo } from "../constants";
 import { ScreenshareAudioProfile, ScreenshareAudioStore, ScreenshareProfile, ScreenshareStore } from "../stores";
-import { MicrophoneSettingsModal } from ".";
 
 const simpleResolutions: readonly (SelectOption & { value: types.Resolution; })[] = [
     {
diff --git a/src/equicordplugins/betterScreenshare/components/index.tsx b/src/equicordplugins/betterScreenshare/components/index.tsx
index 74eadc24..5177495f 100644
--- a/src/equicordplugins/betterScreenshare/components/index.tsx
+++ b/src/equicordplugins/betterScreenshare/components/index.tsx
@@ -17,6 +17,5 @@
 */
 
 export * from "./AudioSourceSelect";
-export * from "./MicrophoneSettingsModal";
 export * from "./OpenScreenshareSettingsButton";
 export * from "./ScreenshareSettingsModal";
diff --git a/src/equicordplugins/betterScreenshare/stores/index.ts b/src/equicordplugins/betterScreenshare/stores/index.ts
index 1a2fdfe8..d9e47818 100644
--- a/src/equicordplugins/betterScreenshare/stores/index.ts
+++ b/src/equicordplugins/betterScreenshare/stores/index.ts
@@ -16,6 +16,5 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */
 
-export * from "./microphoneStore";
 export * from "./screenshareAudioStore";
 export * from "./screenshareStore";
diff --git a/src/equicordplugins/betterScreenshare/stores/screenshareAudioStore.ts b/src/equicordplugins/betterScreenshare/stores/screenshareAudioStore.ts
index 29b2edaa..4a7a4579 100644
--- a/src/equicordplugins/betterScreenshare/stores/screenshareAudioStore.ts
+++ b/src/equicordplugins/betterScreenshare/stores/screenshareAudioStore.ts
@@ -16,14 +16,14 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */
 
-import { createPluginStore, ProfilableStore, profileable } from "../../philsPluginLibrary";
-import { PluginInfo } from "../constants";
 import {
     defaultMicrophoneProfiles as defaultScreenshareAudioProfiles,
     MicrophoneProfile as ScreenshareAudioProfile,
     MicrophoneStore as ScreenshareAudioStore,
     microphoneStoreDefault as screenshareAudioStoreDefault
-} from ".";
+} from "../../betterMicrophone/stores";
+import { createPluginStore, ProfilableStore, profileable } from "../../philsPluginLibrary";
+import { PluginInfo } from "../constants";
 
 export let screenshareAudioStore: ProfilableStore<ScreenshareAudioStore, ScreenshareAudioProfile>;
 
diff --git a/src/equicordplugins/philsPluginLibrary/patches/audio.ts b/src/equicordplugins/philsPluginLibrary/patches/audio.ts
index abe4c626..5910b0a6 100644
--- a/src/equicordplugins/philsPluginLibrary/patches/audio.ts
+++ b/src/equicordplugins/philsPluginLibrary/patches/audio.ts
@@ -19,8 +19,8 @@
 import { Logger } from "@utils/Logger";
 import { lodash } from "@webpack/common";
 
+import { MicrophoneProfile, MicrophoneStore } from "../../betterMicrophone.desktop/stores";
 import { ProfilableStore, replaceObjectValuesIfExist, types } from "..";
-import { MicrophoneProfile, MicrophoneStore } from "../store";
 
 export function getDefaultAudioTransportationOptions(connection: types.Connection) {
     return {
diff --git a/src/equicordplugins/philsPluginLibrary/patches/video.ts b/src/equicordplugins/philsPluginLibrary/patches/video.ts
index 5c24fa52..249e5978 100644
--- a/src/equicordplugins/philsPluginLibrary/patches/video.ts
+++ b/src/equicordplugins/philsPluginLibrary/patches/video.ts
@@ -19,8 +19,8 @@
 import { Logger } from "@utils/Logger";
 import { lodash } from "@webpack/common";
 
+import { ScreenshareProfile, ScreenshareStore } from "../../betterScreenshare/stores";
 import { ProfilableStore, replaceObjectValuesIfExist, types, utils } from "..";
-import { ScreenshareProfile, ScreenshareStore } from "../store";
 
 
 export function getDefaultVideoTransportationOptions(connection: types.Connection) {
diff --git a/src/equicordplugins/philsPluginLibrary/store/index.ts b/src/equicordplugins/philsPluginLibrary/store/index.ts
index 3081d696..c2b57c67 100644
--- a/src/equicordplugins/philsPluginLibrary/store/index.ts
+++ b/src/equicordplugins/philsPluginLibrary/store/index.ts
@@ -16,7 +16,6 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */
 
-export * from "./microphoneStore";
 export * from "./profileable";
 export * from "./screenshareAudioStore";
 export * from "./screenshareStore";