overspend1/PathOfBuilding
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

remove url encoding check, as it was broken (#8372)

Browse Source
This commit is contained in:
Regisle
2024-11-22 16:22:47 +10:30
committed by GitHub
parent 26a80ef52b
commit 80dfb6f56b
1 changed files with 5 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/Classes/ImportTab.lua
View File

@@ -63,11 +63,11 @@ local ImportTabClass = newClass("ImportTab", "ControlHost", "Control", function(
self:DownloadCharacterList()
end)
self.controls.accountNameGo.enabled = function()
return self.controls.accountName.buf:match("%S[#%-(%%23)]%d%d%d%d$")
return self.controls.accountName.buf:match("%S[#%-]%d%d%d%d$")
end
self.controls.accountNameGo.tooltipFunc = function(tooltip)
tooltip:Clear()
if not self.controls.accountName.buf:match("[#%-(%%23)]%d%d%d%d$") then
if not self.controls.accountName.buf:match("[#%-]%d%d%d%d$") then
tooltip:AddLine(16, "^7Missing discriminator e.g. " .. self.controls.accountName.buf .. "#1234")
end
end
@@ -99,7 +99,7 @@ local ImportTabClass = newClass("ImportTab", "ControlHost", "Control", function(
self.controls.accountNameMissingDiscriminator = new("LabelControl", {"BOTTOMLEFT",self.controls.accountNameUnicode,"TOPLEFT"}, {0, -4, 0, 18}, "^1Missing discriminator e.g. #1234")
self.controls.accountNameMissingDiscriminator.shown = function()
return not self.controls.accountName.buf:match("[#%-(%%23)]%d%d%d%d$")
return not self.controls.accountName.buf:match("[#%-]%d%d%d%d$")
end
@@ -423,8 +423,8 @@ function ImportTabClass:DownloadCharacterList()
else
accountName = self.controls.accountName.buf:gsub("^[%s?]+", ""):gsub("[%s?]+$", ""):gsub("%s", "+")
end
accountName = accountName:gsub("(.*)[#%-]", "%1#")
local sessionID = #self.controls.sessionInput.buf == 32 and self.controls.sessionInput.buf or (main.gameAccounts[accountName] and main.gameAccounts[accountName].sessionID)
accountName = ReplaceDiscriminatorSafely(accountName)
launch:DownloadPage(realm.hostName.."character-window/get-characters?accountName="..accountName:gsub("#", "%%23").."&realm="..realm.realmCode, function(response, errMsg)
if errMsg == "Response code: 401" then
self.charImportStatus = colorCodes.NEGATIVE.."Sign-in is required."
@@ -469,7 +469,7 @@ function ImportTabClass:DownloadCharacterList()
self.charImportMode = "GETSESSIONID"
return
end
realAccountName = ReplaceDiscriminatorSafely(realAccountName)
realAccountName = realAccountName:gsub("(.*)[#%-]", "%1#")
accountName = realAccountName
self.controls.accountName:SetText(realAccountName)
self.charImportStatus = "Character list successfully retrieved."
@@ -1139,10 +1139,6 @@ function HexToChar(x)
return string.char(tonumber(x, 16))
end
function ReplaceDiscriminatorSafely(accountName)
return accountName:gsub("(.*)[#%-]", "%1#")
end
function UrlDecode(url)
if url == nil then
return