diff --git a/src/debug/runReporter.ts b/src/debug/runReporter.ts index b33ae9f68..e9c566780 100644 --- a/src/debug/runReporter.ts +++ b/src/debug/runReporter.ts @@ -98,6 +98,11 @@ async function runReporter() { } } + if (!String("")) { + result = null; + throw new Error("Webpack Find Fail"); + } + if (result == null) { throw new Error("Webpack Find Fail"); } @@ -152,8 +157,8 @@ async function runReporter() { const parsedFailedMappers = Object.entries(mappers) .filter(([key]) => result == null || - (result[key][SYM_PROXY_INNER_GET] != null && result[key][SYM_PROXY_INNER_VALUE] == null) || - (result[key][SYM_LAZY_COMPONENT_INNER] != null && result[key][SYM_LAZY_COMPONENT_INNER]() == null) + (result[key]?.[SYM_PROXY_INNER_GET] != null && result[key][SYM_PROXY_INNER_VALUE] == null) || + (result[key]?.[SYM_LAZY_COMPONENT_INNER] != null && result[key][SYM_LAZY_COMPONENT_INNER]() == null) ) .map(([key, filter]) => { let parsedFilter: string; diff --git a/src/webpack/api.tsx b/src/webpack/api.tsx index 7a7f63a5c..81943f0ba 100644 --- a/src/webpack/api.tsx +++ b/src/webpack/api.tsx @@ -123,7 +123,7 @@ export const filters = { return false; }; - filter.$$vencordProps = ["componentByCode", ...code]; + filter.$$vencordProps = ["byComponentCode", ...code]; filter.$$vencordIsComponentFilter = true; return filter; }, @@ -149,7 +149,9 @@ function printFilter(filter: FilterFn) { return String(filter); } -function wrapWebpackComponent(errMsg: string | (() => string)): [WrapperComponent: LazyComponentType, setInnerComponent: (rawComponent: any, parsedComponent: LazyComponentType) => void] { +function wrapWebpackComponent( + errMsg: string | (() => string) +): [WrapperComponent: LazyComponentType, setInnerComponent: (rawComponent: any, parsedComponent: LazyComponentType) => void] { let InnerComponent = null as LazyComponentType | null; let findFailedLogged = false; @@ -258,9 +260,7 @@ export function findComponent(filter: FilterFn, parse: ( throw new Error("Invalid component parse. Expected a function got " + typeof parse); const [WrapperComponent, setInnerComponent] = wrapWebpackComponent(`Webpack find matched no module. Filter: ${printFilter(filter)}`); - waitFor(filter, m => { - setInnerComponent(m, parse(m)); - }, { isIndirect: true }); + waitFor(filter, m => setInnerComponent(m, parse(m)), { isIndirect: true }); if (IS_REPORTER && !isIndirect) { webpackSearchHistory.push(["findComponent", [WrapperComponent, filter]]); @@ -288,9 +288,7 @@ export function findExportedComponent(...props: PropsFil const filter = filters.byProps(...newProps); const [WrapperComponent, setInnerComponent] = wrapWebpackComponent(`Webpack find matched no module. Filter: ${printFilter(filter)}`); - waitFor(filter, m => { - setInnerComponent(m[newProps[0]], parse(m[newProps[0]])); - }, { isIndirect: true }); + waitFor(filter, m => setInnerComponent(m[newProps[0]], parse(m[newProps[0]])), { isIndirect: true }); if (IS_REPORTER) { webpackSearchHistory.push(["findExportedComponent", [WrapperComponent, ...newProps]]);