From c3da99eeeedd11b00d612a1ea7934353e9c812c3 Mon Sep 17 00:00:00 2001
From: Rie Takahashi <megumin.bakaretsurie@gmail.com>
Date: Mon, 24 Oct 2022 18:43:06 +0100
Subject: [PATCH] linting and stuff

---
 src/components/PluginSettings/PluginModal.tsx |  5 +++--
 .../components/SettingBooleanComponent.tsx    |  4 +++-
 .../components/SettingNumericComponent.tsx    |  4 +++-
 .../components/SettingSelectComponent.tsx     |  2 +-
 .../components/SettingSliderComponent.tsx     |  4 +++-
 .../components/SettingTextComponent.tsx       |  4 +++-
 src/components/PluginSettings/index.tsx       |  1 +
 src/components/Settings.tsx                   | 18 ++++++++++--------
 src/components/Updater.tsx                    |  4 +++-
 src/plugins/experiments.tsx                   |  6 ++++--
 .../components/PronounsAboutComponent.tsx     |  4 +++-
 src/webpack/components/Forms.tsx              | 18 ++++++++++++++++++
 src/webpack/components/Select.tsx             | 18 ++++++++++++++++++
 src/webpack/components/Toasts.tsx             | 18 ++++++++++++++++++
 src/webpack/components/index.ts               | 19 ++++++++++++++++++-
 15 files changed, 109 insertions(+), 20 deletions(-)

diff --git a/src/components/PluginSettings/PluginModal.tsx b/src/components/PluginSettings/PluginModal.tsx
index 908876f8..f8dcdeaf 100644
--- a/src/components/PluginSettings/PluginModal.tsx
+++ b/src/components/PluginSettings/PluginModal.tsx
@@ -16,6 +16,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */
 
+import { Forms } from "@components";
 import { User } from "discord-types/general";
 import { Constructor } from "type-fest";
 
@@ -25,7 +26,7 @@ import { lazyWebpack, proxyLazy } from "../../utils";
 import { ModalContent, ModalFooter, ModalHeader, ModalProps, ModalRoot, ModalSize } from "../../utils/modal";
 import { OptionType, Plugin } from "../../utils/types";
 import { filters } from "../../webpack";
-import { Button, FluxDispatcher, Forms, React, Text, Tooltip, UserStore, UserUtils } from "../../webpack/common";
+import { Button, FluxDispatcher, React, Text, Tooltip, UserStore, UserUtils } from "../../webpack/common";
 import ErrorBoundary from "../ErrorBoundary";
 import { Flex } from "../Flex";
 import {
@@ -33,7 +34,7 @@ import {
     SettingInputComponent,
     SettingNumericComponent,
     SettingSelectComponent,
-    SettingSliderComponent,
+    SettingSliderComponent
 } from "./components";
 
 const UserSummaryItem = lazyWebpack(filters.byCode("defaultRenderUser", "showDefaultAvatarsForNullUsers"));
diff --git a/src/components/PluginSettings/components/SettingBooleanComponent.tsx b/src/components/PluginSettings/components/SettingBooleanComponent.tsx
index 99c1eae8..a54a81e1 100644
--- a/src/components/PluginSettings/components/SettingBooleanComponent.tsx
+++ b/src/components/PluginSettings/components/SettingBooleanComponent.tsx
@@ -16,8 +16,10 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */
 
+import { Forms } from "@components";
+
 import { PluginOptionBoolean } from "../../../utils/types";
-import { Forms, React, Select } from "../../../webpack/common";
+import { React, Select } from "../../../webpack/common";
 import { ISettingElementProps } from ".";
 
 export function SettingBooleanComponent({ option, pluginSettings, id, onChange, onError }: ISettingElementProps<PluginOptionBoolean>) {
diff --git a/src/components/PluginSettings/components/SettingNumericComponent.tsx b/src/components/PluginSettings/components/SettingNumericComponent.tsx
index 01e72dc7..eb6e2476 100644
--- a/src/components/PluginSettings/components/SettingNumericComponent.tsx
+++ b/src/components/PluginSettings/components/SettingNumericComponent.tsx
@@ -16,8 +16,10 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */
 
+import { Forms } from "@components";
+
 import { OptionType, PluginOptionNumber } from "../../../utils/types";
-import { Forms, React, TextInput } from "../../../webpack/common";
+import { React, TextInput } from "../../../webpack/common";
 import { ISettingElementProps } from ".";
 
 const MAX_SAFE_NUMBER = BigInt(Number.MAX_SAFE_INTEGER);
diff --git a/src/components/PluginSettings/components/SettingSelectComponent.tsx b/src/components/PluginSettings/components/SettingSelectComponent.tsx
index 430e62a1..d0943c20 100644
--- a/src/components/PluginSettings/components/SettingSelectComponent.tsx
+++ b/src/components/PluginSettings/components/SettingSelectComponent.tsx
@@ -19,9 +19,9 @@
 import { FormSection, FormText, FormTitle } from "@components/Forms";
 import Select from "@components/Select";
 
-import { ISettingElementProps } from ".";
 import { PluginOptionSelect } from "../../../utils/types";
 import { React } from "../../../webpack/common";
+import { ISettingElementProps } from ".";
 
 export function SettingSelectComponent({ option, pluginSettings, onChange, onError, id }: ISettingElementProps<PluginOptionSelect>) {
     const def = pluginSettings[id] ?? option.options?.find(o => o.default)?.value;
diff --git a/src/components/PluginSettings/components/SettingSliderComponent.tsx b/src/components/PluginSettings/components/SettingSliderComponent.tsx
index ff1c491d..cb2d1fd8 100644
--- a/src/components/PluginSettings/components/SettingSliderComponent.tsx
+++ b/src/components/PluginSettings/components/SettingSliderComponent.tsx
@@ -16,8 +16,10 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */
 
+import { Forms } from "@components";
+
 import { PluginOptionSlider } from "../../../utils/types";
-import { Forms, React, Slider } from "../../../webpack/common";
+import { React, Slider } from "../../../webpack/common";
 import { ISettingElementProps } from ".";
 
 export function makeRange(start: number, end: number, step = 1) {
diff --git a/src/components/PluginSettings/components/SettingTextComponent.tsx b/src/components/PluginSettings/components/SettingTextComponent.tsx
index 216a2a17..8f7fadb7 100644
--- a/src/components/PluginSettings/components/SettingTextComponent.tsx
+++ b/src/components/PluginSettings/components/SettingTextComponent.tsx
@@ -16,8 +16,10 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */
 
+import { Forms } from "@components";
+
 import { PluginOptionString } from "../../../utils/types";
-import { Forms, React, TextInput } from "../../../webpack/common";
+import { React, TextInput } from "../../../webpack/common";
 import { ISettingElementProps } from ".";
 
 export function SettingInputComponent({ option, pluginSettings, id, onChange, onError }: ISettingElementProps<PluginOptionString>) {
diff --git a/src/components/PluginSettings/index.tsx b/src/components/PluginSettings/index.tsx
index 1a05c9ea..bf318cc0 100644
--- a/src/components/PluginSettings/index.tsx
+++ b/src/components/PluginSettings/index.tsx
@@ -17,6 +17,7 @@
 */
 
 import { FormDivider, FormSection, FormText, FormTitle } from "@components/Forms";
+
 import Plugins from "~plugins";
 
 import { showNotice } from "../../api/Notices";
diff --git a/src/components/Settings.tsx b/src/components/Settings.tsx
index e720c6fb..a3e57001 100644
--- a/src/components/Settings.tsx
+++ b/src/components/Settings.tsx
@@ -16,11 +16,13 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */
 
+import { FormDivider, FormSection, FormText, FormTitle } from "@components/Forms";
+
 import { useSettings } from "../api/settings";
 import { ChangeList } from "../utils/ChangeList";
 import IpcEvents from "../utils/IpcEvents";
 import { useAwaiter } from "../utils/misc";
-import { Alerts, Button, Forms, Margins, Parser, React, Switch } from "../webpack/common";
+import { Alerts, Button, Margins, Parser, React, Switch } from "../webpack/common";
 import ErrorBoundary from "./ErrorBoundary";
 import { Flex } from "./Flex";
 import { launchMonacoEditor } from "./Monaco";
@@ -51,14 +53,14 @@ export default ErrorBoundary.wrap(function Settings() {
     }, []);
 
     return (
-        <Forms.FormSection tag="h1" title="Vencord">
-            <Forms.FormTitle tag="h5">
+        <FormSection tag="h1" title="Vencord">
+            <FormTitle tag="h5">
                 Settings
-            </Forms.FormTitle>
+            </FormTitle>
 
-            <Forms.FormText>
+            <FormText>
                 Settings Directory: <code style={{ userSelect: "text", cursor: "text" }}>{settingsDir}</code>
-            </Forms.FormText>
+            </FormText>
 
             {!IS_WEB && <Flex className={Margins.marginBottom20} style={{ marginTop: 8 }}>
                 <Button
@@ -92,7 +94,7 @@ export default ErrorBoundary.wrap(function Settings() {
                 Open QuickCSS File
             </Button>}
 
-            <Forms.FormDivider />
+            <FormDivider />
             <Switch
                 value={settings.useQuickCss}
                 onChange={(v: boolean) => settings.useQuickCss = v}
@@ -114,6 +116,6 @@ export default ErrorBoundary.wrap(function Settings() {
             >
                 Get notified about new Updates
             </Switch>}
-        </Forms.FormSection >
+        </FormSection>
     );
 });
diff --git a/src/components/Updater.tsx b/src/components/Updater.tsx
index a11d65b8..59e7e4a7 100644
--- a/src/components/Updater.tsx
+++ b/src/components/Updater.tsx
@@ -16,11 +16,13 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */
 
+import { Forms } from "@components";
+
 import gitHash from "~git-hash";
 
 import { classes, useAwaiter } from "../utils/misc";
 import { changes, checkForUpdates, getRepo, isNewer, rebuild, update, updateError, UpdateLogger } from "../utils/updater";
-import { Alerts, Button, Card, Forms, Margins, Parser, React, Toasts } from "../webpack/common";
+import { Alerts, Button, Card, Margins, Parser, React, Toasts } from "../webpack/common";
 import ErrorBoundary from "./ErrorBoundary";
 import { ErrorCard } from "./ErrorCard";
 import { Flex } from "./Flex";
diff --git a/src/plugins/experiments.tsx b/src/plugins/experiments.tsx
index c6303f3b..4cfe8fc8 100644
--- a/src/plugins/experiments.tsx
+++ b/src/plugins/experiments.tsx
@@ -16,12 +16,14 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */
 
+import { Forms } from "@components";
+
 import { lazyWebpack } from "../utils";
 import { Devs } from "../utils/constants";
 import definePlugin, { OptionType } from "../utils/types";
 import { Settings } from "../Vencord";
 import { filters } from "../webpack";
-import { Forms, React } from "../webpack/common";
+import { React } from "../webpack/common";
 
 const KbdStyles = lazyWebpack(filters.byProps(["key", "removeBuildOverride"]));
 
@@ -76,7 +78,7 @@ export default definePlugin({
         return (
             <React.Fragment>
                 <Forms.FormTitle tag="h3">More Information</Forms.FormTitle>
-                <Forms.FormText variant="text-md/normal">
+                <Forms.FormText>
                     You can enable client DevTools{" "}
                     <kbd className={KbdStyles.key}>{modKey}</kbd> +{" "}
                     <kbd className={KbdStyles.key}>{altKey}</kbd> +{" "}
diff --git a/src/plugins/pronoundb/components/PronounsAboutComponent.tsx b/src/plugins/pronoundb/components/PronounsAboutComponent.tsx
index b38b12a7..c427b2da 100644
--- a/src/plugins/pronoundb/components/PronounsAboutComponent.tsx
+++ b/src/plugins/pronoundb/components/PronounsAboutComponent.tsx
@@ -16,7 +16,9 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */
 
-import { Forms, React } from "../../../webpack/common";
+import { Forms } from "@components";
+
+import { React } from "../../../webpack/common";
 
 export default function PronounsAboutComponent() {
     return (
diff --git a/src/webpack/components/Forms.tsx b/src/webpack/components/Forms.tsx
index e049eb36..b6df5e3a 100644
--- a/src/webpack/components/Forms.tsx
+++ b/src/webpack/components/Forms.tsx
@@ -1,3 +1,21 @@
+/*
+ * Vencord, a modification for Discord's desktop app
+ * Copyright (c) 2022 Vendicated and contributors
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+*/
+
 import { filters, proxyWaitFor } from "../webpack";
 
 export enum Tag {
diff --git a/src/webpack/components/Select.tsx b/src/webpack/components/Select.tsx
index 22e44583..20b26067 100644
--- a/src/webpack/components/Select.tsx
+++ b/src/webpack/components/Select.tsx
@@ -1,3 +1,21 @@
+/*
+ * Vencord, a modification for Discord's desktop app
+ * Copyright (c) 2022 Vendicated and contributors
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+*/
+
 import { lazyWebpack } from "src/utils";
 
 import { filters } from "../webpack";
diff --git a/src/webpack/components/Toasts.tsx b/src/webpack/components/Toasts.tsx
index dd36d2ba..1de2f1ad 100644
--- a/src/webpack/components/Toasts.tsx
+++ b/src/webpack/components/Toasts.tsx
@@ -1,3 +1,21 @@
+/*
+ * Vencord, a modification for Discord's desktop app
+ * Copyright (c) 2022 Vendicated and contributors
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+*/
+
 import { lazyWebpack } from "../../utils";
 import { filters } from "../webpack";
 
diff --git a/src/webpack/components/index.ts b/src/webpack/components/index.ts
index 4f982080..6aa2250a 100644
--- a/src/webpack/components/index.ts
+++ b/src/webpack/components/index.ts
@@ -1,4 +1,21 @@
+/*
+ * Vencord, a modification for Discord's desktop app
+ * Copyright (c) 2022 Vendicated and contributors
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+*/
 
-export * as Toasts from "./Toasts";
 export * as Forms from "./Forms";
 export * as Select from "./Select";
+export * as Toasts from "./Toasts";