SheWhoReignsSupreme/revenge-plugins
1
0
Fork 0
Code Issues 1 Pull requests 1 Projects Releases Packages Wiki Activity Actions

RosePlugs: fix cross-plugin conflict with Raiden's Themes over SETTING_RENDERER_CONFIG

Browse source
This commit is contained in:
Ally Founder 2026-08-11 20:17:55 -04:00
parent a9bc875029
commit b6fc1d43aa
1 changed files with 33 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

43
plugins/rose-plugs/src/patches/settings.ts
View file

@ -128,17 +128,38 @@ function patchTabsUI(getRows: () => SectionRow[], patches: (() => void)[]) {
return;
}
let rendererConfigValue = settingConstants.SETTING_RENDERER_CONFIG;
// Raiden's Themes installs this exact same Object.defineProperty-override pattern on this same
// property. Confirmed live: whichever plugin's override installs LAST completely replaces the
// other's getter (defineProperty doesn't chain, it overwrites the whole descriptor) - freezing
// the first plugin's rows as a one-time snapshot baked into the second plugin's closure. Any
// plugin RosePlugs discovers afterward (installed mid-session, like a freshly-added plugin)
// then never reaches SETTING_RENDERER_CONFIG again, even though the section still correctly
// lists its key - the exact row-key/config mismatch that crashes Settings. Re-asserting this
// override right before every read RosePlugs itself needs (not just once at setup) guarantees
// RosePlugs' getter is always the most-recently-installed one when it actually matters, no
// matter what order plugins load in or what either one does afterward.
let baseConfigValue: any = settingConstants.SETTING_RENDERER_CONFIG;
Object.defineProperty(settingConstants, "SETTING_RENDERER_CONFIG", {
enumerable: true,
configurable: true,
get: () => {
cacheRows(getRows());
return { ...rendererConfigValue, ...rendererRowCache };
},
set(v: any) { rendererConfigValue = v; },
});
const configGetter = () => {
cacheRows(getRows());
return { ...baseConfigValue, ...rendererRowCache };
};
function ensureConfigOverride() {
const current = Object.getOwnPropertyDescriptor(settingConstants, "SETTING_RENDERER_CONFIG");
if (current?.get === configGetter) return;
baseConfigValue = current?.get ? current.get.call(settingConstants) : (current?.value ?? baseConfigValue);
Object.defineProperty(settingConstants, "SETTING_RENDERER_CONFIG", {
enumerable: true,
configurable: true,
get: configGetter,
set(v: any) { baseConfigValue = v; },
});
}
ensureConfigOverride();
const firstRender = Symbol("roseplugs-first-render");
@ -146,6 +167,7 @@ function patchTabsUI(getRows: () => SectionRow[], patches: (() => void)[]) {
if (!createListModule) return;
patches.push(
after("createList", createListModule, function (args: any) {
ensureConfigOverride();
if (args[0][firstRender]) return;
args[0][firstRender] = true;
@ -172,6 +194,7 @@ function patchTabsUI(getRows: () => SectionRow[], patches: (() => void)[]) {
if (!SettingsOverviewScreen) return;
patches.push(
after("default", SettingsOverviewScreen, (args: any, ret: any) => {
ensureConfigOverride();
if (args[0][firstRender]) return;
args[0][firstRender] = true;