ulysia/Vencord
1
0
Fork 0
Code Pull requests Activity

Handle if for some reason modules are set again

Browse source
This commit is contained in:
Nuckyz 2024-05-24 03:44:40 -03:00
parent f64b228cb9
commit 488f133a90
No known key found for this signature in database
GPG key ID: 440BF8296E1C4AD9
1 changed files with 23 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
src/webpack/patchWebpack.ts
View file

@ -21,7 +21,7 @@ const allModuleFactories = new Set<WebpackRequire["m"]>();
function defineModuleFactoryGetter(modulesFactories: WebpackRequire["m"], id: PropertyKey, factory: ModuleFactory) { function defineModuleFactoryGetter(modulesFactories: WebpackRequire["m"], id: PropertyKey, factory: ModuleFactory) {
Object.defineProperty(modulesFactories, id, { Object.defineProperty(modulesFactories, id, {
get: () => { get() {
// $$vencordOriginal means the factory is already patched // $$vencordOriginal means the factory is already patched
// @ts-ignore // @ts-ignore
if (factory.$$vencordOriginal != null) { if (factory.$$vencordOriginal != null) {
@ -31,6 +31,15 @@ function defineModuleFactoryGetter(modulesFactories: WebpackRequire["m"], id: Pr
// This patches factories if eagerPatches are disabled // This patches factories if eagerPatches are disabled
return (factory = patchFactory(id, factory)); return (factory = patchFactory(id, factory));
}, },
set(v: ModuleFactory) {
// @ts-ignore
if (factory.$$vencordOriginal != null) {
// @ts-ignore
factory.$$vencordOriginal = v;
} else {
factory = v;
}
},
configurable: true, configurable: true,
enumerable: true enumerable: true
}); });
@ -43,16 +52,24 @@ const moduleFactoriesHandler: ProxyHandler<WebpackRequire["m"]> = {
return Reflect.set(target, p, newValue, receiver); return Reflect.set(target, p, newValue, receiver);
} }
const existingFactory = Reflect.get(target, p, target);
if (!Settings.eagerPatches) { if (!Settings.eagerPatches) {
// If existingFactory exists, its either wrapped in defineModuleFactoryGetter, or it has already been required
// so call Reflect.set with the new original and let the correct logic apply (normal set, or defineModuleFactoryGetter setter)
if (existingFactory != null) {
return Reflect.set(target, p, newValue, receiver);
}
defineModuleFactoryGetter(target, p, newValue); defineModuleFactoryGetter(target, p, newValue);
return true; return true;
} }
const existingFactory = Reflect.get(target, p, target);
// Check if this factory is already patched // Check if this factory is already patched
// @ts-ignore // @ts-ignore
if (existingFactory?.$$vencordOriginal === newValue) { if (existingFactory.$$vencordOriginal != null) {
// @ts-ignore
existingFactory.$$vencordOriginal = newValue;
return true; return true;
} }
@ -318,7 +335,8 @@ function patchFactory(id: PropertyKey, factory: ModuleFactory) {
const patchedFactory: ModuleFactory = (module, exports, require) => { const patchedFactory: ModuleFactory = (module, exports, require) => {
for (const moduleFactories of allModuleFactories) { for (const moduleFactories of allModuleFactories) {
Object.defineProperty(moduleFactories, id, { Object.defineProperty(moduleFactories, id, {
value: originalFactory, // @ts-ignore
value: patchFactory.$$vencordOriginal,
configurable: true, configurable: true,
enumerable: true, enumerable: true,
writable: true writable: true