diff --git a/components/squad/commons/squad_custom.lua b/components/squad/commons/squad_custom.lua index 22a05397599..70fb9b4020b 100644 --- a/components/squad/commons/squad_custom.lua +++ b/components/squad/commons/squad_custom.lua @@ -83,6 +83,7 @@ function CustomSquad._playerRow(player, squadType) captain = player.captain, role = player.role, team = player.team, + date = player.leavedate or player.inactivedate or player.leavedate, } row:name{name = player.name} row:role{role = player.role} diff --git a/components/squad/commons/squad_row.lua b/components/squad/commons/squad_row.lua index 4cbd75aca35..0e1ee192aa3 100644 --- a/components/squad/commons/squad_row.lua +++ b/components/squad/commons/squad_row.lua @@ -82,7 +82,8 @@ function SquadRow:id(args) local teamNode = mw.html.create('td') if args.team and mw.ext.TeamTemplate.teamexists(args.team) then - teamNode:wikitext(mw.ext.TeamTemplate.teamicon(args.team)) + local date = String.nilIfEmpty(ReferenceCleaner.clean(args.date)) + teamNode:wikitext(mw.ext.TeamTemplate.teamicon(args.team, date)) if args.teamrole then teamNode:css('text-align', 'center') teamNode:tag('div'):css('font-size', '85%'):tag('i'):wikitext(args.teamrole) diff --git a/components/squad/wikis/apexlegends/squad_custom.lua b/components/squad/wikis/apexlegends/squad_custom.lua index a9ec996f2cf..7adddf4a38f 100644 --- a/components/squad/wikis/apexlegends/squad_custom.lua +++ b/components/squad/wikis/apexlegends/squad_custom.lua @@ -82,6 +82,7 @@ function CustomSquad.run(frame) role = player.role, team = player.team, teamrole = player.teamrole, + date = player.leavedate or player.inactivedate or player.leavedate, } :name{name = player.name} :role({role = player.role}) diff --git a/components/squad/wikis/arenaofvalor/squad_custom.lua b/components/squad/wikis/arenaofvalor/squad_custom.lua index 989482ea514..da0e9237520 100644 --- a/components/squad/wikis/arenaofvalor/squad_custom.lua +++ b/components/squad/wikis/arenaofvalor/squad_custom.lua @@ -147,6 +147,7 @@ function CustomSquad._playerRow(player, squadType) captain = player.captain, role = player.role, team = player.team, + date = player.leavedate or player.inactivedate or player.leavedate, }) row:name{name = player.name} row:position{role = player.role, position = player.position} diff --git a/components/squad/wikis/counterstrike/squad_custom.lua b/components/squad/wikis/counterstrike/squad_custom.lua index d5615ecc83b..a06a513ed57 100644 --- a/components/squad/wikis/counterstrike/squad_custom.lua +++ b/components/squad/wikis/counterstrike/squad_custom.lua @@ -82,6 +82,7 @@ function CustomSquad.run(frame) role = player.role, team = player.team, teamrole = player.teamrole, + date = player.leavedate or player.inactivedate or player.leavedate, } :name{name = player.name} :role{role = player.role} diff --git a/components/squad/wikis/dota2/squad_custom.lua b/components/squad/wikis/dota2/squad_custom.lua index dfa86b19ced..8298df76a47 100644 --- a/components/squad/wikis/dota2/squad_custom.lua +++ b/components/squad/wikis/dota2/squad_custom.lua @@ -118,6 +118,7 @@ function CustomSquad.run(frame) role = player.role, team = player.team, teamrole = player.teamrole, + date = player.leavedate or player.inactivedate or player.leavedate, } :name{name = player.name} :position{position = player.position, role = player.role and LANG:ucfirst(player.role) or nil} diff --git a/components/squad/wikis/halo/squad_custom.lua b/components/squad/wikis/halo/squad_custom.lua index 3d6701ba788..67931a9a354 100644 --- a/components/squad/wikis/halo/squad_custom.lua +++ b/components/squad/wikis/halo/squad_custom.lua @@ -55,6 +55,7 @@ function CustomSquad._playerRow(player, squadType) captain = player.captain, role = player.thisTeam.role, team = player.thisTeam.role == 'Loan' and player.oldTeam.team, + date = player.leavedate or player.inactivedate or player.leavedate, }) row:name({name = player.name}) row:role({role = player.thisTeam.role}) diff --git a/components/squad/wikis/leagueoflegends/squad_custom.lua b/components/squad/wikis/leagueoflegends/squad_custom.lua index cb3fce07c49..0f6cc7612a7 100644 --- a/components/squad/wikis/leagueoflegends/squad_custom.lua +++ b/components/squad/wikis/leagueoflegends/squad_custom.lua @@ -116,6 +116,7 @@ function CustomSquad._playerRow(player, squadType) captain = player.captain, role = player.role, team = player.team, + date = player.leavedate or player.inactivedate or player.leavedate, }) row:name{name = player.name} row:position{role = player.role, position = player.position} diff --git a/components/squad/wikis/mobilelegends/squad_custom.lua b/components/squad/wikis/mobilelegends/squad_custom.lua index fe1f16fca85..37adfda49a7 100644 --- a/components/squad/wikis/mobilelegends/squad_custom.lua +++ b/components/squad/wikis/mobilelegends/squad_custom.lua @@ -147,6 +147,7 @@ function CustomSquad._playerRow(player, squadType) captain = player.captain, role = player.role, team = player.team, + date = player.leavedate or player.inactivedate or player.leavedate, }) row:name{name = player.name} row:position{role = player.role, position = player.position} diff --git a/components/squad/wikis/overwatch/squad_custom.lua b/components/squad/wikis/overwatch/squad_custom.lua index b41f61c6fb1..691f6d3f0b4 100644 --- a/components/squad/wikis/overwatch/squad_custom.lua +++ b/components/squad/wikis/overwatch/squad_custom.lua @@ -182,6 +182,7 @@ function CustomSquad._playerRow(player, squadType) captain = player.captain, role = player.role, team = player.team, + date = player.leavedate or player.inactivedate or player.leavedate, }) if HAS_NUMBER then row:number{number = player.number} diff --git a/components/squad/wikis/rainbowsix/squad_custom.lua b/components/squad/wikis/rainbowsix/squad_custom.lua index a973a1599c2..f360347f221 100644 --- a/components/squad/wikis/rainbowsix/squad_custom.lua +++ b/components/squad/wikis/rainbowsix/squad_custom.lua @@ -55,6 +55,7 @@ function CustomSquad._playerRow(player, squadType) captain = player.captain, role = player.thisTeam.role, team = player.thisTeam.role == 'Loan' and player.oldTeam.team, + date = player.leavedate or player.inactivedate or player.leavedate, }) row:name({name = player.name}) row:role({role = player.thisTeam.role}) diff --git a/components/squad/wikis/rocketleague/squad_custom.lua b/components/squad/wikis/rocketleague/squad_custom.lua index 63f21d6234b..9d0c612561c 100644 --- a/components/squad/wikis/rocketleague/squad_custom.lua +++ b/components/squad/wikis/rocketleague/squad_custom.lua @@ -33,6 +33,7 @@ function CustomSquad.run(frame) captain = player.captain, role = player.role, team = player.team, + date = player.leavedate or player.inactivedate or player.leavedate, }) :name({name = player.name}) :role({role = player.role}) diff --git a/components/squad/wikis/smash/squad_custom.lua b/components/squad/wikis/smash/squad_custom.lua index 56aab911096..1d74b657c58 100644 --- a/components/squad/wikis/smash/squad_custom.lua +++ b/components/squad/wikis/smash/squad_custom.lua @@ -86,6 +86,7 @@ function CustomSquad.run(frame) link = player.link, team = player.activeteam, name = Variables.varDefault('name') or player.name, + date = player.leavedate or player.inactivedate or player.leavedate, } row:mains{mains = mw.text.split(mains or '', ','), game = game} row:date(player.joindate, 'Join Date: ', 'joindate') diff --git a/components/squad/wikis/starcraft/squad_custom.lua b/components/squad/wikis/starcraft/squad_custom.lua index 810478b3004..f2bca4f54fe 100644 --- a/components/squad/wikis/starcraft/squad_custom.lua +++ b/components/squad/wikis/starcraft/squad_custom.lua @@ -85,6 +85,7 @@ function CustomSquad.run(frame) flag = player.flag, captain = player.captain, role = player.role, + date = player.leavedate or player.inactivedate or player.leavedate, } row:name{name = name .. ' ' .. localizedName} diff --git a/components/squad/wikis/starcraft2/squad_custom.lua b/components/squad/wikis/starcraft2/squad_custom.lua index 6ca51e807da..5a44eeb6113 100644 --- a/components/squad/wikis/starcraft2/squad_custom.lua +++ b/components/squad/wikis/starcraft2/squad_custom.lua @@ -53,6 +53,7 @@ function CustomSquad.run(frame) captain = player.captain, role = player.role, team = player.team, + date = player.leavedate or player.inactivedate or player.leavedate, }) :name({name = player.name}) :role({role = player.role}) diff --git a/components/squad/wikis/valorant/squad_custom.lua b/components/squad/wikis/valorant/squad_custom.lua index c936f0a361c..4cf2f649d48 100644 --- a/components/squad/wikis/valorant/squad_custom.lua +++ b/components/squad/wikis/valorant/squad_custom.lua @@ -131,6 +131,7 @@ function CustomSquad._playerRow(player, squadType) role = player.role, team = player.team, teamrole = player.teamrole, + date = player.leavedate or player.inactivedate or player.leavedate, } row:name{name = player.name} row:role{role = player.role} diff --git a/components/squad/wikis/warcraft/squad_custom.lua b/components/squad/wikis/warcraft/squad_custom.lua index 39a8623694e..ee194d3ab88 100644 --- a/components/squad/wikis/warcraft/squad_custom.lua +++ b/components/squad/wikis/warcraft/squad_custom.lua @@ -38,6 +38,7 @@ function CustomSquad.run(frame) captain = player.captain, role = player.role, team = player.team, + date = player.leavedate or player.inactivedate or player.leavedate, } row:name{name = player.name} row:role{role = player.role} diff --git a/components/squad/wikis/wildrift/squad_custom.lua b/components/squad/wikis/wildrift/squad_custom.lua index a5d9e64f2fa..42f31afc441 100644 --- a/components/squad/wikis/wildrift/squad_custom.lua +++ b/components/squad/wikis/wildrift/squad_custom.lua @@ -147,6 +147,7 @@ function CustomSquad._playerRow(player, squadType) captain = player.captain, role = player.role, team = player.team, + date = player.leavedate or player.inactivedate or player.leavedate, }) row:name{name = player.name} row:position{role = player.role, position = player.position}