Implement new soundcloud auth

PlayBot/sessions/irc.pm

@@ -15,6 +15,7 @@ use Module::Reload;
 use PlayBot::utils::Logging;
 use PlayBot::sessions::irc::later;
 use PlayBot::sites;
+use PlayBot::sites::soundcloud;
 use PlayBot::commands::parser;
 
 my $log = PlayBot::utils::Logging->new('STDOUT', 1);
@@ -119,6 +120,7 @@ sub setConf
 
     $PlayBot::sites::irc = $irc;
     $PlayBot::sites::log = $log;
+	$PlayBot::sites::soundcloud::clientSecret = $conf->{'soundcloud_secret'};
 }
 
 

PlayBot/sites/soundcloud.pm

@@ -12,8 +12,11 @@ use PlayBot::utils::Logging;
 
 my $log = PlayBot::utils::Logging->new('STDOUT', 1);
 
-my $root = 'http://api.soundcloud.com';
+my $root = 'https://api.soundcloud.com';
 my $clientId = 'f4956716fe1a9dc9c3725af822963365';
+our $clientSecret;
+my $access_token = '';
+my $access_token_time;
 
 
 sub regex_playlist
@@ -27,6 +30,32 @@ sub regex
 	return qr#(?:^|[^!])https?://(?:www\.)?soundcloud.com/([a-zA-Z0-9_-]+/[a-zA-Z0-9_-]+)(?:\?.+)?#;
 }
 
+sub get_access_token
+{
+	if ($access_token ne '' && time() - $access_token_time <= 3000)
+	{
+		return $access_token;
+	}
+
+	$log->info("Get a new soundcloud token");
+
+	my $ua = LWP::UserAgent->new(
+		timeout => 30,
+		env_proxy => 1,
+	);
+	$log->info("the url is ".$root.'/oauth2/token?grant_type=client_credentials&client_id='.$clientId.'&client_secret='.$clientSecret);
+	my $response = $ua->post(
+		$root.'/oauth2/token?grant_type=client_credentials&client_id='.$clientId.'&client_secret='.$clientSecret,
+	);
+	die($response->status_line) unless ($response->is_success);
+
+	my $content = decode_json($response->decoded_content);
+	$access_token = $content->{'access_token'};
+	$access_token_time = time();
+
+	return $access_token;
+}
+
 
 sub get_playlist {
 	shift;
@@ -82,31 +111,22 @@ sub get {
 	my $response;
 	$log->info("the id is ".$id);
 
-    my $retries = 0;
-    while ($retries < 10) {
-	$log->info("Soundcloud API is half break, try number ".($retries + 1));
-
 	if (looks_like_number($id))
 	{
-	    $response = $ua->get($root.'/tracks/'.$id.'?client_id='.$clientId);
+		$response = $ua->get(
+			$root.'/tracks/'.$id,
+			'Authorization' => 'OAuth '.get_access_token(),
+		);
 	}
 	else
 	{
-	    my $url = 'https://www.soundcloud.com/'.$id;
-	    $log->info("the url is ".$root.'/resolve.json?url='.$url.'&client_id='.$clientId);
-	    $response = $ua->get($root.'/resolve.json?url='.$url.'&client_id='.$clientId);
+		my $url = 'https://soundcloud.com/'.$id;
+		$response = $ua->get(
+			$root.'/resolve?url='.$url,
+			'Authorization' => 'OAuth '.get_access_token(),
+		);
 	}
 
-	if ($response->code == 404)
-	{
-	    $retries++;
-	    sleep(1);
-	}
-	else
-	{
-	    last;
-	}
-    }
 	die($response->status_line) unless ($response->is_success);
 
 	my $content = decode_json($response->decoded_content);

playbot-example.conf

@@ -7,6 +7,7 @@
         "youtube_api_key": "somegarbage",
         "facebook_access_token": "myid|myscret",
         "nick": "PlayBot",
+        "soundcloud_secret": SOUNDCLOUD_SECRET,
         "channels": [
             "#hello",
             "#world"