Merge branch 'develop'

Author: evil-morfar

.specs/Integration/VotingFrame/ReannounceOrRequestRoll.spec.lua

@@ -160,15 +160,13 @@ describe("#VotingFrame #ReannounceOrRequestRoll", function()
 
 			assert.spy(receivedSpy).was.called(1)
 			-- Now rolls should be reset:
-			for ses, data in ipairs(VotingFrame:GetLootTable()) do
-				for name, v in pairs(data.candidates) do
-					if name == addon.player.name then -- We might have timedout our roll
-						if v.response == "TIMEOUT" then
-							assert.equal("-", v.roll)
-						end
-					else
-						assert.Nil(v.roll)
+			for name, v in pairs(VotingFrame:GetLootTable()[1].candidates) do
+				if name == addon.player.name then -- We might have timedout our roll
+					if v.response == "TIMEOUT" then
+						assert.equal("?", v.roll)
 					end
+				else
+					assert.Nil(v.roll)
 				end
 			end
 		end)

.vscode/settings.json

@@ -197,19 +197,9 @@
         "${addons}/lldebugger/module/library",
         "${addons}/luafilesystem/module/library",
         "${addons}/luassert/module/library",
-        "~\\.vscode\\extensions\\ketho.wow-api-0.21.0\\Annotations\\Core",
-        "~\\.vscode\\extensions\\ketho.wow-api-0.21.0\\Annotations\\FrameXML"
+        "~\\.vscode\\extensions\\ketho.wow-api-0.22.1\\Annotations\\Core",
+        "~\\.vscode\\extensions\\ketho.wow-api-0.22.1\\Annotations\\FrameXML"
     ],
     "Lua.type.weakUnionCheck": true,
-    "Lua.runtime.builtin": {
-        "basic": "disable",
-        "debug": "disable",
-        "io": "disable",
-        "math": "disable",
-        "os": "disable",
-        "package": "disable",
-        "string": "disable",
-        "table": "disable",
-        "utf8": "disable"
-    },
+
 }

Classes/Data/Player.lua

@@ -189,6 +189,7 @@ end
 
 function private:IsCached(guid)
 	if not guid then return false end
+	if addon.Utils:IsSecretValue(guid) then return false end
 	if not self.cache[guid] then return false end
 	if self.cache[guid].isCouncil then return true end -- Never expire council members
 	if not self.cache[guid].cache_time or self.cache[guid].cache_time + MAX_CACHE_TIME < GetServerTime() then

Classes/Services/Comms.lua

@@ -233,6 +233,7 @@ end
 function private:OnRestrictionsChanged(active)
 	if active then return end
 	local len = #self.queuedComms
+	if len == 0 then return end
 	for _, encoded in ipairs(self.queuedComms) do
 		local prefix, target, command, data = strsplit("|", encoded, 4)
 		self:SendComm(prefix, target, nil, nil, nil, command, true, data)

Classes/Services/CommsRestrictions.lua

@@ -16,11 +16,10 @@ end
 local AddOnRestrictionTypeReverse = tInvert(Enum.AddOnRestrictionType)
 local AddOnRestrictionStateReverse = tInvert(Enum.AddOnRestrictionState)
 function CommsRestrictions:ChangeEvent(_, type, state)
-	-- TODO: Currently checked: Combat, Encounter, ChallengeMode
-	-- Combat seems to be the exception
+	-- Combat seems to be the exception. Not sure about map - comms still work when it's enabled in instances.
 	self.restrictionsEnabled =
 		(state == Enum.AddOnRestrictionState.Active or state == Enum.AddOnRestrictionState.Activating) and
-		(type ~= Enum.AddOnRestrictionType.Combat)
+		(type ~= Enum.AddOnRestrictionType.Combat and type ~= Enum.AddOnRestrictionType.Map)
 	addon.Log:d("Restriction:", AddOnRestrictionTypeReverse[type], AddOnRestrictionStateReverse[state], type, state,
 		self.restrictionsEnabled)
 	self.OnAddonRestrictionChanged(self.restrictionsEnabled)
@@ -29,3 +28,12 @@ end
 function CommsRestrictions:IsRestricted()
 	return self.restrictionsEnabled
 end
+
+function CommsRestrictions:DumpRestrictions()
+	addon.Log:D("Current Addon Restrictions:")
+	for type = 0, #AddOnRestrictionTypeReverse do
+		local state = C_RestrictedActions.IsAddOnRestrictionActive(type)
+		addon.Log:D(" - ", AddOnRestrictionTypeReverse[type], state)
+	end
+	addon.Log:D("Secrets:", C_Secrets.HasSecretRestrictions())
+end

Core/Constants.lua

@@ -186,6 +186,11 @@ addon.RESPONSE_CODE_GENERATORS = {
 		if db.enabledButtons.SPECIAL and C_Item.IsEquippableItem(item) then
 			-- Scan tooltip
 			local info = C_TooltipInfo.GetHyperlink(item)
+			if not info then
+				-- TODO: Find a solution for this
+				addon.Log:E("No tooltip info found for item", itemID)
+				return
+			end
 			if not info.type == Enum.TooltipDataType.Item then
 				addon.Log:W("ItemTooltip was not of type item", itemID, info.type)
 				return

Libs/AceTab-3.0/AceTab-3.0.lua

@@ -2,9 +2,9 @@
 -- Note: This library is not yet finalized.
 -- @class file
 -- @name AceTab-3.0
--- @release $Id: AceTab-3.0.lua 1287 2022-09-25 09:15:57Z nevcairiel $
+-- @release $Id: AceTab-3.0.lua 1388 2026-01-22 23:05:57Z funkehdude $
 
-local ACETAB_MAJOR, ACETAB_MINOR = 'AceTab-3.0', 9
+local ACETAB_MAJOR, ACETAB_MINOR = 'AceTab-3.0', 10
 local AceTab, oldminor = LibStub:NewLibrary(ACETAB_MAJOR, ACETAB_MINOR)
 
 if not AceTab then return end -- No upgrade needed
@@ -23,6 +23,7 @@ local strsub = string.sub
 local strlower = string.lower
 local strformat = string.format
 local strmatch = string.match
+local NUM_CHAT_WINDOWS = NUM_CHAT_WINDOWS or Constants.ChatFrameConstants.MaxChatWindows
 
 local function printf(...)
 	DEFAULT_CHAT_FRAME:AddMessage(strformat(...))