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-08-18 09:07:47 -04:00
commit 2ab693ea97
No known key found for this signature in database
8 changed files with 10 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/equicordplugins/equicordToolbox/index.tsx
View file

@ -165,7 +165,7 @@ export default definePlugin({
{
find: ".controlButtonWrapper,",
replacement: {
match: /(?<=function (\i).{0,100}\()\i.Fragment,(?=.+?toolbar:\1\(\))/,
match: /(?<=toolbar:function\(.{0,100}\()\i.Fragment,/,
replace: "$self.ToolboxFragmentWrapper,"
}
}

4
src/plugins/_api/notices.ts
View file

@ -33,8 +33,8 @@ export default definePlugin({
replace: "if(Vencord.Api.Notices.currentNotice)return false;$&"
},
{
match: /(?<=function (\i)\(\i\){)return null!=(\i)(?=.+?NOTICE_DISMISS:\1)/,
replace: (m, _, notice) => `if(${notice}?.id=="EquicordNotice")return(${notice}=null,Vencord.Api.Notices.nextNotice(),true);${m}`
match: /(?<=,NOTICE_DISMISS:function\(\i\){)return null!=(\i)/,
replace: (m, notice) => `if(${notice}?.id=="EquicordNotice")return(${notice}=null,Vencord.Api.Notices.nextNotice(),true);${m}`
}
]
}

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

@ -40,7 +40,7 @@ export default definePlugin({
replace: "$self.getIdleTimeout()||"
},
{
match: /Math\.min\((\i\.\i\.getSetting\(\)\*\i\.\i\.\i\.SECOND),\i\.\i\)/,
match: /Math\.min\((\i\*\i\.\i\.\i\.SECOND),\i\.\i\)/,
replace: "$1" // Decouple idle from afk (phone notifications will remain at user setting or 10 min maximum)
},
{

2
src/plugins/greetStickerPicker/index.tsx
View file

@ -161,7 +161,7 @@ export default definePlugin({
{
find: "#{intl::WELCOME_CTA_LABEL}",
replacement: {
match: /innerClassName:\i\.welcomeCTAButton,(?<={channel:\i,message:\i}=(\i).+?)/,
match: /className:\i\.welcomeCTA,(?<={channel:\i,message:\i}=(\i).+?)/,
replace: "$&onContextMenu:(vcEvent)=>$self.pickSticker(vcEvent, $1),"
}
}

4
src/plugins/showAllMessageButtons/index.ts
View file

@ -36,8 +36,8 @@ export default definePlugin({
find: "#{intl::MESSAGE_UTILITIES_A11Y_LABEL}",
replacement: [
{
match: /(?<=(\i)=)\i(?=&&.+?isExpanded:\1)/,
replace: "true"
match: /isExpanded:\i&&(.+?),/,
replace: "isExpanded:$1,"
},
{
predicate: () => settings.store.noShiftDelete,

2
src/plugins/showHiddenChannels/index.tsx
View file

@ -331,7 +331,7 @@ export default definePlugin({
},
{
// Export the channel for the users allowed component patch
match: /maxUsers:\i,users:\i(?<=channel:(\i).+?)/,
match: /maxUsers:\d+?,users:\i(?<=channel:(\i).+?)/,
replace: (m, channel) => `${m},shcChannel:${channel}`
},
{

4
src/plugins/superReactionTweaks/index.ts
View file

@ -42,8 +42,8 @@ export default definePlugin({
{
find: ",BURST_REACTION_EFFECT_PLAY",
replacement: {
match: /(?<=(\i)=\i=>{.+?)(\i\(\i,\i\))>=\i(?=\).+BURST_REACTION_EFFECT_PLAY:\1)/,
replace: "!$self.shouldPlayBurstReaction($2)"
match: /(BURST_REACTION_EFFECT_PLAY:\i=>{.+?if\()(\(\(\i,\i\)=>.+?\(\i,\i\))>=\d+?(?=\))/,
replace: (_, rest, playingCount) => `${rest}!$self.shouldPlayBurstReaction(${playingCount})`
}
},
{

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

@ -152,10 +152,6 @@ export default definePlugin({
match: /!\i\.isPlatformEmbedded/,
replace: "false"
},
{
match: /return\s*?\[.{0,100}?(?=\?\(0,\i\.jsxs?.{0,100}?id:"copy-image")/,
replace: "return [true"
},
{
match: /(?<=#{intl::COPY_IMAGE_MENU_ITEM}\),)action:/,
replace: "action:()=>$self.copyImage(arguments[0]),oldAction:"