From 6195ca4ee04c1eaf48a18fc38e724d1c8c2f558d Mon Sep 17 00:00:00 2001 From: Hesketh2 <88981446+Hesketh2@users.noreply.github.com> Date: Fri, 18 Oct 2024 21:00:08 +0700 Subject: [PATCH 01/19] fix(infobox): return false instead of nil for custom Publisherpremier --- .../infobox/wikis/mobilelegends/infobox_league_custom.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/components/infobox/wikis/mobilelegends/infobox_league_custom.lua b/components/infobox/wikis/mobilelegends/infobox_league_custom.lua index 05789a46617..d4d77d96464 100644 --- a/components/infobox/wikis/mobilelegends/infobox_league_custom.lua +++ b/components/infobox/wikis/mobilelegends/infobox_league_custom.lua @@ -60,7 +60,7 @@ end ---@param args table function CustomLeague:customParseArguments(args) - self.data.publishertier = Logic.readBool(args['moonton-sponsored']) and 'true' or nil + self.data.publishertier = Logic.readBool(args['moonton-sponsored']) and 'true' or false end ---@param args table From b31277baf005b02e37eadfa6957f98024caf94d5 Mon Sep 17 00:00:00 2001 From: Hesketh2 <88981446+Hesketh2@users.noreply.github.com> Date: Fri, 18 Oct 2024 21:04:32 +0700 Subject: [PATCH 02/19] Crossfire --- components/infobox/wikis/crossfire/infobox_league_custom.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/components/infobox/wikis/crossfire/infobox_league_custom.lua b/components/infobox/wikis/crossfire/infobox_league_custom.lua index ecf28d1c9c0..92251d5617a 100644 --- a/components/infobox/wikis/crossfire/infobox_league_custom.lua +++ b/components/infobox/wikis/crossfire/infobox_league_custom.lua @@ -77,7 +77,7 @@ end ---@param args table function CustomLeague:customParseArguments(args) - self.data.publishertier = args.cfpremier + self.data.publishertier = Logic.readBool(args['cfpremier']) and 'true' or false end ---@param args table From 714bfdca8a34cbcd59ebbeabd87ef2657501f1f9 Mon Sep 17 00:00:00 2001 From: Hesketh2 <88981446+Hesketh2@users.noreply.github.com> Date: Fri, 18 Oct 2024 21:16:24 +0700 Subject: [PATCH 03/19] fix cf --- components/infobox/wikis/crossfire/infobox_league_custom.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/components/infobox/wikis/crossfire/infobox_league_custom.lua b/components/infobox/wikis/crossfire/infobox_league_custom.lua index 92251d5617a..7113461d6b1 100644 --- a/components/infobox/wikis/crossfire/infobox_league_custom.lua +++ b/components/infobox/wikis/crossfire/infobox_league_custom.lua @@ -77,7 +77,7 @@ end ---@param args table function CustomLeague:customParseArguments(args) - self.data.publishertier = Logic.readBool(args['cfpremier']) and 'true' or false + self.data.publishertier = Logic.readBool(args.cfpremier) end ---@param args table From ba525e4d520d74e73386e58314e02b8c19b60322 Mon Sep 17 00:00:00 2001 From: Hesketh2 <88981446+Hesketh2@users.noreply.github.com> Date: Fri, 18 Oct 2024 21:16:46 +0700 Subject: [PATCH 04/19] fix mlbb --- .../infobox/wikis/mobilelegends/infobox_league_custom.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/components/infobox/wikis/mobilelegends/infobox_league_custom.lua b/components/infobox/wikis/mobilelegends/infobox_league_custom.lua index d4d77d96464..60eb6384e34 100644 --- a/components/infobox/wikis/mobilelegends/infobox_league_custom.lua +++ b/components/infobox/wikis/mobilelegends/infobox_league_custom.lua @@ -60,7 +60,7 @@ end ---@param args table function CustomLeague:customParseArguments(args) - self.data.publishertier = Logic.readBool(args['moonton-sponsored']) and 'true' or false + self.data.publishertier = Logic.readBool(args['moonton-sponsored']) end ---@param args table From 7efe8da786cfde82857053eb625007c9f934cd1e Mon Sep 17 00:00:00 2001 From: Hesketh2 <88981446+Hesketh2@users.noreply.github.com> Date: Fri, 18 Oct 2024 21:22:34 +0700 Subject: [PATCH 05/19] fix for pokemon wiki --- components/infobox/wikis/pokemon/infobox_league_custom.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/components/infobox/wikis/pokemon/infobox_league_custom.lua b/components/infobox/wikis/pokemon/infobox_league_custom.lua index b81497407a8..e7a7a4ef48d 100644 --- a/components/infobox/wikis/pokemon/infobox_league_custom.lua +++ b/components/infobox/wikis/pokemon/infobox_league_custom.lua @@ -73,7 +73,7 @@ end ---@param args table function CustomLeague:customParseArguments(args) - self.data.publishertier = args.pokemonpremier + self.data.publishertier = Logic.readBool(args.pokemonpremier) self.data.mode = self:_getGameMode() end From 0accd5545d5b97c6c749f7bdcd482e08473ac5b7 Mon Sep 17 00:00:00 2001 From: Hesketh2 <88981446+Hesketh2@users.noreply.github.com> Date: Fri, 18 Oct 2024 21:26:50 +0700 Subject: [PATCH 06/19] fix for fortnite --- components/infobox/wikis/fortnite/infobox_league_custom.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/components/infobox/wikis/fortnite/infobox_league_custom.lua b/components/infobox/wikis/fortnite/infobox_league_custom.lua index cce77203a22..7517bf1c535 100644 --- a/components/infobox/wikis/fortnite/infobox_league_custom.lua +++ b/components/infobox/wikis/fortnite/infobox_league_custom.lua @@ -49,7 +49,7 @@ end ---@param args table function CustomLeague:customParseArguments(args) - self.data.publishertier = args.epicpremier + self.data.publishertier = Logic.readBool(args.epicpremier) end ---@param args table From afce3a5166d7c24e04c114e16720853b578d5c0c Mon Sep 17 00:00:00 2001 From: Hesketh2 <88981446+Hesketh2@users.noreply.github.com> Date: Fri, 18 Oct 2024 21:29:59 +0700 Subject: [PATCH 07/19] fix for naraka --- components/infobox/wikis/naraka/infobox_league_custom.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/components/infobox/wikis/naraka/infobox_league_custom.lua b/components/infobox/wikis/naraka/infobox_league_custom.lua index 0976eaabd7d..852487f99c8 100644 --- a/components/infobox/wikis/naraka/infobox_league_custom.lua +++ b/components/infobox/wikis/naraka/infobox_league_custom.lua @@ -65,7 +65,7 @@ end ---@param args table function CustomLeague:customParseArguments(args) - self.data.publishertier = args.narakapremier + self.data.publishertier = Logic.readBool(args.narakapremier) end ---@param lpdbData table From 177e47b2859731cfb58312b8b689c8bc576ed620 Mon Sep 17 00:00:00 2001 From: Hesketh2 <88981446+Hesketh2@users.noreply.github.com> Date: Fri, 18 Oct 2024 21:32:29 +0700 Subject: [PATCH 08/19] fix for halo --- components/infobox/wikis/halo/infobox_league_custom.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/components/infobox/wikis/halo/infobox_league_custom.lua b/components/infobox/wikis/halo/infobox_league_custom.lua index e8a60a58b14..9dd0070c632 100644 --- a/components/infobox/wikis/halo/infobox_league_custom.lua +++ b/components/infobox/wikis/halo/infobox_league_custom.lua @@ -102,7 +102,7 @@ end ---@param args table function CustomLeague:customParseArguments(args) self.data.mode = args.player_number and 'solo' or self.data.mode - self.data.publishertier = args['hcs-sponsored'] + self.data.publishertier = Logic.readBool(args['hcs-sponsored']) end ---@param args table From af42f9430f6d7bb106b24320da1453e06d4215b2 Mon Sep 17 00:00:00 2001 From: Hesketh2 <88981446+Hesketh2@users.noreply.github.com> Date: Fri, 18 Oct 2024 21:34:12 +0700 Subject: [PATCH 09/19] fix for naraka (2) --- components/infobox/wikis/naraka/infobox_league_custom.lua | 1 + 1 file changed, 1 insertion(+) diff --git a/components/infobox/wikis/naraka/infobox_league_custom.lua b/components/infobox/wikis/naraka/infobox_league_custom.lua index 852487f99c8..0aa6047a8ab 100644 --- a/components/infobox/wikis/naraka/infobox_league_custom.lua +++ b/components/infobox/wikis/naraka/infobox_league_custom.lua @@ -8,6 +8,7 @@ local Class = require('Module:Class') local Lua = require('Module:Lua') +local Logic = require('Module:Logic') local String = require('Module:StringUtils') local Injector = Lua.import('Module:Widget/Injector') From 1ac86c5c983eeea8771c5c380009efacf6981da0 Mon Sep 17 00:00:00 2001 From: Hesketh2 <88981446+Hesketh2@users.noreply.github.com> Date: Fri, 18 Oct 2024 21:36:59 +0700 Subject: [PATCH 10/19] fix for wildrift --- components/infobox/wikis/wildrift/infobox_league_custom.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/components/infobox/wikis/wildrift/infobox_league_custom.lua b/components/infobox/wikis/wildrift/infobox_league_custom.lua index 50c8d58ae91..0fb34c6ce5e 100644 --- a/components/infobox/wikis/wildrift/infobox_league_custom.lua +++ b/components/infobox/wikis/wildrift/infobox_league_custom.lua @@ -60,7 +60,7 @@ end ---@param args table function CustomLeague:customParseArguments(args) - self.data.publishertier = Logic.readBool(args.riotpremier) and 'true' or nil + self.data.publishertier = Logic.readBool(args.riotpremier) end ---@param args table From e4775cf4392f720a7636b694f8f4229a76903ae4 Mon Sep 17 00:00:00 2001 From: Hesketh2 <88981446+Hesketh2@users.noreply.github.com> Date: Fri, 18 Oct 2024 21:39:56 +0700 Subject: [PATCH 11/19] fix for brawlstars --- components/infobox/wikis/brawlstars/infobox_league_custom.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/components/infobox/wikis/brawlstars/infobox_league_custom.lua b/components/infobox/wikis/brawlstars/infobox_league_custom.lua index a091d053e76..ed21aac4636 100644 --- a/components/infobox/wikis/brawlstars/infobox_league_custom.lua +++ b/components/infobox/wikis/brawlstars/infobox_league_custom.lua @@ -77,7 +77,7 @@ end ---@param args table function CustomLeague:customParseArguments(args) - self.data.publishertier = args['supercell-sponsored'] + self.data.publishertier = Logic.readBool(args['supercell-sponsored']) end ---@param args table From ade7486d71676c6a1df3b2af74e8d207fe33fed4 Mon Sep 17 00:00:00 2001 From: Hesketh2 <88981446+Hesketh2@users.noreply.github.com> Date: Fri, 18 Oct 2024 21:45:17 +0700 Subject: [PATCH 12/19] fix for pubg mobile --- components/infobox/wikis/pubgmobile/infobox_league_custom.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/components/infobox/wikis/pubgmobile/infobox_league_custom.lua b/components/infobox/wikis/pubgmobile/infobox_league_custom.lua index 131ac360206..571ec283ad3 100644 --- a/components/infobox/wikis/pubgmobile/infobox_league_custom.lua +++ b/components/infobox/wikis/pubgmobile/infobox_league_custom.lua @@ -98,7 +98,7 @@ end ---@param args table function CustomLeague:customParseArguments(args) - self.data.publishertier = args.pubgpremier + self.data.publishertier = Logic.readBool(args.pubgpremier) end ---@param args table From a015e91a42c1415132518f0f49beb5a70c9827fd Mon Sep 17 00:00:00 2001 From: Hesketh2 <88981446+Hesketh2@users.noreply.github.com> Date: Fri, 18 Oct 2024 21:45:31 +0700 Subject: [PATCH 13/19] fix for pubg desktop --- components/infobox/wikis/pubg/infobox_league_custom.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/components/infobox/wikis/pubg/infobox_league_custom.lua b/components/infobox/wikis/pubg/infobox_league_custom.lua index a0b84234c01..0b20b39ff2f 100644 --- a/components/infobox/wikis/pubg/infobox_league_custom.lua +++ b/components/infobox/wikis/pubg/infobox_league_custom.lua @@ -113,7 +113,7 @@ end ---@param args table function CustomLeague:customParseArguments(args) - self.data.publishertier = args.pubgpremier + self.data.publishertier = Logic.readBool(args.pubgpremier) end ---@param args table From 0cd8934a3ac6e91fbcdac8ade20726eae012f8c9 Mon Sep 17 00:00:00 2001 From: Hesketh2 <88981446+Hesketh2@users.noreply.github.com> Date: Fri, 18 Oct 2024 21:47:16 +0700 Subject: [PATCH 14/19] Fix for COD --- components/infobox/wikis/callofduty/infobox_league_custom.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/components/infobox/wikis/callofduty/infobox_league_custom.lua b/components/infobox/wikis/callofduty/infobox_league_custom.lua index 463e1a96904..d2821957652 100644 --- a/components/infobox/wikis/callofduty/infobox_league_custom.lua +++ b/components/infobox/wikis/callofduty/infobox_league_custom.lua @@ -74,7 +74,7 @@ end ---@param args table function CustomLeague:customParseArguments(args) - self.data.publishertier = args['atvi-sponsored'] + self.data.publishertier = Logic.readBool(args['atvi-sponsored']) self.data.mode = args.player_number and 'solo' or self.data.mode end From d665cd3d836445873c1dc6fea9dfeca90831ecd4 Mon Sep 17 00:00:00 2001 From: Hesketh2 <88981446+Hesketh2@users.noreply.github.com> Date: Fri, 18 Oct 2024 21:48:47 +0700 Subject: [PATCH 15/19] fix for clashofclans --- components/infobox/wikis/clashofclans/infobox_league_custom.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/components/infobox/wikis/clashofclans/infobox_league_custom.lua b/components/infobox/wikis/clashofclans/infobox_league_custom.lua index aa09e06f0b8..d549cddaa74 100644 --- a/components/infobox/wikis/clashofclans/infobox_league_custom.lua +++ b/components/infobox/wikis/clashofclans/infobox_league_custom.lua @@ -60,7 +60,7 @@ end ---@param args table function CustomLeague:customParseArguments(args) - self.data.publishertier = Logic.readBool(args['supercell-sponsored']) and 'true' or nil + self.data.publishertier = Logic.readBool(args['supercell-sponsored']) end return CustomLeague From d1b6fcc065dfe999fa5c3881bc0efc9e73cc6d7e Mon Sep 17 00:00:00 2001 From: Hesketh2 <88981446+Hesketh2@users.noreply.github.com> Date: Fri, 18 Oct 2024 21:54:15 +0700 Subject: [PATCH 16/19] Update infobox_league_custom.lua can I just remove the '1' here? is it for app reasons? (Compared to wildrift for example) --- .../infobox/wikis/leagueoflegends/infobox_league_custom.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/components/infobox/wikis/leagueoflegends/infobox_league_custom.lua b/components/infobox/wikis/leagueoflegends/infobox_league_custom.lua index 5719b366556..d991e71722d 100644 --- a/components/infobox/wikis/leagueoflegends/infobox_league_custom.lua +++ b/components/infobox/wikis/leagueoflegends/infobox_league_custom.lua @@ -82,7 +82,7 @@ end ---@param args table function CustomLeague:customParseArguments(args) - self.data.publishertier = Logic.readBool(args.riotpremier) and '1' or nil + self.data.publishertier = Logic.readBool(args.riotpremier) and '1' or false end ---@param args table From f3b01f1e51671b809cd6f7a607670d1b9f04de25 Mon Sep 17 00:00:00 2001 From: Hesketh2 <88981446+Hesketh2@users.noreply.github.com> Date: Fri, 18 Oct 2024 21:59:50 +0700 Subject: [PATCH 17/19] fix for warcraft cc hjp: you may want to double check on this if this is all the fixes I needed to do or not given Warcraft code is a bit different --- components/infobox/wikis/warcraft/infobox_league_custom.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/components/infobox/wikis/warcraft/infobox_league_custom.lua b/components/infobox/wikis/warcraft/infobox_league_custom.lua index a613f0ffcc0..28172d20fdf 100644 --- a/components/infobox/wikis/warcraft/infobox_league_custom.lua +++ b/components/infobox/wikis/warcraft/infobox_league_custom.lua @@ -96,7 +96,7 @@ end function CustomLeague:customParseArguments(args) self.data.game = self:_determineGame(args.game) self.data.status = self:_getStatus(args) - self.data.publishertier = ESL_TIERS[(args.eslprotier or ''):lower()] and args.eslprotier:lower() or nil + self.data.publishertier = ESL_TIERS[(args.eslprotier or ''):lower()] and args.eslprotier:lower() or false self.data.raceBreakDown = RaceBreakdown.run(args, BREAKDOWN_RACES) or {} self.data.maps = self:_getMaps('map', args) self.data.number = tonumber(args.number) From 1789e9586ecb5d0c8b9b1bdcd05f2a31e753f9cc Mon Sep 17 00:00:00 2001 From: Hesketh2 <88981446+Hesketh2@users.noreply.github.com> Date: Fri, 18 Oct 2024 22:34:54 +0700 Subject: [PATCH 18/19] fix for counterstrike Tournaments list shows highlight unintentionally, this seems to be the fix for the case --- .../infobox/wikis/counterstrike/infobox_league_custom.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/components/infobox/wikis/counterstrike/infobox_league_custom.lua b/components/infobox/wikis/counterstrike/infobox_league_custom.lua index 133ae146f24..3011cd6f8dc 100644 --- a/components/infobox/wikis/counterstrike/infobox_league_custom.lua +++ b/components/infobox/wikis/counterstrike/infobox_league_custom.lua @@ -126,7 +126,7 @@ end ---@param args table function CustomLeague:customParseArguments(args) - self.data.publishertier = (self.valveTier or {}).name + self.data.publishertier = (self.valveTier or {}).name or '' if String.isNotEmpty(args.localcurrency) and String.isNotEmpty(args.prizepool) then local currency = string.upper(args.localcurrency) local prize = InfoboxPrizePool._cleanValue(args.prizepool) From 7285c4bbc60017c96236deffa220e9b13565f66d Mon Sep 17 00:00:00 2001 From: Hesketh2 <88981446+Hesketh2@users.noreply.github.com> Date: Sat, 19 Oct 2024 02:25:07 +0700 Subject: [PATCH 19/19] fix for LoL (2) "1" seems to be existed since 2022 so it looks like a primitive code --- .../infobox/wikis/leagueoflegends/infobox_league_custom.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/components/infobox/wikis/leagueoflegends/infobox_league_custom.lua b/components/infobox/wikis/leagueoflegends/infobox_league_custom.lua index d991e71722d..d554efb6480 100644 --- a/components/infobox/wikis/leagueoflegends/infobox_league_custom.lua +++ b/components/infobox/wikis/leagueoflegends/infobox_league_custom.lua @@ -82,7 +82,7 @@ end ---@param args table function CustomLeague:customParseArguments(args) - self.data.publishertier = Logic.readBool(args.riotpremier) and '1' or false + self.data.publishertier = Logic.readBool(args.riotpremier) end ---@param args table