diff --git a/package.json b/package.json index 6e99d5785..68a44e4c1 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "equicord", "private": "true", - "version": "1.14.1.1", + "version": "1.14.2.0", "description": "The other cutest Discord client mod", "homepage": "https://github.com/Equicord/Equicord#readme", "bugs": { diff --git a/src/equicordplugins/dragify/index.tsx b/src/equicordplugins/dragify/index.tsx index 32058d694..47b6a5469 100644 --- a/src/equicordplugins/dragify/index.tsx +++ b/src/equicordplugins/dragify/index.tsx @@ -233,8 +233,8 @@ export default definePlugin({ { find: ']="BADGES"', replacement: { - match: /(?<="username"===.{0,100})(onClick:\i,onContextMenu:\i,)(?=children:)/, - replace: "$1draggable:!0,onDragStart:e=>$self.onUserDragStart(e,arguments[0].author),\"data-dragify-user\":!0,\"data-user-id\":arguments[0].author.id," + match: /(?<=textDecorationColor:.{0,300})(?=onClick:\i,onContextMenu:\i,)/, + replace: "draggable:!0,onDragStart:e=>$self.onUserDragStart(e,arguments[0].author),\"data-dragify-user\":!0,\"data-user-id\":arguments[0].author.id," } }, // Call avatars (DM/group call tiles) diff --git a/src/plugins/accountPanelServerProfile/index.tsx b/src/plugins/accountPanelServerProfile/index.tsx index 0d2fc2c35..8d90ff5eb 100644 --- a/src/plugins/accountPanelServerProfile/index.tsx +++ b/src/plugins/accountPanelServerProfile/index.tsx @@ -87,7 +87,7 @@ export default definePlugin({ replace: "$&$self.onPopoutClose();" }, { - match: /#{intl::SET_STATUS}\)(?<=innerRef:(\i),style:.+?)/, + match: /(?:#{intl::5fWB8U::raw}|#{intl::SET_STATUS})\)(?<=ref:(\i),style:.+?)/, replace: "$&,onContextMenu:($self.grabRef($1),$self.openAccountPanelContextMenu)" } ] diff --git a/src/plugins/betterSettings/index.tsx b/src/plugins/betterSettings/index.tsx index c76385579..1c8e8a76b 100644 --- a/src/plugins/betterSettings/index.tsx +++ b/src/plugins/betterSettings/index.tsx @@ -139,7 +139,7 @@ export default definePlugin({ find: "#{intl::USER_SETTINGS_ACTIONS_MENU_LABEL}", replacement: [ { - match: /=\[\];(\i)(?=\.forEach.{0,100}"logout"!==\i.{0,30}(\i)\.get\(\i\))/, + match: /=\[\];(\i)(?=\.forEach.{0,200}?"logout"===\i.{0,100}?(\i)\.get\(\i\))/, replace: "=$self.wrapMap([]);$self.transformSettingsEntries($1,$2)", predicate: () => settings.store.organizeMenu }, diff --git a/src/plugins/decor/index.tsx b/src/plugins/decor/index.tsx index 1e870dae8..e2783e92d 100644 --- a/src/plugins/decor/index.tsx +++ b/src/plugins/decor/index.tsx @@ -104,11 +104,7 @@ export default definePlugin({ find, replacement: [ { - match: /(?<=userValue:)((\i)(?:.{0,10})?\.avatarDecoration)/, - replace: "$self.useUserDecorAvatarDecoration($2)??$1" - }, - { - match: /(?<=userValue:)((\i)(?:.{0,10})?\.avatarDecoration)/, + match: /(?<=userValue:)((\i(?:\.author)?)\?\.avatarDecoration)/, replace: "$self.useUserDecorAvatarDecoration($2)??$1" } ]