Skip to content

Commit

Permalink
refactor(match2): cleanup player processing functions (#4838)
Browse files Browse the repository at this point in the history
  • Loading branch information
@Rathoz
Rathoz authored Oct 10, 2024
1 parent 20e0178 commit 2febef7
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 136 deletions.
137 changes: 2 additions & 135 deletions components/match2/commons/match_group_input_util.lua
View file
Original file line number Diff line number Diff line change
Expand Up @@ -229,8 +229,7 @@ function MatchGroupInputUtil.readOpponent(match, opponentIndex, options)
if opponent.type == Opponent.team then
local manualPlayersInput = MatchGroupInputUtil.extractManualPlayersInput(match, opponentIndex, opponentInput)
substitutions = manualPlayersInput.substitutions
--a variation of `MatchGroupInput.readPlayersOfTeam` that returns a player array
opponent.players = MatchGroupInputUtil.readPlayersOfTeamNew(
opponent.players = MatchGroupInputUtil.readPlayersOfTeam(
Opponent.toName(opponent) or '',
manualPlayersInput,
options,
Expand Down Expand Up @@ -420,7 +419,7 @@ end
---@param options readOpponentOptions
---@param dateTimeInfo {timestamp: integer?, timezoneOffset: string?}
---@return table
function MatchGroupInputUtil.readPlayersOfTeamNew(teamName, manualPlayersInput, options, dateTimeInfo)
function MatchGroupInputUtil.readPlayersOfTeam(teamName, manualPlayersInput, options, dateTimeInfo)
local players = {}
local playersIndex = 0

Expand Down Expand Up @@ -507,138 +506,6 @@ function MatchGroupInputUtil.readPlayersOfTeamNew(teamName, manualPlayersInput,
return playersArray
end

---reads the players of a team from input and wiki variables
---@deprecated
---@param match table
---@param opponentIndex integer
---@param teamName string
---@param options MatchGroupInputReadPlayersOfTeamOptions?
---@return table
function MatchGroupInputUtil.readPlayersOfTeam(match, opponentIndex, teamName, options)
options = options or {}

local opponent = match['opponent' .. opponentIndex]
local players = {}
local playersIndex = 0

local insertIntoPlayers = function(player)
if type(player) ~= 'table' or Logic.isEmpty(player) or Logic.isEmpty(player.name or player.pageName) then
return
end

player.name = Logic.emptyOr(player.name, player.pageName) --[[@as string]]
player.name = options.resolveRedirect and mw.ext.TeamLiquidIntegration.resolve_redirect(player.name) or player.name
player.name = options.applyUnderScores and player.name:gsub(' ', '_') or player.name
player.flag = Flags.CountryName(player.flag)
player.displayname = Logic.emptyOr(player.displayname, player.displayName)
playersIndex = playersIndex + 1
player.index = playersIndex

players[player.name] = players[player.name] or {}
Table.mergeInto(players[player.name], player)
end

local playerIndex = 1
local varPrefix = teamName .. '_p' .. playerIndex
local name = globalVars:get(varPrefix)
while name do
if options.maxNumPlayers and (playersIndex >= options.maxNumPlayers) then break end

local wasPresentInMatch = function()
if not match.timestamp then return true end

local joinDate = DateExt.readTimestamp(globalVars:get(varPrefix .. 'joindate') or '')
local leaveDate = DateExt.readTimestamp(globalVars:get(varPrefix .. 'leavedate') or '')

if (not joinDate) and (not leaveDate) then return true end

-- need to offset match time to correct timezone as transfers do not have a time associated with them
local timestampLocal = match.timestamp + DateExt.getOffsetSeconds(match.timezoneOffset or '')

return (not joinDate or (joinDate <= timestampLocal)) and
(not leaveDate or (leaveDate > timestampLocal))
end

if wasPresentInMatch() then
insertIntoPlayers{
pageName = name,
displayName = globalVars:get(varPrefix .. 'dn'),
flag = globalVars:get(varPrefix .. 'flag'),
}
end
playerIndex = playerIndex + 1
varPrefix = teamName .. '_p' .. playerIndex
name = globalVars:get(varPrefix)
end

--players from manual input as `opponnetX_pY`
for _, player in Table.iter.pairsByPrefix(match, 'opponent' .. opponentIndex .. '_p') do
local playerTable = Json.parseIfString(player) or {}
insertIntoPlayers(playerTable)
end

--players from manual input in `opponent.players`
local playersData = Json.parseIfString(opponent.players) or {}
for playerPrefix, playerName in Table.iter.pairsByPrefix(playersData, 'p') do
insertIntoPlayers{
pageName = playerName,
displayName = playersData[playerPrefix .. 'dn'],
flag = playersData[playerPrefix .. 'flag'],
}
end

---@param playerData table|string|nil
---@return standardPlayer?
local getStandardPlayer = function(playerData)
if not playerData then return end
playerData = type(playerData) == 'string' and {playerData} or playerData
local player = {
displayName = Logic.emptyOr(playerData.displayName, playerData.displayname, playerData[1] or playerData.name),
pageName = Logic.emptyOr(playerData.pageName, playerData.pagename, playerData.link),
flag = playerData.flag,
}
if Logic.isEmpty(player.displayName) then return end
player = PlayerExt.populatePlayer(player)
player.pageName = options.applyUnderScores and player.pageName:gsub(' ', '_') or player.pageName
return player
end

local substitutions, parseFailure = Json.parseStringified(opponent.substitutes)
if parseFailure then
substitutions = {}
end

--handle `substitutes` input for opponenets
Array.forEach(substitutions, function(substitution)
if type(substitution) ~= 'table' or not substitution['in'] then return end
local substitute = getStandardPlayer(substitution['in'])

local subbedGames = substitution['games']

local player = getStandardPlayer(substitution['out'])
if player then
players[player.pageName] = subbedGames and players[player.pageName] or nil
end

opponent.extradata = Table.merge({substitutions = {}}, opponent.extradata or {})
table.insert(opponent.extradata.substitutions, {
substitute = substitute,
player = player,
games = subbedGames and Array.map(mw.text.split(subbedGames, ';'), String.trim) or nil,
reason = substitution['reason'],
})

insertIntoPlayers(substitute)
end)

opponent.match2players = Array.extractValues(players)
Array.sortInPlaceBy(opponent.match2players, function (player)
return player.index
end)

return match
end

---reads the caster input of a match
---@param match table
---@param options {noSort: boolean?}?
Expand Down
2 changes: 1 addition & 1 deletion components/match2/wikis/ageofempires/match_group_input_custom.lua
View file
Original file line number Diff line number Diff line change
Expand Up @@ -118,7 +118,7 @@ function CustomMatchGroupInput.readOpponent(match, opponentIndex, options)
substitutions = manualPlayersInput.substitutions
-- Change compared to commons MatchGroupInputUtil.readOpponent
local template = mw.ext.TeamTemplate.raw(opponent.template or '') or {}
opponent.players = MatchGroupInputUtil.readPlayersOfTeamNew(
opponent.players = MatchGroupInputUtil.readPlayersOfTeam(
template.page or '',
manualPlayersInput,
options,
Expand Down

0 comments on commit 2febef7

Please sign in to comment.