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

Merge remote-tracking branch 'upstream/dev' into dev

Browse source
This commit is contained in:
thororen1234 2025-09-27 21:01:25 -04:00
commit 67e7145e7e
No known key found for this signature in database
3 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/plugins/_core/settings.tsx
View file

@ -81,11 +81,11 @@ export default definePlugin({
{
find: "#{intl::USER_SETTINGS_ACTIONS_MENU_LABEL}",
replacement: {
// Skip the check discord performs to make sure the section is valid
match: /(?<=function\((\i),(\i),\i\)\{)(?=let \i=Object.values\(\i\.\i\).*?(\(0,\i\.openUserSettings\))\()/,
replace: (_, target, section, func) => `${func}(${target},{section:${section}});return;`
},
},
// Skip the check Discord performs to make sure the section being selected in the user settings context menu is valid
match: /(?<=function\((\i),(\i),\i\)\{)(?=let \i=Object.values\(\i\.\i\).+?(\(0,\i\.openUserSettings\))\()/,
replace: (_, settingsPanel, section, openUserSettings) => `${openUserSettings}(${settingsPanel},{section:${section}});return;`
}
}
],
customSections: [] as ((SectionTypes: SectionTypes) => any)[],

2
src/plugins/implicitRelationships/index.ts
View file

@ -48,7 +48,7 @@ export default definePlugin({
},
// Sections header
{
find: "#{intl::FRIENDS_SECTION_ONLINE}),className",
find: "#{intl::FRIENDS_SECTION_ONLINE}),className:",
replacement: {
match: /,{id:(\i\.\i)\.PENDING,show:.+?className:(\i\.item)/,
replace: (rest, relationShipTypes, className) => `,{id:${relationShipTypes}.IMPLICIT,show:true,className:${className},content:"Implicit"}${rest}`

2
src/webpack/common/components.ts
View file

@ -87,7 +87,7 @@ export const ListScrollerNone = LazyComponent(() => createListScroller(listScrol
export const ListScrollerThin = LazyComponent(() => createListScroller(listScrollerClasses.thin, listScrollerClasses.fade, "", ResizeObserver));
export const ListScrollerAuto = LazyComponent(() => createListScroller(listScrollerClasses.auto, listScrollerClasses.fade, "", ResizeObserver));
export const FocusLock = waitForComponent<t.FocusLock>("FocusLock", filters.componentByCode("containerRef,{keyboardModeEnabled"));
export const FocusLock = waitForComponent<t.FocusLock>("FocusLock", filters.componentByCode(".containerRef,{keyboardModeEnabled:"));
export let useToken: t.useToken;
waitFor(m => {