feat(tournaments-ticker): add new redesigned ticker with variants for AB testing

lua/spec/league_icon_spec.lua

@@ -1,7 +1,7 @@
 --- Triple Comment to Enable our LLS Plugin
 local LeagueIcon = require('Module:LeagueIcon')
 
-local FILLER_EXPECT = '<span class="league-icon-small-image">[[File:Logo filler event.png|link=]]</span>'
+local FILLER_EXPECT = '<span class="league-icon-small-image"><i class="fas fa-trophy"></i></span>'
 local ICON_DARK_EXPECT = '<span class="league-icon-small-image">[[File:DarkIcon.png|link=||50x50px]]</span>'
 
 local ICON_BOTH_EXPECT =

lua/wikis/apexlegends/MainPageLayout/data.lua

@@ -10,7 +10,7 @@ local Lua = require('Module:Lua')
 local MainPageLayoutUtil = Lua.import('Module:MainPageLayout/Util')
 
 local FilterButtonsWidget = Lua.import('Module:Widget/FilterButtons')
-local TournamentsTicker = Lua.import('Module:Widget/Tournaments/Ticker')
+local TournamentsTicker = Lua.import('Module:Widget/Tournaments/Ticker/List')
 
 local HtmlWidgets = Lua.import('Module:Widget/Html/All')
 local Div = HtmlWidgets.Div
@@ -76,9 +76,10 @@ local CONTENT = {
 		heading = 'Tournaments',
 		body = TournamentsTicker{
 			upcomingDays = 30,
-			completedDays = 30
+			completedDays = 30,
+			tierColorScheme = 'top3',
 		},
-		padding = true,
+		padding = false,
 		boxid = MainPageLayoutUtil.BoxId.TOURNAMENTS_TICKER,
 	},
 	headlines = {

lua/wikis/commons/LeagueIcon.lua

@@ -9,11 +9,10 @@ local Lua = require('Module:Lua')
 
 local LeagueIcon = {}
 local Class = Lua.import('Module:Class')
+local Icon = Lua.import('Module:Icon')
 local Template = Lua.import('Module:Template')
 local Logic = Lua.import('Module:Logic')
 local String = Lua.import('Module:StringUtils')
-
-local FILLER = '<span class="league-icon-small-image">[[File:Logo filler event.png|link=]]</span>'
 local NO_ICON_BUT_ICONDARK_TRACKING_CATEGORY = '[[Category:Pages with only icondark]]'
 
 ---@class LeagueIconDisplayArgs
@@ -56,7 +55,9 @@ function LeagueIcon.display(args)
 
 	--if icon and iconDark are not given and can not be retrieved return filler icon
 	if String.isEmpty(icon) and String.isEmpty(iconDark) then
-		return FILLER
+		return tostring(mw.html.create('span')
+			:addClass('league-icon-small-image')
+			:node(Icon.makeIcon{iconName = 'firstplace'}))
 	end
 
 	if String.isEmpty(icon) then

lua/wikis/commons/TournamentsTicker/Data.lua

@@ -0,0 +1,149 @@
+---
+-- @Liquipedia
+-- page=Module:TournamentsTicker/Data
+--
+-- Please see https://github.com/Liquipedia/Lua-Modules to contribute
+--
+
+local Lua = require('Module:Lua')
+
+local Array = Lua.import('Module:Array')
+local Condition = Lua.import('Module:Condition')
+local DateExt = Lua.import('Module:Date/Ext')
+local Operator = Lua.import('Module:Operator')
+
+local Tournament = Lua.import('Module:Tournament')
+
+local TournamentsTickerData = {}
+
+---@class TournamentsTickerDataProps
+---@field upcomingDays number
+---@field completedDays number
+---@field modifierTier1 number?
+---@field modifierTier2 number?
+---@field modifierTier3 number?
+---@field modifierTier4 number?
+---@field modifierTier5 number?
+---@field modifierTierMisc number?
+---@field modifierTypeQualifier number?
+
+---@class TournamentsTickerDataResult
+---@field upcoming StandardTournament[]
+---@field ongoing StandardTournament[]
+---@field completed StandardTournament[]
+
+---@param props TournamentsTickerDataProps
+---@return TournamentsTickerDataResult
+function TournamentsTickerData.get(props)
+	local upcomingDays = props.upcomingDays or 5
+	local completedDays = props.completedDays or 5
+
+	local tierThresholdModifiers = {
+		[1] = props.modifierTier1,
+		[2] = props.modifierTier2,
+		[3] = props.modifierTier3,
+		[4] = props.modifierTier4,
+		[5] = props.modifierTier5,
+		[-1] = props.modifierTierMisc,
+	}
+
+	--- The Tier Type thresholds only affect completed tournaments.
+	local tierTypeThresholdModifiers = {
+		['qualifier'] = props.modifierTypeQualifier,
+	}
+
+	local currentTimestamp = DateExt.getCurrentTimestamp()
+
+	---@param tournament StandardTournament
+	---@return boolean
+	local function isWithinDateRange(tournament)
+		local modifiedThreshold = tierThresholdModifiers[tournament.liquipediaTier] or 0
+		local modifiedCompletedThreshold = tierTypeThresholdModifiers[tournament.liquipediaTierType] or modifiedThreshold
+
+		if not tournament.startDate then
+			return false
+		end
+
+		local startDateThreshold = currentTimestamp + DateExt.daysToSeconds(upcomingDays + modifiedThreshold)
+		local endDateThreshold = currentTimestamp - DateExt.daysToSeconds(completedDays + modifiedCompletedThreshold)
+
+		if tournament.phase == 'ONGOING' then
+			return true
+		elseif tournament.phase == 'UPCOMING' then
+			return tournament.startDate.timestamp < startDateThreshold
+		elseif tournament.phase == 'FINISHED' then
+			assert(tournament.endDate, 'Tournament without end date: ' .. tournament.pageName)
+			return tournament.endDate.timestamp > endDateThreshold
+		end
+		return false
+	end
+
+	local lpdbFilter = Condition.Tree(Condition.BooleanOperator.all):add{
+		Condition.Util.anyOf(Condition.ColumnName('status'), {'', 'finished'}),
+		Condition.Node(Condition.ColumnName('liquipediatiertype'), Condition.Comparator.neq, 'Points')
+	}
+
+	local allTournaments = Tournament.getAllTournaments(lpdbFilter, function(tournament)
+		return isWithinDateRange(tournament)
+	end)
+
+	---@param a StandardTournament
+	---@param b StandardTournament
+	---@param dateProperty 'endDate'|'startDate'
+	---@param operator fun(a: integer, b: integer): boolean
+	---@return boolean?
+	local function sortByDateProperty(a, b, dateProperty, operator)
+		if not a[dateProperty] and not b[dateProperty] then return nil end
+		if not a[dateProperty] then return true end
+		if not b[dateProperty] then return false end
+		if a[dateProperty].timestamp ~= b[dateProperty].timestamp then
+			return operator(a[dateProperty].timestamp, b[dateProperty].timestamp)
+		end
+		return nil
+	end
+
+	---@param a StandardTournament
+	---@param b StandardTournament
+	---@return boolean
+	local function sortByDate(a, b)
+		local endDateSort = sortByDateProperty(a, b, 'endDate', Operator.gt)
+		if endDateSort ~= nil then return endDateSort end
+		local startDateSort = sortByDateProperty(a, b, 'startDate', Operator.gt)
+		if startDateSort ~= nil then return startDateSort end
+		return a.pageName < b.pageName
+	end
+
+	---@param a StandardTournament
+	---@param b StandardTournament
+	---@return boolean
+	local function sortByDateUpcoming(a, b)
+		local startDateSort = sortByDateProperty(a, b, 'startDate', Operator.gt)
+		if startDateSort ~= nil then return startDateSort end
+		local endDateSort = sortByDateProperty(a, b, 'endDate', Operator.gt)
+		if endDateSort ~= nil then return endDateSort end
+		return a.pageName < b.pageName
+	end
+
+	---@param phase TournamentPhase
+	---@return fun(tournament: StandardTournament): boolean
+	local function filterByPhase(phase)
+		return function(tournament)
+			return tournament.phase == phase
+		end
+	end
+
+	local upcomingTournaments = Array.filter(allTournaments, filterByPhase('UPCOMING'))
+	local ongoingTournaments = Array.filter(allTournaments, filterByPhase('ONGOING'))
+	local completedTournaments = Array.filter(allTournaments, filterByPhase('FINISHED'))
+	table.sort(upcomingTournaments, sortByDateUpcoming)
+	table.sort(ongoingTournaments, sortByDate)
+	table.sort(completedTournaments, sortByDate)
+
+	return {
+		upcoming = upcomingTournaments,
+		ongoing = ongoingTournaments,
+		completed = completedTournaments,
+	}
+end
+
+return TournamentsTickerData

lua/wikis/commons/Widget/Participants/Team/ChevronToggle.lua → lua/wikis/commons/Widget/GeneralCollapsible/ChevronToggle.lua

@@ -1,6 +1,6 @@
 ---
 -- @Liquipedia
--- page=Module:Widget/Participants/Team/ChevronToggle
+-- page=Module:Widget/GeneralCollapsible/ChevronToggle
 --
 -- Please see https://github.com/Liquipedia/Lua-Modules to contribute
 --

lua/wikis/commons/Widget/Participants/Team/Header.lua

@@ -14,7 +14,7 @@ local Opponent = Lua.import('Module:Opponent/Custom')
 local OpponentDisplay = Lua.import('Module:OpponentDisplay/Custom')
 
 local Widget = Lua.import('Module:Widget')
-local ChevronToggle = Lua.import('Module:Widget/Participants/Team/ChevronToggle')
+local ChevronToggle = Lua.import('Module:Widget/GeneralCollapsible/ChevronToggle')
 local WidgetUtil = Lua.import('Module:Widget/Util')
 local HtmlWidgets = Lua.import('Module:Widget/Html/All')
 local Div = HtmlWidgets.Div

lua/wikis/commons/Widget/Tournament/TierPill.lua

@@ -10,13 +10,25 @@ local Lua = require('Module:Lua')
 local Class = Lua.import('Module:Class')
 local Tier = Lua.import('Module:Tier/Utils')
 
+local WidgetUtil = Lua.import('Module:Widget/Util')
 local Widget = Lua.import('Module:Widget')
 local HtmlWidgets = Lua.import('Module:Widget/Html/All')
 
+---@class TournamentsTickerPillWidgetProps
+---@field tournament StandardTournament
+---@field variant 'solid'|'subtle'?
+---@field colorScheme 'full'|'top3'?
+
 ---@class TournamentsTickerPillWidget: Widget
----@operator call(table): TournamentsTickerPillWidget
+---@operator call(TournamentsTickerPillWidgetProps): TournamentsTickerPillWidget
+---@field props TournamentsTickerPillWidgetProps
 local TournamentsTickerPillWidget = Class.new(Widget)
 
+TournamentsTickerPillWidget.defaultProps = {
+	variant = 'solid',
+	colorScheme = 'full',
+}
+
 local COLOR_CLASSES = {
 	[1] = 'tier1',
 	[2] = 'tier2',
@@ -41,32 +53,40 @@ function TournamentsTickerPillWidget:render()
 		return
 	end
 
-	local tierShort, tierTypeShort = Tier.toShortName(tournament.liquipediaTier,tournament.liquipediaTierType)
+	local subtle = self.props.variant == 'subtle'
+	local tierShort, tierTypeShort = Tier.toShortName(tournament.liquipediaTier, tournament.liquipediaTierType)
 
-	local tierNode, tierTypeNode, colorClass
-	if tierTypeShort then
+	local colorClass
+	if tierTypeShort and not subtle then
 		colorClass = COLOR_CLASSES[tournament.liquipediaTierType]
-		tierNode = HtmlWidgets.Div{
-			classes = {'tournament-badge__chip', 'chip--' .. COLOR_CLASSES[tournament.liquipediaTier]},
-			children = tierShort,
-		}
-		tierTypeNode = HtmlWidgets.Div{
-			classes = {'tournament-badge__text'},
-			children = tierTypeShort,
-		}
 	else
 		colorClass = COLOR_CLASSES[tournament.liquipediaTier]
-		tierNode = HtmlWidgets.Div{
-			classes = {'tournament-badge__text'},
-			children = Tier.toName(tournament.liquipediaTier),
-		}
 	end
-
 	colorClass = colorClass or COLOR_CLASSES.default
 
+	local chipText = subtle and Tier.toName(tournament.liquipediaTier) or tierShort
+	local textContent = tierTypeShort and tierTypeShort or Tier.toName(tournament.liquipediaTier)
+
 	return HtmlWidgets.Div{
-		classes = {'tournament-badge', 'badge--' .. colorClass},
-		children = {tierNode, tierTypeNode},
+		classes = WidgetUtil.collect(
+			'tournament-badge',
+			'badge--' .. colorClass,
+			subtle and 'tournament-badge--subtle' or nil,
+			self.props.colorScheme == 'top3' and 'tournament-badge--top3' or nil
+		),
+		children = WidgetUtil.collect(
+			tierTypeShort and HtmlWidgets.Div{
+				classes = WidgetUtil.collect(
+					'tournament-badge__chip',
+					not subtle and 'chip--' .. COLOR_CLASSES[tournament.liquipediaTier] or nil
+				),
+				children = chipText,
+			} or nil,
+			HtmlWidgets.Div{
+				classes = {'tournament-badge__text'},
+				children = textContent,
+			}
+		),
 	}
 end