X-Git-Url: http://git.shiar.nl/sc2-widget/blobdiff_plain/cbae85142a87301b7e7c3d881550e31b5472c12c..82977cdaf6a7b9f8c11266424efb6f6e97cea4e7:/getsc2clan

diff --git a/getsc2clan b/getsc2clan
index 94ca435..c373051 100755
--- a/getsc2clan
+++ b/getsc2clan
@@ -6,7 +6,7 @@ use utf8;
 use Data::Dump qw( pp );
 use LWP::Authen::OAuth2;
 use JSON qw( decode_json );
-use List::MoreUtils qw( all part nsort_by );
+use List::MoreUtils qw( all part sort_by nsort_by );
 
 if (@ARGV and all { m[/] } @ARGV) {
 	say pp blizget($_) for @ARGV;
@@ -40,13 +40,19 @@ sub blizget {
 my @ladderdata = map {
 	blizget(legacy => profile => 2 => 1 => $_ => 'ladders')
 } @{$profiles};
-my %ladders = (
-	map { $_->{ladder}->[0]->{ladderId} => $_ } # unique
-	grep { $_->{ladder}->[0]->{division} }
-	map { $_->{previousSeason}->@*, $_->{currentSeason}->@* }
-	@ladderdata
-);
+
+# merge relevant ladder data of all users
+my %ladders;
+for my $season (qw[ currentSeason previousSeason ]) {
+	for my $row (map { $_->{$season}->@* } @ladderdata) {
+		$row->{ladder}->[0]->{division} or next;
+		$row->{season} = $season;
+		$ladders{ $row->{ladder}->[0]->{ladderId} } //= $row;
+	}
+}
+
 my @ladders = (
+	sort_by { $_->{season} } # season
 	nsort_by {
 		-($_->{ladder}->[0]->{wins} + $_->{ladder}->[0]->{losses})
 	} # activity desc
@@ -72,6 +78,7 @@ say JSON->new->canonical->pretty->encode({
 		members  => [map { $memberidx{$_->{id}} } $_->{characters}->@*],
 		wins     => $_->{ladder}->[0]->{wins},
 		losses   => $_->{ladder}->[0]->{losses},
+		(season  => -1) x ($_->{season} eq 'previousSeason'),
 	}} @ladders],
 	members  => [map {
 		blizget(metadata => profile => 2 => 1 => $_->{id})