diff --git a/src/main/utils/extensions.ts b/src/main/utils/extensions.ts index 4d74a873..4af7129f 100644 --- a/src/main/utils/extensions.ts +++ b/src/main/utils/extensions.ts @@ -67,13 +67,7 @@ export async function installExt(id: string) { try { await access(extDir, fsConstants.F_OK); } catch (err) { - const url = id === "fmkadmapgofadopljbjfkapdkoienihi" - // React Devtools v4.25 - // v4.27 is broken in Electron, see https://github.com/facebook/react/issues/25843 - // Unfortunately, Google does not serve old versions, so this is the only way - // This zip file is pinned to long commit hash so it cannot be changed remotely - ? "https://raw.githubusercontent.com/Vendicated/random-files/f6f550e4c58ac5f2012095a130406c2ab25b984d/fmkadmapgofadopljbjfkapdkoienihi.zip" - : `https://clients2.google.com/service/update2/crx?response=redirect&acceptformat=crx2,crx3&x=id%3D${id}%26uc&prodversion=${process.versions.chrome}`; + const url = `https://clients2.google.com/service/update2/crx?response=redirect&acceptformat=crx2,crx3&x=id%3D${id}%26uc&prodversion=${process.versions.chrome}`; const buf = await get(url, { headers: { diff --git a/src/plugins/consoleJanitor/index.tsx b/src/plugins/consoleJanitor/index.tsx index d32f525e..7ef7ec9c 100644 --- a/src/plugins/consoleJanitor/index.tsx +++ b/src/plugins/consoleJanitor/index.tsx @@ -197,7 +197,7 @@ export default definePlugin({ }, // Patches Discord generic logger function { - find: "Σ:", + find: '"file-only"!==', predicate: () => settings.store.disableLoggers, replacement: { match: /(?<=&&)(?=console)/, diff --git a/src/plugins/ircColors/index.ts b/src/plugins/ircColors/index.ts index 087bea15..08c0bd24 100644 --- a/src/plugins/ircColors/index.ts +++ b/src/plugins/ircColors/index.ts @@ -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; diff --git a/src/plugins/mutualGroupDMs/index.tsx b/src/plugins/mutualGroupDMs/index.tsx index d88e1ee0..e46824b4 100644 --- a/src/plugins/mutualGroupDMs/index.tsx +++ b/src/plugins/mutualGroupDMs/index.tsx @@ -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"' } ] },