GNUsocial/gnu-social
4
0
Fork 1
Code Issues Releases Wiki Activity

Makes TwitterBridge plugin use Twitter API 1.1 instead of API 1 which is deprecated and will be switched off soon

Browse Source
This commit is contained in:
Jean Baptiste Favre 2013-02-10 20:06:30 +01:00
parent a10a34a3cf
commit f726c6b23f
2 changed files with 16 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
plugins/TwitterBridge/daemons/twitterstatusfetcher.php
View File

@ -137,7 +137,7 @@ class TwitterStatusFetcher extends ParallelizingDaemon
$conn = &$flink->getDatabaseConnection(); $conn = &$flink->getDatabaseConnection();
$this->getTimeline($flink, 'home_timeline'); $this->getTimeline($flink, 'home_timeline');
$this->getTimeline($flink, 'mentions'); $this->getTimeline($flink, 'mentions_timeline');
$flink->last_friendsync = common_sql_now(); $flink->last_friendsync = common_sql_now();
$flink->update(); $flink->update();

26
plugins/TwitterBridge/twitteroauthclient.php
View File

@ -157,7 +157,7 @@ class TwitterOAuthClient extends OAuthClient
*/ */
function verifyCredentials() function verifyCredentials()
{ {
$url = 'https://api.twitter.com/1/account/verify_credentials.json'; $url = 'https://api.twitter.com/1.1/account/verify_credentials.json';
$response = $this->oAuthGet($url); $response = $this->oAuthGet($url);
$twitter_user = json_decode($response); $twitter_user = json_decode($response);
return $twitter_user; return $twitter_user;
@ -175,7 +175,7 @@ class TwitterOAuthClient extends OAuthClient
*/ */
function statusesUpdate($status, $params=array()) function statusesUpdate($status, $params=array())
{ {
$url = 'https://api.twitter.com/1/statuses/update.json'; $url = 'https://api.twitter.com/1.1/statuses/update.json';
if (is_numeric($params)) { if (is_numeric($params)) {
$params = array('in_reply_to_status_id' => intval($params)); $params = array('in_reply_to_status_id' => intval($params));
} }
@ -201,7 +201,7 @@ class TwitterOAuthClient extends OAuthClient
function statusesTimeline($since_id = null, $timelineUri = 'home_timeline', function statusesTimeline($since_id = null, $timelineUri = 'home_timeline',
$max_id = null, $cnt = 200, $page = null) $max_id = null, $cnt = 200, $page = null)
{ {
$url = 'https://api.twitter.com/1/statuses/'.$timelineUri.'.json'; $url = 'https://api.twitter.com/1.1/statuses/'.$timelineUri.'.json';
$params = array('include_entities' => 'true', $params = array('include_entities' => 'true',
'include_rts' => 'true'); 'include_rts' => 'true');
@ -237,7 +237,7 @@ class TwitterOAuthClient extends OAuthClient
function statusesFriends($id = null, $user_id = null, $screen_name = null, function statusesFriends($id = null, $user_id = null, $screen_name = null,
$page = null) $page = null)
{ {
$url = "https://api.twitter.com/1/statuses/friends.json"; $url = "https://api.twitter.com/1.1/friends/list.json";
$params = array(); $params = array();
@ -275,7 +275,7 @@ class TwitterOAuthClient extends OAuthClient
function friendsIds($id = null, $user_id = null, $screen_name = null, function friendsIds($id = null, $user_id = null, $screen_name = null,
$page = null) $page = null)
{ {
$url = "https://api.twitter.com/1/friends/ids.json"; $url = "https://api.twitter.com/1.1/friends/ids.json";
$params = array(); $params = array();
@ -310,7 +310,7 @@ class TwitterOAuthClient extends OAuthClient
function statusesRetweet($id) function statusesRetweet($id)
{ {
$url = "http://api.twitter.com/1/statuses/retweet/$id.json"; $url = "http://api.twitter.com/1.1/statuses/retweet/$id.json";
$response = $this->oAuthPost($url); $response = $this->oAuthPost($url);
$status = json_decode($response); $status = json_decode($response);
return $status; return $status;
@ -326,8 +326,10 @@ class TwitterOAuthClient extends OAuthClient
function favoritesCreate($id) function favoritesCreate($id)
{ {
$url = "http://api.twitter.com/1/favorites/create/$id.json"; $url = "http://api.twitter.com/1.1/favorites/create.json";
$response = $this->oAuthPost($url); $params=array();
$params['id'] = $id;
$response = $this->oAuthPost($url, $params);
$status = json_decode($response); $status = json_decode($response);
return $status; return $status;
} }
@ -342,8 +344,10 @@ class TwitterOAuthClient extends OAuthClient
function favoritesDestroy($id) function favoritesDestroy($id)
{ {
$url = "http://api.twitter.com/1/favorites/destroy/$id.json"; $url = "http://api.twitter.com/1.1/favorites/destroy.json";
$response = $this->oAuthPost($url); $params=array();
$params['id'] = $id;
$response = $this->oAuthPost($url,$params);
$status = json_decode($response); $status = json_decode($response);
return $status; return $status;
} }
@ -358,7 +362,7 @@ class TwitterOAuthClient extends OAuthClient
function statusesDestroy($id) function statusesDestroy($id)
{ {
$url = "http://api.twitter.com/1/statuses/destroy/$id.json"; $url = "http://api.twitter.com/1.1/statuses/destroy/$id.json";
$response = $this->oAuthPost($url); $response = $this->oAuthPost($url);
$status = json_decode($response); $status = json_decode($response);
return $status; return $status;