Skip to content

Commit

Permalink
links needs to be before stream parsing
Browse files Browse the repository at this point in the history
  • Loading branch information
Rathoz committed Oct 15, 2024
1 parent 76a07b2 commit 7c56add
Show file tree
Hide file tree
Showing 27 changed files with 27 additions and 27 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,7 @@ function StarcraftMatchGroupInput.processMatch(match, options)
local opponents = MatchFunctions.readOpponents(match)

local games = MatchFunctions.extractMaps(match, opponents)
match.links = MatchGroupInputUtil.getLinks(match)

local autoScoreFunction = MatchGroupInputUtil.canUseAutoScore(match, games)
and MatchFunctions.calculateMatchScore(games, opponents)
Expand Down Expand Up @@ -90,7 +91,6 @@ function StarcraftMatchGroupInput.processMatch(match, options)

match.stream = Streams.processStreams(match)
match.vod = Logic.nilIfEmpty(match.vod)
match.links = MatchGroupInputUtil.getLinks(match)

match.games = games
match.opponents = opponents
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -46,9 +46,9 @@ local MapFunctions = {}
function StarcraftFfaMatchGroupInput.processMatch(match, options)
Table.mergeInto(match, BaseMatchFunctions.readDate(match.date))

match.links = MatchGroupInputUtil.getLinks(match)
match.stream = Streams.processStreams(match)
match.vod = Logic.nilIfEmpty(match.vod)
match.links = MatchGroupInputUtil.getLinks(match)

Table.mergeInto(match, MatchGroupInputUtil.getTournamentContext(match))

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,7 @@ function CustomMatchGroupInput.processMatch(match, options)
end)

local games = CustomMatchGroupInput.extractMaps(match, opponents)
match.links = MatchGroupInputUtil.getLinks(match)

local autoScoreFunction = MatchGroupInputUtil.canUseAutoScore(match, games)
and CustomMatchGroupInput.calculateMatchScore(games)
Expand Down Expand Up @@ -74,7 +75,6 @@ function CustomMatchGroupInput.processMatch(match, options)

match.mode = Opponent.toLegacyMode(opponents[1].type, opponents[2].type)
match.stream = Streams.processStreams(match)
match.links = MatchGroupInputUtil.getLinks(match)

match.games = games
match.opponents = opponents
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,7 @@ function CustomMatchGroupInput.processMatch(match, options)
end)

local games = MatchFunctions.extractMaps(match, #opponents)
match.links = MatchGroupInputUtil.getLinks(match)

match.bestof = MatchFunctions.getBestOf(match.bestof)

Expand Down Expand Up @@ -70,7 +71,6 @@ function CustomMatchGroupInput.processMatch(match, options)
Table.mergeInto(match, MatchGroupInputUtil.getTournamentContext(match))

match.stream = Streams.processStreams(match)
match.links = MatchGroupInputUtil.getLinks(match)

match.games = games
match.opponents = opponents
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,7 @@ function CustomMatchGroupInput.processMatch(match, options)
local games = MatchFunctions.extractMaps(match, #opponents)
match.bestof = MatchGroupInputUtil.getBestOf(nil, games)
games = MatchFunctions.removeUnsetMaps(games)
match.links = MatchGroupInputUtil.getLinks(match)

local autoScoreFunction = MatchGroupInputUtil.canUseAutoScore(match, games)
and MatchFunctions.calculateMatchScore(games)
Expand Down Expand Up @@ -70,7 +71,6 @@ function CustomMatchGroupInput.processMatch(match, options)
Table.mergeInto(match, MatchGroupInputUtil.getTournamentContext(match))

match.stream = Streams.processStreams(match)
match.links = MatchGroupInputUtil.getLinks(match)

match.games = games
match.opponents = opponents
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,7 @@ function CustomMatchGroupInput.processMatch(match, options)
end)
local games = CustomMatchGroupInput.extractMaps(match, #opponents)
match.bestof = MatchFunctions.getBestOf(match)
match.links = MatchGroupInputUtil.getLinks(match)

local autoScoreFunction = MatchGroupInputUtil.canUseAutoScore(match, games)
and MatchFunctions.calculateMatchScore(games)
Expand Down Expand Up @@ -66,7 +67,6 @@ function CustomMatchGroupInput.processMatch(match, options)
Table.mergeInto(match, MatchGroupInputUtil.getTournamentContext(match))

match.stream = Streams.processStreams(match)
match.links = MatchGroupInputUtil.getLinks(match)

match.games = games
match.opponents = opponents
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,7 @@ function CustomMatchGroupInput.processMatch(match, options)
local games = MatchFunctions.extractMaps(match, #opponents)

match.bestof = MatchFunctions.getBestOf(match.bestof)
match.links = MatchGroupInputUtil.getLinks(match)

local autoScoreFunction = MatchGroupInputUtil.canUseAutoScore(match, games)
and MatchFunctions.calculateMatchScore(games)
Expand Down Expand Up @@ -75,7 +76,6 @@ function CustomMatchGroupInput.processMatch(match, options)
Table.mergeInto(match, MatchGroupInputUtil.getTournamentContext(match))

match.stream = Streams.processStreams(match)
match.links = MatchGroupInputUtil.getLinks(match)

match.vod = Logic.emptyOr(match.vod, Variables.varDefault('vod'))

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,7 @@ function CustomMatchGroupInput.processMatch(match, options)
end)

local games = MatchFunctions.extractMaps(match, opponents)
match.links = MatchGroupInputUtil.getLinks(match)

local autoScoreFunction = MatchGroupInputUtil.canUseAutoScore(match, games)
and MatchFunctions.calculateMatchScore(games, opponents)
Expand Down Expand Up @@ -75,7 +76,6 @@ function CustomMatchGroupInput.processMatch(match, options)
Table.mergeInto(match, MatchGroupInputUtil.getTournamentContext(match))

match.stream = Streams.processStreams(match)
match.links = MatchGroupInputUtil.getLinks(match)
match.vod = Logic.nilIfEmpty(match.vod)
match.extradata = MatchFunctions.getExtraData(match, #games)

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,7 @@ function CustomMatchGroupInput.processMatch(match, options)
local games = MatchFunctions.extractMaps(match, #opponents)
match.bestof = MatchGroupInputUtil.getBestOf(nil, games)
games = MatchFunctions.removeUnsetMaps(games)
match.links = MatchFunctions.getLinks(match, games)

local autoScoreFunction = MatchGroupInputUtil.canUseAutoScore(match, games)
and MatchFunctions.calculateMatchScore(games)
Expand Down Expand Up @@ -80,7 +81,6 @@ function CustomMatchGroupInput.processMatch(match, options)
Table.mergeInto(match, MatchGroupInputUtil.getTournamentContext(match))

match.stream = Streams.processStreams(match)
match.links = MatchFunctions.getLinks(match, games)

match.games = games
match.opponents = opponents
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,7 @@ function CustomMatchGroupInput.processMatch(match, options)
local games = MatchFunctions.extractMaps(match, #opponents)
match.bestof = MatchGroupInputUtil.getBestOf(nil, games)
games = MatchFunctions.removeUnsetMaps(games)
match.links = MatchGroupInputUtil.getLinks(match)

local autoScoreFunction = MatchGroupInputUtil.canUseAutoScore(match, games)
and MatchFunctions.calculateMatchScore(games)
Expand Down Expand Up @@ -74,7 +75,6 @@ function CustomMatchGroupInput.processMatch(match, options)
Table.mergeInto(match, MatchGroupInputUtil.getTournamentContext(match))

match.stream = Streams.processStreams(match)
match.links = MatchGroupInputUtil.getLinks(match)

match.vod = Logic.emptyOr(match.vod, Variables.varDefault('vod'))

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,7 @@ function CustomMatchGroupInput.processMatch(match, options)
local games = MatchFunctions.extractMaps(match, #opponents)

match.bestof = MatchFunctions.getBestOf(match.bestof)
match.links = MatchGroupInputUtil.getLinks(match)

local autoScoreFunction = MatchGroupInputUtil.canUseAutoScore(match, games)
and MatchFunctions.calculateMatchScore(games)
Expand Down Expand Up @@ -75,7 +76,6 @@ function CustomMatchGroupInput.processMatch(match, options)
Table.mergeInto(match, MatchGroupInputUtil.getTournamentContext(match))

match.stream = Streams.processStreams(match)
match.links = MatchGroupInputUtil.getLinks(match)

match.games = games
match.opponents = opponents
Expand Down
2 changes: 1 addition & 1 deletion components/match2/wikis/halo/match_group_input_custom.lua
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,7 @@ function CustomMatchGroupInput.processMatch(match, options)
end)

local games = MatchFunctions.extractMaps(match, #opponents)
match.links = MatchGroupInputUtil.getLinks(match)

match.bestof = MatchFunctions.getBestOf(match.bestof)

Expand Down Expand Up @@ -70,7 +71,6 @@ function CustomMatchGroupInput.processMatch(match, options)
Table.mergeInto(match, MatchGroupInputUtil.getTournamentContext(match))

match.stream = Streams.processStreams(match)
match.links = MatchGroupInputUtil.getLinks(match)

match.games = games
match.opponents = opponents
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,7 @@ function CustomMatchGroupInput.processMatch(match, options)
end)
local games = CustomMatchGroupInput.extractMaps(match, #opponents)
match.bestof = MatchFunctions.getBestOf(match)
match.links = MatchGroupInputUtil.getLinks(match)

local autoScoreFunction = MatchGroupInputUtil.canUseAutoScore(match, games)
and MatchFunctions.calculateMatchScore(games)
Expand Down Expand Up @@ -74,7 +75,6 @@ function CustomMatchGroupInput.processMatch(match, options)
Table.mergeInto(match, MatchGroupInputUtil.getTournamentContext(match))

match.stream = Streams.processStreams(match)
match.links = MatchGroupInputUtil.getLinks(match)

match.games = games
match.opponents = opponents
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,7 @@ function CustomMatchGroupInput.processMatch(match, options)
end)
local games = CustomMatchGroupInput.extractMaps(match, #opponents)
match.bestof = MatchFunctions.getBestOf(match)
match.links = MatchGroupInputUtil.getLinks(match)

local autoScoreFunction = MatchGroupInputUtil.canUseAutoScore(match, games)
and MatchFunctions.calculateMatchScore(games)
Expand Down Expand Up @@ -81,7 +82,6 @@ function CustomMatchGroupInput.processMatch(match, options)
Table.mergeInto(match, MatchGroupInputUtil.getTournamentContext(match))

match.stream = Streams.processStreams(match)
match.links = MatchGroupInputUtil.getLinks(match)

match.games = games
match.opponents = opponents
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -80,6 +80,7 @@ function CustomMatchGroupInput.processMatchWithoutStandalone(MatchParser, match)
end)
local games = MatchFunctions.extractMaps(MatchParser, match, opponents)
match.bestof = MatchGroupInputUtil.getBestOf(match.bestof, games)
match.links = MatchGroupInputUtil.getLinks(match)

local autoScoreFunction = MatchGroupInputUtil.canUseAutoScore(match, games)
and MatchFunctions.calculateMatchScore(games)
Expand Down Expand Up @@ -109,7 +110,6 @@ function CustomMatchGroupInput.processMatchWithoutStandalone(MatchParser, match)
Table.mergeInto(match, MatchGroupInputUtil.getTournamentContext(match))

match.stream = Streams.processStreams(match)
match.links = MatchGroupInputUtil.getLinks(match)

match.games = games
match.opponents = opponents
Expand Down
2 changes: 1 addition & 1 deletion components/match2/wikis/osu/match_group_input_custom.lua
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,7 @@ function CustomMatchGroupInput.processMatch(match, options)
end)

local games = MatchFunctions.extractMaps(match, #opponents)
match.links = MatchGroupInputUtil.getLinks(match)

match.bestof = MatchFunctions.getBestOf(match.bestof)

Expand Down Expand Up @@ -71,7 +72,6 @@ function CustomMatchGroupInput.processMatch(match, options)
Table.mergeInto(match, MatchGroupInputUtil.getTournamentContext(match))

match.stream = Streams.processStreams(match)
match.links = MatchGroupInputUtil.getLinks(match)

match.games = games
match.opponents = opponents
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,7 @@ function CustomMatchGroupInput.processMatch(match, options)
end)
local games = CustomMatchGroupInput.extractMaps(match, #opponents)
match.bestof = MatchFunctions.getBestOf(match)
match.links = MatchGroupInputUtil.getLinks(match)

local autoScoreFunction = MatchGroupInputUtil.canUseAutoScore(match, games)
and MatchFunctions.calculateMatchScore(games)
Expand Down Expand Up @@ -66,7 +67,6 @@ function CustomMatchGroupInput.processMatch(match, options)
Table.mergeInto(match, MatchGroupInputUtil.getTournamentContext(match))

match.stream = Streams.processStreams(match)
match.links = MatchGroupInputUtil.getLinks(match)

match.games = games
match.opponents = opponents
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,7 @@ function CustomMatchGroupInput.processMatch(match, options)
local games = MatchFunctions.extractMaps(match, #opponents)
match.bestof = MatchGroupInputUtil.getBestOf(nil, games)
games = MatchFunctions.removeUnsetMaps(games)
match.links = MatchGroupInputUtil.getLinks(match)

local autoScoreFunction = MatchGroupInputUtil.canUseAutoScore(match, games)
and MatchFunctions.calculateMatchScore(games)
Expand Down Expand Up @@ -71,7 +72,6 @@ function CustomMatchGroupInput.processMatch(match, options)
Table.mergeInto(match, MatchGroupInputUtil.getTournamentContext(match))

match.stream = Streams.processStreams(match)
match.links = MatchGroupInputUtil.getLinks(match)

match.games = games
match.opponents = opponents
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,7 @@ function CustomMatchGroupInput.processMatch(match, options)
return MatchGroupInputUtil.readOpponent(match, opponentIndex, {})
end)
local games = CustomMatchGroupInput.extractMaps(match, #opponents)
match.links = MatchGroupInputUtil.getLinks(match)

Array.forEach(opponents, function(opponent, opponentIndex)
opponent.extradata = CustomMatchGroupInput.getOpponentExtradata(opponent)
Expand Down Expand Up @@ -73,7 +74,6 @@ function CustomMatchGroupInput.processMatch(match, options)
Table.mergeInto(match, MatchGroupInputUtil.getTournamentContext(match))

match.stream = Streams.processStreams(match)
match.links = MatchGroupInputUtil.getLinks(match)

match.games = games
match.opponents = opponents
Expand Down
2 changes: 1 addition & 1 deletion components/match2/wikis/smite/match_group_input_custom.lua
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,7 @@ function CustomMatchGroupInput.processMatch(match, options)

local games = MatchFunctions.extractMaps(match, #opponents)
match.bestof = MatchFunctions.getBestOf(match.bestof)
match.links = MatchGroupInputUtil.getLinks(match)

local autoScoreFunction = MatchGroupInputUtil.canUseAutoScore(match, games)
and MatchFunctions.calculateMatchScore(games)
Expand Down Expand Up @@ -77,7 +78,6 @@ function CustomMatchGroupInput.processMatch(match, options)
Table.mergeInto(match, MatchGroupInputUtil.getTournamentContext(match))

match.stream = Streams.processStreams(match)
match.links = MatchGroupInputUtil.getLinks(match)

match.games = games
match.opponents = opponents
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,7 @@ function CustomMatchGroupInput.processMatch(match, options)
end)

local games = MatchFunctions.extractMaps(match, #opponents)
match.links = MatchGroupInputUtil.getLinks(match)

match.bestof = MatchFunctions.getBestOf(match.bestof)

Expand Down Expand Up @@ -70,7 +71,6 @@ function CustomMatchGroupInput.processMatch(match, options)
Table.mergeInto(match, MatchGroupInputUtil.getTournamentContext(match))

match.stream = Streams.processStreams(match)
match.links = MatchGroupInputUtil.getLinks(match)

match.games = games
match.opponents = opponents
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,7 @@ function CustomMatchGroupInput.processMatch(match, options)
end)
local games = CustomMatchGroupInput.extractMaps(match, #opponents)
match.bestof = MatchGroupInputUtil.getBestOf(match.bestof, games)
match.links = MatchFunctions.getLinks(match, games)

local autoScoreFunction = MatchGroupInputUtil.canUseAutoScore(match, games)
and MatchFunctions.calculateMatchScore(games)
Expand Down Expand Up @@ -67,7 +68,6 @@ function CustomMatchGroupInput.processMatch(match, options)
Table.mergeInto(match, MatchGroupInputUtil.getTournamentContext(match))

match.stream = Streams.processStreams(match)
match.links = MatchFunctions.getLinks(match, games)
match.games = games
match.opponents = opponents

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,7 @@ function CustomMatchGroupInput.processMatch(match, options)
local games = CustomMatchGroupInput.extractMaps(match, opponents)
match.bestof = MatchGroupInputUtil.getBestOf(nil, games)
games = MatchFunctions.removeUnsetMaps(games)
match.links = MatchGroupInputUtil.getLinks(match)

local autoScoreFunction = MatchGroupInputUtil.canUseAutoScore(match, games)
and MatchFunctions.calculateMatchScore(games)
Expand Down Expand Up @@ -70,7 +71,6 @@ function CustomMatchGroupInput.processMatch(match, options)
Table.mergeInto(match, MatchGroupInputUtil.getTournamentContext(match))

match.stream = Streams.processStreams(match)
match.links = MatchGroupInputUtil.getLinks(match)

match.games = games
match.opponents = opponents
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -70,6 +70,7 @@ function CustomMatchGroupInput.processMatch(match, options)
end)

local games = MatchFunctions.extractMaps(match, opponents)
match.links = MatchGroupInputUtil.getLinks(match)

local autoScoreFunction = MatchGroupInputUtil.canUseAutoScore(match, games)
and MatchFunctions.calculateMatchScore(games, opponents)
Expand Down Expand Up @@ -109,7 +110,6 @@ function CustomMatchGroupInput.processMatch(match, options)

match.stream = Streams.processStreams(match)
match.vod = Logic.nilIfEmpty(match.vod)
match.links = MatchGroupInputUtil.getLinks(match)
match.extradata = MatchFunctions.getExtraData(match, #games)

match.games = games
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,7 @@ function CustomMatchGroupInput.processMatch(match, options)
end)
local games = CustomMatchGroupInput.extractMaps(match, #opponents)
match.bestof = MatchFunctions.getBestOf(match)
match.links = MatchGroupInputUtil.getLinks(match)

local autoScoreFunction = MatchGroupInputUtil.canUseAutoScore(match, games)
and MatchFunctions.calculateMatchScore(games)
Expand Down Expand Up @@ -79,7 +80,6 @@ function CustomMatchGroupInput.processMatch(match, options)
Table.mergeInto(match, MatchGroupInputUtil.getTournamentContext(match))

match.stream = Streams.processStreams(match)
match.links = MatchGroupInputUtil.getLinks(match)

match.games = games
match.opponents = opponents
Expand Down
Loading

0 comments on commit 7c56add

Please sign in to comment.