fix some minor bugs

This commit is contained in:
Vendicated 2024-03-01 00:18:09 +01:00
parent da50c7a19b
commit 3ebde1aae8
No known key found for this signature in database
GPG key ID: D66986BAF75ECF18
3 changed files with 5 additions and 4 deletions

View file

@ -428,10 +428,11 @@ function runTime(token: string) {
if (searchType === "findComponent") method = "find"; if (searchType === "findComponent") method = "find";
if (searchType === "findExportedComponent") method = "findByProps"; if (searchType === "findExportedComponent") method = "findByProps";
if (searchType === "waitFor" || searchType === "waitForComponent" || searchType === "waitForStore") { if (searchType === "waitFor" || searchType === "waitForComponent") {
if (typeof args[0] === "string") method = "findByProps"; if (typeof args[0] === "string") method = "findByProps";
else method = "find"; else method = "find";
} }
if (searchType === "waitForStore") method = "findStore";
try { try {
let result: any; let result: any;

View file

@ -474,7 +474,7 @@ export default definePlugin({
if (typeof firstContent === "string") { if (typeof firstContent === "string") {
content[0] = firstContent.trimStart(); content[0] = firstContent.trimStart();
content[0] || content.shift(); content[0] || content.shift();
} else if (typeof firstContent?.props.children === "string") { } else if (typeof firstContent?.props?.children === "string") {
firstContent.props.children = firstContent.props.children.trimStart(); firstContent.props.children = firstContent.props.children.trimStart();
firstContent.props.children || content.shift(); firstContent.props.children || content.shift();
} }
@ -484,7 +484,7 @@ export default definePlugin({
if (typeof lastContent === "string") { if (typeof lastContent === "string") {
content[lastIndex] = lastContent.trimEnd(); content[lastIndex] = lastContent.trimEnd();
content[lastIndex] || content.pop(); content[lastIndex] || content.pop();
} else if (typeof firstContent?.props.children === "string") { } else if (typeof lastContent?.props?.children === "string") {
lastContent.props.children = lastContent.props.children.trimEnd(); lastContent.props.children = lastContent.props.children.trimEnd();
lastContent.props.children || content.pop(); lastContent.props.children || content.pop();
} }

View file

@ -83,8 +83,8 @@ export function _initWebpack(instance: typeof window.webpackChunkdiscord_app) {
return true; return true;
} }
let devToolsOpen = false;
if (IS_DEV && IS_DISCORD_DESKTOP) { if (IS_DEV && IS_DISCORD_DESKTOP) {
var devToolsOpen = false;
// At this point in time, DiscordNative has not been exposed yet, so setImmediate is needed // At this point in time, DiscordNative has not been exposed yet, so setImmediate is needed
setTimeout(() => { setTimeout(() => {
DiscordNative/* just to make sure */?.window.setDevtoolsCallbacks(() => devToolsOpen = true, () => devToolsOpen = false); DiscordNative/* just to make sure */?.window.setDevtoolsCallbacks(() => devToolsOpen = true, () => devToolsOpen = false);