From e48561860a617ebf8a49c9196e256bdb2680e71d Mon Sep 17 00:00:00 2001 From: SyntacticSalt Date: Sun, 1 Feb 2026 19:29:00 +0100 Subject: [PATCH 1/2] feat(infobox): Support unclear tournament dates Moved the implementation from R6 custom to commons --- lua/wikis/commons/Infobox/League.lua | 23 ++++++++++++++++++- .../rainbowsix/Infobox/League/Custom.lua | 18 --------------- 2 files changed, 22 insertions(+), 19 deletions(-) diff --git a/lua/wikis/commons/Infobox/League.lua b/lua/wikis/commons/Infobox/League.lua index 0a965b1bdd4..63f537a09c6 100644 --- a/lua/wikis/commons/Infobox/League.lua +++ b/lua/wikis/commons/Infobox/League.lua @@ -195,6 +195,23 @@ function League:createInfobox() }, HtmlWidgets.Br{})} end +---@private +---@param dateString string +---@return string +function League:_standardiseRawDate(dateString) + -- Length 7 = YYYY-MM + -- Length 10 = YYYY-MM-?? + if String.isEmpty(dateString) or (#dateString ~= 7 and #dateString ~= 10) then + return '' + end + + if #dateString == 7 then + dateString = dateString .. '-??' + end + dateString = dateString:gsub('%-XX', '-??') + return dateString +end + ---@private function League:_parseArgs() local args = self.args @@ -230,8 +247,10 @@ function League:_parseArgs() parent = (args.parent or mw.title.getCurrentTitle().prefixedText):gsub(' ', '_'), startDate = ReferenceCleaner.cleanDateIfKnown{date = args.sdate} or ReferenceCleaner.cleanDateIfKnown{date = args.date}, + startDateDisplay = self:_standardiseRawDate(args.sdate or args.date), endDate = ReferenceCleaner.cleanDateIfKnown{date = args.edate} - or ReferenceCleaner.cleanDateIfKnown{date = args.date}, + or ReferenceCleaner.cleanDateIfKnown{date = args.date}, + endDateDisplay = self:_standardiseRawDate(args.edate or args.date), mode = args.mode, patch = args.patch, endPatch = args.endpatch or args.epatch or args.patch, @@ -550,6 +569,8 @@ function League:_setLpdbData(args, links) summary = self:seoText(args), extradata = { series2 = args.series2 and mw.ext.TeamLiquidIntegration.resolve_redirect(args.series2) or nil, + startdatetext = self.data.startDateDisplay, + enddatetext = self.data.endDateDisplay, }, } diff --git a/lua/wikis/rainbowsix/Infobox/League/Custom.lua b/lua/wikis/rainbowsix/Infobox/League/Custom.lua index e098539321e..6d00efdb7a3 100644 --- a/lua/wikis/rainbowsix/Infobox/League/Custom.lua +++ b/lua/wikis/rainbowsix/Infobox/League/Custom.lua @@ -105,10 +105,7 @@ end ---@return table function CustomLeague:addToLpdb(lpdbData, args) lpdbData.maps = table.concat(self:getAllArgsForBase(args, 'map'), ';') - lpdbData.extradata.individual = String.isNotEmpty(args.player_number) and 'true' or '' - lpdbData.extradata.startdatetext = self:_standardiseRawDate(args.sdate or args.date) - lpdbData.extradata.enddatetext = self:_standardiseRawDate(args.edate or args.date) return lpdbData end @@ -119,21 +116,6 @@ function CustomLeague:_validPublisherTier(publishertier) return UBISOFT_TIERS[string.lower(publishertier or '')] end ----@param dateString string ----@return string -function CustomLeague:_standardiseRawDate(dateString) - -- Length 7 = YYYY-MM - -- Length 10 = YYYY-MM-?? - if String.isEmpty(dateString) or (#dateString ~= 7 and #dateString ~= 10) then - return '' - end - - if #dateString == 7 then - dateString = dateString .. '-??' - end - dateString = dateString:gsub('%-XX', '-??') - return dateString -end ---@param args table function CustomLeague:customParseArguments(args) From bc4ea849030422fdefbc1893f1f6984b847272d6 Mon Sep 17 00:00:00 2001 From: SyntacticSalt Date: Mon, 2 Feb 2026 18:26:10 +0100 Subject: [PATCH 2/2] Remove startdate_raw from val, cs --- lua/wikis/counterstrike/Infobox/League/Custom.lua | 2 -- lua/wikis/valorant/Infobox/League/Custom.lua | 2 -- 2 files changed, 4 deletions(-) diff --git a/lua/wikis/counterstrike/Infobox/League/Custom.lua b/lua/wikis/counterstrike/Infobox/League/Custom.lua index 99a22eca738..b73884fec35 100644 --- a/lua/wikis/counterstrike/Infobox/League/Custom.lua +++ b/lua/wikis/counterstrike/Infobox/League/Custom.lua @@ -312,8 +312,6 @@ function CustomLeague:addToLpdb(lpdbData, args) lpdbData.sortdate = args.sort_date or lpdbData.enddate lpdbData.extradata.prizepoollocal = self.data.localPrizePool - lpdbData.extradata.startdate_raw = args.sdate or args.date - lpdbData.extradata.enddate_raw = args.edate or args.date lpdbData.extradata.shortname2 = args.shortname2 Array.forEach(CustomLeague.getRestrictions(args.restrictions), diff --git a/lua/wikis/valorant/Infobox/League/Custom.lua b/lua/wikis/valorant/Infobox/League/Custom.lua index 5dd59a90cf5..5ba9119e594 100644 --- a/lua/wikis/valorant/Infobox/League/Custom.lua +++ b/lua/wikis/valorant/Infobox/League/Custom.lua @@ -114,8 +114,6 @@ function CustomLeague:addToLpdb(lpdbData, args) lpdbData.maps = table.concat(self:getAllArgsForBase(args, 'map'), ';') lpdbData.extradata.region = Template.safeExpand(mw.getCurrentFrame(), 'Template:Player region', {args.country}) - lpdbData.extradata.startdate_raw = args.sdate or args.date - lpdbData.extradata.enddate_raw = args.edate or args.date lpdbData.extradata.gamechangers = tostring(self.data.gameChangers) return lpdbData