mirrors/Equicord
1
1
Fork 0
mirror of https://github.com/Equicord/Equicord.git synced 2025-06-13 08:33:01 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 5

Fix More Stickers
Some checks are pending
Release / Build Equicord (push) Waiting to run
Details
Test / Test (push) Waiting to run
Details

Browse source
This commit is contained in:
thororen1234 2025-04-25 11:23:15 -04:00
parent 3338c10678
commit 5e6567e1c5
No known key found for this signature in database
2 changed files with 18 additions and 38 deletions
Download patch file Download diff file Expand all files Collapse all files

54
src/equicordplugins/moreStickers/index.tsx
View file

@ -35,54 +35,34 @@ export default definePlugin({
find: "ChannelStickerPickerButton", find: "ChannelStickerPickerButton",
replacement: [{ replacement: [{
match: /(children:\(0,\i\.jsx\)\()(.{0,10})({innerClassName.{10,30}\.stickerButton)/, match: /(children:\(0,\i\.jsx\)\()(.{0,10})({innerClassName.{10,30}\.stickerButton)/,
replace: (_, head, button, tail) => { replace: "$1arguments[0]?.stickersType?$self.stickerButton:$2$3"
const isMoreStickers = "arguments[0]?.stickersType";
return `${head}${isMoreStickers}?$self.stickerButton:${button}${tail}`;
}
}, { }, {
match: /(\i=)(\i\.useCallback.{0,25}\.STICKER,.{0,10});/, match: /(\i=)((\i\.useCallback\(\(\)=>\{\(.*?\)\().*?\.STICKER,(\i.{0,10}));/,
replace: (_, decl, cb) => { replace: '$1arguments[0]?.stickersType?$3"stickers+",$4:$2;'
const newCb = cb.replace(/(?<=\(\)=>\{\(.*?\)\().+?\.STICKER/, "\"stickers+\"");
return `${decl}arguments[0]?.stickersType?${newCb}:${cb};`;
}
}, { }, {
match: /(\i)=((\i)===\i\.\i\.STICKER)/, match: /(\i)=((\i)===\i\.\i\.STICKER)/,
replace: (_, isActive, isStickerTab, currentTab) => { replace: "$1=arguments[0].stickersType?($3===arguments[0].stickersType):($2)"
const c = "arguments[0].stickersType";
return `${isActive}=${c}?(${currentTab}===${c}):(${isStickerTab})`;
}
}] }]
}, },
{ {
find: ".gifts)", find: ".gifts)",
replacement: { replacement: {
match: /,.{0,5}\(null==\(\i=\i\.stickers\)\?void 0.*?(\i)\.push\((\(0,\w\.jsx\))\((.+?),{disabled:\i,type:(\i)},"sticker"\)\)\)/, match: /(?<=,.{0,5}\(null==\(\i=\i\.stickers\)\?void 0.*?(\i)\.push\((\(0,\i\.jsx\))\((.+?),{disabled:\i,type:(\i)},"sticker"\)\)\))/,
replace: (m, _, jsx, compo, type) => { replace: ",arguments[0].type?.submit?.button&&$1.push($2($3,{disabled:!arguments[0].type?.submit?.button,type:$4,stickersType:\"stickers+\"},\"stickers+\"))"
const c = "arguments[0].type";
return `${m},${c}?.submit?.button&&${_}.push(${jsx}(${compo},{disabled:!${c}?.submit?.button,type:${type},stickersType:"stickers+"},"stickers+"))`;
}
} }
}, },
{ {
find: "#{intl::EXPRESSION_PICKER_CATEGORIES_A11Y_LABEL}", find: "#{intl::EXPRESSION_PICKER_CATEGORIES_A11Y_LABEL}",
replacement: { replacement: [
match: /role:"tablist",.*?,?"aria-label":.+?\),children:(\[.*?\)\]}\)}\):null,)(.*?closePopout:\w.*?:null)/s, {
replace: m => { match: /(?<=null,(\i)\?(\(.*?\))\((\i),{.{0,128},isActive:(\i)===.{0,200},children:(\i\.intl\.string\(.*?\))\}\)\}\):null,)/s,
const stickerTabRegex = /(\w+?)\?(\([^()]+?\))\((.{1,2}),{.{0,128},isActive:(.{1,2})===.{1,6}\.STICKER.{1,140},children:(.{1,5}\.string\(.+?\)).*?:null/s; replace: '$1?$2($3,{id:"stickers+-picker-tab","aria-controls":"more-stickers-picker-tab-panel","aria-selected":$4==="stickers+",isActive:$4==="stickers+",autoFocus:true,viewType:"stickers+",children:$5+"+"}):null,'
const res = m.replace(stickerTabRegex, (_m, canUseStickers, jsx, tabHeaderComp, currentTab, stickerText) => { },
const isActive = `${currentTab}==="stickers+"`; {
return ( match: /:null,((.{1,200})===.{1,30}\.STICKER&&\w+\?(\([^()]{1,10}\)).{1,15}?(\{.*?,onSelectSticker:.*?\})\):null)/,
`${_m},${canUseStickers}?` + replace: ':null,$2==="stickers+"?$3($self.moreStickersComponent,$4):null,$1'
`${jsx}(${tabHeaderComp},{id:"stickers+-picker-tab","aria-controls":"more-stickers-picker-tab-panel","aria-selected":${isActive},isActive:${isActive},autoFocus:true,viewType:"stickers+",children:${jsx}("div",{children:${stickerText}+"+"})})` +
":null"
);
});
return res.replace(/:null,((.{1,200})===.{1,30}\.STICKER&&\w+\?(\([^()]{1,10}\)).{1,15}?(\{.*?,onSelectSticker:.*?\})\):null)/s, (_, _m, currentTab, jsx, props) => {
return `:null,${currentTab}==="stickers+"?${jsx}($self.moreStickersComponent,${props}):null,${_m}`;
});
}
} }
]
}, },
{ {
find: '==="remove_text"', find: '==="remove_text"',
@ -114,8 +94,8 @@ export default definePlugin({
> >
<path d="M18.5 11c-4.136 0-7.5 3.364-7.5 7.5c0 .871.157 1.704.432 2.482l9.551-9.551A7.462 7.462 0 0 0 18.5 11z" /> <path d="M18.5 11c-4.136 0-7.5 3.364-7.5 7.5c0 .871.157 1.704.432 2.482l9.551-9.551A7.462 7.462 0 0 0 18.5 11z" />
<path d="M12 2C6.486 2 2 6.486 2 12c0 4.583 3.158 8.585 7.563 9.69A9.431 9.431 0 0 1 9 18.5C9 13.262 13.262 9 18.5 9c1.12 0 2.191.205 3.19.563C20.585 5.158 16.583 2 12 2z" /> <path d="M12 2C6.486 2 2 6.486 2 12c0 4.583 3.158 8.585 7.563 9.69A9.431 9.431 0 0 1 9 18.5C9 13.262 13.262 9 18.5 9c1.12 0 2.191.205 3.19.563C20.585 5.158 16.583 2 12 2z" />
</svg> </svg >
</button> </button >
); );
}, },
moreStickersComponent({ moreStickersComponent({

2
src/equicordplugins/moreStickers/style.css
View file

@ -116,7 +116,7 @@
.vc-more-stickers-category-scroller, .vc-more-stickers-category-scroller,
.vc-more-stickers-picker-content-scroller { .vc-more-stickers-picker-content-scroller {
scrollbar-width: thin; scrollbar-width: none;
scrollbar-color: var(--scrollbar-thin-thumb) var(--scrollbar-thin-track); scrollbar-color: var(--scrollbar-thin-thumb) var(--scrollbar-thin-track);
} }