LPA-6687: Pagenames should be stored with _ and not spaces

components/infobox/wikis/starcraft/infobox_person_player_custom.lua

@@ -187,9 +187,11 @@ end
 
 function CustomPlayer._getMatchupData()
 	local yearsActive
-	local player = string.gsub(_player.pagename, '_', ' ')
+	local playerWithoutUnderscore = string.gsub(_player.pagename, '_', ' ')
+	local player = _player.pagename
 	local queryParameters = {
-		conditions = '[[opponent::' .. player .. ']] AND [[walkover::]] AND [[winner::>]]',
+		conditions = '([[opponent::' .. player .. ']] OR [[opponent::' .. playerWithoutUnderscore .. ']])' ..
+			'AND [[walkover::]] AND [[winner::>]]',
 		query = 'match2opponents, date',
 	}
 
@@ -205,7 +207,7 @@ function CustomPlayer._getMatchupData()
 	local foundData = false
 	local processMatch = function(match)
 		foundData = true
-		vs = CustomPlayer._addScoresToVS(vs, match.match2opponents, player)
+		vs = CustomPlayer._addScoresToVS(vs, match.match2opponents, player, playerWithoutUnderscore)
 		local year = string.sub(match.date, 1, 4)
 		years[tonumber(year)] = year
 	end
@@ -278,12 +280,12 @@ function CustomPlayer._setVarsForVS(table)
 	end
 end
 
-function CustomPlayer._addScoresToVS(vs, opponents, player)
+function CustomPlayer._addScoresToVS(vs, opponents, player, playerWithoutUnderscore)
 	local plIndex = 1
 	local vsIndex = 2
 	-- catch matches vs empty opponents
 	if opponents[1] and opponents[2] then
-		if opponents[2].name == player then
+		if opponents[2].name == player or opponents[2].name == playerWithoutUnderscore then
 			plIndex = 2
 			vsIndex = 1
 		end

components/infobox/wikis/starcraft2/infobox_person_player_custom.lua

@@ -199,9 +199,10 @@ end
 
 function CustomPlayer._getMatchupData(player)
 	local yearsActive
-	player = string.gsub(player, '_', ' ')
+	local playerWithoutUnderscore = string.gsub(player, '_', ' ')
 	local queryParameters = {
-		conditions = '[[opponent::' .. player .. ']] AND [[walkover::]] AND [[winner::>]]',
+		conditions = '([[opponent::' .. player .. ']] OR [[opponent::' .. playerWithoutUnderscore .. ']])' ..
+			'AND [[walkover::]] AND [[winner::>]]',
 		order = 'date desc',
 		query = table.concat({
 				'match2opponents',
@@ -235,7 +236,7 @@ function CustomPlayer._getMatchupData(player)
 	local foundData = false
 	local processMatch = function(match)
 		foundData = true
-		vs = CustomPlayer._addScoresToVS(vs, match.match2opponents, player)
+		vs = CustomPlayer._addScoresToVS(vs, match.match2opponents, player, playerWithoutUnderscore)
 		local year = string.sub(match.date, 1, 4)
 		years[tonumber(year)] = year
 		if #_player.recentMatches <= NUMBER_OF_RECENT_MATCHES then
@@ -311,12 +312,12 @@ function CustomPlayer._setVarsForVS(table)
 	end
 end
 
-function CustomPlayer._addScoresToVS(vs, opponents, player)
+function CustomPlayer._addScoresToVS(vs, opponents, player, playerWithoutUnderscore)
 	local plIndex = 1
 	local vsIndex = 2
 	--catch matches vs empty opponents
 	if opponents[1] and opponents[2] then
-		if opponents[2].name == player then
+		if opponents[2].name == player or opponents[2].name == playerWithoutUnderscore then
 			plIndex = 2
 			vsIndex = 1
 		end

components/match2/commons/match_group_input.lua

@@ -368,7 +368,7 @@ function MatchGroupInput.mergeRecordWithOpponent(record, opponent)
 				return {
 					displayname = player.displayName,
 					flag = player.flag,
-					name = player.pageName,
+					name = player.pageName and player.pageName:gsub(' ', '_') or nil,
 				}
 			end)
 	end

components/match2/commons/match_ticker/match_ticker_query.lua

@@ -142,12 +142,17 @@ end
 
 function BaseConditions:participantConditions(queryArgs)
 	if String.isNotEmpty(queryArgs.team) then
-		return {ConditionNode(ColumnName('opponent'), Comparator.eq, queryArgs.team)}
+		return ConditionTree(BooleanOperator.any):add{
+			ConditionNode(ColumnName('opponent'), Comparator.eq, queryArgs.team),
+			ConditionNode(ColumnName('opponent'), Comparator.eq, queryArgs.team:gsub(' ', '_')),
+		}
 	elseif String.isNotEmpty(queryArgs.player) then
-		return ConditionTree(BooleanOperator.any):add({
+		return ConditionTree(BooleanOperator.any):add{
 			ConditionNode(ColumnName('player'), Comparator.eq, queryArgs.player),
 			ConditionNode(ColumnName('opponent'), Comparator.eq, queryArgs.player),
-		})
+			ConditionNode(ColumnName('player'), Comparator.eq, queryArgs.player:gsub(' ', '_')),
+			ConditionNode(ColumnName('opponent'), Comparator.eq, queryArgs.player:gsub(' ', '_')),
+		}
 	end
 end
 

components/match2/commons/player_ext.lua

@@ -188,7 +188,10 @@ function PlayerExt.populatePageName(player)
 		or globalVars:get(player.displayName .. '_page')
 		or player.displayName and mw.ext.TeamLiquidIntegration.resolve_redirect(player.displayName)
 
-	player.pageIsResolved = player.pageName and true or nil
+	if player.pageName then
+		player.pageIsResolved = true
+		player.pageName = player.pageName:gsub(' ', '_')
+	end
 end
 
 --[[

components/match2/commons/starcraft_starcraft2/match_group_input_starcraft.lua

@@ -523,7 +523,7 @@ function StarcraftMatchGroupInput.ProcessSoloOpponentInput(opponent)
 		opponent[1] or ''
 	)
 	local link = Logic.emptyOr(opponent.link, Variables.varDefault(name .. '_page'), name)
-	link = mw.ext.TeamLiquidIntegration.resolve_redirect(link)
+	link = mw.ext.TeamLiquidIntegration.resolve_redirect(link):gsub(' ', '_')
 	local race = Logic.emptyOr(opponent.race, Variables.varDefault(name .. '_race'), '')
 	local players = {}
 	local flag = Logic.emptyOr(opponent.flag, Variables.varDefault(name .. '_flag'))
@@ -550,12 +550,12 @@ function StarcraftMatchGroupInput.ProcessDuoOpponentInput(opponent)
 			opponent.p1link,
 			Variables.varDefault(opponent.p1 .. '_page'),
 			opponent.p1
-		))
+		)):gsub(' ', '_')
 	opponent.link2 = mw.ext.TeamLiquidIntegration.resolve_redirect(Logic.emptyOr(
 			opponent.p2link,
 			Variables.varDefault(opponent.p2 .. '_page'),
 			opponent.p2
-		))
+		)):gsub(' ', '_')
 	if Logic.readBool(opponent.extradata.isarchon) then
 		opponent.p1race = Faction.read(opponent.race) or Faction.defaultFaction
 		opponent.p2race = opponent.p1race
@@ -605,7 +605,7 @@ function StarcraftMatchGroupInput.ProcessOpponentInput(opponent, playernumber)
 				opponent['p' .. playerIndex .. 'link'],
 				Variables.varDefault(playerName .. '_page'),
 				playerName
-			))
+			)):gsub(' ', '_')
 		local race = Logic.emptyOr(
 			opponent['p' .. playerIndex .. 'race'],
 			Variables.varDefault(playerName .. '_race'),
@@ -667,7 +667,7 @@ function StarcraftMatchGroupInput._getManuallyEnteredPlayers(playerData)
 				playerData['p' .. playerIndex .. 'link'],
 				playerData['p' .. playerIndex],
 				''
-			))
+			)):gsub(' ', '_')
 		if String.isNotEmpty(name) then
 			players[playerIndex] = {
 				name = name,
@@ -693,7 +693,7 @@ function StarcraftMatchGroupInput._getPlayersFromVariables(teamName)
 		if Logic.isNotEmpty(name) then
 			local flag = Variables.varDefault(teamName .. '_p' .. playerIndex .. 'flag')
 			players[playerIndex] = {
-				name = name,
+				name = name:gsub(' ', '_'),
 				displayname = Variables.varDefault(teamName .. '_p' .. playerIndex .. 'display'),
 				flag = Flags.CountryName(flag),
 				extradata = {faction = Variables.varDefault(teamName .. '_p' .. playerIndex .. 'race')}
@@ -719,7 +719,7 @@ function StarcraftMatchGroupInput.ProcessTeamOpponentInput(opponent, date)
 		end
 		opponent.template = 'default'
 		icon = defaultIcon
-		name = Logic.emptyOr(opponent.link, opponent.name, opponent[1] or '')
+		name = Logic.emptyOr(opponent.link, opponent.name, opponent[1] or ''):gsub(' ', '_')
 		opponent.extradata = opponent.extradata or {}
 		opponent.extradata.display = Logic.emptyOr(opponent.name, opponent[1], '')
 		opponent.extradata.short = Logic.emptyOr(opponent.short, opponent.name, opponent[1] or '')
@@ -742,7 +742,7 @@ function StarcraftMatchGroupInput.ProcessTeamOpponentInput(opponent, date)
 		icondark = iconDark,
 		template = opponent.template,
 		type = opponent.type,
-		name = name,
+		name = name:gsub(' ', '_'),
 		score = opponent.score,
 		extradata = opponent.extradata,
 		match2players = players
@@ -993,7 +993,7 @@ function StarcraftMatchGroupInput._processDefaultPlayerMapData(players, map, opp
 	for playerIndex = 1, #players do
 		local faction = map['t' .. opponentIndex .. 'p' .. playerIndex .. 'race']
 		participants[opponentIndex .. '_' .. playerIndex] = {
-			faction = Faction.read(faction) or players[playerIndex].extradata.faction or Faction.defaultFaction,
+			faction = Faction.read(faction or players[playerIndex].extradata.faction) or Faction.defaultFaction,
 			player = players[playerIndex].name
 		}
 	end
@@ -1033,7 +1033,7 @@ function StarcraftMatchGroupInput._processTeamPlayerMapData(players, map, oppone
 					map[playerKey .. 'link'] or
 					Variables.varDefault(map[playerKey] .. '_page') or
 					map[playerKey]
-				)
+				):gsub(' ', '_')
 				if Logic.readBool(map['opponent' .. opponentIndex .. 'archon']) then
 					playerData[mapPlayer] = {
 						faction = Faction.read(Logic.emptyOr(

components/opponent/commons/opponent.lua

@@ -273,7 +273,8 @@ function Opponent.toName(opponent)
 		return TeamTemplate.getPageName(opponent.template)
 	elseif Opponent.typeIsParty(opponent.type) then
 		local pageNames = Array.map(opponent.players, function(player)
-			return player.pageName or player.displayName
+				local pageName = player.pageName or player.displayName
+			return pageName and pageName:gsub(' ', '_') or nil
 		end)
 		return table.concat(pageNames, ' / ')
 	else -- opponent.type == Opponent.literal
@@ -379,7 +380,7 @@ function Opponent.toLpdbStruct(opponent)
 		for playerIndex, player in ipairs(opponent.players) do
 			local prefix = 'p' .. playerIndex
 
-			players[prefix] = player.pageName
+			players[prefix] = player.pageName and player.pageName:gsub(' ', '_') or nil
 			players[prefix .. 'dn'] = player.displayName
 			players[prefix .. 'flag'] = player.flag
 			players[prefix .. 'team'] = player.team and Opponent.toName({type = Opponent.team, template = player.team}) or nil