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

This commit is contained in:
thororen1234 2024-07-25 10:02:13 -04:00
commit 22e78cc832
5 changed files with 9 additions and 5 deletions
package.json
src
plugins
clientTheme
imageZoom
spotifyControls
utils

View file

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

View file

@ -30,7 +30,7 @@ function onPickColor(color: number) {
updateColorVars(hexColor); updateColorVars(hexColor);
} }
const saveClientTheme = findByCodeLazy('type:"UNSYNCED_USER_SETTINGS_UPDATE",settings:{useSystemTheme:null!='); const saveClientTheme = findByCodeLazy('type:"UNSYNCED_USER_SETTINGS_UPDATE', '"system"===');
function setTheme(theme: string) { function setTheme(theme: string) {
saveClientTheme({ theme }); saveClientTheme({ theme });

View file

@ -171,7 +171,7 @@ export default definePlugin({
find: ".handleImageLoad)", find: ".handleImageLoad)",
replacement: [ replacement: [
{ {
match: /dataSafeSrc:\i,children:/, match: /placeholderVersion:\i,(?=.{0,50}children:)/,
replace: "...$self.makeProps(this),$&" replace: "...$self.makeProps(this),$&"
}, },

View file

@ -48,7 +48,7 @@ export default definePlugin({
}, },
patches: [ patches: [
{ {
find: '"account";', find: "this.isCopiedStreakGodlike",
replacement: { replacement: {
// react.jsx)(AccountPanel, { ..., showTaglessAccountPanel: blah }) // react.jsx)(AccountPanel, { ..., showTaglessAccountPanel: blah })
match: /(?<=\i\.jsxs?\)\()(\i),{(?=[^}]*?userTag:\i,hidePrivateData:)/, match: /(?<=\i\.jsxs?\)\()(\i),{(?=[^}]*?userTag:\i,hidePrivateData:)/,

View file

@ -535,7 +535,11 @@ export const Devs = /* #__PURE__*/ Object.freeze({
Antti: { Antti: {
name: "Antti", name: "Antti",
id: 312974985876471810n id: 312974985876471810n
} },
Joona: {
name: "Joona",
id: 297410829589020673n
},
} satisfies Record<string, Dev>); } satisfies Record<string, Dev>);
export const EquicordDevs = Object.freeze({ export const EquicordDevs = Object.freeze({