From ccdb988cd2a4ec68c66514572514fb5328f63506 Mon Sep 17 00:00:00 2001 From: Tzen Date: Mon, 27 Nov 2023 22:23:57 +0100 Subject: [PATCH 1/7] Update clanmembers.json As agreed in a recent poll. I know you are busy so did the work for you. --- config/clanmembers.json | 3 --- 1 file changed, 3 deletions(-) diff --git a/config/clanmembers.json b/config/clanmembers.json index 0b22e50..6b16d42 100644 --- a/config/clanmembers.json +++ b/config/clanmembers.json @@ -7,9 +7,6 @@ "Masistuta", "RalphNorris", "Jimbo_The_One", - "SquadKiller101", - "Pettie1972", - "HeteKip", "Shepherders" ] } -- 2.49.1 From e5d0f69e0f009fea352a18d1596eaa70d9826478 Mon Sep 17 00:00:00 2001 From: Thijs Stobbelaar Date: Tue, 28 Nov 2023 10:49:10 +0100 Subject: [PATCH 2/7] efficientcy --- index.php | 28 +++++++++++++--------------- 1 file changed, 13 insertions(+), 15 deletions(-) diff --git a/index.php b/index.php index dda75e3..1fdad76 100644 --- a/index.php +++ b/index.php @@ -92,7 +92,6 @@ $lastMatches = array_slice($allMatches, 0, 8); //CLANINFO $clanInfoPath = './data/claninfo.json'; - $clanmembersfile = './config/clanmembers.json'; $rankedfile = './data/player_season_data.json'; $clanmembers = json_decode(file_get_contents($clanmembersfile), true); $playerRanks = json_decode(file_get_contents($rankedfile), true); @@ -101,24 +100,23 @@ $lastMatches = array_slice($allMatches, 0, 8); if (isset($clan) && !empty($clan)) { echo ""; echo ""; - foreach ($clanmembers['clanMembers'] as $value) { - foreach ($playerRanks as $rank) { - if ($rank['name'] == $value) { - if (isset($rank['stat']['data']['attributes']['rankedGameModeStats']['squad-fpp'])) { - $tier = $rank['stat']['data']['attributes']['rankedGameModeStats']['squad-fpp']['currentTier']['tier']; - $subTier = $rank['stat']['data']['attributes']['rankedGameModeStats']['squad-fpp']['currentTier']['subTier']; - $image = "./images/ranks/" . $tier . "-" . $subTier . ".png"; - $rankPoint = htmlspecialchars($rank['stat']['data']['attributes']['rankedGameModeStats']['squad-fpp']['currentRankPoint']); - echo ""; - } else { - echo ""; - } + foreach ($playerRanks as $rank) { + if ($rank['name'] == $value) { + if (isset($rank['stat']['data']['attributes']['rankedGameModeStats']['squad-fpp'])) { + $tier = $rank['stat']['data']['attributes']['rankedGameModeStats']['squad-fpp']['currentTier']['tier']; + $subTier = $rank['stat']['data']['attributes']['rankedGameModeStats']['squad-fpp']['currentTier']['subTier']; + $image = "./images/ranks/" . $tier . "-" . $subTier . ".png"; + $rankPoint = htmlspecialchars($rank['stat']['data']['attributes']['rankedGameModeStats']['squad-fpp']['currentRankPoint']); + echo ""; + } else { + echo ""; } - - } + + } + foreach ($clan as $key => $value) { if ($key == 'updated') { continue; -- 2.49.1 From 229c5ac09a74790a3cf73d165fd8b7e16c03e404 Mon Sep 17 00:00:00 2001 From: Thijs Stobbelaar Date: Tue, 28 Nov 2023 10:49:59 +0100 Subject: [PATCH 3/7] refactor --- index.php | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/index.php b/index.php index 1fdad76..97401fe 100644 --- a/index.php +++ b/index.php @@ -102,19 +102,19 @@ $lastMatches = array_slice($allMatches, 0, 8); echo ""; foreach ($playerRanks as $rank) { - if ($rank['name'] == $value) { - if (isset($rank['stat']['data']['attributes']['rankedGameModeStats']['squad-fpp'])) { - $tier = $rank['stat']['data']['attributes']['rankedGameModeStats']['squad-fpp']['currentTier']['tier']; - $subTier = $rank['stat']['data']['attributes']['rankedGameModeStats']['squad-fpp']['currentTier']['subTier']; - $image = "./images/ranks/" . $tier . "-" . $subTier . ".png"; - $rankPoint = htmlspecialchars($rank['stat']['data']['attributes']['rankedGameModeStats']['squad-fpp']['currentRankPoint']); - echo ""; - } else { - echo ""; - } + + if (isset($rank['stat']['data']['attributes']['rankedGameModeStats']['squad-fpp'])) { + $tier = $rank['stat']['data']['attributes']['rankedGameModeStats']['squad-fpp']['currentTier']['tier']; + $subTier = $rank['stat']['data']['attributes']['rankedGameModeStats']['squad-fpp']['currentTier']['subTier']; + $image = "./images/ranks/" . $tier . "-" . $subTier . ".png"; + $rankPoint = htmlspecialchars($rank['stat']['data']['attributes']['rankedGameModeStats']['squad-fpp']['currentRankPoint']); + echo ""; + } else { + echo ""; } + } foreach ($clan as $key => $value) { -- 2.49.1 From 2b5e9b96fa886962af33e25bca47b7f3e17ff284 Mon Sep 17 00:00:00 2001 From: Thijs Stobbelaar Date: Tue, 28 Nov 2023 10:53:27 +0100 Subject: [PATCH 4/7] efficientcy --- index.php | 28 +++++++++++++++------------- 1 file changed, 15 insertions(+), 13 deletions(-) diff --git a/index.php b/index.php index 97401fe..dda75e3 100644 --- a/index.php +++ b/index.php @@ -92,6 +92,7 @@ $lastMatches = array_slice($allMatches, 0, 8); //CLANINFO $clanInfoPath = './data/claninfo.json'; + $clanmembersfile = './config/clanmembers.json'; $rankedfile = './data/player_season_data.json'; $clanmembers = json_decode(file_get_contents($clanmembersfile), true); $playerRanks = json_decode(file_get_contents($rankedfile), true); @@ -100,23 +101,24 @@ $lastMatches = array_slice($allMatches, 0, 8); if (isset($clan) && !empty($clan)) { echo "
AttributeValueRank(FPP SQUAD)Points
name" . htmlspecialchars($value) . "" . $rankPoint . "
name" . htmlspecialchars($value) . "
name" . htmlspecialchars($rank['name']) . "" . $rankPoint . "
name" . htmlspecialchars($rank['name']) . "
AttributeValueRank(FPP SQUAD)Points
name" . htmlspecialchars($rank['name']) . "" . $rankPoint . "
name" . htmlspecialchars($rank['name']) . "
name" . htmlspecialchars($rank['name']) . "" . $rankPoint . "
name" . htmlspecialchars($rank['name']) . "
"; echo ""; + foreach ($clanmembers['clanMembers'] as $value) { + foreach ($playerRanks as $rank) { + + if ($rank['name'] == $value) { + if (isset($rank['stat']['data']['attributes']['rankedGameModeStats']['squad-fpp'])) { + $tier = $rank['stat']['data']['attributes']['rankedGameModeStats']['squad-fpp']['currentTier']['tier']; + $subTier = $rank['stat']['data']['attributes']['rankedGameModeStats']['squad-fpp']['currentTier']['subTier']; + $image = "./images/ranks/" . $tier . "-" . $subTier . ".png"; + $rankPoint = htmlspecialchars($rank['stat']['data']['attributes']['rankedGameModeStats']['squad-fpp']['currentRankPoint']); + echo ""; + } else { + echo ""; + } + } - foreach ($playerRanks as $rank) { - if (isset($rank['stat']['data']['attributes']['rankedGameModeStats']['squad-fpp'])) { - $tier = $rank['stat']['data']['attributes']['rankedGameModeStats']['squad-fpp']['currentTier']['tier']; - $subTier = $rank['stat']['data']['attributes']['rankedGameModeStats']['squad-fpp']['currentTier']['subTier']; - $image = "./images/ranks/" . $tier . "-" . $subTier . ".png"; - $rankPoint = htmlspecialchars($rank['stat']['data']['attributes']['rankedGameModeStats']['squad-fpp']['currentRankPoint']); - echo ""; - } else { - echo ""; } - - - } - foreach ($clan as $key => $value) { if ($key == 'updated') { continue; -- 2.49.1 From 50a631230c0dba1106b7543ff94b99e54ce77972 Mon Sep 17 00:00:00 2001 From: Thijs Stobbelaar Date: Tue, 28 Nov 2023 10:54:20 +0100 Subject: [PATCH 5/7] s --- index.php | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/index.php b/index.php index dda75e3..f002bfc 100644 --- a/index.php +++ b/index.php @@ -101,10 +101,10 @@ $lastMatches = array_slice($allMatches, 0, 8); if (isset($clan) && !empty($clan)) { echo "
AttributeValueRank(FPP SQUAD)Points
name" . htmlspecialchars($value) . "" . $rankPoint . "
name" . htmlspecialchars($value) . "
name" . htmlspecialchars($rank['name']) . "" . $rankPoint . "
name" . htmlspecialchars($rank['name']) . "
"; echo ""; - foreach ($clanmembers['clanMembers'] as $value) { + foreach ($playerRanks as $rank) { - if ($rank['name'] == $value) { + if (isset($rank['stat']['data']['attributes']['rankedGameModeStats']['squad-fpp'])) { $tier = $rank['stat']['data']['attributes']['rankedGameModeStats']['squad-fpp']['currentTier']['tier']; $subTier = $rank['stat']['data']['attributes']['rankedGameModeStats']['squad-fpp']['currentTier']['subTier']; @@ -114,11 +114,11 @@ $lastMatches = array_slice($allMatches, 0, 8); } else { echo ""; } - } + } - } + foreach ($clan as $key => $value) { if ($key == 'updated') { continue; -- 2.49.1 From 04d652528414b44784ccaab97ef529b8ef095fab Mon Sep 17 00:00:00 2001 From: Thijs Stobbelaar Date: Tue, 28 Nov 2023 10:55:50 +0100 Subject: [PATCH 6/7] ref --- index.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/index.php b/index.php index f002bfc..7b62f2b 100644 --- a/index.php +++ b/index.php @@ -104,15 +104,15 @@ $lastMatches = array_slice($allMatches, 0, 8); foreach ($playerRanks as $rank) { - + $playername = $rank['name']; if (isset($rank['stat']['data']['attributes']['rankedGameModeStats']['squad-fpp'])) { $tier = $rank['stat']['data']['attributes']['rankedGameModeStats']['squad-fpp']['currentTier']['tier']; $subTier = $rank['stat']['data']['attributes']['rankedGameModeStats']['squad-fpp']['currentTier']['subTier']; $image = "./images/ranks/" . $tier . "-" . $subTier . ".png"; $rankPoint = htmlspecialchars($rank['stat']['data']['attributes']['rankedGameModeStats']['squad-fpp']['currentRankPoint']); - echo ""; + echo ""; } else { - echo ""; + echo ""; } -- 2.49.1 From fcdaffd1ef0c7a625ae34b03fe654207c5b6736b Mon Sep 17 00:00:00 2001 From: Thijs Stobbelaar Date: Tue, 28 Nov 2023 11:18:45 +0100 Subject: [PATCH 7/7] sorting --- update/get_matches.ps1 | 2 ++ update/update_clan_members.ps1 | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/update/get_matches.ps1 b/update/get_matches.ps1 index 793e36f..cc77ff4 100644 --- a/update/get_matches.ps1 +++ b/update/get_matches.ps1 @@ -46,6 +46,8 @@ foreach ($player in $player_data) { } else { $stats = Invoke-RestMethod -Uri "https://api.pubg.com/shards/steam/matches/$match" -Method GET -Headers $headers + $sortedStats = $stats.included | Where-Object { $_.attributes.stats } | Sort-Object { $_.attributes.stats.winplace } + $stats.included = $sortedStats $stats | ConvertTo-Json -Depth 100 | Out-File "$scriptroot/../data/matches/$match.json" } diff --git a/update/update_clan_members.ps1 b/update/update_clan_members.ps1 index 8732e83..f15b709 100644 --- a/update/update_clan_members.ps1 +++ b/update/update_clan_members.ps1 @@ -196,7 +196,7 @@ while($playerinfo.data.Count -gt $i) { $i++ } -$seasonstats | convertto-json -Depth 100| Out-File "$scriptroot/../data/player_season_data.json" +$seasonstats | Sort-Object -Property {$_.stat.data.attributes.rankedGameModeStats.'squad-fpp'.currentRankPoint} -Descending | convertto-json -Depth 100| Out-File "$scriptroot/../data/player_season_data.json" remove-lock Stop-Transcript \ No newline at end of file -- 2.49.1
AttributeValueRank(FPP SQUAD)Points
name" . htmlspecialchars($value) . "
name" . htmlspecialchars($value) . "" . $rankPoint . "
name" . htmlspecialchars($playername) . "" . $rankPoint . "
name" . htmlspecialchars($value) . "
name" . htmlspecialchars($playername) . "