Added enabled by default settings to ignore vote kick / vote abandon popups

Author: Numynum

main.lua

@@ -11,10 +11,12 @@ local DialogKey = LibStub("AceAddon-3.0"):NewAddon(name, "AceEvent-3.0", "AceHoo
 ns.Core = DialogKey
 
 local defaultPopupBlacklist = { -- If a popup dialog contains one of these strings, don't click it
-    AREA_SPIRIT_HEAL, -- Prevents cancelling the resurrection
-    TOO_MANY_LUA_ERRORS,
-    END_BOUND_TRADEABLE, -- Probably quite reasonable to make the user click on this one
-    ADDON_ACTION_FORBIDDEN, -- Don't disable and reload UI on errors
+    AREA_SPIRIT_HEAL = true, -- Prevents cancelling the resurrection
+    TOO_MANY_LUA_ERRORS = true,
+    END_BOUND_TRADEABLE = true, EQUIP_BIND_TRADEABLE = true, -- Probably quite reasonable to make the user click on this one
+    ADDON_ACTION_FORBIDDEN = true,                           -- Don't disable and reload UI on errors
+    CONFIRM_LEAVE_RESTRICTED_CHALLENGE_MODE = true,
+    WARN_LEAVE_RESTRICTED_CHALLENGE_MODE = true,
 }
 
 local function callFrameMethod(frame, method, ...)
@@ -273,46 +275,26 @@ function DialogKey:GetValidPopupButtons()
     return next(buttons) and buttons or nil
 end
 
--- Takes a global string like '%s has challenged you to a duel.' and converts it to a format suitable for string.find
-local summonMatch = CONFIRM_SUMMON:gsub("%%d", ".+"):format(".+", ".+", ".+")
-local duelMatch = DUEL_REQUESTED:format(".+")
-local resurrectMatch = RESURRECT_REQUEST_NO_SICKNESS:format(".+")
-local groupinviteMatch = INVITATION:format(".+")
-local instanceLogMatches = {
-    INSTANCE_LOCK_TIMER:format(".+", ".+"),
-    INSTANCE_LOCK_TIMER_PREVIOUSLY_SAVED:format(".+", ".+"),
-    INSTANCE_LOCK_WARNING:format(".+"),
-    INSTANCE_LOCK_WARNING_PREVIOUSLY_SAVED:format(".+"),
-}
-
 --- @param popupFrame StaticPopupTemplate # One of the StaticPopup1-4 frames
 --- @return Frame|nil|false # The button to click, nil if no button should be clicked, false if the text is empty and should be checked again later
 function DialogKey:GetPopupButton(popupFrame)
     local fontString = popupFrame.GetTextFontString and popupFrame:GetTextFontString() or popupFrame.text
     local text = fontString and fontString:GetText()
-    local button1, button2
-    if popupFrame.GetButtons then
-        button1, button2 = unpack(popupFrame:GetButtons())
-    else
-        button1 = popupFrame.button1
-        button2 = popupFrame.button2
-    end
+    local which = popupFrame.which
+
+    local button1 = popupFrame.button1 or popupFrame:GetButton1()
+    local button2 = popupFrame.button2 or popupFrame:GetButton2()
 
     -- Some popups have no text when they initially show, and instead get text applied OnUpdate (summons are an example)
     -- False is returned in that case, so we know to keep checking OnUpdate
     if not text or text == " " or text == "" then return false end
 
-    -- Don't accept group invitations if the option is enabled
-    if self.db.dontAcceptInvite and text:find(groupinviteMatch) then return end
-
-    -- Don't accept summons/duels/resurrects if the options are enabled
-    if self.db.dontClickSummons and text:find(summonMatch) then return end
-    if self.db.dontClickDuels and text:find(duelMatch) then return end
-    if self.db.dontAcceptInstanceLocks then
-        for _, match in pairs(instanceLogMatches) do
-            if text:find(match) then return end
-        end
-    end
+    if self.db.dontAcceptInvite and which == 'PARTY_INVITE' then return end
+    if self.db.dontClickSummons and which == 'CONFIRM_SUMMON' then return end
+    if self.db.dontClickDuels and which == 'DUEL_REQUESTED' then return end
+    if self.db.dontAcceptInstanceLocks and which == 'INSTANCE_LOCK' then return end
+    if self.db.dontAcceptAbandonVote and which == 'VOTE_ABANDON_INSTANCE_VOTE' or which == 'VOTE_ABANDON_INSTANCE_WAIT' then return end
+    if self.db.dontAcceptVoteKick and which == 'VOTE_BOOT_PLAYER' then return end
 
     -- If resurrect dialog has three buttons, and the option is enabled, use the middle one instead of the first one (soulstone, etc.)
     -- Located before resurrect/release checks/returns so it happens even if you have releases/revives disabled
@@ -325,27 +307,18 @@ function DialogKey:GetPopupButton(popupFrame)
         return button2
     end
 
-    if self.db.dontClickRevives and (text == RECOVER_CORPSE or text:find(resurrectMatch)) then return end
+    if self.db.dontClickRevives and (text == RECOVER_CORPSE or which == 'RESURRECT_NO_SICKNESS' or which == 'RESURRECT_NO_TIMER') then return end
     if self.db.dontClickReleases and canRelease then return end
 
-    -- Ignore blacklisted popup dialogs!
+    -- Ignore blacklisted popup dialogs
+    if defaultPopupBlacklist[which] or self.db.dialogBlacklist[which] then return end
     local lowerCaseText = text:lower()
     for blacklistText, _ in pairs(self.db.dialogBlacklist) do
         -- Prepend non-alphabetical characters with '%' to escape them
         blacklistText = blacklistText:gsub("%W", "%%%0"):gsub("%%%%s", ".+")
         if lowerCaseText:find(blacklistText:lower()) then return end
     end
 
-    for _, blacklistText in pairs(defaultPopupBlacklist) do
-        -- Prepend non-alphabetical characters with '%' to escape them
-        -- Replace %s and %d with .+ to match any string or number
-        -- Trim whitespaces
-        blacklistText = blacklistText:gsub("%W", "%%%0"):gsub("%%%%s", ".+"):gsub("%%%%d", ".+"):gsub("^%s*(.-)%s*$", "%1")
-        if lowerCaseText:find(blacklistText:lower()) then
-            return
-        end
-    end
-
     return button1:IsVisible() and button1 or nil
 end
 

options.lua

@@ -23,6 +23,8 @@ ns.defaultOptions = {
     dontClickRevives = true,
     dontClickReleases = true,
     dontAcceptInvite = true,
+    dontAcceptAbandonVote = true,
+    dontAcceptVoteKick = true,
     dontAcceptInstanceLocks = false,
     useSoulstoneRez = true,
     handleCraftingOrders = true,
@@ -248,7 +250,7 @@ function ns:GetOptionsTable()
                         order = increment(),
                         name = wrapName("Number keys for Gossip - Risky"),
                         disabled = function() return not db.numKeysForGossip end,
-                        desc = "Ensure scrollbar is enabled if the text becomes too long. This may taint objective frame buttons, such as dropping candles in delves. If you encounter issues, just disable this option.",
+                        desc = "Ensure scrollbar is enabled if the text becomes too long. This may taint objective frame buttons. If you encounter issues, just disable this option.",
                         descStyle = "inline", width = "full", type = "toggle",
                     },
                     numKeysForQuestRewards = {
@@ -343,49 +345,62 @@ If you have trouble finding the name, try "/fstack", pressing ALT until the fram
                         order = increment(),
                         name = wrapName("Don't Accept Group Invites"),
                         desc = "Don't allow DialogKey to accept Raid/Party Invitations",
-                        descStyle = "inline", width = "full", type = "toggle",
+                        width = 1.2, type = "toggle",
                     },
                     dontAcceptInstanceLocks = {
                         order = increment(),
                         name = wrapName("Don't Accept Instance Lockouts"),
                         desc = "Don't allow DialogKey to accept/\"save\" Instance Lockouts",
-                        descStyle = "inline", width = "full", type = "toggle",
+                        width = 1.2, type = "toggle",
+                    },
+                    dontAcceptAbandonVote = {
+                        order = increment(),
+                        name = wrapName("Don't Accept M+ Abandon Key Votes"),
+                        desc = "Don't allow DialogKey to vote to abandon a m+ key",
+                        width = 1.2, type = "toggle",
+                    },
+                    dontAcceptVoteKick = {
+                        order = increment(),
+                        name = wrapName("Don't Accept Vote Kicks"),
+                        desc = "Don't allow DialogKey to vote in Vote Kicks",
+                        width = 1.2, type = "toggle",
                     },
                     dontClickSummons = {
                         order = increment(),
                         name = wrapName("Don't Accept Summons"),
                         desc = "Don't allow DialogKey to accept Summon Requests",
-                        descStyle = "inline", width = "full", type = "toggle",
+                        width = 1.2, type = "toggle",
                     },
                     dontClickDuels = {
                         order = increment(),
                         name = wrapName("Don't Accept Duels"),
                         desc = "Don't allow DialogKey to accept Duel Requests",
-                        descStyle = "inline", width = "full", type = "toggle",
+                        width = 1.2, type = "toggle",
                     },
                     dontClickRevives = {
                         order = increment(),
                         name = wrapName("Don't Accept Revives"),
                         desc = "Don't allow DialogKey to accept Resurrections",
-                        descStyle = "inline", width = "full", type = "toggle",
-                    },
-                    dontClickReleases = {
-                        order = increment(),
-                        name = wrapName("Don't Release Spirit"),
-                        desc = "Don't allow DialogKey to Release Spirit",
-                        descStyle = "inline", width = "full", type = "toggle",
+                        width = 1.2, type = "toggle",
                     },
                     useSoulstoneRez = {
                         order = increment(),
                         name = wrapName("Use Class-specific Revive"),
                         desc = "Use Soulstone/Ankh/etc. resurrection option when one is available and a normal/battle resurrection is not\n\nThis option |cffff0000ignores|r the |cffffd100Don't Accept Revives|r option!",
-                        descStyle = "inline", width = "full", type = "toggle",
+                        width = 1.2, type = "toggle",
+                    },
+                    dontClickReleases = {
+                        order = increment(),
+                        name = wrapName("Don't Release Spirit"),
+                        desc = "Don't allow DialogKey to Release Spirit",
+                        width = 1.2, type = "toggle",
                     },
                     desc = {
                         order = increment(),
                         name = [[
 Here you can create a custom list of popups that DialogKey should ignore.
 Simply add (part of) the text that appears in the popup, and DialogKey will ignore it.
+Alternatively, you can add the technical name of the popup, which you can find with /dump StaticPopup1.which while the popup is open.
 ]],
                         type = "description",
                         fontSize = "medium",