diff --git a/src/equicordplugins/middleClickTweaks/index.ts b/src/equicordplugins/middleClickTweaks/index.ts index e931f9aa5..07911041e 100644 --- a/src/equicordplugins/middleClickTweaks/index.ts +++ b/src/equicordplugins/middleClickTweaks/index.ts @@ -116,12 +116,12 @@ export default definePlugin({ } }, { - // Detects paste events triggered inside of Discord's search box. - find: "props.handlePastedText&&", + // Detects paste events triggered inside Discord's channel search editor. + find: "onPasteCapture:function", replacement: { - match: /(?<=clipboardData\);)/, - replace: "if($self.isPastingDisabled(true)){arguments[1].preventDefault?.();arguments[1].stopPropagation?.();return;};" + match: /(?<=onPasteCapture:function\((\i)\){)(?=\i\.insertData\(\1\.clipboardData\))/, + replace: "if($self.isPastingDisabled(true)){$1.preventDefault?.();$1.stopPropagation?.();return;}" } - }, + } ], }); diff --git a/src/equicordplugins/questify/index.tsx b/src/equicordplugins/questify/index.tsx index 8a8072a82..7eccd6e70 100644 --- a/src/equicordplugins/questify/index.tsx +++ b/src/equicordplugins/questify/index.tsx @@ -338,7 +338,7 @@ export default definePlugin({ replacement: [ { // Overwrite button props for UNENROLLED Quests. - match: /(?<=onClick:\(\)=>{.[^}]+},text:\i,icon:\i,fullWidth:!0)/, + match: /(?<=onClick:\(\)=>{\i\?\.\(\),\i\(\)},text:\i,icon:\i,iconPosition:\i,fullWidth:!0)/, replace: ",...($self.getQuestButtonProps(arguments[0])??{})" }, { diff --git a/src/equicordplugins/questify/utils/completion.ts b/src/equicordplugins/questify/utils/completion.ts index 22339026b..2273ae0dd 100644 --- a/src/equicordplugins/questify/utils/completion.ts +++ b/src/equicordplugins/questify/utils/completion.ts @@ -85,7 +85,7 @@ const reportVideoProgress = findByCodeLazy(".QUESTS_VIDEO_PROGRESS(") as (questI const sendHeartbeat = findByCodeLazy(".QUESTS_HEARTBEAT(") as (options: { questId: string; streamKey?: string; - applicationId: string; + applicationId?: string; terminal?: boolean; executableFingerprint?: unknown; }) => Promise; @@ -705,7 +705,7 @@ async function reportPlayQuestProgress( const attempts = options.attempts ?? 1; const delay = options.delay ?? 2500; const timeout = options.timeout ?? 10000; - const applicationId = options.applicationId ?? quest.config.application.id; + const applicationId = options.applicationId ?? entry.task.applications?.[0]?.id ?? quest.config.application?.id; for (let attempt = 1; attempt <= attempts; attempt++) { try {