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

This commit is contained in:
thororen1234 2026-02-26 10:32:37 -05:00
commit 2f054f78da
No known key found for this signature in database
9 changed files with 46 additions and 19 deletions

View file

@ -1,7 +1,7 @@
{
"name": "equicord",
"private": "true",
"version": "1.14.2.1",
"version": "1.14.3.0",
"description": "The other cutest Discord client mod",
"homepage": "https://github.com/Equicord/Equicord#readme",
"bugs": {

View file

@ -87,7 +87,7 @@ export default definePlugin({
replace: "$&$self.onPopoutClose();"
},
{
match: /ref:(\i),style:\i(?=.{0,250}#{intl::5fWB8U::raw})/,
match: /ref:(\i),style:\i(?=.{0,250}#{intl::USER_PROFILE_ACCOUNT_POPOUT_BUTTON_A11Y_LABEL})/,
replace: "$&,onContextMenu:($self.grabRef($1),$self.openAccountPanelContextMenu)"
}
]

View file

@ -137,6 +137,28 @@ export default definePlugin({
],
predicate: () => settings.store.disableFade
},
{ // Disable fade animations for settings menu
find: '"data-mana-component":"layer-modal"',
replacement: [
{
match: /(\i)\.animated\.div(?=,\{"data-mana-component":"layer-modal")/,
replace: '"div"'
},
{
match: /(?<="data-mana-component":"layer-modal"[^}]*?)style:\i,/,
replace: "style:{},"
}
],
predicate: () => settings.store.disableFade
},
{ // Disable initial and exit delay for settings menu
find: "headerId:void 0,headerIdIsManaged:!1",
replacement: {
match: /let (\i)=300/,
replace: "let $1=0"
},
predicate: () => settings.store.disableFade
},
{ // Load menu TOC eagerly
find: "handleOpenSettingsContextMenu=",
replacement: {
@ -145,8 +167,7 @@ export default definePlugin({
},
predicate: () => settings.store.eagerLoad
},
{
// Settings cog context menu
{ // Settings cog context menu
find: "#{intl::USER_SETTINGS_ACTIONS_MENU_LABEL}",
replacement: [
{

View file

@ -99,7 +99,7 @@ export default definePlugin({
...[
'"Message Username"', // Messages
"#{intl::COLLECTIBLES_NAMEPLATE_PREVIEW_A11Y}", // Nameplate preview
"#{intl::ayozFl::raw}", // Avatar preview
"#{intl::COLLECTIBLES_PROFILE_PREVIEW_A11Y}", // Avatar preview
].map(find => ({
find,
replacement: {

View file

@ -37,7 +37,7 @@ function toggleStreamerMode({ streamKey }: StreamEvent, value: boolean) {
export default definePlugin({
name: "StreamerModeOn",
description: "Automatically enables streamer mode when you start streaming in Discord",
authors: [Devs.Kodarru],
authors: [Devs.IcedMarina],
flux: {
STREAM_CREATE: d => toggleStreamerMode(d, true),
STREAM_DELETE: d => toggleStreamerMode(d, false)

View file

@ -225,6 +225,7 @@ export const DeeplLanguages = {
"it": "Italian",
"ja": "Japanese",
"jv": "Javanese",
"ko": "Korean",
"pam": "Kapampangan",
"kk": "Kazakh",
"kmr": "Kurdish (Kurmanji)",

View file

@ -15,7 +15,7 @@ export default definePlugin({
authors: [Devs.puv],
patches: [
{
find: "#{intl::LgCPMt::raw}",
find: "#{intl::VOICE_MESSAGES_PLAYBACK_RATE_LABEL}",
replacement: {
match: /(?<=onVolumeHide:\i\}\))/,
replace: ",$self.renderDownload(arguments[0].src)"

View file

@ -55,16 +55,21 @@ export default definePlugin({
patches: [
// Change the max volume for sliders to allow for values above 200
...[
"#{intl::USER_VOLUME}",
"currentVolume:"
].map(find => ({
find,
{
find: "#{intl::USER_VOLUME}",
replacement: {
match: /(?<=maxValue:)\i\.\i\?(\i\.\i|\d+?):(\i\.\i|\d+?)(?=,)/,
replace: (_, higherMaxVolume, minorMaxVolume) => `${higherMaxVolume}*$self.settings.store.multiplier`
match: /(?<=maxValue:)\i\.isPlatformEmbedded\?(\i\.\i):\i\.\i(?=,)/,
replace: (_, higherMaxVolume) => `${higherMaxVolume}*$self.settings.store.multiplier`
}
})),
},
// Change the max volume for sliders to allow for values above 200
{
find: "currentVolume:",
replacement: {
match: /(?<=maxValue:)\i\.\i\?(\d+?):\d+?(?=,)/,
replace: (_, higherMaxVolume) => `${higherMaxVolume}*$self.settings.store.multiplier`
}
},
// Patches needed for web/vesktop
{
find: "streamSourceNode",

View file

@ -466,7 +466,7 @@ export const Devs = /* #__PURE__*/ Object.freeze({
},
nin0dev: {
name: "nin0dev",
id: 886685857560539176n
id: 1395533040914141235n
},
Elvyra: {
name: "Elvyra",
@ -496,9 +496,9 @@ export const Devs = /* #__PURE__*/ Object.freeze({
name: "puv",
id: 469441552251355137n
},
Kodarru: {
name: "Kodarru",
id: 785227396218748949n
IcedMarina: {
name: "icedmarina",
id: 594406131670188042n
},
nakoyasha: {
name: "nakoyasha",