ulysia/Vencord
1
0
Fork 0
Code Pull requests Activity

fix reporter trying to JSON.stringify regex

Browse source
This commit is contained in:
Nuckyz 2024-07-03 04:50:08 -03:00
parent ea6fccb54e
commit b377cad1e6
No known key found for this signature in database
GPG key ID: 440BF8296E1C4AD9
1 changed files with 14 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
src/debug/runReporter.ts
View file

@ -107,6 +107,14 @@ async function runReporter() {
parsedArgs = args[0].$$vencordProps.slice(1); parsedArgs = args[0].$$vencordProps.slice(1);
} }
function stringifyCodeFilter(code: string | RegExp | Webpack.CodeFilter) {
if (Array.isArray(code)) {
return `[${code.map(arg => arg instanceof RegExp ? String(arg) : JSON.stringify(arg)).join(", ")}]`;
}
return code instanceof RegExp ? String(code) : JSON.stringify(code);
}
// if parsedArgs is the same as args, it means vencordProps of the filter was not available (like in normal filter functions), // if parsedArgs is the same as args, it means vencordProps of the filter was not available (like in normal filter functions),
// so log the filter function instead // so log the filter function instead
if ( if (
@ -129,7 +137,7 @@ async function runReporter() {
regexStr = String(matcher); regexStr = String(matcher);
} }
logMessage += `(${JSON.stringify(code)}, ${regexStr})`; logMessage += `(${stringifyCodeFilter(code)}, ${regexStr})`;
} else if (searchType === "mapMangledModule") { } else if (searchType === "mapMangledModule") {
const [code, mappers] = parsedArgs; const [code, mappers] = parsedArgs;
@ -142,13 +150,16 @@ async function runReporter() {
const filterName = filter.$$vencordProps[0]; const filterName = filter.$$vencordProps[0];
parsedFilter = `${filterName}(${filter.$$vencordProps.slice(1).map((arg: any) => arg instanceof RegExp ? String(arg) : JSON.stringify(arg)).join(", ")})`; parsedFilter = `${filterName}(${filter.$$vencordProps.slice(1).map((arg: any) => arg instanceof RegExp ? String(arg) : JSON.stringify(arg)).join(", ")})`;
} else { } else {
parsedFilter = String(filter).slice(0, 147) + "..."; parsedFilter = String(filter);
if (parsedFilter.length > 150) {
parsedFilter = parsedFilter.slice(0, 147) + "...";
}
} }
return [key, parsedFilter]; return [key, parsedFilter];
}); });
logMessage += `(${JSON.stringify(code)}, {\n${parsedFailedMappers.map(([key, parsedFilter]) => `\t${key}: ${parsedFilter}`).join(",\n")}\n})`; logMessage += `(${stringifyCodeFilter(code)}, {\n${parsedFailedMappers.map(([key, parsedFilter]) => `\t${key}: ${parsedFilter}`).join(",\n")}\n})`;
} else { } else {
logMessage += `(${filterName.length ? `${filterName}(` : ""}${parsedArgs.map(arg => arg instanceof RegExp ? String(arg) : JSON.stringify(arg)).join(", ")})${filterName.length ? ")" : ""}`; logMessage += `(${filterName.length ? `${filterName}(` : ""}${parsedArgs.map(arg => arg instanceof RegExp ? String(arg) : JSON.stringify(arg)).join(", ")})${filterName.length ? ")" : ""}`;
} }