wamo/gnu-social
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge commit 'refs/merge-requests/164' of git://gitorious.org/statusnet/mainline into merge-requests/164

Browse Source 
Conflicts:
	classes/Avatar.php

I ignored the code in Avatar; it's a different patch.
This commit is contained in:
Evan Prodromou 2011-09-21 15:39:44 -04:00
commit 59043dca7f
1 changed files with 17 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

53
plugins/BitlyUrl/BitlyUrlPlugin.php
View File

@ -36,7 +36,7 @@ if (!defined('STATUSNET')) {
class BitlyUrlPlugin extends UrlShortenerPlugin class BitlyUrlPlugin extends UrlShortenerPlugin
{ {
public $shortenerName = 'bit.ly'; public $shortenerName = 'bit.ly';
public $serviceUrl = 'http://bit.ly/api?method=shorten&version=2.0.1&longUrl=%s'; public $serviceUrl = 'http://api.bit.ly/v3/shorten?longUrl=%s';
public $login; // To set a site-default when admins or users don't override it. public $login; // To set a site-default when admins or users don't override it.
public $apiKey; public $apiKey;
@ -69,12 +69,10 @@ class BitlyUrlPlugin extends UrlShortenerPlugin
* @return string shortened version of the url, or null if URL shortening failed * @return string shortened version of the url, or null if URL shortening failed
*/ */
protected function shorten($url) { protected function shorten($url) {
common_log(LOG_INFO, "bit.ly call for $url");
$response = $this->query($url); $response = $this->query($url);
if ($this->isOk($url, $response)) { common_log(LOG_INFO, "bit.ly answer for $url is ".$response->getBody());
return $this->decode($url, $response->getBody()); return $this->decode($url, $response);
} else {
return null;
}
} }
/** /**
@ -126,42 +124,25 @@ class BitlyUrlPlugin extends UrlShortenerPlugin
/** /**
* JSON decode for API result * JSON decode for API result
*/ */
protected function decode($url, $body) protected function decode($url, $response)
{ {
$json = json_decode($body, true); $msg = "bit.ly returned unknown response with unknown message for $url";
return $json['results'][$url]['shortUrl'];
}
/**
* JSON decode for API result
*/
protected function isOk($url, $response)
{
$code = 'unknown';
$msg = '';
if ($response->isOk()) { if ($response->isOk()) {
$body = $response->getBody(); $body = $response->getBody();
common_log(LOG_INFO, $body); common_log(LOG_INFO, $body);
$json = json_decode($body, true); $json = json_decode($body, true);
if ($json['statusCode'] == 'OK') { if ($json['status_code'] == 200) {
if (!isset($json['results'][$url])) { if (isset($json['data']['url'])) {
common_log(LOG_ERR, "bit.ly returned OK response, but didn't find expected URL $url in $body"); common_log(LOG_INFO, "bit.ly returned ".$json['data']['url']." as short URL for $url");
return false; return $json['data']['url'];
} }
$data = $json['results'][$url]; $msg = "bit.ly returned ".$json['status_code']." response, but didn't find expected URL $url in $body";
if (isset($data['shortUrl'])) { }else{
return true; $msg = "bit.ly returned ".$json['status_code']." response with ".$json['status_txt']." for $url";
} else if (isset($data['statusCode']) && $data['statusCode'] == 'ERROR') { }
$code = $data['errorCode']; }
$msg = $data['errorMessage']; common_log(LOG_ERR, $msg);
} return null;
} else if ($json['statusCode'] == 'ERROR') {
$code = $json['errorCode'];
$msg = $json['errorMessage'];
}
common_log(LOG_ERR, "bit.ly returned error $code $msg for $url");
}
return false;
} }
function onPluginVersion(&$versions) function onPluginVersion(&$versions)