match multiple clan names

[sc2-widget] / getsc2clan

diff --git a/getsc2clan b/getsc2clan
index 4f6bcc35fd4f5827693e3eed0156f047616bd09c..498d0a31622d2b88f6087a5cf461d3972368f78b 100755 (executable)
--- a/getsc2clan
+++ b/getsc2clan
@@ -8,21 +8,21 @@ use LWP::Authen::OAuth2;
 use JSON qw( decode_json );
 use List::Util qw( all );
 
-my ($profileid, $clanmatch) = @ARGV;  # clan host and name
+my ($profileid, @clanmatches) = @ARGV;  # clan host and names
 $profileid and $profileid =~ /\A\d+\z/
-       or die "Usage: $0 <profile id> [<clan name>]\n";
+       or die "Usage: $0 <profile id> [<clan name>...]\n";
+my ($clanmatch) = map { $_ && qr/\A(?:$_)\z/i } join '|', @clanmatches;
 
-my $bliz = LWP::Authen::OAuth2->new(
-       client_id               => '7f0f95ac9529474f854ee8d68a12c3e0',
-       client_secret           => 'Kfa8n98UAaDo4brOeqxe9C2kJE9pqpSd',
-       token_endpoint          => 'https://us.battle.net/oauth/token',
+my %auth = do './.blizzard.passwd.pl' or die "no auth setup: $!\n";
+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 )],
 );
 $bliz->request_tokens(grant_type => 'client_credentials');
 
 sub blizget {
        my $args = join('/', @_);
-       my $res = $bliz->get("https://us.api.blizzard.com/sc2/$args");
+       my $res = $bliz->get("https://eu.api.blizzard.com/sc2/$args");
        $res->is_success or die $res->status_line;
        my $json = $res->decoded_content;
        return decode_json($json);
@@ -38,7 +38,7 @@ my @ladders = (
        } # activity desc
        grep {
                !$clanmatch or
-               all { fc $_->{clanName} eq fc $clanmatch } $_->{characters}->@*
+               all { $_->{clanName} =~ $clanmatch } $_->{characters}->@*
        } # members
        grep { $_->{ladder}->[0]->{division} }
        $ladderdata->{currentSeason}->@*
@@ -62,4 +62,4 @@ say JSON->new->canonical->pretty->encode({
                blizget(metadata => profile => 2 => 1 => $_->{id})
                # lacks mmr, fav race (available in new api)
        } @members],
-});
+}) =~ s/(?: \G \d,? | \[ ) \K \s+ (?=\d|\])/ /grx; # concat arrays of single digits