mirror of
https://github.com/Vendicated/Vencord
synced 2024-08-26 03:37:47 -04:00
Merge branch 'main' into main
This commit is contained in:
commit
c8f76eda6a
9 changed files with 38 additions and 27 deletions
|
@ -114,7 +114,7 @@ export default definePlugin({
|
|||
'("MessageActionCreators")', '("ChannelMessages")',
|
||||
'("Routing/Utils")', '("RTCControlSocket")',
|
||||
'("ConnectionEventFramerateReducer")', '("RTCLatencyTestManager")',
|
||||
'("OverlayBridgeStore")', '("RPCServer:WSS")'
|
||||
'("OverlayBridgeStore")', '("RPCServer:WSS")', '("RPCServer:IPC")'
|
||||
].map(logger => ({
|
||||
find: logger,
|
||||
predicate: () => settings.store.disableNoisyLoggers,
|
||||
|
|
|
@ -39,6 +39,15 @@ export default definePlugin({
|
|||
}
|
||||
}),
|
||||
patches: [
|
||||
// Only one of the two patches will be at effect; Discord often updates to switch between them.
|
||||
// See: https://discord.com/channels/1015060230222131221/1032770730703716362/1261398512017477673
|
||||
{
|
||||
find: ".ENTER&&(!",
|
||||
replacement: {
|
||||
match: /(?<=(\i)\.which===\i\.\i.ENTER&&).{0,100}(\(0,\i\.\i\)\(\i\)).{0,100}(?=&&\(\i\.preventDefault)/,
|
||||
replace: "$self.shouldSubmit($1, $2)"
|
||||
}
|
||||
},
|
||||
{
|
||||
find: "!this.hasOpenCodeBlock()",
|
||||
replacement: {
|
||||
|
|
|
@ -88,8 +88,8 @@ export default definePlugin({
|
|||
{
|
||||
find: "useCanFavoriteChannel",
|
||||
replacement: {
|
||||
match: /!\(\i\.isDM\(\)\|\|\i\.isThread\(\)\)/,
|
||||
replace: "true",
|
||||
match: /\i\.isDM\(\)\|\|\i\.isThread\(\)/,
|
||||
replace: "false",
|
||||
}
|
||||
}
|
||||
],
|
||||
|
|
|
@ -17,7 +17,7 @@ const container = findByPropsLazy("memberSince");
|
|||
const getCreatedAtDate = findByCodeLazy('month:"short",day:"numeric"');
|
||||
const locale = findByPropsLazy("getLocale");
|
||||
const lastSection = findByPropsLazy("lastSection");
|
||||
const section = findLazy((m: any) => m.section !== void 0 && Object.values(m).length === 1);
|
||||
const section = findLazy((m: any) => m.section !== void 0 && m.heading !== void 0 && Object.values(m).length === 2);
|
||||
|
||||
export default definePlugin({
|
||||
name: "FriendsSince",
|
||||
|
|
|
@ -256,6 +256,7 @@ export default definePlugin({
|
|||
// in profiles
|
||||
{
|
||||
find: ",overrideDiscriminator:",
|
||||
group: true,
|
||||
replacement: [
|
||||
{
|
||||
// prevent channel id from getting ghosted
|
||||
|
@ -263,7 +264,7 @@ export default definePlugin({
|
|||
match: /user:\i,nick:\i,/,
|
||||
replace: "$&moreTags_channelId,"
|
||||
}, {
|
||||
match: /,botType:(\i\((\i)\)),/g,
|
||||
match: /,botType:(\i),(?<=user:(\i).+?)/g,
|
||||
replace: ",botType:$self.getTag({user:$2,channelId:moreTags_channelId,origType:$1,location:'not-chat'}),"
|
||||
}
|
||||
]
|
||||
|
|
|
@ -34,7 +34,7 @@ import UserPermissions from "./components/UserPermissions";
|
|||
import { getSortedRoles, sortPermissionOverwrites } from "./utils";
|
||||
|
||||
const PopoutClasses = findByPropsLazy("container", "scroller", "list");
|
||||
const RoleButtonClasses = findByPropsLazy("button", "buttonInner", "icon", "text");
|
||||
const RoleButtonClasses = findByPropsLazy("button", "buttonInner", "icon", "banner");
|
||||
|
||||
export const enum PermissionsSortOrder {
|
||||
HighestRole,
|
||||
|
|
|
@ -37,8 +37,7 @@ import { getCurrentUserInfo, readNotification } from "./reviewDbApi";
|
|||
import { settings } from "./settings";
|
||||
import { showToast } from "./utils";
|
||||
|
||||
const PopoutClasses = findByPropsLazy("container", "scroller", "list");
|
||||
const RoleButtonClasses = findByPropsLazy("button", "buttonInner", "icon", "text");
|
||||
const RoleButtonClasses = findByPropsLazy("button", "buttonInner", "icon", "banner");
|
||||
|
||||
const guildPopoutPatch: NavContextMenuPatchCallback = (children, { guild }: { guild: Guild, onClose(): void; }) => {
|
||||
if (!guild) return;
|
||||
|
@ -181,9 +180,9 @@ export default definePlugin({
|
|||
onClick={() => openReviewsModal(user.id, user.username)}
|
||||
look={Button.Looks.FILLED}
|
||||
size={Button.Sizes.NONE}
|
||||
color={RoleButtonClasses.color}
|
||||
className={classes(RoleButtonClasses.button, RoleButtonClasses.banner)}
|
||||
innerClassName={classes(RoleButtonClasses.buttonInner, RoleButtonClasses.banner)}
|
||||
color={RoleButtonClasses.bannerColor}
|
||||
className={classes(RoleButtonClasses.button, RoleButtonClasses.icon, RoleButtonClasses.banner)}
|
||||
innerClassName={classes(RoleButtonClasses.buttonInner, RoleButtonClasses.icon, RoleButtonClasses.banner)}
|
||||
>
|
||||
<NotesIcon height={16} width={16} />
|
||||
</Button>
|
||||
|
|
|
@ -257,7 +257,7 @@ export default definePlugin({
|
|||
{
|
||||
find: '"alt+shift+down"',
|
||||
replacement: {
|
||||
match: /(?<=getChannel\(\i\);return null!=(\i))(?=.{0,150}?>0\)&&\(0,\i\.\i\)\(\i\))/,
|
||||
match: /(?<=getChannel\(\i\);return null!=(\i))(?=.{0,200}?>0\)&&\(0,\i\.\i\)\(\i\))/,
|
||||
replace: (_, channel) => `&&!$self.isHiddenChannel(${channel})`
|
||||
}
|
||||
},
|
||||
|
@ -265,8 +265,8 @@ export default definePlugin({
|
|||
{
|
||||
find: ".APPLICATION_STORE&&null!=",
|
||||
replacement: {
|
||||
match: /(?<=getState\(\)\.channelId.{0,30}?\(0,\i\.\i\)\(\i\))(?=\.map\()/,
|
||||
replace: ".filter(e=>!$self.isHiddenChannel(e))"
|
||||
match: /getState\(\)\.channelId.+?(?=\.map\(\i=>\i\.id)/,
|
||||
replace: "$&.filter(e=>!$self.isHiddenChannel(e))"
|
||||
}
|
||||
},
|
||||
{
|
||||
|
|
|
@ -183,14 +183,24 @@ export default definePlugin({
|
|||
},
|
||||
|
||||
patches: [
|
||||
// Profiles Modal pfp
|
||||
...[".MODAL,hasProfileEffect", ".FULL_SIZE,hasProfileEffect:"].map(find => ({
|
||||
find,
|
||||
// Avatar component used in User DMs "User Profile" popup in the right and Profiles Modal pfp
|
||||
{
|
||||
find: ".overlay:void 0,status:",
|
||||
replacement: [
|
||||
...[/"PRESS_VIEW_PROFILE".+?(?=children:)(?<=avatarSrc:(\i).+?)/, /avatarSrc:(\i),eventHandlers:(\i).+?"div",{...\2,/].map(match => ({
|
||||
match,
|
||||
replace: "$&style:{cursor:\"pointer\"},onClick:()=>{$self.openImage($1)},"
|
||||
}))
|
||||
]
|
||||
},
|
||||
// Old Profiles Modal pfp
|
||||
{
|
||||
find: ".MODAL,hasProfileEffect",
|
||||
replacement: {
|
||||
match: /\{src:(\i)(?=,avatarDecoration)/,
|
||||
replace: "{src:$1,onClick:()=>$self.openImage($1)"
|
||||
}
|
||||
})),
|
||||
},
|
||||
// Banners
|
||||
...[".NITRO_BANNER,", "=!1,canUsePremiumCustomization:"].map(find => ({
|
||||
find,
|
||||
|
@ -202,7 +212,7 @@ export default definePlugin({
|
|||
'onClick:ev=>$1&&ev.target.style.backgroundImage&&$self.openImage($2),style:{cursor:$1?"pointer":void 0,'
|
||||
}
|
||||
})),
|
||||
// User DMs "User Profile" popup in the right
|
||||
// Old User DMs "User Profile" popup in the right
|
||||
{
|
||||
find: ".avatarPositionPanel",
|
||||
replacement: {
|
||||
|
@ -210,14 +220,6 @@ export default definePlugin({
|
|||
replace: "$1style:($2)?{cursor:\"pointer\"}:{},onClick:$2?()=>{$self.openImage($3)}"
|
||||
}
|
||||
},
|
||||
{
|
||||
find: ".canUsePremiumProfileCustomization,{avatarSrc:",
|
||||
replacement: {
|
||||
match: /children:\(0,\i\.jsx\)\(\i,{src:(\i)/,
|
||||
replace: "style:{cursor:\"pointer\"},onClick:()=>{$self.openImage($1)},$&"
|
||||
|
||||
}
|
||||
},
|
||||
// Group DMs top small & large icon
|
||||
{
|
||||
find: /\.recipients\.length>=2(?!<isMultiUserDM.{0,50})/,
|
||||
|
|
Loading…
Reference in a new issue