feat: release v1.3.9 - fix BackdropTemplate crash and quest re-tracking reliability

2026-03-19 15:14:05 -05:00
parent c5c3897421
commit 5cb64a4c30
17 changed files with 119 additions and 44 deletions
@@ -42,8 +42,17 @@ function Hooks:HookQuestLogTitle()

        -- For all other clicks (including tracking/untracking), use the original function
        -- only call Questie's tracker if we actually want to fix this quest (normal quests already call AQW_insert)
-        if Questie.db.profile.trackerEnabled and GetNumQuestLeaderBoards(questLogLineIndex) == 0 and (not IsQuestWatched(questLogLineIndex)) then
-            QuestieTracker:AQW_Insert(questLogLineIndex, QUEST_WATCH_NO_EXPIRE)
+        if Questie.db.profile.trackerEnabled and GetNumQuestLeaderBoards(questLogLineIndex) == 0 then
+            local _, _, _, _, _, _, _, questId = GetQuestLogTitle(questLogLineIndex)
+            if questId and questId > 0 then
+                if Questie.db.char.TrackedQuests[questId] or (Questie.db.profile.autoTrackQuests and (not Questie.db.char.AutoUntrackedQuests[questId])) then
+                    -- Quest is currently tracked — hidden it
+                    QuestieTracker:UntrackQuestId(questId)
+                else
+                    -- Quest is currently hidden — show it
+                    QuestieTracker:AQW_Insert(questLogLineIndex, QUEST_WATCH_NO_EXPIRE)
+                end
+            end
            if WatchFrame_Update then
                WatchFrame_Update()
            end
@@ -2287,19 +2287,36 @@ function QuestieTracker.RemoveQuestWatch(index, isQuestie)

    if not isQuestie then
        if index then
-            local questId = select(8, GetQuestLogTitle(index))
-            if (not questId) or questId == 0 then
-                -- When an objective progresses in TBC "index" is the questId, but when a quest is manually removed from
-                -- the quest watch (e.g. shift clicking it in the quest log) "index" is the questLogIndex.
-                -- We should NOT untrack when Blizzard calls this with a questId internally during objective updates.
-                if questId == 0 then
-                    Questie:Debug(Questie.DEBUG_DEVELOP, "[QuestieTracker.RemoveQuestWatch] - Internal Blizzard update, skipping untrack for ID:", index)
-                end
+            local _, _, _, isHeader, _, _, _, questId = GetQuestLogTitle(index)
+
+            if isHeader then
                return
            end

-            if questId then
-                QuestieTracker:UntrackQuestId(questId)
+            if (not questId) or questId == 0 then
+                -- Maybe index was already a questId (Ascension/Ebonhold extension)
+                if index > 0 and (GetQuestLogIndexByID and GetQuestLogIndexByID(index) > 0) then
+                    questId = index
+                else
+                    return
+                end
+            end
+
+            if questId and questId > 0 then
+                local stack = debugstack(2, 5, 0)
+                local isUserAction = stack:find("QuestLog") or stack:find("OnClick") or stack:find("QuestWatch") or stack:find("TrackerLinePool") or stack:find("TrackerMenu") or IsShiftKeyDown()
+
+                if not isUserAction then
+                    -- Internal update: Only untrack if we are NOT in auto-track mode
+                    if not Questie.db.profile.autoTrackQuests then
+                        Questie:Debug(Questie.DEBUG_DEVELOP, "[QuestieTracker.RemoveQuestWatch] - Internal update (untrack):", questId)
+                        QuestieTracker:UntrackQuestId(questId)
+                    end
+                else
+                    -- User triggered untrack: Explicitly follow it.
+                    Questie:Debug(Questie.DEBUG_DEVELOP, "[QuestieTracker.RemoveQuestWatch] - User action (untrack):", questId)
+                    QuestieTracker:UntrackQuestId(questId)
+                end
                Questie:Debug(Questie.DEBUG_DEVELOP, "[QuestieTracker.RemoveQuestWatch] - by Blizzard", questId)
            end
        end
@@ -2341,7 +2358,7 @@ function QuestieTracker:AQW_Insert(index, expire)

    -- This prevents double calling this function
    local now = GetTime()
-    if index and index == QuestieTracker.last_aqw and (now - lastAQW) < 0.1 then
+    if index and index == QuestieTracker.last_aqw and (now - lastAQW) < 0.05 then
        return
    end

@@ -2352,24 +2369,50 @@ function QuestieTracker:AQW_Insert(index, expire)
    -- that is all the player will see. This also prevents hitting the Blizzard Quest Watch Limit.
    RemoveQuestWatch(index, true)

-    local questId = select(8, GetQuestLogTitle(index))
+    local _, _, _, isHeader, _, _, _, questId = GetQuestLogTitle(index)
+    if isHeader then return end
+
    if (not questId) or questId == 0 then
        -- When an objective progresses in TBC "index" is the questId, but when a quest is manually added to the quest watch
        -- (e.g. shift clicking it in the quest log) "index" is the questLogIndex.
-        questId = index
+        if index and index > 50 and GetQuestLogIndexByID and GetQuestLogIndexByID(index) > 0 then
+            questId = index
+        else
+            return
+        end
    end

    if questId and questId > 0 then
+        -- Check if this was a manual user action (Shift-Click in Quest Log or similar)
+        local stack = debugstack(2, 8, 0)
+        local isUserAction = stack:find("QuestLog") or stack:find("OnClick") or stack:find("QuestWatch") or stack:find("Toggle") or stack:find("TrackerLinePool") or stack:find("TrackerMenu") or IsShiftKeyDown()
+
        -- These checks makes sure the only way to track a quest is through the Blizzard Quest Log
        -- or another Addon hooked into the Blizzard Quest Log that replaces the default Quest Log.
        if not Questie.db.profile.autoTrackQuests then
-            -- Manual track mode: force track when AddQuestWatch is called
-            Questie.db.char.TrackedQuests[questId] = true
-            Questie.db.char.AutoUntrackedQuests[questId] = nil
-        else
-            if Questie.db.char.AutoUntrackedQuests[questId] then
-                -- Quest was manually hidden — shift-click re-tracks it
+            if isUserAction then
+                Questie:Debug(Questie.DEBUG_DEVELOP, "[QuestieTracker:AQW_Insert] - Manual mode, user re-track:", questId)
+                Questie.db.char.TrackedQuests[questId] = true
                Questie.db.char.AutoUntrackedQuests[questId] = nil
+            else
+                -- In manual mode, we normally only track on user action, but if Blizzard calls it,
+                -- it might be a re-sync of something the user HAD tracked.
+                if Questie.db.char.TrackedQuests[questId] then
+                    -- Keep it tracked
+                else
+                    -- Blizzard auto-tracked something we didn't ask for? Ignore it in Manual mode.
+                    return
+                end
+            end
+        else
+            if isUserAction then
+                -- Auto track mode: User manually tracked it (un-hiding)
+                Questie:Debug(Questie.DEBUG_DEVELOP, "[QuestieTracker:AQW_Insert] - Auto mode, user un-hide:", questId)
+                Questie.db.char.AutoUntrackedQuests[questId] = nil
+            elseif Questie.db.char.AutoUntrackedQuests[questId] then
+                -- Auto track mode: Internal update for a HIDDEN quest — respect the hidden state!
+                Questie:Debug(Questie.DEBUG_DEVELOP, "[QuestieTracker:AQW_Insert] - Auto mode, skipping hidden quest:", questId)
+                return
            end
        end

@@ -1017,6 +1017,10 @@ TrackerLinePool.OnClickQuest = function(self, button)
                end
            end
        else
+            local questLogIndex = GetQuestLogIndexByID(self.Quest.Id)
+            if questLogIndex and questLogIndex > 0 then
+                RemoveQuestWatch(questLogIndex)
+            end
            QuestieTracker:UntrackQuestId(self.Quest.Id)
            local questLogFrame = QuestLogExFrame or ClassicQuestLog or QuestLogFrame
            if questLogFrame:IsShown() then