* Added support for Siren Isle (TWW)

* Added icon for world quests that involve Legion world bosses (quest TagID 144)

Author: Amadeus-

Broker_WorldQuests.toc

@@ -1,7 +1,7 @@
-## Interface: 110005
+## Interface: 110007
 ## Author: myno (original author; up through 8.x), Amadeus (maintainer since 9.0)
 ## Title: Broker_WorldQuests
-## Version: 11.0.5.2
+## Version: 11.0.7.0
 ## SavedVariables: BWQcfg
 ## SavedVariablesPerCharacter: BWQcache, BWQcfgPerCharacter
 ## OptionalDeps: TomTom

CHANGELOG.md

@@ -1,3 +1,7 @@
+### 11.0.7.0
+* Added support for Siren Isle (TWW)
+* Added icon for world quests that involve Legion world bosses (quest TagID 144)
+
 ### 11.0.5.2
 * Added support for Bronze Celebration Token currency
 

Globals.lua

@@ -41,6 +41,7 @@ BWQ.MAP_ZONES = {
 		[2215] = { id = 2215, name = C_Map.GetMapInfo(2215).name, quests = {}, buttons = {}, }, -- Hallowfall 11.0
 		[2255] = { id = 2255, name = C_Map.GetMapInfo(2255).name, quests = {}, buttons = {}, }, -- Azj-Kahet 11.0
 		[2213] = { id = 2213, name = C_Map.GetMapInfo(2213).name, quests = {}, buttons = {}, }, -- City of Threads 11.0
+		[2369] = { id = 2369, name = C_Map.GetMapInfo(2369).name, quests = {}, buttons = {}, }, -- Siren Isle 11.0.7
 	},
 	[CONSTANTS.EXPANSIONS.DRAGONFLIGHT] = {
 		[2022] = { id = 2022, name = C_Map.GetMapInfo(2022).name, quests = {}, buttons = {}, }, -- The Waking Shores 10.0
@@ -92,7 +93,7 @@ BWQ.MAP_ZONES = {
 -- The following table is used to sort the zones when displayed. This table should only include zones that are in the 
 -- BWQ.MAP_ZONES table above.
 BWQ.MAP_ZONES_SORT = {
-	[CONSTANTS.EXPANSIONS.THEWARWITHIN] = 	{	2248, 2214, 2215, 2255, 2213										},
+	[CONSTANTS.EXPANSIONS.THEWARWITHIN] = 	{	2248, 2214, 2215, 2255, 2213, 2369									},
 	[CONSTANTS.EXPANSIONS.DRAGONFLIGHT] = 	{	2022, 2023, 2024, 2025, 2085, 2151, 2133, 2200						},
 	[CONSTANTS.EXPANSIONS.SHADOWLANDS] =  	{	1525, 1533, 1536, 1565, 1543, 1970									},
 	[CONSTANTS.EXPANSIONS.BFA] = 			{	1530, 1527, 1355, 1462, 62, 14, 863, 864, 862, 895, 942, 896, 1161	},

Utilities.lua

@@ -17,7 +17,8 @@ end
 
 function BWQ:FormatTimeLeftString(minutes)
 	local timeLeftStr = ""
-	if minutes <= 0 then return "" end
+
+	if not minutes or minutes <= 0 then return "" end
 
 	local days = math.floor(minutes / 1440)
 	local hours = math.floor((minutes % 1440) / 60)

WorldQuests.lua

@@ -901,8 +901,15 @@ local RetrieveWorldQuests = function(mapId)
 										quest.timeLeftString = timeLeftStr
 									elseif string.find(widgetInfo.text, "Complete") then
 										local quests, zone = string.match(widgetInfo.text, "Complete (%d+) |4world quest:world quests; in ?(.-) to unlock")
-										if string.find(zone,"the") then
-											zone = string.match(zone, "^the%s*(.+)")    -- remove the word "the" if it's the first word in the string and lowercase.
+										if zone then
+											-- TODO:  Why am I parsing the zone name rather than just using C_Map.GetMapInfo(mapId).name or "UNKNOWN" ??
+											if string.find(zone,"the") then
+												zone = string.match(zone, "^the%s*(.+)")    -- remove the word "the" if it's the first word in the string and lowercase.
+											end
+										else
+											quest.LockedWQ_QuestToComplete = string.match(widgetInfo.text, "Complete ?(.-) to unlock")
+											--print(string.format("[BWQ]: %s", quest.LockedWQ_QuestToComplete))
+											zone = C_Map.GetMapInfo(mapId).name or "UNKNOWN"
 										end
 										quest.LockedWQ_questsRemaining = quests and tonumber(quests) or 0
 										quest.LockedWQ_zone = zone or ""
@@ -931,9 +938,27 @@ local RetrieveWorldQuests = function(mapId)
 		end
 
 		if BWQ:C("sortByTimeRemaining") then
-			table.sort(BWQ.MAP_ZONES[BWQ.expansion][mapId].questsSort, function(a, b) return BWQ.MAP_ZONES[BWQ.expansion][mapId].quests[a].timeLeft < BWQ.MAP_ZONES[BWQ.expansion][mapId].quests[b].timeLeft end)
+			table.sort(BWQ.MAP_ZONES[BWQ.expansion][mapId].questsSort, function(a, b)
+				local questA = BWQ.MAP_ZONES[BWQ.expansion][mapId].quests[a]
+				local questB = BWQ.MAP_ZONES[BWQ.expansion][mapId].quests[b]
+				
+				-- If either quest is nil, put it at the end
+				if not questA or not questA.timeLeft then return false end
+				if not questB or not questB.timeLeft then return true end
+				
+				return questA.timeLeft < questB.timeLeft
+			end)
 		else -- reward type
-			table.sort(BWQ.MAP_ZONES[BWQ.expansion][mapId].questsSort, function(a, b) return BWQ.MAP_ZONES[BWQ.expansion][mapId].quests[a].sort > BWQ.MAP_ZONES[BWQ.expansion][mapId].quests[b].sort end)
+			table.sort(BWQ.MAP_ZONES[BWQ.expansion][mapId].questsSort, function(a, b)
+				local questA = BWQ.MAP_ZONES[BWQ.expansion][mapId].quests[a]
+				local questB = BWQ.MAP_ZONES[BWQ.expansion][mapId].quests[b]
+				
+				-- If either quest is nil, put it at the end
+				if not questA or not questA.sort then return false end
+				if not questB or not questB.sort then return true end
+				
+				return questA.sort > questB.sort
+			end)
 		end
 
 		BWQ.MAP_ZONES[BWQ.expansion][mapId].numQuests = numQuests
@@ -1264,12 +1289,20 @@ function BWQ:UpdateBlock()
 				local rewardText = ""
 				if button.quest.LockedWQ then
 					-- To find Atlas textures such as the "padlock" below.  Use the /tav command (Texture Atlas Viewer addon).
-					rewardText = string.format(
-						"|cnWARNING_FONT_COLOR:|A:%s:14:14|a Complete %d more %s in %s|r",
-						"Garr_LockedBuilding",
-						button.quest.LockedWQ_questsRemaining and button.quest.LockedWQ_questsRemaining or "",
-						button.quest.LockedWQ_questsRemaining > 1 and "WQs" or "WQ",
-						button.quest.LockedWQ_zone and button.quest.LockedWQ_zone or "")
+					if button.quest.LockedWQ_QuestToComplete then
+						rewardText = string.format(
+							"|cnWARNING_FONT_COLOR:|A:%s:14:14|a Complete the quest '%s' in %s|r",
+							"Garr_LockedBuilding",
+							button.quest.LockedWQ_QuestToComplete,
+							button.quest.LockedWQ_zone and button.quest.LockedWQ_zone or "")
+					else
+						rewardText = string.format(
+							"|cnWARNING_FONT_COLOR:|A:%s:14:14|a Complete %d more %s in %s|r",
+							"Garr_LockedBuilding",
+							button.quest.LockedWQ_questsRemaining and button.quest.LockedWQ_questsRemaining or "",
+							button.quest.LockedWQ_questsRemaining > 1 and "WQs" or "WQ",
+							button.quest.LockedWQ_zone and button.quest.LockedWQ_zone or "")
+					end
 					button.reward:SetScript("OnEvent", function(self, event)
 						if event == "MODIFIER_STATE_CHANGED" then
 							if button.reward:IsMouseOver() and button.reward:IsShown() then