From 0af506baf6bcaff36120f4f2fd1e577ad5e21c12 Mon Sep 17 00:00:00 2001 From: hjpalpha Date: Wed, 16 Oct 2024 10:00:21 +0200 Subject: [PATCH 1/3] config --- standard/info/wikis/clashofclans/info.lua | 3 +++ standard/info/wikis/crossfire/info.lua | 3 +++ standard/info/wikis/formula1/info.lua | 3 +++ standard/info/wikis/freefire/info.lua | 3 +++ standard/info/wikis/honorofkings/info.lua | 3 +++ standard/info/wikis/leagueoflegends/info.lua | 3 +++ standard/info/wikis/mobilelegends/info.lua | 3 +++ standard/info/wikis/omegastrikers/info.lua | 3 +++ standard/info/wikis/pubgmobile/info.lua | 3 +++ standard/info/wikis/smite/info.lua | 3 +++ standard/info/wikis/splatoon/info.lua | 3 +++ standard/info/wikis/wildrift/info.lua | 3 +++ 12 files changed, 36 insertions(+) diff --git a/standard/info/wikis/clashofclans/info.lua b/standard/info/wikis/clashofclans/info.lua index ca17e0abfb4..6e9a50f3032 100644 --- a/standard/info/wikis/clashofclans/info.lua +++ b/standard/info/wikis/clashofclans/info.lua @@ -36,5 +36,8 @@ return { status = 1, matchWidth = 200, }, + transfers = { + showTeamName = true, + }, }, } diff --git a/standard/info/wikis/crossfire/info.lua b/standard/info/wikis/crossfire/info.lua index 091b1459824..440ae5decb0 100644 --- a/standard/info/wikis/crossfire/info.lua +++ b/standard/info/wikis/crossfire/info.lua @@ -64,6 +64,9 @@ return { matchWidth = 190, gameScoresIfBo1 = true, }, + transfers = { + showTeamName = true, + }, }, defaultRoundPrecision = 0, } diff --git a/standard/info/wikis/formula1/info.lua b/standard/info/wikis/formula1/info.lua index 385d9865490..b170affdf77 100644 --- a/standard/info/wikis/formula1/info.lua +++ b/standard/info/wikis/formula1/info.lua @@ -35,5 +35,8 @@ return { match2 = { status = 0, }, + transfers = { + showTeamName = true, + }, }, } diff --git a/standard/info/wikis/freefire/info.lua b/standard/info/wikis/freefire/info.lua index 0cef4bd774e..a1a8e7da8bb 100644 --- a/standard/info/wikis/freefire/info.lua +++ b/standard/info/wikis/freefire/info.lua @@ -35,6 +35,9 @@ return { match2 = { status = 0, }, + transfers = { + showTeamName = true, + }, }, defaultRoundPrecision = 0, } diff --git a/standard/info/wikis/honorofkings/info.lua b/standard/info/wikis/honorofkings/info.lua index ef5100919f5..98e05d15e98 100644 --- a/standard/info/wikis/honorofkings/info.lua +++ b/standard/info/wikis/honorofkings/info.lua @@ -78,5 +78,8 @@ return { matchWidthMobile = 110, matchWidth = 190, }, + transfers = { + showTeamName = true, + }, }, } diff --git a/standard/info/wikis/leagueoflegends/info.lua b/standard/info/wikis/leagueoflegends/info.lua index 1c4c0a5a9ef..85308e158ca 100644 --- a/standard/info/wikis/leagueoflegends/info.lua +++ b/standard/info/wikis/leagueoflegends/info.lua @@ -36,6 +36,9 @@ return { status = 2, matchWidth = 200, }, + transfers = { + showTeamName = true, + }, }, defaultRoundPrecision = 0, } diff --git a/standard/info/wikis/mobilelegends/info.lua b/standard/info/wikis/mobilelegends/info.lua index 1a5e992dde3..735960a17b0 100644 --- a/standard/info/wikis/mobilelegends/info.lua +++ b/standard/info/wikis/mobilelegends/info.lua @@ -37,5 +37,8 @@ return { matchWidthMobile = 110, matchWidth = 190, }, + transfers = { + showTeamName = true, + }, }, } diff --git a/standard/info/wikis/omegastrikers/info.lua b/standard/info/wikis/omegastrikers/info.lua index 296ae36bc2c..ba576587771 100644 --- a/standard/info/wikis/omegastrikers/info.lua +++ b/standard/info/wikis/omegastrikers/info.lua @@ -36,5 +36,8 @@ return { status = 0, matchWidth = 180, }, + transfers = { + showTeamName = true, + }, }, } diff --git a/standard/info/wikis/pubgmobile/info.lua b/standard/info/wikis/pubgmobile/info.lua index 7cb6cc4bc29..6ac2398645b 100644 --- a/standard/info/wikis/pubgmobile/info.lua +++ b/standard/info/wikis/pubgmobile/info.lua @@ -74,6 +74,9 @@ return { match2 = { status = 0, }, + transfers = { + showTeamName = true, + }, }, defaultRoundPrecision = 0, } diff --git a/standard/info/wikis/smite/info.lua b/standard/info/wikis/smite/info.lua index 32b16cf9df0..742726a5999 100644 --- a/standard/info/wikis/smite/info.lua +++ b/standard/info/wikis/smite/info.lua @@ -48,5 +48,8 @@ return { match2 = { status = 0, }, + transfers = { + showTeamName = true, + }, }, } diff --git a/standard/info/wikis/splatoon/info.lua b/standard/info/wikis/splatoon/info.lua index ed4ba705949..a7437343f0b 100644 --- a/standard/info/wikis/splatoon/info.lua +++ b/standard/info/wikis/splatoon/info.lua @@ -63,5 +63,8 @@ return { matchWidthMobile = 110, matchWidth = 190, }, + transfers = { + showTeamName = true, + }, }, } diff --git a/standard/info/wikis/wildrift/info.lua b/standard/info/wikis/wildrift/info.lua index 26b56d6f3b5..1c2d83b48e8 100644 --- a/standard/info/wikis/wildrift/info.lua +++ b/standard/info/wikis/wildrift/info.lua @@ -37,5 +37,8 @@ return { matchWidthMobile = 110, matchWidth = 200, }, + transfers = { + showTeamName = true, + }, }, } From 70b822badc41707e5793b5ddb9f56775acaa74de Mon Sep 17 00:00:00 2001 From: hjpalpha Date: Wed, 16 Oct 2024 10:02:19 +0200 Subject: [PATCH 2/3] kick the deprecated stuff --- .../transfer/commons/transfer_references.lua | 34 ------------------- 1 file changed, 34 deletions(-) diff --git a/components/transfer/commons/transfer_references.lua b/components/transfer/commons/transfer_references.lua index b7b35ae1eb7..8d6fedc89e0 100644 --- a/components/transfer/commons/transfer_references.lua +++ b/components/transfer/commons/transfer_references.lua @@ -120,12 +120,6 @@ function TransferRef.fromStorageData(referencesData) end ---@cast referencesData -nil - --fallback processing for pre standardized TRef data, so we do not break stuff - --to be removed after switching to standardized and having everything purged - if Logic.isEmpty(referencesData.reference1type) then - return TransferRef.fromLegacyStorageData(referencesData) - end - return Array.mapIndexes(function(referenceIndex) local prefix = 'reference' .. referenceIndex local link = referencesData[prefix] @@ -146,34 +140,6 @@ function TransferRef.fromStorageData(referencesData) end) end ----@deprecated ----to be removed after switching to standardized and having everything purged ----@param referencesData table ----@return TransferReference[] -function TransferRef.fromLegacyStorageData(referencesData) - return Array.mapIndexes(function(referenceIndex) - local tempArray = mw.text.split(referencesData['reference' .. referenceIndex] or '', ',,,', true) - local refType = tempArray[1] - - if not TransferRef.isValidRefType(refType) then return end - - local link = Logic.nilIfEmpty(tempArray[2]) - if Logic.isEmpty(refType) or refType == WEB_TYPE and not link then return end - return { - link = link, - refType = refType, - text = Logic.nilIfEmpty(tempArray[3]), - title = Logic.nilIfEmpty(tempArray[4]), - transTitle = Logic.nilIfEmpty(tempArray[5]), - language = Logic.nilIfEmpty(tempArray[6]), - author = Logic.nilIfEmpty(tempArray[7]), - publisher = Logic.nilIfEmpty(tempArray[8]), - archiveUrl = Logic.nilIfEmpty(tempArray[9]), - archiveDate = Logic.nilIfEmpty(tempArray[10]), - } - end) -end - ---@param references TransferReference[] ---@return TransferReference[] function TransferRef.makeUnique(references) From 96932435ad639c949dd08ab349afcf2a3eb76e8c Mon Sep 17 00:00:00 2001 From: hjpalpha Date: Wed, 16 Oct 2024 10:24:18 +0200 Subject: [PATCH 3/3] adjust tests due to config adjusts --- spec/golden_masters/transfer_row_leagueoflegends.txt | 2 +- spec/golden_masters/transfer_row_mobilelegends.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/spec/golden_masters/transfer_row_leagueoflegends.txt b/spec/golden_masters/transfer_row_leagueoflegends.txt index 30207c09fb2..61c595b5d86 100644 --- a/spec/golden_masters/transfer_row_leagueoflegends.txt +++ b/spec/golden_masters/transfer_row_leagueoflegends.txt @@ -1 +1 @@ -
2024-10-11
[[File:us_hd.png|36x24px|United States|link=]][[Supr|supr]]
 None 
⇒
 None 
[https://x.com/streamerzone_gg/status/1844766204742832441 ]
\ No newline at end of file +
2024-10-11
[[File:us_hd.png|36x24px|United States|link=]][[Supr|supr]]
 None 
⇒
 None 
[https://x.com/streamerzone_gg/status/1844766204742832441 ]
\ No newline at end of file diff --git a/spec/golden_masters/transfer_row_mobilelegends.txt b/spec/golden_masters/transfer_row_mobilelegends.txt index 30207c09fb2..61c595b5d86 100644 --- a/spec/golden_masters/transfer_row_mobilelegends.txt +++ b/spec/golden_masters/transfer_row_mobilelegends.txt @@ -1 +1 @@ -
2024-10-11
[[File:us_hd.png|36x24px|United States|link=]][[Supr|supr]]
 None 
⇒
 None 
[https://x.com/streamerzone_gg/status/1844766204742832441 ]
\ No newline at end of file +
2024-10-11
[[File:us_hd.png|36x24px|United States|link=]][[Supr|supr]]
 None 
⇒
 None 
[https://x.com/streamerzone_gg/status/1844766204742832441 ]
\ No newline at end of file