From 632e26c1419ee02904ee133e1fbd2763e95ac3f9 Mon Sep 17 00:00:00 2001
From: Etorix <92535668+EtorixDev@users.noreply.github.com>
Date: Wed, 4 Feb 2026 13:51:52 -0800
Subject: [PATCH] Questify: Fixes. (#725)

---
 src/equicordplugins/questify/index.tsx        | 36 +++++++++----------
 .../questify/utils/components.tsx             |  4 +--
 2 files changed, 18 insertions(+), 22 deletions(-)

diff --git a/src/equicordplugins/questify/index.tsx b/src/equicordplugins/questify/index.tsx
index 6ad569d70..20a0b9cb9 100644
--- a/src/equicordplugins/questify/index.tsx
+++ b/src/equicordplugins/questify/index.tsx
@@ -1050,6 +1050,7 @@ function getQuestPanelTitleText(quest: Quest): string | null {
 }
 
 function getQuestPanelOverride(): Quest | null {
+    settings.use(["triggerQuestsRerender"]);
     let closestQuest: Quest | null = null;
     let closestTimeRemaining = Infinity;
 
@@ -1079,20 +1080,15 @@ function getQuestPanelOverride(): Quest | null {
     });
 
     if (!closestQuest) {
-        const completedQuests = Array.from(QuestsStore.quests.values() as Quest[]).filter(q => q.userStatus?.completedAt).sort((a, b) => {
-            const aTime = new Date(a.userStatus?.completedAt as string);
-            const bTime = new Date(b.userStatus?.completedAt as string);
-            return bTime.getTime() - aTime.getTime();
-        });
+        const completedUnclaimedQuests = (Array.from(QuestsStore.quests.values()) as Quest[])
+            .filter(q => q.userStatus?.completedAt && getQuestStatus(q) === QuestStatus.Unclaimed)
+            .sort((a, b) => {
+                const aTime = new Date(a.userStatus?.completedAt as string).getTime();
+                const bTime = new Date(b.userStatus?.completedAt as string).getTime();
+                return bTime - aTime;
+            });
 
-        completedQuests.forEach(quest => {
-            const completedQuest = quest.userStatus?.completedAt;
-            const questStatus = getQuestStatus(quest);
-
-            if (completedQuest && questStatus === QuestStatus.Unclaimed) {
-                closestQuest = quest;
-            }
-        });
+        closestQuest = completedUnclaimedQuests[0] ?? null;
     }
 
     return closestQuest;
@@ -1430,13 +1426,13 @@ export default definePlugin({
                     match: /(children:\i\(\i)/,
                     replace: "$1,maxDigits"
                 },
-                // {
-                // Makes use of the custom prop if provided by using custom logic for negatives and truncation.
-                // If the prop is not provided, assume default behavior for native badges or other plugins not
-                // utilizing the custom prop.
-                // match: /function (\i\((\i))\)\{return (.{0,100}?k\+`)/,
-                // replace: "function $1,maxDigits){return maxDigits===undefined?($3):$self.formatLowerBadge($2,maxDigits)[0]"
-                // }
+                {
+                    // Makes use of the custom prop if provided by using custom logic for negatives and truncation.
+                    // If the prop is not provided, assume default behavior for native badges or other plugins not
+                    // utilizing the custom prop.
+                    match: /(?<=function \i\((\i))(\){return )(\i<1e3.{0,60}?k\+`)/,
+                    replace: ",maxDigits$2maxDigits===undefined?($3):$self.formatLowerBadge($1,maxDigits)[0]"
+                }
             ]
         },
         {
diff --git a/src/equicordplugins/questify/utils/components.tsx b/src/equicordplugins/questify/utils/components.tsx
index afc1a8ceb..1f363a24b 100644
--- a/src/equicordplugins/questify/utils/components.tsx
+++ b/src/equicordplugins/questify/utils/components.tsx
@@ -14,9 +14,9 @@ import { formatLowerBadge } from "./misc";
 // GuildlessServerListItem's built-in pill does not support unread state.
 export const GuildlessServerListItemComponent = findComponentByCodeLazy("tooltip:", "lowerBadgeSize:");
 export const GuildedServerListItemPillComponent = findComponentByCodeLazy('"pill":"empty"');
-export const ServerListItemLowerBadgeComponent = findComponentByCodeLazy("BADGE_NOTIFICATION_BACKGROUND", '"renderBadgeCount"');
+export const ServerListItemLowerBadgeComponent = findComponentByCodeLazy("BADGE_NOTIFICATION_BACKGROUND", "let{count:");
 export const ServerListItemUpperBadgeComponent = findComponentByCodeLazy("{icon:", ".ROUND,disableColor");
-export const RadioGroup = findComponentByCodeLazy(',["label","description"');
+export const RadioGroup = findComponentByCodeLazy(",{label:", ",description:", ",required:", ",errorMessage:", ",children:");
 export const QuestTile = findComponentByCodeLazy(".rowIndex,trackGuildAndChannelMetadata");
 
 export enum QuestRewardType {