fix: allow account names with dashed in them to be imported correctly #8370
Conversation
src/Classes/ImportTab.lua
Outdated
| @@ -1138,6 +1139,24 @@ function HexToChar(x) | |||
| return string.char(tonumber(x, 16)) | |||
| end | |||
|
|
|||
| function ReplaceCharAtIndex(str, pos, r) | |||
| return ("%s%s%s"):format(str:sub(1,pos-1), r, str:sub(pos+1)) | |||
There was a problem hiding this comment.
This line is space-indented; should be tab.
|
This looks like it works from the few tests I did, but is a little overkill, as the Also a helper function like edit: it works, so unless a maintainer wants the changes you can just leave it as is (and just fix the space indentation), just being nit picky. |
|
I totally agree with moving I did the discriminator char index search this over-engineered because it would be forward-compatible to GGG having to adapt to thing like long account names and discriminators being anything other than 4 characters. Since it's not run very often I figured the overkill would be okay for the benefit of also addressing those potential discriminators. Fixing indent and |
|
Moved |
src/Classes/ImportTab.lua
Outdated
| reversedAccountName = string.reverse(accountName) | ||
| discriminatorIndex = 0 | ||
| for i = 1, #reversedAccountName do | ||
| local c = reversedAccountName:sub(i,i) | ||
| if c == "#" or c == "-" then | ||
| discriminatorIndex = i | ||
| break | ||
| end | ||
| end | ||
| discriminatorIndex = discriminatorIndex * -1 |
There was a problem hiding this comment.
FYI, you don't have to reverse the string and the index here, just put your for loop in reverse instead
I just realized this can all be done in a single gsub
| reversedAccountName = string.reverse(accountName) | |
| discriminatorIndex = 0 | |
| for i = 1, #reversedAccountName do | |
| local c = reversedAccountName:sub(i,i) | |
| if c == "#" or c == "-" then | |
| discriminatorIndex = i | |
| break | |
| end | |
| end | |
| discriminatorIndex = discriminatorIndex * -1 | |
| return accountName:gsub("(.*)[#%-]", "%1#") |
There was a problem hiding this comment.
Didn't know that was possible in lua, cool stuff, but I see you removed it anyways.
gsub not working with regex totally did not click in my brain, props for finding a better shorthand.
src/Classes/ImportTab.lua
Outdated
| @@ -424,7 +424,8 @@ function ImportTabClass:DownloadCharacterList() | |||
| accountName = self.controls.accountName.buf:gsub("^[%s?]+", ""):gsub("[%s?]+$", ""):gsub("%s", "+") | |||
| end | |||
| local sessionID = #self.controls.sessionInput.buf == 32 and self.controls.sessionInput.buf or (main.gameAccounts[accountName] and main.gameAccounts[accountName].sessionID) | |||
| launch:DownloadPage(realm.hostName.."character-window/get-characters?accountName="..accountName:gsub("-", "%%23"):gsub("#", "%%23").."&realm="..realm.realmCode, function(response, errMsg) | |||
| accountName = ReplaceDiscrimintorSafely(accountName) | |||
There was a problem hiding this comment.
Does this behave fine when saving previously imported accounts in settings?
Fixes #8369.
Description of the problem being solved:
Accounts with dashes in them (e.g.
Dj-Reck1#9507) could not be imported.Those accounts are possible because dashes are allowed in account names for consoles.
Steps taken to verify a working solution:
Dj-Reck1#9507Dj-Reck1-9507Tarekis#5639Tarekis-5639Hope code looks good to yall. Not a lua dev lol