diff --git a/src/debug/runReporter.ts b/src/debug/runReporter.ts index e6dd94432..484eb67b4 100644 --- a/src/debug/runReporter.ts +++ b/src/debug/runReporter.ts @@ -77,7 +77,6 @@ async function runReporter() { else method = "find"; } if (searchType === "waitForStore") method = "findStore"; - if (searchType === "waitForStore" && args[0] === "PermissionStore") continue; let result: any; try { diff --git a/src/equicordplugins/discordDevBanner/index.tsx b/src/equicordplugins/discordDevBanner/index.tsx index febc2eb2a..fdd32848e 100644 --- a/src/equicordplugins/discordDevBanner/index.tsx +++ b/src/equicordplugins/discordDevBanner/index.tsx @@ -26,7 +26,11 @@ export default definePlugin({ replace: "true" }, { - match: /children:\[.*?\{\}\)\]/g, + match: /children:\[.{0,80}#{intl::BUILD_OVERRIDE}.{0,15}\{\}\)\]/, + replace: "children:$self.makeDevBanner()" + }, + { + match: /children:\[.{0,80}#{intl::uyrfYF::raw}.{0,50}\{\}\)\]/, replace: "children:$self.makeDevBanner()" }, ] diff --git a/src/equicordplugins/loginWithQR/index.tsx b/src/equicordplugins/loginWithQR/index.tsx index e1f076aa2..54fa10542 100644 --- a/src/equicordplugins/loginWithQR/index.tsx +++ b/src/equicordplugins/loginWithQR/index.tsx @@ -52,7 +52,7 @@ export default definePlugin({ { find: ".clipboardData&&(", replacement: { - match: /handleGlobalPaste:(\i)/, + match: /handleGlobalPaste:(\i)(?=\}\))/, replace: "handleGlobalPaste:(...args)=>!$self.qrModalOpen&&$1(...args)", }, }, diff --git a/src/equicordplugins/moreStickers/index.tsx b/src/equicordplugins/moreStickers/index.tsx index 5a1114ba3..4e89d8089 100644 --- a/src/equicordplugins/moreStickers/index.tsx +++ b/src/equicordplugins/moreStickers/index.tsx @@ -65,7 +65,7 @@ export default definePlugin({ find: "#{intl::EXPRESSION_PICKER_CATEGORIES_A11Y_LABEL}", replacement: [ { - match: /(?<=(\i)\?(\(.{0,15}\))\((\i),\{.{0,150}(\i)===\i\.\i\.STICKER,.{0,150}children:(.{0,30}\.\i,children:.{0,25})\}\)\}\):null)/, + match: /(?<=(\i)\?(\(.{0,15}\))\((\i),\{.{0,150}(\i)===\i\.\i\.STICKER,.{0,150}children:(.{0,50}\.\i,children:.{0,50})\}\)\}\):null)/, replace: ',vcStickers=$1?$2($3,{id:"stickers+-picker-tab","aria-controls":"more-stickers-picker-tab-panel","aria-selected":$4==="stickers+",isActive:$4==="stickers+",autoFocus:true,viewType:"stickers+",children:$5+"+"})}):null' }, { diff --git a/src/equicordplugins/questify/index.tsx b/src/equicordplugins/questify/index.tsx index dcabdb490..6078eedc1 100644 --- a/src/equicordplugins/questify/index.tsx +++ b/src/equicordplugins/questify/index.tsx @@ -14,7 +14,7 @@ import ErrorBoundary from "@components/ErrorBoundary"; import { openPluginModal } from "@components/settings"; import { EquicordDevs } from "@utils/constants"; import { copyToClipboard } from "@utils/index"; -import definePlugin, { PluginNative, StartAt } from "@utils/types"; +import definePlugin, { PluginNative, ReporterTestable, StartAt } from "@utils/types"; import { findStoreLazy, onceReady } from "@webpack"; import { ContextMenuApi, Menu, NavigationRouter, RestAPI, useEffect, useState } from "@webpack/common"; import { JSX } from "react"; diff --git a/src/equicordplugins/songSpotlight.desktop/index.tsx b/src/equicordplugins/songSpotlight.desktop/index.tsx index 5a898ea77..b870b58db 100644 --- a/src/equicordplugins/songSpotlight.desktop/index.tsx +++ b/src/equicordplugins/songSpotlight.desktop/index.tsx @@ -29,7 +29,7 @@ export default definePlugin({ { find: ".MUTUAL_GUILDS})),", replacement: { - match: /(\i).push\({text.{0,50}}\);/, + match: /(\i).push\({text.{0,50}.ACTIVITY\}\);/, replace: '$&$1.push({text:"Song Spotlight",section:"SONG_SPOTLIGHT"});', }, }, diff --git a/src/equicordplugins/timezones/index.tsx b/src/equicordplugins/timezones/index.tsx index 9901e3b8b..d0a500991 100644 --- a/src/equicordplugins/timezones/index.tsx +++ b/src/equicordplugins/timezones/index.tsx @@ -275,8 +275,8 @@ export default definePlugin({ find: "#{intl::GUILD_COMMUNICATION_DISABLED_ICON_TOOLTIP_BODY}", replacement: { // thanks https://github.com/Syncxv/vc-timezones/pull/4 - match: /(?<=isVisibleOnlyOnHover.+?)id:.{1,11},timestamp.{1,50}}\),/, - replace: "$&,$self.renderMessageTimezone(arguments[0])," + match: /(?<=isVisibleOnlyOnHover.+?)id:.{0,15},timestamp.{1,50}}\),/, + replace: "$&$self.renderMessageTimezone(arguments[0])," } } ], diff --git a/src/plugins/_api/nicknameIcons.ts b/src/plugins/_api/nicknameIcons.ts index 6d0c220b6..25efc00db 100644 --- a/src/plugins/_api/nicknameIcons.ts +++ b/src/plugins/_api/nicknameIcons.ts @@ -16,7 +16,7 @@ export default definePlugin({ find: "#{intl::USER_PROFILE_PRONOUNS}", replacement: [ { - match: /(?<=,\i\]\}\)\),)null!=\i/, + match: /(?<=\}\),children:\[)null!=\i/, replace: "($&||Vencord.Api.NicknameIcons._renderIcons({userId:arguments[0].user?.id})?.length)" }, {