SheWhoReignsSupreme/Equicord
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix Questify & WebContextMenus

Browse source
This commit is contained in:
thororen1234 2025-10-06 18:54:42 -04:00
parent a57edd6a28
commit 1c2d573f1d
No known key found for this signature in database
3 changed files with 15 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
src/equicordplugins/newPluginsManager/knownSettings.ts
View file

@ -25,14 +25,21 @@ function getCurrentSettings(pluginList: string[]): KnownPluginSettingsMap {
]));
}
export async function getKnownSettings(): Promise<KnownPluginSettingsMap> {
let map = await DataStore.get(KNOWN_SETTINGS_DATA_KEY) as KnownPluginSettingsMap;
if (map === undefined) {
export async function getKnownSettings(): Promise<Map<string, Set<string>>> {
const raw = await DataStore.get(KNOWN_SETTINGS_DATA_KEY);
let map: Map<string, Set<string>>;
if (!raw) {
const knownPlugins = await DataStore.get(KNOWN_PLUGINS_LEGACY_DATA_KEY) ?? [] as string[];
const Plugins = [...Object.keys(plugins), ...knownPlugins];
map = getCurrentSettings(Plugins);
DataStore.set(KNOWN_SETTINGS_DATA_KEY, map);
await DataStore.set(KNOWN_SETTINGS_DATA_KEY, [...map.entries()].map(
([plugin, settings]) => [plugin, [...settings]]
));
} else {
map = new Map(raw.map(([plugin, settings]: [string, string[]]) => [plugin, new Set(settings)]));
}
return map;
}

4
src/equicordplugins/questify/index.tsx
View file

@ -1044,7 +1044,7 @@ export default definePlugin({
// Run Questify's sort function every time due to hook requirements but return
// early if not applicable. If the sort method is set to "Questify", replace the
// quests with the sorted ones. Also, setup a trigger to rerender the memo.
match: /(?<=function \i\((\i).{0,100}?useRef\(\i\);)(return \i.useMemo\(\(\)=>{)/,
match: /(?<=function \i\((\i).{0,100}?useRef\(0\);)(return \i.useMemo\(\(\)=>{)/,
replace: "const questRerenderTrigger=$self.useQuestRerender();const questifySorted=$self.sortQuests($1,arguments[1].sortMethod!==\"questify\");$2if(arguments[1].sortMethod===\"questify\"){$1=questifySorted;};"
},
{
@ -1059,7 +1059,7 @@ export default definePlugin({
},
{
// Add the trigger to the memo for rerendering Quests order due to progress changes, etc.
match: /(?<=current=\i,\i},\[\i,\i,\i)/,
match: /(?<=current=\i\.length,\i},\[\i,\i,\i)/,
replace: ",questRerenderTrigger,questifySorted"
}
]

4
src/plugins/webContextMenus.web/index.ts
View file

@ -138,8 +138,8 @@ export default definePlugin({
replace: "false"
},
{
match: /canCopyImage\(.+?(?=return"function"==typeof \i\.clipboard\.copyImage)/,
replace: "$&return true;"
match: /(canCopyImage\(.+?)\|\|"function"!=typeof \i\.clipboard\.copyImage/,
replace: "$1"
}
]
},