Merge branch 'release/3.18.2'

Author: evil-morfar

.luacheckrc

@@ -4921,7 +4921,6 @@ globals = {
 	"VoiceChatShineFadeIn",
 	"VoiceChatShineFadeOut",
 	"WrapTextInColorCode",
-	"escapePatternSymbols",
 	"getglobal",
 	"getprinthandler",
 	"isRaidFinderDungeonDisplayable",

.vscode/settings.json

@@ -34,7 +34,6 @@
         "CreateSimpleTextureMarkup",
         "tContains",
         "FindValueInTableIf",
-        "escapePatternSymbols",
         "ITEM_BNETACCOUNTBOUND",
         "PLAYER_LIST_DELIMITER",
         "BIND_TRADE_TIME_REMAINING",

RCLootCouncil.toc

@@ -1,8 +1,8 @@
 ## Author: Potdisc
 ## Interface: 110207
-## Notes: Interface for running a Loot Council v3.18.1
+## Notes: Interface for running a Loot Council v3.18.2
 ## Title: RCLootCouncil
-## Version: 3.18.1
+## Version: 3.18.2
 ## SavedVariables: RCLootCouncilDB, RCLootCouncilLootDB
 ## AllowLoadGameType: standard
 ## OptionalDeps: LibStub, CallbackHandler-1.0, Ace3, lib-st, LibWindow-1.1, LibDialog-1.0

Utils/Utils.lua

@@ -371,6 +371,16 @@ function Utils:Int2Bin(n)
 	return string.format("%04s", result)
 end
 
+local symbols = { "%%", "%*", "%+", "%-", "%?", "%(", "%)", "%[", "%]", "%$", "%^", } --% has to be escaped first or everything is ruined
+local replacements = { "%%%%", "%%%*", "%%%+", "%%%-", "%%%?", "%%%(", "%%%)", "%%%[", "%%%]", "%%%$", "%%%^", }
+--- Reimplementation of Blizzard function (make local in 11.2.7)
+function Utils:escapePatternSymbols(text)
+	for i = 1, #symbols do
+		text = text:gsub(symbols[i], replacements[i])
+	end
+	return text
+end
+
 ---@deprecated
 ---@see Utils.Item.GetTransmittableItemString
 function Utils:GetTransmittableItemString(link)

__tests/wow_api/wow_api.lua

@@ -1123,16 +1123,6 @@ function _G.GetInventorySlotInfo(slot) end
 -- Mocked with random item
 function GetInventoryItemLink(unit, slot) return _G.Items_Array[math.random(#_G.Items_Array)] end
 
-local symbols = { "%%", "%*", "%+", "%-", "%?", "%(", "%)", "%[", "%]", "%$", "%^", } --% has to be escaped first or everything is ruined
-local replacements = { "%%%%", "%%%*", "%%%+", "%%%-", "%%%?", "%%%(", "%%%)", "%%%[", "%%%]", "%%%$", "%%%^", }
--- Defined in FrameXML/ChatFrame.lua
-function escapePatternSymbols(text)
-	for i = 1, #symbols do
-		text = text:gsub(symbols[i], replacements[i])
-	end
-	return text
-end
-
 function FauxScrollFrame_Update()
 end
 

changelog.md

@@ -1,4 +1,4 @@
-# 3.18.1
+# 3.18.2
 
 Updated for patch 11.2.7.
 
@@ -8,6 +8,10 @@ Updated for patch 11.2.7.
 
 Added an option for the group leader to block trade requests while their voting frame is open. When enabled, any trade attempts will be cancelled.
 
+## Bugfixes
+
+- *v3.18.1 didn't include the fix for `escapePatternSymbols`.*
+
 ### Button group
 
 Added new button group for housing decor.

core.lua

@@ -1423,7 +1423,7 @@ function RCLootCouncil:GetContainerItemTradeTimeRemaining(container, slot)
 	tooltipForParsing:SetBagItem(container, slot) -- Set the tooltip content and show it, should hide the tooltip before function ends
 	if not tooltipForParsing:NumLines() or tooltipForParsing:NumLines() == 0 then return 0 end
 
-	local bindTradeTimeRemainingPattern = escapePatternSymbols(BIND_TRADE_TIME_REMAINING) -- Escape special characters in translations
+	local bindTradeTimeRemainingPattern = self.Utils:escapePatternSymbols(BIND_TRADE_TIME_REMAINING) -- Escape special characters in translations
 		:gsub("1%%%$", "") -- Remove weird insertion in RU '%1$s'
 		:gsub("%%%%s", "%(%.%+%)") -- Create capture group for the time string
 	local bounded = false

ml_core.lua

@@ -1043,7 +1043,7 @@ function RCLootCouncilML:AnnounceItems(table)
 		local msg = db.announceItemString
 		for text, func in pairs(self.announceItemStrings) do
 			-- escapePatternSymbols is defined in FrameXML/ChatFrame.lua that escapes special characters.
-			msg = gsub(msg, text, escapePatternSymbols(tostring(func(v.session or k, link, v))))
+			msg = gsub(msg, text, addon.Utils:escapePatternSymbols(tostring(func(v.session or k, link, v))))
 		end
 		if v.isRoll then
 			msg = _G.ROLL..": "..msg
@@ -1103,7 +1103,8 @@ function RCLootCouncilML:AnnounceAward(name, link, response, roll, session, chan
 			local message = v.text
 			for text, func in pairs(self.awardStrings) do
 				-- escapePatternSymbols is defined in FrameXML/ChatFrame.lua that escapes special characters.
-				message = gsub(message, text, escapePatternSymbols(tostring(func(name, link, response, roll, session, owner))))
+				message = gsub(message, text,
+				addon.Utils:escapePatternSymbols(tostring(func(name, link, response, roll, session, owner))))
 			end
 			if changeAward then
 				message = "("..L["Change Award"]..") "..message