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-07-14 19:46:56 -04:00
commit fedaed27b4
No known key found for this signature in database
3 changed files with 13 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/plugins/_api/messagePopover.ts
View file

@ -27,7 +27,7 @@ export default definePlugin({
{
find: "#{intl::MESSAGE_UTILITIES_A11Y_LABEL}",
replacement: {
match: /(?<=:null),(.{0,40}togglePopout:.+?}\)),(.+?)\]}\):null,(?<=\((\i\.\i),{label:.+?children:\[(\i&&!\i)\?\(0,\i\.jsxs?\)\(\i\.Fragment.+?message:(\i).+?)/,
match: /(?<=:null),(.{0,40}togglePopout:.+?}\)),(.+?)\]}\):null,(?<=\((\i\.\i),{label:.+?:null,(\i)\?\(0,\i\.jsxs?\)\(\i\.Fragment.+?message:(\i).+?)/,
replace: (_, ReactButton, PotionButton, ButtonComponent, showReactButton, message) => "" +
`]}):null,Vencord.Api.MessagePopover._buildPopoverElements(${ButtonComponent},${message}),${showReactButton}?${ReactButton}:null,${showReactButton}&&${PotionButton},`
}

12
src/plugins/experiments/index.tsx
View file

@ -103,11 +103,19 @@ export default definePlugin({
},
// Fix some tricky experiments name causing a client crash
{
match: /\i\.\i\)\(\)(?<=(\i)=.+?).+?if\(null==(\i)(?=\);)/,
replace: "$&||!Object.hasOwn($1,$2)"
match: /.getExperimentBucketName.+?if\(null==(\i)\|\|null==\i(?=\)return null;)/,
replace: "$&||({})[$1]!=null"
}
]
},
// Fix another function which cases crashes with tricky experiment names and the experiment embed
{
find: "}getServerAssignment(",
replacement: {
match: /}getServerAssignment\((\i),\i,\i\){/,
replace: "$&if($1==null)return;"
}
}
],
start: () => !BugReporterExperiment.getCurrentConfig().hasBugReporterAccess && enableStyle(hideBugReport),

4
src/plugins/overrideForumDefaults/index.tsx
View file

@ -36,11 +36,11 @@ export default definePlugin({
find: "getDefaultLayout(){",
replacement: [
{
match: /getDefaultLayout\(\){/,
match: /}getDefaultLayout\(\){/,
replace: "$&return $self.getLayout();"
},
{
match: /getDefaultSortOrder\(\){/,
match: /}getDefaultSortOrder\(\){/,
replace: "$&return $self.getSortOrder();"
}
]