ulysia/Vencord
1
0
Fork 0
Code Pull requests Activity

fixes

Browse source
This commit is contained in:
Nuckyz 2024-07-20 19:30:24 -03:00
parent 42353373db
commit 129b770ffa
No known key found for this signature in database
GPG key ID: 440BF8296E1C4AD9
2 changed files with 13 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
src/debug/runReporter.ts
View file

@ -98,6 +98,11 @@ async function runReporter() {
} }
} }
if (!String("")) {
result = null;
throw new Error("Webpack Find Fail");
}
if (result == null) { if (result == null) {
throw new Error("Webpack Find Fail"); throw new Error("Webpack Find Fail");
} }
@ -152,8 +157,8 @@ async function runReporter() {
const parsedFailedMappers = Object.entries<any>(mappers) const parsedFailedMappers = Object.entries<any>(mappers)
.filter(([key]) => .filter(([key]) =>
result == null || result == null ||
(result[key][SYM_PROXY_INNER_GET] != null && result[key][SYM_PROXY_INNER_VALUE] == 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_LAZY_COMPONENT_INNER] != null && result[key][SYM_LAZY_COMPONENT_INNER]() == null)
) )
.map(([key, filter]) => { .map(([key, filter]) => {
let parsedFilter: string; let parsedFilter: string;

14
src/webpack/api.tsx
View file

@ -123,7 +123,7 @@ export const filters = {
return false; return false;
}; };
filter.$$vencordProps = ["componentByCode", ...code]; filter.$$vencordProps = ["byComponentCode", ...code];
filter.$$vencordIsComponentFilter = true; filter.$$vencordIsComponentFilter = true;
return filter; return filter;
}, },
@ -149,7 +149,9 @@ function printFilter(filter: FilterFn) {
return String(filter); return String(filter);
} }
function wrapWebpackComponent<T extends object = any>(errMsg: string | (() => string)): [WrapperComponent: LazyComponentType<T>, setInnerComponent: (rawComponent: any, parsedComponent: LazyComponentType<T>) => void] { function wrapWebpackComponent<T extends object = any>(
errMsg: string | (() => string)
): [WrapperComponent: LazyComponentType<T>, setInnerComponent: (rawComponent: any, parsedComponent: LazyComponentType<T>) => void] {
let InnerComponent = null as LazyComponentType<T> | null; let InnerComponent = null as LazyComponentType<T> | null;
let findFailedLogged = false; let findFailedLogged = false;
@ -258,9 +260,7 @@ export function findComponent<T extends object = any>(filter: FilterFn, parse: (
throw new Error("Invalid component parse. Expected a function got " + typeof parse); throw new Error("Invalid component parse. Expected a function got " + typeof parse);
const [WrapperComponent, setInnerComponent] = wrapWebpackComponent<T>(`Webpack find matched no module. Filter: ${printFilter(filter)}`); const [WrapperComponent, setInnerComponent] = wrapWebpackComponent<T>(`Webpack find matched no module. Filter: ${printFilter(filter)}`);
waitFor(filter, m => { waitFor(filter, m => setInnerComponent(m, parse(m)), { isIndirect: true });
setInnerComponent(m, parse(m));
}, { isIndirect: true });
if (IS_REPORTER && !isIndirect) { if (IS_REPORTER && !isIndirect) {
webpackSearchHistory.push(["findComponent", [WrapperComponent, filter]]); webpackSearchHistory.push(["findComponent", [WrapperComponent, filter]]);
@ -288,9 +288,7 @@ export function findExportedComponent<T extends object = any>(...props: PropsFil
const filter = filters.byProps(...newProps); const filter = filters.byProps(...newProps);
const [WrapperComponent, setInnerComponent] = wrapWebpackComponent<T>(`Webpack find matched no module. Filter: ${printFilter(filter)}`); const [WrapperComponent, setInnerComponent] = wrapWebpackComponent<T>(`Webpack find matched no module. Filter: ${printFilter(filter)}`);
waitFor(filter, m => { waitFor(filter, m => setInnerComponent(m[newProps[0]], parse(m[newProps[0]])), { isIndirect: true });
setInnerComponent(m[newProps[0]], parse(m[newProps[0]]));
}, { isIndirect: true });
if (IS_REPORTER) { if (IS_REPORTER) {
webpackSearchHistory.push(["findExportedComponent", [WrapperComponent, ...newProps]]); webpackSearchHistory.push(["findExportedComponent", [WrapperComponent, ...newProps]]);