[SoundcloudBridge] Fix client ID extraction (#1973)
This commit is contained in:
parent
e9424f6a08
commit
809343ed06
1 changed files with 26 additions and 12 deletions
|
@ -27,6 +27,9 @@ class SoundCloudBridge extends BridgeAbstract {
|
||||||
private $feedIcon = null;
|
private $feedIcon = null;
|
||||||
private $clientIDCache = null;
|
private $clientIDCache = null;
|
||||||
|
|
||||||
|
private $clientIdRegex = '/client_id.*?"(.+?)"/';
|
||||||
|
private $widgetRegex = '/widget-.+?\.js/';
|
||||||
|
|
||||||
public function collectData(){
|
public function collectData(){
|
||||||
$res = $this->apiGet('resolve', array(
|
$res = $this->apiGet('resolve', array(
|
||||||
'url' => 'https://soundcloud.com/' . $this->getInput('u')
|
'url' => 'https://soundcloud.com/' . $this->getInput('u')
|
||||||
|
@ -113,21 +116,32 @@ class SoundCloudBridge extends BridgeAbstract {
|
||||||
// Without url=http, this returns a 404
|
// Without url=http, this returns a 404
|
||||||
$playerHTML = getContents('https://w.soundcloud.com/player/?url=http')
|
$playerHTML = getContents('https://w.soundcloud.com/player/?url=http')
|
||||||
or returnServerError('Unable to get player page.');
|
or returnServerError('Unable to get player page.');
|
||||||
$regex = '/widget-.+?\.js/';
|
|
||||||
if(preg_match($regex, $playerHTML, $matches) == false)
|
// Extract widget JS filenames from player page
|
||||||
|
if(preg_match_all($this->widgetRegex, $playerHTML, $matches) == false)
|
||||||
returnServerError('Unable to find widget JS URL.');
|
returnServerError('Unable to find widget JS URL.');
|
||||||
$widgetURL = 'https://widget.sndcdn.com/' . $matches[0];
|
|
||||||
|
$clientID = '';
|
||||||
|
|
||||||
|
// Loop widget js files and extract client ID
|
||||||
|
foreach ($matches[0] as $widgetFile) {
|
||||||
|
$widgetURL = 'https://widget.sndcdn.com/' . $widgetFile;
|
||||||
|
|
||||||
$widgetJS = getContents($widgetURL)
|
$widgetJS = getContents($widgetURL)
|
||||||
or returnServerError('Unable to get widget JS page.');
|
or returnServerError('Unable to get widget JS page.');
|
||||||
$regex = '/client_id.*?"(.+?)"/';
|
|
||||||
if(preg_match($regex, $widgetJS, $matches) == false)
|
|
||||||
returnServerError('Unable to find client ID.');
|
|
||||||
$clientID = $matches[1];
|
|
||||||
|
|
||||||
|
if(preg_match($this->clientIdRegex, $widgetJS, $matches)) {
|
||||||
|
$clientID = $matches[1];
|
||||||
$this->clientIDCache->saveData($clientID);
|
$this->clientIDCache->saveData($clientID);
|
||||||
|
|
||||||
return $clientID;
|
return $clientID;
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
if (empty($clientID)) {
|
||||||
|
returnServerError('Unable to find client ID.');
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
private function buildAPIURL($endpoint, $parameters){
|
private function buildAPIURL($endpoint, $parameters){
|
||||||
return 'https://api-v2.soundcloud.com/'
|
return 'https://api-v2.soundcloud.com/'
|
||||||
|
|
Loading…
Reference in a new issue