feat(infobox): move publisherpremier to base league infobox (#4852)

* fix(league): move publisherpremier to base * add this line to make "true" stored in the LPDB Fields Otherwise things like TournamentsList does not applied the highlights because it cant see the stored entry * Line adjustments * customs * adjust test cases * unused imports * add the missing comma * unused * unused also * trying parsed data the storage and highlight still showing fine * Update infobox_league.lua Still working fine --------- Co-authored-by: hjpalpha <[email protected]> Co-authored-by: hjpalpha <[email protected]>
Liquipedia · Oct 18, 2024 · 6bb9a37 · 6bb9a37
1 parent 481a756
commit 6bb9a37
Show file tree

Hide file tree

Showing 15 changed files with 6 additions and 112 deletions.
diff --git a/components/infobox/commons/infobox_league.lua b/components/infobox/commons/infobox_league.lua
@@ -275,6 +275,7 @@ function League:_parseArgs()
 		mode = args.mode,
 		patch = args.patch,
 		endPatch = args.endpatch or args.epatch or args.patch,
+		publishertier = Logic.readBool(args.publisherpremier),
 	}
 
 	data.liquipediatier, data.liquipediatiertype =
@@ -416,7 +417,7 @@ end
 ---@param args table
 ---@return boolean
 function League:liquipediaTierHighlighted(args)
-	return false
+	return self.data.publishertier
 end
 
 --- Allows for overriding this functionality
@@ -450,7 +451,7 @@ function League:_definePageVariables(args)
 
 	Variables.varDefine('tournament_liquipediatier', self.data.liquipediatier)
 	Variables.varDefine('tournament_liquipediatiertype', self.data.liquipediatiertype)
-	Variables.varDefine('tournament_publishertier', self.data.publishertier)
+	Variables.varDefine('tournament_publishertier', tostring(self.data.publishertier))
 
 	Variables.varDefine('tournament_type', args.type)
 	Variables.varDefine('tournament_mode', self.data.mode)
@@ -521,7 +522,7 @@ function League:_setLpdbData(args, links)
 		prizepool = self.data.prizepoolUsd,
 		liquipediatier = self.data.liquipediatier,
 		liquipediatiertype = self.data.liquipediatiertype,
-		publishertier = self.data.publishertier,
+		publishertier = tostring(self.data.publishertier),
 		participantsnumber = tonumber(args.participants_number)
 			or tonumber(args.team_number)
 			or tonumber(args.player_number)

diff --git a/components/infobox/wikis/clashroyale/infobox_league_custom.lua b/components/infobox/wikis/clashroyale/infobox_league_custom.lua
@@ -58,7 +58,6 @@ end
 ---@param args table
 function CustomLeague:customParseArguments(args)
 	self.data.mode = args.player_number and 'solo' or 'team'
-	self.data.publishertier = args.publisherpremier
 end
 
 return CustomLeague
diff --git a/components/infobox/wikis/easportsfc/infobox_league_custom.lua b/components/infobox/wikis/easportsfc/infobox_league_custom.lua
@@ -8,7 +8,6 @@
 
 local Array = require('Module:Array')
 local Class = require('Module:Class')
-local Logic = require('Module:Logic')
 local Game = require('Module:Game')
 local Lua = require('Module:Lua')
 local Variables = require('Module:Variables')
@@ -71,17 +70,6 @@ function CustomInjector:parse(id, widgets)
 	return widgets
 end
 
----@param args table
----@return boolean
-function CustomLeague:liquipediaTierHighlighted(args)
-	return Logic.readBool(args.publisherpremier)
-end
-
----@param args table
-function CustomLeague:customParseArguments(args)
-	self.data.publishertier = Logic.readBool(args.publisherpremier) and 'true' or nil
-end
-
 ---@param args table
 function CustomLeague:defineCustomPageVariables(args)
 	--Legacy vars

diff --git a/components/infobox/wikis/honorofkings/infobox_league_custom.lua b/components/infobox/wikis/honorofkings/infobox_league_custom.lua
@@ -9,7 +9,6 @@
 local Class = require('Module:Class')
 local Game = require('Module:Game')
 local Lua = require('Module:Lua')
-local Logic = require('Module:Logic')
 local String = require('Module:StringUtils')
 local Variables = require('Module:Variables')
 
@@ -60,12 +59,6 @@ function CustomInjector:parse(id, widgets)
 	return widgets
 end
 
----@param args table
----@return boolean
-function CustomLeague:liquipediaTierHighlighted(args)
-	return Logic.readBool(args.publisherpremier)
-end
-
 ---@param lpdbData table
 ---@param args table
 ---@return table
@@ -75,11 +68,6 @@ function CustomLeague:addToLpdb(lpdbData, args)
 	return lpdbData
 end
 
----@param args table
-function CustomLeague:customParseArguments(args)
-	self.data.publishertier = Logic.readBool(args.publisherpremier) and 'true' or nil
-end
-
 ---@param args table
 function CustomLeague:defineCustomPageVariables(args)
 	--Legacy Vars:

diff --git a/components/infobox/wikis/omegastrikers/infobox_league_custom.lua b/components/infobox/wikis/omegastrikers/infobox_league_custom.lua
@@ -8,7 +8,6 @@
 
 local Class = require('Module:Class')
 local Lua = require('Module:Lua')
-local Logic = require('Module:Logic')
 
 local Injector = Lua.import('Module:Widget/Injector')
 local League = Lua.import('Module:Infobox/League')
@@ -44,15 +43,4 @@ function CustomInjector:parse(id, widgets)
 	return widgets
 end
 
----@param args table
----@return boolean
-function CustomLeague:liquipediaTierHighlighted(args)
-	return Logic.readBool(args.publisherpremier)
-end
-
----@param args table
-function CustomLeague:customParseArguments(args)
-	self.data.publishertier = tostring(Logic.readBool(args.publisherpremier))
-end
-
 return CustomLeague
diff --git a/components/infobox/wikis/osu/infobox_league_custom.lua b/components/infobox/wikis/osu/infobox_league_custom.lua
@@ -9,7 +9,6 @@
 local Class = require('Module:Class')
 local Game = require('Module:Game')
 local Lua = require('Module:Lua')
-local Logic = require('Module:Logic')
 local String = require('Module:StringUtils')
 local Variables = require('Module:Variables')
 
@@ -92,17 +91,6 @@ function CustomLeague:defineCustomPageVariables(args)
 	Variables.varDefine('tournament_game', Game.name{game = args.game})
 end
 
----@param args table
-function CustomLeague:customParseArguments(args)
-	self.data.publishertier = args.publisherpremier
-end
-
----@param args table
----@return boolean
-function CustomLeague:liquipediaTierHighlighted(args)
-	return Logic.readBool(args.publisherpremier)
-end
-
 ---@param args table
 ---@return table
 function CustomLeague:getWikiCategories(args)

diff --git a/components/infobox/wikis/smite/infobox_league_custom.lua b/components/infobox/wikis/smite/infobox_league_custom.lua
@@ -9,7 +9,6 @@
 local Class = require('Module:Class')
 local Game = require('Module:Game')
 local Lua = require('Module:Lua')
-local Logic = require('Module:Logic')
 
 local Injector = Lua.import('Module:Widget/Injector')
 local League = Lua.import('Module:Infobox/League')
@@ -49,15 +48,4 @@ function CustomInjector:parse(id, widgets)
 	return widgets
 end
 
----@param args table
----@return boolean
-function CustomLeague:liquipediaTierHighlighted(args)
-	return Logic.readBool(args.publisherpremier)
-end
-
----@param args table
-function CustomLeague:customParseArguments(args)
-	self.data.publishertier = tostring(Logic.readBool(args.publisherpremier))
-end
-
 return CustomLeague
diff --git a/components/infobox/wikis/splatoon/infobox_league_custom.lua b/components/infobox/wikis/splatoon/infobox_league_custom.lua
@@ -10,7 +10,6 @@ local Array = require('Module:Array')
 local Class = require('Module:Class')
 local Game = require('Module:Game')
 local Lua = require('Module:Lua')
-local Logic = require('Module:Logic')
 local String = require('Module:StringUtils')
 
 local Injector = Lua.import('Module:Widget/Injector')
@@ -52,12 +51,6 @@ function CustomInjector:parse(id, widgets)
 	return widgets
 end
 
----@param args table
----@return boolean
-function CustomLeague:liquipediaTierHighlighted(args)
-	return Logic.readBool(args.publisherpremier)
-end
-
 ---@param lpdbData table
 ---@param args table
 ---@return table
@@ -67,9 +60,4 @@ function CustomLeague:addToLpdb(lpdbData, args)
 	return lpdbData
 end
 
----@param args table
-function CustomLeague:customParseArguments(args)
-	self.data.publishertier = Logic.readBool(args.publisherpremier) and 'true' or nil
-end
-
 return CustomLeague
diff --git a/components/infobox/wikis/tetris/infobox_league_custom.lua b/components/infobox/wikis/tetris/infobox_league_custom.lua
@@ -9,7 +9,6 @@
 local Array = require('Module:Array')
 local Class = require('Module:Class')
 local Game = require('Module:Game')
-local Logic = require('Module:Logic')
 local Lua = require('Module:Lua')
 local String = require('Module:StringUtils')
 local Table = require('Module:Table')
@@ -86,13 +85,6 @@ end
 ---@param args table
 function CustomLeague:customParseArguments(args)
 	self.data.mode = args.team_number and 'team' or 'individual'
-	self.data.publishertier = args.publisherpremier
-end
-
----@param args table
----@return boolean
-function CustomLeague:liquipediaTierHighlighted(args)
-	return Logic.readBool(args.publisherpremier)
 end
 
 return CustomLeague
diff --git a/components/infobox/wikis/worldoftanks/infobox_league_custom.lua b/components/infobox/wikis/worldoftanks/infobox_league_custom.lua
@@ -35,11 +35,6 @@ function CustomLeague.run(frame)
 	return league:createInfobox()
 end
 
----@param args table
-function CustomLeague:customParseArguments(args)
-	self.data.publishertier = tostring(Logic.readBool(args.publisherpremier))
-end
-
 ---@param id string
 ---@param widgets Widget[]
 ---@return Widget[]
@@ -77,12 +72,6 @@ function CustomLeague:addToLpdb(lpdbData, args)
 	return lpdbData
 end
 
----@param args table
----@return boolean
-function CustomLeague:liquipediaTierHighlighted(args)
-	return Logic.readBool(args.publisherpremier)
-end
-
 ---@return string?
 function CustomLeague:_createPatchCell()
 	local data = self.data

diff --git a/components/infobox/wikis/zula/infobox_league_custom.lua b/components/infobox/wikis/zula/infobox_league_custom.lua
@@ -9,7 +9,6 @@
 local Class = require('Module:Class')
 local Game = require('Module:Game')
 local Lua = require('Module:Lua')
-local Logic = require('Module:Logic')
 
 local Injector = Lua.import('Module:Widget/Injector')
 local League = Lua.import('Module:Infobox/League')
@@ -49,15 +48,4 @@ function CustomInjector:parse(id, widgets)
 	return widgets
 end
 
----@param args table
----@return boolean
-function CustomLeague:liquipediaTierHighlighted(args)
-	return Logic.readBool(args.publisherpremier)
-end
-
----@param args table
-function CustomLeague:customParseArguments(args)
-	self.data.publishertier = tostring(Logic.readBool(args.publisherpremier))
-end
-
 return CustomLeague
diff --git a/components/prize_pool/wikis/mobilelegends/prize_pool_custom.lua b/components/prize_pool/wikis/mobilelegends/prize_pool_custom.lua
@@ -44,8 +44,6 @@ function CustomLpdbInjector:adjust(lpdbData, placement, opponent)
 		placement.placeStart
 	)
 
-	lpdbData.extradata.publisherpremier = Variables.varDefault('tournament_publisher_major') and 'true' or ''
-
 	local team = lpdbData.participant or ''
 	local lpdbPrefix = placement.parent.options.lpdbPrefix
 

diff --git a/components/prize_pool/wikis/pokemon/prize_pool_custom.lua b/components/prize_pool/wikis/pokemon/prize_pool_custom.lua
@@ -47,8 +47,6 @@ function CustomLpdbInjector:adjust(lpdbData, placement, opponent)
 		placement.placeStart
 	)
 
-	lpdbData.extradata.publisherpremier = Variables.varDefault('tournament_publisher_major') and 'true' or ''
-
 	local lastVs = ((opponent or {}).additionalData or {}).LASTVS or {}
 	if lastVs.type == Opponent.solo then
 		local playerData = (lastVs.players or {})[1] or {}

diff --git a/spec/prize_pool_spec.lua b/spec/prize_pool_spec.lua
@@ -121,6 +121,7 @@ describe('prize pool', function()
 				players = '{"p1":"Rathoz","p1dn":"Rathoz","p1flag":"Sweden"}', -- Legacy
 				prizemoney = 970.97276906869001323,
 				prizepoolindex = 1,
+				publishertier = 'false',
 				series = 'Test Series',
 				shortname = 'Test Tourney',
 				startdate = '2022-10-13',

diff --git a/spec/team_card_storage_spec.lua b/spec/team_card_storage_spec.lua
@@ -25,7 +25,7 @@ describe('Team Card Storage', function()
 			imagedark = args.imagedark1,
 			mode = 'team',
 			participant = 'Team Liquid',
-			publishertier = nil,
+			publishertier = 'false',
 			icon = tournamentData.icon,
 			icondark = tournamentData.icondark,
 			game = string.lower(tournamentData.game),