diff --git a/.eslintrc.json b/.eslintrc.json index 7de658b5..43e4cefb 100644 --- a/.eslintrc.json +++ b/.eslintrc.json @@ -2,7 +2,7 @@ "root": true, "parser": "@typescript-eslint/parser", "ignorePatterns": ["dist", "browser"], - "plugins": ["header"], + "plugins": ["header", "simple-import-sort"], "rules": { // Since it's only been a month and Vencord has already been stolen // by random skids who rebranded it to "AlphaCord" and erased all license @@ -83,6 +83,9 @@ "no-useless-backreference": "error", "use-isnan": "error", "prefer-const": "error", - "prefer-spread": "error" + "prefer-spread": "error", + + "simple-import-sort/imports": "error", + "simple-import-sort/exports": "error" } } diff --git a/src/Vencord.ts b/src/Vencord.ts index 80cd405f..83cd13ac 100644 --- a/src/Vencord.ts +++ b/src/Vencord.ts @@ -16,21 +16,22 @@ * along with this program. If not, see . */ -export * as Plugins from "./plugins"; -export * as Webpack from "./webpack"; export * as Api from "./api"; -export * as Updater from "./utils/updater"; -export * as QuickCss from "./utils/quickCss"; +export * as Plugins from "./plugins"; export * as Util from "./utils"; +export * as QuickCss from "./utils/quickCss"; +export * as Updater from "./utils/updater"; +export * as Webpack from "./webpack"; import { popNotice, showNotice } from "./api/Notices"; -import { Settings, PlainSettings } from "./api/settings"; +import { PlainSettings,Settings } from "./api/settings"; import { startAllPlugins } from "./plugins"; -export { Settings, PlainSettings }; +export { PlainSettings,Settings }; import "./webpack/patchWebpack"; import "./utils/quickCss"; + import { checkForUpdates, UpdateLogger } from "./utils/updater"; import { onceReady } from "./webpack"; import { Router } from "./webpack/common"; diff --git a/src/VencordNative.ts b/src/VencordNative.ts index a3ad095e..c9848707 100644 --- a/src/VencordNative.ts +++ b/src/VencordNative.ts @@ -16,9 +16,10 @@ * along with this program. If not, see . */ -import IPC_EVENTS from "./utils/IpcEvents"; import { IpcRenderer, ipcRenderer } from "electron"; +import IPC_EVENTS from "./utils/IpcEvents"; + function assertEventAllowed(event: string) { if (!(event in IPC_EVENTS)) throw new Error(`Event ${event} not allowed.`); } diff --git a/src/api/Commands/commandHelpers.ts b/src/api/Commands/commandHelpers.ts index d8b27df6..90b89ed1 100644 --- a/src/api/Commands/commandHelpers.ts +++ b/src/api/Commands/commandHelpers.ts @@ -16,10 +16,11 @@ * along with this program. If not, see . */ -import { filters, waitFor } from "../../webpack"; -import type { PartialDeep } from "type-fest"; import { Message } from "discord-types/general"; +import type { PartialDeep } from "type-fest"; + import { lazyWebpack, mergeDefaults } from "../../utils/misc"; +import { filters, waitFor } from "../../webpack"; import { Argument } from "./types"; const createBotMessage = lazyWebpack(filters.byCode('username:"Clyde"')); diff --git a/src/api/Commands/index.ts b/src/api/Commands/index.ts index 8384b4a5..c7034ab3 100644 --- a/src/api/Commands/index.ts +++ b/src/api/Commands/index.ts @@ -18,10 +18,10 @@ import { makeCodeblock } from "../../utils/misc"; import { generateId, sendBotMessage } from "./commandHelpers"; -import { ApplicationCommandInputType, ApplicationCommandType, Argument, Command, CommandContext, Option, CommandReturnValue } from "./types"; +import { ApplicationCommandInputType, ApplicationCommandType, Argument, Command, CommandContext, CommandReturnValue,Option } from "./types"; -export * from "./types"; export * from "./commandHelpers"; +export * from "./types"; export let BUILT_IN: Command[]; export const commands = {} as Record; diff --git a/src/api/MessageEvents.ts b/src/api/MessageEvents.ts index 25e302be..90e8c730 100644 --- a/src/api/MessageEvents.ts +++ b/src/api/MessageEvents.ts @@ -16,7 +16,8 @@ * along with this program. If not, see . */ -import type { Message, Channel } from "discord-types/general"; +import type { Channel,Message } from "discord-types/general"; + import Logger from "../utils/logger"; const MessageEventsLogger = new Logger("MessageEvents", "#e5c890"); diff --git a/src/api/index.ts b/src/api/index.ts index 37f06201..73dafc93 100644 --- a/src/api/index.ts +++ b/src/api/index.ts @@ -16,11 +16,11 @@ * along with this program. If not, see . */ -import * as $MessageEventsAPI from "./MessageEvents"; -import * as $Notices from "./Notices"; import * as $Commands from "./Commands"; import * as $DataStore from "./DataStore"; import * as $MessageAccessories from "./MessageAccessories"; +import * as $MessageEventsAPI from "./MessageEvents"; +import * as $Notices from "./Notices"; /** * An API allowing you to listen to Message Clicks or run your own logic @@ -58,4 +58,4 @@ const DataStore = $DataStore; */ const MessageAccessories = $MessageAccessories; -export { DataStore, MessageAccessories, MessageEvents, Notices, Commands }; +export { Commands,DataStore, MessageAccessories, MessageEvents, Notices }; diff --git a/src/api/settings.ts b/src/api/settings.ts index f80f96b5..0fdbe137 100644 --- a/src/api/settings.ts +++ b/src/api/settings.ts @@ -17,10 +17,11 @@ */ import plugins from "plugins"; + import IpcEvents from "../utils/IpcEvents"; -import { React } from "../webpack/common"; import { mergeDefaults } from "../utils/misc"; import { OptionType } from "../utils/types"; +import { React } from "../webpack/common"; export interface Settings { notifyAboutUpdates: boolean; diff --git a/src/components/Monaco.ts b/src/components/Monaco.ts index 6b018916..33f5545d 100644 --- a/src/components/Monaco.ts +++ b/src/components/Monaco.ts @@ -16,11 +16,12 @@ * along with this program. If not, see . */ +import monacoHtml from "@fileContent/monacoWin.html"; + import { IpcEvents } from "../utils"; import { debounce } from "../utils/debounce"; -import { find } from "../webpack/webpack"; -import monacoHtml from "@fileContent/monacoWin.html"; import { Queue } from "../utils/Queue"; +import { find } from "../webpack/webpack"; const queue = new Queue(); const setCss = debounce((css: string) => { diff --git a/src/components/PluginSettings/components/SettingBooleanComponent.tsx b/src/components/PluginSettings/components/SettingBooleanComponent.tsx index da5827b6..99c1eae8 100644 --- a/src/components/PluginSettings/components/SettingBooleanComponent.tsx +++ b/src/components/PluginSettings/components/SettingBooleanComponent.tsx @@ -16,9 +16,9 @@ * along with this program. If not, see . */ -import { ISettingElementProps } from "."; import { PluginOptionBoolean } from "../../../utils/types"; import { Forms, React, Select } from "../../../webpack/common"; +import { ISettingElementProps } from "."; export function SettingBooleanComponent({ option, pluginSettings, id, onChange, onError }: ISettingElementProps) { const def = pluginSettings[id] ?? option.default; diff --git a/src/components/PluginSettings/components/SettingNumericComponent.tsx b/src/components/PluginSettings/components/SettingNumericComponent.tsx index e154f670..01e72dc7 100644 --- a/src/components/PluginSettings/components/SettingNumericComponent.tsx +++ b/src/components/PluginSettings/components/SettingNumericComponent.tsx @@ -16,9 +16,9 @@ * along with this program. If not, see . */ -import { ISettingElementProps } from "."; import { OptionType, PluginOptionNumber } from "../../../utils/types"; import { Forms, 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 3889c8e8..ce35675c 100644 --- a/src/components/PluginSettings/components/SettingSelectComponent.tsx +++ b/src/components/PluginSettings/components/SettingSelectComponent.tsx @@ -16,9 +16,9 @@ * along with this program. If not, see . */ -import { ISettingElementProps } from "."; import { PluginOptionSelect } from "../../../utils/types"; import { Forms, React, Select } from "../../../webpack/common"; +import { ISettingElementProps } from "."; export function SettingSelectComponent({ option, pluginSettings, onChange, onError, id }: ISettingElementProps) { 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 3910e8bd..ff1c491d 100644 --- a/src/components/PluginSettings/components/SettingSliderComponent.tsx +++ b/src/components/PluginSettings/components/SettingSliderComponent.tsx @@ -16,9 +16,9 @@ * along with this program. If not, see . */ -import { ISettingElementProps } from "."; import { PluginOptionSlider } from "../../../utils/types"; import { Forms, React, Slider } from "../../../webpack/common"; +import { ISettingElementProps } from "."; export function makeRange(start: number, end: number, step = 1) { const ranges: number[] = []; diff --git a/src/components/PluginSettings/components/SettingTextComponent.tsx b/src/components/PluginSettings/components/SettingTextComponent.tsx index 97bbd995..216a2a17 100644 --- a/src/components/PluginSettings/components/SettingTextComponent.tsx +++ b/src/components/PluginSettings/components/SettingTextComponent.tsx @@ -16,9 +16,9 @@ * along with this program. If not, see . */ -import { ISettingElementProps } from "."; import { PluginOptionString } from "../../../utils/types"; import { Forms, React, TextInput } from "../../../webpack/common"; +import { ISettingElementProps } from "."; export function SettingInputComponent({ option, pluginSettings, id, onChange, onError }: ISettingElementProps) { const [state, setState] = React.useState(pluginSettings[id] ?? option.default ?? null); diff --git a/src/components/PluginSettings/components/index.ts b/src/components/PluginSettings/components/index.ts index 6da4140e..1712987a 100644 --- a/src/components/PluginSettings/components/index.ts +++ b/src/components/PluginSettings/components/index.ts @@ -32,5 +32,5 @@ export interface ISettingElementProps { export * from "./SettingBooleanComponent"; export * from "./SettingNumericComponent"; export * from "./SettingSelectComponent"; -export * from "./SettingTextComponent"; export * from "./SettingSliderComponent"; +export * from "./SettingTextComponent"; diff --git a/src/components/Updater.tsx b/src/components/Updater.tsx index f4dedd78..21ae6a3f 100644 --- a/src/components/Updater.tsx +++ b/src/components/Updater.tsx @@ -17,13 +17,14 @@ */ import gitHash from "git-hash"; -import { changes, checkForUpdates, getRepo, rebuild, update, UpdateLogger, updateError, isOutdated, isNewer } from "../utils/updater"; -import { React, Forms, Button, Margins, Alerts, Card, Parser, Toasts } from "../webpack/common"; -import { Flex } from "./Flex"; + import { classes, useAwaiter } from "../utils/misc"; -import { Link } from "./Link"; +import { changes, checkForUpdates, getRepo, isNewer,isOutdated, rebuild, update, updateError, UpdateLogger } from "../utils/updater"; +import { Alerts, Button, Card, Forms, Margins, Parser, React, Toasts } from "../webpack/common"; import ErrorBoundary from "./ErrorBoundary"; import { ErrorCard } from "./ErrorCard"; +import { Flex } from "./Flex"; +import { Link } from "./Link"; function withDispatcher(dispatcher: React.Dispatch>, action: () => any) { return async () => { diff --git a/src/components/index.ts b/src/components/index.ts index 30dcea29..6f7ffba7 100644 --- a/src/components/index.ts +++ b/src/components/index.ts @@ -16,6 +16,6 @@ * along with this program. If not, see . */ -export { default as Settings } from "./Settings"; export { default as PluginSettings } from "./PluginSettings"; +export { default as Settings } from "./Settings"; export { default as Updater } from "./Updater"; diff --git a/src/ipcMain/constants.ts b/src/ipcMain/constants.ts index 18726fc3..71337578 100644 --- a/src/ipcMain/constants.ts +++ b/src/ipcMain/constants.ts @@ -16,8 +16,8 @@ * along with this program. If not, see . */ -import { join } from "path"; import { app } from "electron"; +import { join } from "path"; export const DATA_DIR = process.env.VENCORD_USER_DATA_DIR ?? ( process.env.DISCORD_USER_DATA_DIR diff --git a/src/ipcMain/extensions.ts b/src/ipcMain/extensions.ts index 9bebdaf8..d676f22d 100644 --- a/src/ipcMain/extensions.ts +++ b/src/ipcMain/extensions.ts @@ -16,13 +16,14 @@ * along with this program. If not, see . */ -import https from "https"; -import { mkdir, rm, writeFile, access } from "fs/promises"; -import { constants as fsConstants } from "fs"; -import { join } from "path"; -import { DATA_DIR } from "./constants"; -import { unzip } from "fflate"; import { session } from "electron"; +import { unzip } from "fflate"; +import { constants as fsConstants } from "fs"; +import { access,mkdir, rm, writeFile } from "fs/promises"; +import https from "https"; +import { join } from "path"; + +import { DATA_DIR } from "./constants"; import { crxToZip } from "./crxToZip"; const extensionCacheDir = join(DATA_DIR, "ExtensionCache"); diff --git a/src/ipcMain/index.ts b/src/ipcMain/index.ts index d8151427..958728a2 100644 --- a/src/ipcMain/index.ts +++ b/src/ipcMain/index.ts @@ -16,17 +16,18 @@ * along with this program. If not, see . */ +import "./updater"; + +import monacoHtml from "@fileContent/../components/monacoWin.html;base64"; import { app, BrowserWindow, desktopCapturer, ipcMain, shell } from "electron"; import { mkdirSync, readFileSync, watch } from "fs"; import { open, readFile, writeFile } from "fs/promises"; import { join } from "path"; + import { debounce } from "../utils/debounce"; import IpcEvents from "../utils/IpcEvents"; -import monacoHtml from "@fileContent/../components/monacoWin.html;base64"; - -import "./updater"; import { Queue } from "../utils/Queue"; -import { QUICKCSS_PATH, ALLOWED_PROTOCOLS, SETTINGS_DIR, SETTINGS_FILE } from "./constants"; +import { ALLOWED_PROTOCOLS, QUICKCSS_PATH, SETTINGS_DIR, SETTINGS_FILE } from "./constants"; diff --git a/src/ipcMain/updater.ts b/src/ipcMain/updater.ts index a1da8a76..69879168 100644 --- a/src/ipcMain/updater.ts +++ b/src/ipcMain/updater.ts @@ -16,13 +16,14 @@ * along with this program. If not, see . */ -import { ipcMain } from "electron"; -import { promisify } from "util"; -import IpcEvents from "../utils/IpcEvents"; import { execFile as cpExecFile } from "child_process"; -import { join } from "path"; -import { createReadStream } from "fs"; import { createHash } from "crypto"; +import { ipcMain } from "electron"; +import { createReadStream } from "fs"; +import { join } from "path"; +import { promisify } from "util"; + +import IpcEvents from "../utils/IpcEvents"; const VENCORD_SRC_DIR = join(__dirname, ".."); diff --git a/src/patchWin32Updater.ts b/src/patchWin32Updater.ts index 2044615f..e853ebf4 100644 --- a/src/patchWin32Updater.ts +++ b/src/patchWin32Updater.ts @@ -17,8 +17,8 @@ */ import { app, autoUpdater } from "electron"; -import { dirname, basename, join } from "path"; -import { readdirSync, existsSync, mkdirSync, writeFileSync } from "fs"; +import { existsSync, mkdirSync, readdirSync, writeFileSync } from "fs"; +import { basename, dirname, join } from "path"; const { setAppUserModelId } = app; diff --git a/src/patcher.ts b/src/patcher.ts index 14f08127..542fba5c 100644 --- a/src/patcher.ts +++ b/src/patcher.ts @@ -17,11 +17,12 @@ */ import electron, { app, BrowserWindowConstructorOptions } from "electron"; +import { readFileSync } from "fs"; import { dirname, join } from "path"; + import { initIpc } from "./ipcMain"; import { installExt } from "./ipcMain/extensions"; import { readSettings } from "./ipcMain/index"; -import { readFileSync } from "fs"; console.log("[Vencord] Starting up..."); diff --git a/src/plugins/STFU.ts b/src/plugins/STFU.ts index cfc207aa..66392c85 100644 --- a/src/plugins/STFU.ts +++ b/src/plugins/STFU.ts @@ -16,8 +16,8 @@ * along with this program. If not, see . */ -import definePlugin from "../utils/types"; import { Devs } from "../utils/constants"; +import definePlugin from "../utils/types"; export default definePlugin({ name: "STFU", diff --git a/src/plugins/anonymiseFileNames.ts b/src/plugins/anonymiseFileNames.ts index e689a6dc..5bae10ae 100644 --- a/src/plugins/anonymiseFileNames.ts +++ b/src/plugins/anonymiseFileNames.ts @@ -16,8 +16,8 @@ * along with this program. If not, see . */ -import definePlugin, { OptionType } from "../utils/types"; import { Devs } from "../utils/constants"; +import definePlugin, { OptionType } from "../utils/types"; import { Settings } from "../Vencord"; enum Methods { diff --git a/src/plugins/apiCommands.ts b/src/plugins/apiCommands.ts index dbfdcd5f..7b08b8a8 100644 --- a/src/plugins/apiCommands.ts +++ b/src/plugins/apiCommands.ts @@ -16,8 +16,8 @@ * along with this program. If not, see . */ -import definePlugin from "../utils/types"; import { Devs } from "../utils/constants"; +import definePlugin from "../utils/types"; export default definePlugin({ name: "CommandsAPI", diff --git a/src/plugins/banger.ts b/src/plugins/banger.ts index 4ce4b23c..59d9b421 100644 --- a/src/plugins/banger.ts +++ b/src/plugins/banger.ts @@ -16,8 +16,8 @@ * along with this program. If not, see . */ -import definePlugin, { OptionType } from "../utils/types"; import { Devs } from "../utils/constants"; +import definePlugin, { OptionType } from "../utils/types"; export default definePlugin({ name: "BANger", diff --git a/src/plugins/betterUploadButton.ts b/src/plugins/betterUploadButton.ts index 7589be8e..52d8aed8 100644 --- a/src/plugins/betterUploadButton.ts +++ b/src/plugins/betterUploadButton.ts @@ -16,8 +16,8 @@ * along with this program. If not, see . */ -import definePlugin from "../utils/types"; import { Devs } from "../utils/constants"; +import definePlugin from "../utils/types"; export default definePlugin({ name: "BetterUploadButton", diff --git a/src/plugins/clearURLs/index.ts b/src/plugins/clearURLs/index.ts index c760a90e..be0b8029 100644 --- a/src/plugins/clearURLs/index.ts +++ b/src/plugins/clearURLs/index.ts @@ -16,15 +16,15 @@ * along with this program. If not, see . */ -import { defaultRules } from "./defaultRules"; import { - addPreSendListener, addPreEditListener, + addPreSendListener, MessageObject, - removePreSendListener, removePreEditListener, + removePreSendListener, } from "../../api/MessageEvents"; import definePlugin from "../../utils/types"; +import { defaultRules } from "./defaultRules"; // From lodash const reRegExpChar = /[\\^$.*+?()[\]{}|]/g; diff --git a/src/plugins/fxTwitter.ts b/src/plugins/fxTwitter.ts index dac81364..45f9fb61 100644 --- a/src/plugins/fxTwitter.ts +++ b/src/plugins/fxTwitter.ts @@ -16,9 +16,9 @@ * along with this program. If not, see . */ -import definePlugin from "../utils/types"; import { addPreSendListener, MessageObject, removePreSendListener } from "../api/MessageEvents"; import { Devs } from "../utils/constants"; +import definePlugin from "../utils/types"; const re = /https?:\/\/twitter\.com(?=\/\w+?\/status\/)/g; diff --git a/src/plugins/interactionKeybinds.ts b/src/plugins/interactionKeybinds.ts index ee4e422d..1d28847f 100644 --- a/src/plugins/interactionKeybinds.ts +++ b/src/plugins/interactionKeybinds.ts @@ -16,13 +16,14 @@ * along with this program. If not, see . */ -import definePlugin from "../utils/types"; -import { Devs } from "../utils/constants"; -import { FluxDispatcher as Dispatcher, ChannelStore, SelectedChannelStore, UserStore } from "../webpack/common"; -import { filters } from "../webpack"; -import { lazyWebpack } from "../utils/misc"; import { Message } from "discord-types/general"; +import { Devs } from "../utils/constants"; +import { lazyWebpack } from "../utils/misc"; +import definePlugin from "../utils/types"; +import { filters } from "../webpack"; +import { ChannelStore, FluxDispatcher as Dispatcher, SelectedChannelStore, UserStore } from "../webpack/common"; + const MessageStore = lazyWebpack(filters.byProps(["getRawMessages"])); const isMac = navigator.platform.includes("Mac"); // bruh diff --git a/src/plugins/moreCommands.ts b/src/plugins/moreCommands.ts index 600cc243..a58993d5 100644 --- a/src/plugins/moreCommands.ts +++ b/src/plugins/moreCommands.ts @@ -16,9 +16,9 @@ * along with this program. If not, see . */ -import definePlugin from "../utils/types"; -import { ApplicationCommandInputType, OptionalMessageOption, sendBotMessage, findOption, RequiredMessageOption } from "../api/Commands"; +import { ApplicationCommandInputType, findOption, OptionalMessageOption, RequiredMessageOption,sendBotMessage } from "../api/Commands"; import { Devs } from "../utils/constants"; +import definePlugin from "../utils/types"; function mock(input: string): string { diff --git a/src/plugins/muteNewGuild.ts b/src/plugins/muteNewGuild.ts index aa0844fa..e4ca1d5d 100644 --- a/src/plugins/muteNewGuild.ts +++ b/src/plugins/muteNewGuild.ts @@ -16,8 +16,8 @@ * along with this program. If not, see . */ -import definePlugin from "../utils/types"; import { Devs } from "../utils/constants"; +import definePlugin from "../utils/types"; export default definePlugin({ name: "MuteNewGuild", diff --git a/src/plugins/nitroBypass.ts b/src/plugins/nitroBypass.ts index 08d49f20..7fed9cd6 100644 --- a/src/plugins/nitroBypass.ts +++ b/src/plugins/nitroBypass.ts @@ -16,12 +16,12 @@ * along with this program. If not, see . */ -import { addPreSendListener, addPreEditListener, removePreSendListener, removePreEditListener } from "../api/MessageEvents"; -import { findByProps } from "../webpack"; -import definePlugin, { OptionType } from "../utils/types"; +import { addPreEditListener, addPreSendListener, removePreEditListener,removePreSendListener } from "../api/MessageEvents"; import { Devs } from "../utils/constants"; -import { UserStore } from "../webpack/common"; +import definePlugin, { OptionType } from "../utils/types"; import { Settings } from "../Vencord"; +import { findByProps } from "../webpack"; +import { UserStore } from "../webpack/common"; export default definePlugin({ name: "NitroBypass", diff --git a/src/plugins/noCanaryMessageLinks.ts b/src/plugins/noCanaryMessageLinks.ts index 8c773e15..3ee95cd5 100644 --- a/src/plugins/noCanaryMessageLinks.ts +++ b/src/plugins/noCanaryMessageLinks.ts @@ -16,9 +16,9 @@ * along with this program. If not, see . */ -import definePlugin from "../utils/types"; import { addPreSendListener, MessageObject, removePreSendListener } from "../api/MessageEvents"; import { Devs } from "../utils/constants"; +import definePlugin from "../utils/types"; export default definePlugin({ name: "NoCanaryMessageLinks", diff --git a/src/plugins/noF1.ts b/src/plugins/noF1.ts index 86132364..22e351a5 100644 --- a/src/plugins/noF1.ts +++ b/src/plugins/noF1.ts @@ -16,8 +16,8 @@ * along with this program. If not, see . */ -import definePlugin from "../utils/types"; import { Devs } from "../utils/constants"; +import definePlugin from "../utils/types"; export default definePlugin({ name: "No F1", diff --git a/src/plugins/noRPC.ts b/src/plugins/noRPC.ts index fa3ff8a0..ca82c2bd 100644 --- a/src/plugins/noRPC.ts +++ b/src/plugins/noRPC.ts @@ -16,8 +16,8 @@ * along with this program. If not, see . */ -import definePlugin from "../utils/types"; import { Devs } from "../utils/constants"; +import definePlugin from "../utils/types"; export default definePlugin({ name: "No RPC", diff --git a/src/plugins/noTrack.ts b/src/plugins/noTrack.ts index be3dfe0c..a86e0aff 100644 --- a/src/plugins/noTrack.ts +++ b/src/plugins/noTrack.ts @@ -16,8 +16,8 @@ * along with this program. If not, see . */ -import definePlugin from "../utils/types"; import { Devs } from "../utils/constants"; +import definePlugin from "../utils/types"; export default definePlugin({ name: "NoTrack", diff --git a/src/plugins/petpet.ts b/src/plugins/petpet.ts index 652ebda5..8f2462df 100644 --- a/src/plugins/petpet.ts +++ b/src/plugins/petpet.ts @@ -16,10 +16,10 @@ * along with this program. If not, see . */ -import { ApplicationCommandOptionType, findOption, ApplicationCommandInputType, Argument, CommandContext } from "../api/Commands"; +import { ApplicationCommandInputType, ApplicationCommandOptionType, Argument, CommandContext,findOption } from "../api/Commands"; import { Devs } from "../utils/constants"; +import { lazyWebpack,makeLazy } from "../utils/misc"; import definePlugin from "../utils/types"; -import { makeLazy, lazyWebpack } from "../utils/misc"; import { filters } from "../webpack"; const DRAFT_TYPE = 0; diff --git a/src/plugins/pronoundb/components/PronounsChatComponent.tsx b/src/plugins/pronoundb/components/PronounsChatComponent.tsx index c0b5a90c..ec4de98a 100644 --- a/src/plugins/pronoundb/components/PronounsChatComponent.tsx +++ b/src/plugins/pronoundb/components/PronounsChatComponent.tsx @@ -17,12 +17,13 @@ */ import { Message } from "discord-types/general"; -import { fetchPronouns, formatPronouns } from "../utils"; + import { classes, lazyWebpack, useAwaiter } from "../../../utils/misc"; -import { PronounMapping } from "../types"; +import { Settings } from "../../../Vencord"; import { filters } from "../../../webpack"; import { UserStore } from "../../../webpack/common"; -import { Settings } from "../../../Vencord"; +import { PronounMapping } from "../types"; +import { fetchPronouns, formatPronouns } from "../utils"; const styles: Record = lazyWebpack(filters.byProps(["timestampInline"])); diff --git a/src/plugins/pronoundb/components/PronounsProfileWrapper.tsx b/src/plugins/pronoundb/components/PronounsProfileWrapper.tsx index af2f84bd..930d5a76 100644 --- a/src/plugins/pronoundb/components/PronounsProfileWrapper.tsx +++ b/src/plugins/pronoundb/components/PronounsProfileWrapper.tsx @@ -16,10 +16,10 @@ * along with this program. If not, see . */ -import { UserStore } from "../../../webpack/common"; +import { classes,useAwaiter } from "../../../utils"; import { Settings } from "../../../Vencord"; +import { UserStore } from "../../../webpack/common"; import { PronounMapping, UserProfileProps } from "../types"; -import { useAwaiter, classes } from "../../../utils"; import { fetchPronouns, formatPronouns } from "../utils"; export default function PronounsProfileWrapper(props: UserProfileProps, pronounsComponent: JSX.Element) { diff --git a/src/plugins/pronoundb/utils.ts b/src/plugins/pronoundb/utils.ts index a9828d23..24bc3e2d 100644 --- a/src/plugins/pronoundb/utils.ts +++ b/src/plugins/pronoundb/utils.ts @@ -17,9 +17,10 @@ */ import gitHash from "git-hash"; -import { PronounsFormat } from "."; + import { debounce } from "../../utils"; import { Settings } from "../../Vencord"; +import { PronounsFormat } from "."; import { PronounCode, PronounMapping, PronounsResponse } from "./types"; // A map of cached pronouns so the same request isn't sent twice diff --git a/src/plugins/sendify.ts b/src/plugins/sendify.ts index a43260a0..d0c7af73 100644 --- a/src/plugins/sendify.ts +++ b/src/plugins/sendify.ts @@ -16,13 +16,14 @@ * along with this program. If not, see . */ -import definePlugin from "../utils/types"; -import { lazyWebpack } from "../utils"; -import { filters } from "../webpack"; -import { ApplicationCommandInputType, sendBotMessage } from "../api/Commands"; -import { Devs } from "../utils/constants"; -import { PartialDeep } from "type-fest"; import { Message } from "discord-types/general"; +import { PartialDeep } from "type-fest"; + +import { ApplicationCommandInputType, sendBotMessage } from "../api/Commands"; +import { lazyWebpack } from "../utils"; +import { Devs } from "../utils/constants"; +import definePlugin from "../utils/types"; +import { filters } from "../webpack"; import { FluxDispatcher } from "../webpack/common"; interface Album { diff --git a/src/plugins/silentTyping.ts b/src/plugins/silentTyping.ts index 328ee74e..1f791251 100644 --- a/src/plugins/silentTyping.ts +++ b/src/plugins/silentTyping.ts @@ -16,8 +16,8 @@ * along with this program. If not, see . */ -import definePlugin from "../utils/types"; import { Devs } from "../utils/constants"; +import definePlugin from "../utils/types"; export default definePlugin({ name: "SilentTyping", diff --git a/src/plugins/unindent.ts b/src/plugins/unindent.ts index ea5625e3..0206095e 100644 --- a/src/plugins/unindent.ts +++ b/src/plugins/unindent.ts @@ -16,9 +16,9 @@ * along with this program. If not, see . */ -import definePlugin from "../utils/types"; -import { addPreSendListener, addPreEditListener, MessageObject, removePreSendListener, removePreEditListener } from "../api/MessageEvents"; +import { addPreEditListener, addPreSendListener, MessageObject, removePreEditListener,removePreSendListener } from "../api/MessageEvents"; import { Devs } from "../utils/constants"; +import definePlugin from "../utils/types"; export default definePlugin({ name: "Unindent", diff --git a/src/plugins/unminifyErrors.ts b/src/plugins/unminifyErrors.ts index b3d31a44..f0ee77cf 100644 --- a/src/plugins/unminifyErrors.ts +++ b/src/plugins/unminifyErrors.ts @@ -16,8 +16,8 @@ * along with this program. If not, see . */ -import definePlugin from "../utils/types"; import { Devs } from "../utils/constants"; +import definePlugin from "../utils/types"; let ERROR_CODES: any; const CODES_URL = diff --git a/src/plugins/uwuify.ts b/src/plugins/uwuify.ts index 21ef0939..9f4ac7e7 100644 --- a/src/plugins/uwuify.ts +++ b/src/plugins/uwuify.ts @@ -16,8 +16,8 @@ * along with this program. If not, see . */ -import definePlugin from "../utils/types"; import { findOption, RequiredMessageOption } from "../api/Commands"; +import definePlugin from "../utils/types"; const endings = [ "owo", "UwU", ">w<", "^w^", "ā—wā—", "ā˜†wā˜†", "š—Øš˜„š—Ø", "(į—’į—Øį—•)", "(ā–°Ė˜vĖ˜ā–°)", diff --git a/src/plugins/vcDoubleClick.ts b/src/plugins/vcDoubleClick.ts index e83e0025..f2a33a4e 100644 --- a/src/plugins/vcDoubleClick.ts +++ b/src/plugins/vcDoubleClick.ts @@ -16,8 +16,8 @@ * along with this program. If not, see . */ -import definePlugin from "../utils/types"; import { Devs } from "../utils/constants"; +import definePlugin from "../utils/types"; const timers = {} as Record. */ -import definePlugin from "../utils/types"; import { Devs } from "../utils/constants"; +import definePlugin from "../utils/types"; export default definePlugin({ name: "Webhook Tags", diff --git a/src/preload.ts b/src/preload.ts index 5de42981..fccc0249 100644 --- a/src/preload.ts +++ b/src/preload.ts @@ -16,12 +16,13 @@ * along with this program. If not, see . */ -import electron, { contextBridge, webFrame, ipcRenderer } from "electron"; +import electron, { contextBridge, ipcRenderer, webFrame } from "electron"; import { readFileSync } from "fs"; import { join } from "path"; -import VencordNative from "./VencordNative"; -import IpcEvents from "./utils/IpcEvents"; + import { debounce } from "./utils/debounce"; +import IpcEvents from "./utils/IpcEvents"; +import VencordNative from "./VencordNative"; if (electron.desktopCapturer === void 0) { // Fix for desktopCapturer being main only in Electron 17+ diff --git a/src/utils/discord.ts b/src/utils/discord.ts index a19dd92e..75fb079c 100644 --- a/src/utils/discord.ts +++ b/src/utils/discord.ts @@ -17,7 +17,8 @@ */ import { Guild } from "discord-types/general"; -import { ChannelStore, SelectedChannelStore, GuildStore } from "../webpack/common"; + +import { ChannelStore, GuildStore,SelectedChannelStore } from "../webpack/common"; export function getCurrentChannel() { return ChannelStore.getChannel(SelectedChannelStore.getChannelId()); diff --git a/src/utils/index.ts b/src/utils/index.ts index 4313bb4f..d818e886 100644 --- a/src/utils/index.ts +++ b/src/utils/index.ts @@ -17,13 +17,11 @@ */ export * from "./ChangeList"; +export * as Constants from "./constants"; export * from "./debounce"; -export * from "./misc"; -export * from "./proxyLazy"; - +export * as Discord from "./discord"; export { default as IpcEvents } from "./IpcEvents"; export { default as Logger } from "./logger"; - -export * as Constants from "./constants"; -export * as Discord from "./discord"; +export * from "./misc"; export * as Modals from "./modal"; +export * from "./proxyLazy"; diff --git a/src/utils/updater.ts b/src/utils/updater.ts index 4b8f4ba1..51739ae8 100644 --- a/src/utils/updater.ts +++ b/src/utils/updater.ts @@ -16,10 +16,11 @@ * along with this program. If not, see . */ +import gitHash from "git-hash"; + import IpcEvents from "./IpcEvents"; import Logger from "./logger"; import { IpcRes } from "./types"; -import gitHash from "git-hash"; export const UpdateLogger = new Logger("Updater", "white"); export let isOutdated = false; diff --git a/src/webpack/common.tsx b/src/webpack/common.tsx index f7e66f37..0bcc82ca 100644 --- a/src/webpack/common.tsx +++ b/src/webpack/common.tsx @@ -16,14 +16,13 @@ * along with this program. If not, see . */ +import type Components from "discord-types/components"; import { User } from "discord-types/general"; +import type Other from "discord-types/other"; +import type Stores from "discord-types/stores"; import { lazyWebpack } from "../utils/misc"; -import { _resolveReady, filters, waitFor, mapMangledModuleLazy } from "./webpack"; - -import type Components from "discord-types/components"; -import type Stores from "discord-types/stores"; -import type Other from "discord-types/other"; +import { _resolveReady, filters, mapMangledModuleLazy,waitFor } from "./webpack"; export const Margins = lazyWebpack(filters.byProps(["marginTop20"])); export let FluxDispatcher: Other.FluxDispatcher; diff --git a/src/webpack/index.ts b/src/webpack/index.ts index 53eb6264..036c2a3f 100644 --- a/src/webpack/index.ts +++ b/src/webpack/index.ts @@ -16,5 +16,5 @@ * along with this program. If not, see . */ -export * from "./webpack"; export * as Common from "./common"; +export * from "./webpack"; diff --git a/src/webpack/webpack.ts b/src/webpack/webpack.ts index 58589c28..7604266f 100644 --- a/src/webpack/webpack.ts +++ b/src/webpack/webpack.ts @@ -17,6 +17,7 @@ */ import type { WebpackInstance } from "discord-types/other"; + import { proxyLazy } from "../utils/proxyLazy"; export let _resolveReady: () => void;