{sortedPlugins?.length ? sortedPlugins
.filter(a => !a.required && !dependencyCheck(a.name, depMap).length && pluginFilter(a))
@@ -302,7 +305,7 @@ export default ErrorBoundary.wrap(function Settings() {
changes.add(name)}
+ onRestartNeeded={name => changes.handleChange(name)}
disabled={plugin.required || !!dependency}
plugin={plugin}
/>
diff --git a/src/components/Settings.tsx b/src/components/Settings.tsx
deleted file mode 100644
index e2abff2e3..000000000
--- a/src/components/Settings.tsx
+++ /dev/null
@@ -1,162 +0,0 @@
-/*
- * 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 (IpcEvents.GET_SETTINGS_DIR), "Loading...");
- const settings = useSettings();
- const changes = React.useMemo(() => new ChangeList(), []);
-
- React.useEffect(() => {
- return () => void (changes.hasChanges && Alerts.show({
- title: "Restart required",
- body: (
- <>
-
-
- 
-
-
-
- Settings
-
-
-
- Settings Directory:
-
- {!IS_WEB &&
-
-
-
- }
-
- {IS_WEB && }
-
- settings.useQuickCss = v}
- note="Loads styles from your QuickCss file"
- >
- Use QuickCss
-
- {!IS_WEB && settings.enableReactDevtools = v}
- note="Requires a full restart"
- >
- Enable React Developer Tools
- }
- {!IS_WEB && settings.notifyAboutUpdates = v}
- note="Shows a Toast on StartUp"
- >
- Get notified about new Updates
- }
-
- Settings Sync
-
-
-
-
-
- );
-}, {
- message: "Failed to render the Settings. If this persists, try using the installer to reinstall!",
- onError: handleComponentFailed,
-});
diff --git a/src/components/VencordSettings/BackupRestoreTab.tsx b/src/components/VencordSettings/BackupRestoreTab.tsx
new file mode 100644
index 000000000..f0730b345
--- /dev/null
+++ b/src/components/VencordSettings/BackupRestoreTab.tsx
@@ -0,0 +1,69 @@
+/*
+ * 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
+
+
+ Warning
+ Importing a settings file will overwrite your current settings.
+
+
+
+ You can import and export your Vencord settings as a JSON file.
+ This allows you to easily transfer your settings to another device,
+ or recover your settings after reinstalling Vencord or Discord.
+
+
+ Settings Export contains:
+
+
+
+
+
+
+ );
+}
+
+export default ErrorBoundary.wrap(BackupRestoreTab);
diff --git a/src/components/VencordSettings/PluginsTab.tsx b/src/components/VencordSettings/PluginsTab.tsx
new file mode 100644
index 000000000..04b5dc26f
--- /dev/null
+++ b/src/components/VencordSettings/PluginsTab.tsx
@@ -0,0 +1,22 @@
+/*
+ * 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 >, action: () => any) {
return async () => {
@@ -192,7 +192,7 @@ function Updater() {
};
return (
-
+
Repo
{repoPending ? repo : err ? "Failed to retrieve - check console" : (
diff --git a/src/components/VencordSettings/VencordTab.tsx b/src/components/VencordSettings/VencordTab.tsx
new file mode 100644
index 000000000..04fb057f0
--- /dev/null
+++ b/src/components/VencordSettings/VencordTab.tsx
@@ -0,0 +1,134 @@
+/*
+ * 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 (IpcEvents.GET_SETTINGS_DIR), "Loading...");
+ const settings = useSettings();
+
+ return (
+
+
+
+ {IS_WEB ? (
+
+ ) : (
+
+
+
+
+
+
+ )}
+
+
+
+
+ settings.useQuickCss = v}
+ note="Loads styles from your QuickCss file">
+ Use QuickCss
+
+ {!IS_WEB && (
+
+ settings.enableReactDevtools = v}
+ note="Requires a full restart">
+ Enable React Developer Tools
+
+ settings.notifyAboutUpdates = v}
+ note="Shows a Toast on StartUp">
+ Get notified about new Updates
+
+
+ )}
+
+
+
+ );
+}
+
+
+
+function DonateCard() {
+ return (
+
+
+
+ );
+}
+
+export default ErrorBoundary.wrap(VencordSettings);
diff --git a/src/components/VencordSettings/index.tsx b/src/components/VencordSettings/index.tsx
new file mode 100644
index 000000000..37dab8f50
--- /dev/null
+++ b/src/components/VencordSettings/index.tsx
@@ -0,0 +1,91 @@
+/*
+ * 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 = {
+ VencordSettings: { name: "Vencord", component: () => Coming soon to a Vencord near you! },
+ VencordUpdater: { name: "Updater" }, // Only show updater if IS_WEB is false
+ VencordSettingsSync: { name: "Backup & Restore", component: () =>
+ Vencord Settings
+
+
+ {Object.entries(SettingsTabs).map(([key, { name, component }]) => {
+ if (!component) return null;
+ return
+ {name}
+ ;
+ })}
+
+ ;
+}
+
+export default function (props: SettingsProps) {
+ return
+ ;
+}
diff --git a/src/components/VencordSettings/settingsStyles.css b/src/components/VencordSettings/settingsStyles.css
new file mode 100644
index 000000000..e90ef141b
--- /dev/null
+++ b/src/components/VencordSettings/settingsStyles.css
@@ -0,0 +1,23 @@
+.vcSettingsTabBar {
+ margin-top: 20px;
+ margin-bottom: -2px;
+ border-bottom: 2px solid var(--background-modifier-accent);
+}
+
+.vcSettingsTabBarItem {
+ margin-right: 32px;
+ padding-bottom: 16px;
+ margin-bottom: -2px;
+}
+
+.vcSettingsQuickActionCard {
+ padding: 1em;
+ display: flex;
+ gap: 1em;
+ align-items: center;
+ justify-content: space-between;
+ flex-wrap: wrap;
+ flex-grow: 1;
+ flex-direction: row;
+ margin-bottom: 1em;
+}
diff --git a/src/components/handleComponentFailed.ts b/src/components/handleComponentFailed.ts
index 34f3ab9b2..020e8ef21 100644
--- a/src/components/handleComponentFailed.ts
+++ b/src/components/handleComponentFailed.ts
@@ -16,7 +16,7 @@
* along with this program. If not, see ;
diff --git a/src/ipcMain/index.ts b/src/ipcMain/index.ts
index 8a60bc6ed..ba85eeb0b 100644
--- a/src/ipcMain/index.ts
+++ b/src/ipcMain/index.ts
@@ -18,6 +18,9 @@
import "./updater";
+import { debounce } from "@utils/debounce";
+import IpcEvents from "@utils/IpcEvents";
+import { Queue } from "@utils/Queue";
import { BrowserWindow, desktopCapturer, ipcMain, shell } from "electron";
import { mkdirSync, readFileSync, watch } from "fs";
import { open, readFile, writeFile } from "fs/promises";
@@ -25,9 +28,6 @@ import { join } from "path";
import monacoHtml from "~fileContent/../components/monacoWin.html;base64";
-import { debounce } from "../utils/debounce";
-import IpcEvents from "../utils/IpcEvents";
-import { Queue } from "../utils/Queue";
import { ALLOWED_PROTOCOLS, QUICKCSS_PATH, SETTINGS_DIR, SETTINGS_FILE } from "./constants";
mkdirSync(SETTINGS_DIR, { recursive: true });
@@ -66,14 +66,14 @@ const settingsWriteQueue = new Queue();
ipcMain.handle(IpcEvents.GET_QUICK_CSS, () => readCss());
ipcMain.handle(IpcEvents.SET_QUICK_CSS, (_, css) =>
- cssWriteQueue.add(() => writeFile(QUICKCSS_PATH, css))
+ cssWriteQueue.push(() => writeFile(QUICKCSS_PATH, css))
);
ipcMain.handle(IpcEvents.GET_SETTINGS_DIR, () => SETTINGS_DIR);
ipcMain.on(IpcEvents.GET_SETTINGS, e => e.returnValue = readSettings());
ipcMain.handle(IpcEvents.SET_SETTINGS, (_, s) => {
- settingsWriteQueue.add(() => writeFile(SETTINGS_FILE, s));
+ settingsWriteQueue.push(() => writeFile(SETTINGS_FILE, s));
});
diff --git a/src/ipcMain/updater/git.ts b/src/ipcMain/updater/git.ts
index 7e4176a86..07c94cb56 100644
--- a/src/ipcMain/updater/git.ts
+++ b/src/ipcMain/updater/git.ts
@@ -16,12 +16,12 @@
* along with this program. If not, see ;
+ const plugins: Record;
export default plugins;
}
diff --git a/src/patcher.ts b/src/patcher.ts
index 28910b7af..12cefc018 100644
--- a/src/patcher.ts
+++ b/src/patcher.ts
@@ -16,6 +16,7 @@
* along with this program. If not, see {
return (await assetManager.getAsset(applicationId, [key, undefined]))[0];
diff --git a/src/plugins/banger.ts b/src/plugins/banger.ts
index 626322481..68163cbd6 100644
--- a/src/plugins/banger.ts
+++ b/src/plugins/banger.ts
@@ -16,8 +16,8 @@
* along with this program. If not, see
+ ;
+ },
+
+ Timer({ channelId }: { channelId: string; }) {
+ const [time, setTime] = React.useState(0);
+ const startTime = React.useMemo(() => Date.now(), [channelId]);
+
+ React.useEffect(() => {
+ const interval = setInterval(() => setTime(Date.now() - startTime), 1000);
+ return () => {
+ clearInterval(interval);
+ setTime(0);
+ };
+ }, [channelId]);
+
+ return ;
getStickerById(id: string): Sticker | undefined;
diff --git a/src/plugins/fart.ts b/src/plugins/fart.ts
index 88e95af03..9404b39b0 100644
--- a/src/plugins/fart.ts
+++ b/src/plugins/fart.ts
@@ -16,11 +16,11 @@
* along with this program. If not, see
- name: string
- application_id: string
+ start?: Number;
+ };
+ assets?: ActivityAssets;
+ buttons?: Array;
+ name: string;
+ application_id: string;
metadata?: {
- button_urls?: Array
- }
- type: Number
- flags: Number
+ button_urls?: Array;
+ };
+ type: Number;
+ flags: Number;
}
interface TrackData {
- name: string
- album: string
- artist: string
- url: string
- imageUrl?: string
+ name: string;
+ album: string;
+ artist: string;
+ url: string;
+ imageUrl?: string;
}
// only relevant enum values
@@ -67,11 +67,11 @@ enum ActivityFlag {
const applicationId = "1043533871037284423";
-const presenceStore = lazyWebpack(Webpack.filters.byProps("getLocalPresence"));
-const assetManager = Webpack.mapMangledModuleLazy(
+const presenceStore = findByPropsLazy("getLocalPresence");
+const assetManager = mapMangledModuleLazy(
"getAssetImage: size must === [number, number] for Twitch",
{
- getAsset: Webpack.filters.byCode("apply("),
+ getAsset: filters.byCode("apply("),
}
);
@@ -196,9 +196,9 @@ export default definePlugin({
state: hideAlbumName ? trackData.artist : `${trackData.artist} - ${trackData.album}`,
assets,
- buttons: [ "Open in Last.fm" ],
+ buttons: ["Open in Last.fm"],
metadata: {
- button_urls: [ trackData.url ]
+ button_urls: [trackData.url]
},
type: this.settings.useListeningStatus ? ActivityType.LISTENING : ActivityType.PLAYING,
diff --git a/src/plugins/loadingQuotes.ts b/src/plugins/loadingQuotes.ts
index 7ee55d8ef..052bfe6ec 100644
--- a/src/plugins/loadingQuotes.ts
+++ b/src/plugins/loadingQuotes.ts
@@ -16,8 +16,8 @@
* along with this program. If not, see
@@ -52,7 +50,7 @@ const Icons = {
};
type Platform = keyof typeof Icons;
-const getStatusColor = lazyWebpack(filters.byCode("STATUS_YELLOW", "TWITCH", "STATUS_GREY"));
+const getStatusColor = findByCodeLazy("STATUS_YELLOW", "TWITCH", "STATUS_GREY");
const PlatformIcon = ({ platform, status }: { platform: Platform, status: string; }) => {
const tooltip = platform[0].toUpperCase() + platform.slice(1);
diff --git a/src/plugins/pronoundb/components/PronounsAboutComponent.tsx b/src/plugins/pronoundb/components/PronounsAboutComponent.tsx
index 3f288d5ed..255c6d35b 100644
--- a/src/plugins/pronoundb/components/PronounsAboutComponent.tsx
+++ b/src/plugins/pronoundb/components/PronounsAboutComponent.tsx
@@ -16,8 +16,8 @@
* along with this program. If not, see = lazyWebpack(filters.byProps("timestampInline"));
+const styles: Record = findByPropsLazy("timestampInline");
export default function PronounsChatComponentWrapper({ message }: { message: Message; }) {
// Don't bother fetching bot or system users
diff --git a/src/plugins/pronoundb/components/PronounsProfileWrapper.tsx b/src/plugins/pronoundb/components/PronounsProfileWrapper.tsx
index b39f4ed3d..9540bb9e6 100644
--- a/src/plugins/pronoundb/components/PronounsProfileWrapper.tsx
+++ b/src/plugins/pronoundb/components/PronounsProfileWrapper.tsx
@@ -16,9 +16,10 @@
* along with this program. If not, see = [];
diff --git a/src/plugins/reverseImageSearch.tsx b/src/plugins/reverseImageSearch.tsx
index 804ac0489..26e10038d 100644
--- a/src/plugins/reverseImageSearch.tsx
+++ b/src/plugins/reverseImageSearch.tsx
@@ -16,9 +16,9 @@
* along with this program. If not, see (
idk?: null,
compare?: (old: T, newer: T) => boolean
) => T
- = lazyWebpack(filters.byCode("useStateFromStores"));
+ = findByCodeLazy("useStateFromStores");
function Svg(path: string, label: string) {
return () => (
diff --git a/src/plugins/spotifyControls/SpotifyStore.ts b/src/plugins/spotifyControls/SpotifyStore.ts
index 0dad5038b..75448dc2b 100644
--- a/src/plugins/spotifyControls/SpotifyStore.ts
+++ b/src/plugins/spotifyControls/SpotifyStore.ts
@@ -16,13 +16,12 @@
* along with this program. If not, see
@@ -70,8 +105,19 @@ export default definePlugin({
},
_renderUsers({ message, emoji }: RootObject) {
- const reactions = ReactionStore.getReactions(message.channel_id, message.id, emoji);
- const users = Object.values(reactions) as User[];
+ const forceUpdate = useForceUpdater();
+ React.useEffect(() => {
+ const cb = (e: any) => {
+ if (e.messageId === message.id)
+ forceUpdate();
+ };
+ FluxDispatcher.subscribe("MESSAGE_REACTION_ADD_USERS", cb);
+
+ return () => FluxDispatcher.unsubscribe("MESSAGE_REACTION_ADD_USERS", cb);
+ }, [message.id]);
+
+ const reactions = getReactionsWithQueue(message, emoji);
+ const users = Object.values(reactions).filter(Boolean) as User[];
return (
= Promise.resolve();
+ /**
+ * @param maxSize The maximum amount of functions that can be queued at once.
+ * If the queue is full, the oldest function will be removed.
+ */
+ constructor(public maxSize = Infinity) { }
- add(func: (lastValue: unknown) => Promisable): Promise {
- return (this.promise = this.promise.then(func));
+ private queue = [] as Array<() => Promisable>;
+
+ private promise?: Promise;
+
+ private next() {
+ const func = this.queue.shift();
+ if (func)
+ this.promise = Promise.resolve()
+ .then(func)
+ .finally(() => this.next());
+ else
+ this.promise = undefined;
+ }
+
+ private run() {
+ if (!this.promise)
+ this.next();
+ }
+
+ /**
+ * Append a task at the end of the queue. This task will be executed after all other tasks
+ * If the queue exceeds the specified maxSize, the first task in queue will be removed.
+ * @param func Task
+ */
+ push(func: () => Promisable) {
+ if (this.size >= this.maxSize)
+ this.queue.shift();
+
+ this.queue.push(func);
+ this.run();
+ }
+
+ /**
+ * Prepend a task at the beginning of the queue. This task will be executed next
+ * If the queue exceeds the specified maxSize, the last task in queue will be removed.
+ * @param func Task
+ */
+ unshift(func: () => Promisable) {
+ if (this.size >= this.maxSize)
+ this.queue.pop();
+
+ this.queue.unshift(func);
+ this.run();
+ }
+
+ /**
+ * The amount of tasks in the queue
+ */
+ get size() {
+ return this.queue.length;
}
}
diff --git a/src/utils/debounce.ts b/src/utils/debounce.ts
index d9e19defc..6e5bba661 100644
--- a/src/utils/debounce.ts
+++ b/src/utils/debounce.ts
@@ -16,6 +16,13 @@
* along with this program. If not, see (func: T, delay = 300): T {
let timeout: NodeJS.Timeout;
return function (...args: any[]) {
diff --git a/src/utils/discord.ts b/src/utils/discord.ts
index 7fc5064a7..f1a1f8a5a 100644
--- a/src/utils/discord.ts
+++ b/src/utils/discord.ts
@@ -16,10 +16,9 @@
* along with this program. If not, see (factory: () => T): () => T {
let cache: T;
return () => cache ?? (cache = factory());
}
-export const lazy = makeLazy;
-
-/**
- * Do a lazy webpack search. Searches the module on first property access
- * @param filter Filter function
- * @returns A proxy to the webpack module. Not all traps are implemented, may produce unexpected results.
- */
-export function lazyWebpack(filter: FilterFn): T {
- return proxyLazy(() => find(filter));
-}
type AwaiterRes = [T, any, boolean, () => void];
/**
@@ -70,6 +58,14 @@ export function useAwaiter(factory: () => Promise, fallbackValue: T | null
return [state.value, state.error, state.pending, () => setSignal(signal + 1)];
}
+/**
+ * Returns a function that can be used to force rerender react components
+ */
+export function useForceUpdater() {
+ const [, set] = React.useState(0);
+ return () => set(s => s + 1);
+}
+
/**
* A lazy component. The factory method is called on first render. For example useful
* for const Component = LazyComponent(() => findByDisplayName("...").default)
@@ -139,6 +135,9 @@ export function classes(...classes: string[]) {
return classes.join(" ");
}
+/**
+ * Returns a promise that resolves after the specified amount of time
+ */
export function sleep(ms: number): Promise {
return new Promise(r => setTimeout(r, ms));
}
diff --git a/src/utils/modal.tsx b/src/utils/modal.tsx
index 2affbd7d1..9a90460b3 100644
--- a/src/utils/modal.tsx
+++ b/src/utils/modal.tsx
@@ -16,8 +16,7 @@
* along with this program. If not, see , options?: ModalOptions & { contextKey?: string; }): Promise {
return ModalAPI.openModalLazy(render, options);
}
+/**
+ * Open a Modal with the given render function.
+ * You should use the Modal components exported by this file
+ */
export function openModal(render: RenderFunction, options?: ModalOptions, contextKey?: string): string {
return ModalAPI.openModal(render, options, contextKey);
}
+/**
+ * Close a modal by its key
+ */
export function closeModal(modalKey: string, contextKey?: string): void {
return ModalAPI.closeModal(modalKey, contextKey);
}
diff --git a/src/utils/proxyLazy.ts b/src/utils/proxyLazy.ts
index 364dd5697..42b5a91d3 100644
--- a/src/utils/proxyLazy.ts
+++ b/src/utils/proxyLazy.ts
@@ -63,7 +63,7 @@ handler.getOwnPropertyDescriptor = (target, p) => {
* @param factory lazy factory
* @returns Proxy
*
- * Note that the example below exists already as an api, see {@link lazyWebpack}
+ * Note that the example below exists already as an api, see {@link findByPropsLazy}
* @example const mod = proxyLazy(() => findByProps("blah")); console.log(mod.blah);
*/
export function proxyLazy(factory: () => T): T {
diff --git a/src/utils/quickCss.ts b/src/utils/quickCss.ts
index 0ce1f588e..1f9f235f5 100644
--- a/src/utils/quickCss.ts
+++ b/src/utils/quickCss.ts
@@ -16,7 +16,8 @@
* along with this program. If not, see
The following plugins require a restart:
-{changes.map((s, i) => (
- <>
- {i > 0 && ", "}
- {Parser.parse("`" + s + "`")}
-
- ))}
-
- ),
- confirmText: "Restart now",
- cancelText: "Later!",
- onConfirm: () => location.reload()
- }));
- }, []);
-
- return (
-
- Support the Project
-
- Please consider supporting the Development of Vencord by donating!
-
-
-
- {settingsDir}
- -
+
- — Custom QuickCSS +
- — Plugin Settings +
+ Support the Project
+
+ Please consider supporting the Development of Vencord by donating!
+
+
+
+ Connected for {formatDuration(time)}
; + } +}); diff --git a/src/plugins/clearURLs/index.ts b/src/plugins/clearURLs/index.ts index f5b890996..178a0e11f 100644 --- a/src/plugins/clearURLs/index.ts +++ b/src/plugins/clearURLs/index.ts @@ -22,10 +22,11 @@ import { MessageObject, removePreEditListener, removePreSendListener -} from "../../api/MessageEvents"; -import { migratePluginSettings } from "../../api/settings"; -import { Devs } from "../../utils/constants"; -import definePlugin from "../../utils/types"; +} from "@api/MessageEvents"; +import { migratePluginSettings } from "@api/settings"; +import { Devs } from "@utils/constants"; +import definePlugin from "@utils/types"; + import { defaultRules } from "./defaultRules"; // From lodash diff --git a/src/plugins/consoleShortcuts.ts b/src/plugins/consoleShortcuts.ts index eeb5d8dcb..ae0de9f83 100644 --- a/src/plugins/consoleShortcuts.ts +++ b/src/plugins/consoleShortcuts.ts @@ -16,8 +16,8 @@ * along with this program. If not, see(p: P & Record(code: string, mappers: Re
return proxyLazy(() => mapMangledModule(code, mappers));
}
+/**
+ * Find the first module that has the specified properties
+ */
export function findByProps(...props: string[]) {
return find(filters.byProps(...props));
}
+/**
+ * findByProps but lazy
+ */
+export function findByPropsLazy(...props: string[]) {
+ return findLazy(filters.byProps(...props));
+}
+
+/**
+ * Find all modules that have the specified properties
+ */
export function findAllByProps(...props: string[]) {
return findAll(filters.byProps(...props));
}
+/**
+ * Find a function by its code
+ */
export function findByCode(...code: string[]) {
return find(filters.byCode(...code));
}
-export function findByDisplayName(deezNuts: string) {
- return find(filters.byDisplayName(deezNuts));
+/**
+ * findByCode but lazy
+ */
+export function findByCodeLazy(...code: string[]) {
+ return findLazy(filters.byCode(...code));
}
+/**
+ * Wait for a module that matches the provided filter to be registered,
+ * then call the callback with the module as the first argument
+ */
export function waitFor(filter: string | string[] | FilterFn, callback: CallbackFn) {
if (typeof filter === "string")
filter = filters.byProps(filter);
diff --git a/tsconfig.json b/tsconfig.json
index aa1253296..a55c1fe36 100644
--- a/tsconfig.json
+++ b/tsconfig.json
@@ -14,7 +14,16 @@
"strict": true,
"noImplicitAny": false,
"target": "ESNEXT",
- "jsx": "preserve"
+ "jsx": "preserve",
+
+ "baseUrl": "./src/",
+ "paths": {
+ "@webpack": ["./webpack"],
+ "@webpack/common": ["./webpack/common"],
+ "@utils/*": ["./utils/*"],
+ "@api/*": ["./api/*"],
+ "@components/*": ["./components/*"]
+ }
},
"include": ["src/**/*"]
}