mirrors/Equicord
1
1
Fork 0
mirror of https://github.com/Equicord/Equicord.git synced 2025-06-17 02:17:03 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

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

Browse source
This commit is contained in:
thororen1234 2025-05-13 00:54:00 -04:00
commit e941ba88c0
No known key found for this signature in database
4 changed files with 16 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -197,7 +197,7 @@ export default definePlugin({
},
// Patches Discord generic logger function
{
find: "Σ:",
find: '"file-only"!==',
predicate: () => settings.store.disableLoggers,
replacement: {
match: /(?<=&&)(?=console)/,

14
src/plugins/ircColors/index.ts
View file

@ -67,8 +67,10 @@ export default definePlugin({
{
find: '="SYSTEM_TAG"',
replacement: {
match: /(?<=\.username.{0,50}?)style:/,
replace: "style:{color:$self.calculateNameColorForMessageContext(arguments[0])},_style:"
// Override colorString with our custom color and disable gradients if applying the custom color.
match: /&&null!=\i\.secondaryColor,(?<=colorString:(\i).+?(\i)=.+?)/,
replace: (m, colorString, hasGradientColors) => `${m}` +
`vcIrcColorsDummy=[${colorString},${hasGradientColors}]=$self.getMessageColorsVariables(arguments[0],${hasGradientColors}),`
}
},
{
@ -81,6 +83,13 @@ export default definePlugin({
}
],
getMessageColorsVariables(context: any, hasGradientColors: boolean) {
const colorString = this.calculateNameColorForMessageContext(context);
const originalColorString = context?.author?.colorString;
return [colorString, hasGradientColors && colorString === originalColorString];
},
calculateNameColorForMessageContext(context: any) {
const userId: string | undefined = context?.message?.author?.id;
const colorString = context?.author?.colorString;
@ -101,6 +110,7 @@ export default definePlugin({
return customColor ?? colorString;
}
},
calculateNameColorForListContext(context: any) {
const id = context?.user?.id;
const colorString = context?.colorString;

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

@ -126,8 +126,8 @@ export default definePlugin({
},
// Make the tab bar item text smaller so our tab can fit.
{
match: /(\.tabBarItem.+?variant:)"heading-lg\/medium"/,
replace: '$1"heading-sm/medium"'
match: /(\.tabBarItem.+?variant:)"heading-md\/normal"/,
replace: '$1"heading-sm/normal"'
}
]
},