X-Git-Url: http://git.shiar.nl/sc2-widget/blobdiff_plain/73d1bf9607b8ca88878e89b53eb00fa89135bcc0..21b89205cdef485ddc3d039e94ac791590bcff91:/getsc2clan

diff --git a/getsc2clan b/getsc2clan
index 9e6222a..86cb3b8 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;
@@ -18,9 +18,12 @@ $profiles && @{$profiles}
 	or die "Usage: $0 <profile id>... [<clan name>...]\n";
 my ($clanmatch) = map { $_ && qr/\A(?:$_)\z/i } join '|', @{$clanmatches || []};
 
+my @realmget = (profile => 2 => 1); # common request path for european data
 sub blizget {
 	state $bliz = do {
-		my %auth = do './.blizzard.passwd.pl' or die "no auth setup: $!\n";
+		my @authdata = do './.blizzard.passwd.pl' and not $@ || $!
+			or die "No auth setup: ", $@ || $!, "\n";
+		my %auth = @authdata;
 		my $bliz = LWP::Authen::OAuth2->new(%auth,
 			token_endpoint          => 'https://eu.battle.net/oauth/token',
 			request_required_params => [qw( client_id client_secret grant_type )],
@@ -38,17 +41,20 @@ sub blizget {
 
 # prefer deprecated interface to prevent costly ladder search
 my @ladderdata = map {
-	blizget(legacy => profile => 2 => 1 => $_ => 'ladders')
+	blizget(legacy => @realmget => $_ => 'ladders')
 } @{$profiles};
-my %ladders = (
-	map { $_->{ladder}->[0]->{ladderId} => $_ } # unique
-	grep { $_->{ladder}->[0]->{division} }
-	map { $_->{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 = (
-	nsort_by {
-		-($_->{ladder}->[0]->{wins} + $_->{ladder}->[0]->{losses})
-	} # activity desc
 	nsort_by { $_->{ladder}->[0]->{ladderId} } # stable order
 	grep {
 		!$clanmatch or
@@ -61,19 +67,38 @@ my (@members, %memberidx);
 $memberidx{ $_->{id} } //= push(@members, $_) && $#members
 	for map { $_->{characters}->@* } @ladders;
 
+my @games;
+for my $member (map { $_->{id} } @members) {
+	my $usergames = blizget(legacy => @realmget => $member => 'matches');
+	for ($usergames->{matches}->@*) {
+		$_->{player} = $memberidx{$member};
+		push @games, $_;
+	}
+}
+
 say JSON->new->canonical->pretty->encode({
 	name     => $members[0]->{clanName},
 	tag      => $members[0]->{clanTag},
-	ladders  => [map {{
-		league   => lc $_->{ladder}->[0]->{league},
-		division => $_->{ladder}->[0]->{ladderName},
-		rank     => $_->{ladder}->[0]->{rank},
-		members  => [map { $memberidx{$_->{id}} } $_->{characters}->@*],
-		wins     => $_->{ladder}->[0]->{wins},
-		losses   => $_->{ladder}->[0]->{losses},
-	}} @ladders],
+	ladders  => [
+		map {{
+			id       => $_->{ladder}->[0]->{ladderId},
+			league   => lc $_->{ladder}->[0]->{league},
+			division => $_->{ladder}->[0]->{ladderName},
+			rank     => $_->{ladder}->[0]->{rank},
+			members  => [map { $memberidx{$_->{id}} } $_->{characters}->@*],
+			wins     => $_->{ladder}->[0]->{wins},
+			losses   => $_->{ladder}->[0]->{losses},
+			(season  => -1) x ($_->{season} eq 'previousSeason'),
+		}}
+		sort_by { $_->{season} } # season
+		nsort_by {
+			-($_->{ladder}->[0]->{wins} + $_->{ladder}->[0]->{losses})
+		} # activity desc
+		@ladders
+	],
 	members  => [map {
-		blizget(metadata => profile => 2 => 1 => $_->{id})
+		blizget(metadata => @realmget => $_->{id})
 		# lacks mmr, fav race (available in new api)
 	} @members],
+	matches  => [nsort_by { -$_->{date} } @games],
 }) =~ s/(?: \G \d,? | \[ ) \K \s+ (?=\d|\])/ /grx; # concat arrays of single digits