X-Git-Url: http://git.shiar.net/sc2-widget/blobdiff_plain/8fa3495ef2c5ea9cf57cda680cfc65b4404477cf..12f56f9cb78506076b690bae00531330ace88fd3:/getsc2clan

diff --git a/getsc2clan b/getsc2clan
index 6c02c0b..23190e4 100755
--- a/getsc2clan
+++ b/getsc2clan
@@ -30,21 +30,30 @@ sub blizget {
 
 # find largest group consisting entirely of clan members
 # prefer deprecated interface to prevent costly ladder search
-my $ladders = blizget(legacy => profile => 2 => 1 => $profileid => 'ladders');
-my ($ladder) = (
+my $ladderdata = blizget(legacy => profile => 2 => 1 => $profileid => 'ladders');
+my @ladders = (
 	sort { $b->{characters}->@* <=> $a->{characters}->@* } # population desc
 	grep {
 		!$clanmatch or
 		all { fc $_->{clanName} eq fc $clanmatch } $_->{characters}->@*
 	} # members
-	$ladders->{currentSeason}->@*
+	grep { $_->{ladder}->[0]->{division} }
+	$ladderdata->{currentSeason}->@*
 ) or die "No matching groups found\n";
+my @members = $ladders[0]->{characters}->@*;
+my %memberidx = map { $members[$_]->{id} => $_ } 0 .. $#members;
 
 say JSON->new->canonical->pretty->encode({
-	league   => ucfirst lc $ladder->{ladder}->[0]->{league},
-	division => $ladder->{ladder}->[0]->{ladderName},
-	rank     => $ladder->{ladder}->[0]->{rank},
-	tag      => $ladder->{characters}->[0]->{clanTag},
-	members  => [map { blizget(metadata => profile => 2 => 1 => $_->{id}) } $ladder->{characters}->@*],
-	# lacks mmr, fav race (available in new api)
+	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}->@*],
+	}} @ladders],
+	members  => [map {
+		blizget(metadata => profile => 2 => 1 => $_->{id})
+		# lacks mmr, fav race (available in new api)
+	} @members],
 });