aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVendicated <vendicated@riseup.net>2022-10-02 02:51:10 +0200
committerVendicated <vendicated@riseup.net>2022-10-02 02:51:10 +0200
commitacd24cdc4f4cb65f2c94c3a356c541f414935c0a (patch)
treee364ca169a635e0477b75a7f60d7c25de8c9be9f
parentf31fd75efcf6971048c0111860be5c25de925075 (diff)
parentacf06203b6ab5129adc4bf09c7014d888f15944b (diff)
downloadVencord-acd24cdc4f4cb65f2c94c3a356c541f414935c0a.tar.gz
Vencord-acd24cdc4f4cb65f2c94c3a356c541f414935c0a.tar.bz2
Vencord-acd24cdc4f4cb65f2c94c3a356c541f414935c0a.zip
Merge branch 'main' of github.com:Vendicated/Vencord
-rw-r--r--src/components/Settings.tsx20
-rw-r--r--src/webpack/webpack.ts2
2 files changed, 15 insertions, 7 deletions
diff --git a/src/components/Settings.tsx b/src/components/Settings.tsx
index 3b4c04a..bc44e26 100644
--- a/src/components/Settings.tsx
+++ b/src/components/Settings.tsx
@@ -69,11 +69,18 @@ export default ErrorBoundary.wrap(function Settings() {
</Forms.FormTitle>
<Forms.FormText>
- SettingsDir: {settingsDir}
+ SettingsDir: <code style={{ userSelect: 'text', cursor: 'text' }}>{settingsDir}</code>
</Forms.FormText>
<Flex className={classes(Margins.marginBottom20)}>
<Button
+ onClick={() => window.DiscordNative.app.relaunch()}
+ size={Button.Sizes.SMALL}
+ color={Button.Colors.GREEN}
+ >
+ Reload
+ </Button>
+ <Button
onClick={() => window.DiscordNative.fileManager.showItemInFolder(settingsDir)}
size={Button.Sizes.SMALL}
disabled={settingsDirPending}
@@ -88,24 +95,25 @@ export default ErrorBoundary.wrap(function Settings() {
Open QuickCSS File
</Button>
</Flex>
-
+ <Forms.FormDivider />
+ <Forms.FormTitle tag="h5">Settings</Forms.FormTitle>
<Switch
value={settings.useQuickCss}
- onChange={v => settings.useQuickCss = v}
- note="Enable QuickCss"
+ onChange={(v: boolean) => settings.useQuickCss = v}
+ note="Enable QuickCSS"
>
Use QuickCss
</Switch>
<Switch
value={settings.notifyAboutUpdates}
- onChange={v => settings.notifyAboutUpdates = v}
+ onChange={(v: boolean) => settings.notifyAboutUpdates = v}
note="Shows a Toast on StartUp"
>
Get notified about new Updates
</Switch>
<Switch
value={settings.unsafeRequire}
- onChange={v => settings.unsafeRequire = v}
+ onChange={(v: boolean) => settings.unsafeRequire = v}
note="Enables VencordNative.require. Useful for testing, very bad for security. Leave this off unless you need it."
>
Enable Unsafe Require
diff --git a/src/webpack/webpack.ts b/src/webpack/webpack.ts
index 9be576a..15104bb 100644
--- a/src/webpack/webpack.ts
+++ b/src/webpack/webpack.ts
@@ -135,7 +135,7 @@ export function search(...filters: Array<string | RegExp>) {
const factories = wreq.m;
outer:
for (const id in factories) {
- const factory = factories[id];
+ const factory = factories[id].original ?? factories[id];
const str: string = factory.toString();
for (const filter of filters) {
if (typeof filter === "string" && !str.includes(filter)) continue outer;