forked from GNUsocial/gnu-social
Revert "Twitter-compatible API - update verify_credentials to return profile"
This reverts commit b801f73b1f.
Twhirl assumes we return the old kind of results, so we have to do that.
This commit is contained in:
Evan Prodromou
parent
28d17d8d90
commit
0f8b902004
@ -47,7 +47,7 @@ class ApiAction extends Action {
|
|||||||
$this->content_type = strtolower($cmdext[1]);
|
$this->content_type = strtolower($cmdext[1]);
|
||||||
}
|
}
|
||||||
|
|
||||||
if ($this->requires_auth()) {
|
if($this->requires_auth()) {
|
||||||
if (!isset($_SERVER['PHP_AUTH_USER'])) {
|
if (!isset($_SERVER['PHP_AUTH_USER'])) {
|
||||||
|
|
||||||
# This header makes basic auth go
|
# This header makes basic auth go
|
||||||
@ -70,9 +70,13 @@ class ApiAction extends Action {
|
|||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
|
|
||||||
# Look for the user in the session
|
# Caller might give us a username even if not required
|
||||||
if (common_logged_in()) {
|
if (isset($_SERVER['PHP_AUTH_USER'])) {
|
||||||
$this->user = common_current_user();
|
$user = User::staticGet('nickname', $_SERVER['PHP_AUTH_USER']);
|
||||||
|
if ($user) {
|
||||||
|
$this->user = $user;
|
||||||
|
}
|
||||||
|
# Twitter doesn't throw an error if the user isn't found
|
||||||
}
|
}
|
||||||
|
|
||||||
$this->process_command();
|
$this->process_command();
|
||||||
|
|||||||
@ -24,14 +24,17 @@ require_once(INSTALLDIR.'/lib/twitterapi.php');
|
|||||||
class TwitapiaccountAction extends TwitterapiAction {
|
class TwitapiaccountAction extends TwitterapiAction {
|
||||||
|
|
||||||
function verify_credentials($args, $apidata) {
|
function verify_credentials($args, $apidata) {
|
||||||
parent::handle($args);
|
|
||||||
|
|
||||||
if (!in_array($apidata['content-type'], array('xml', 'json'))) {
|
if ($apidata['content-type'] == 'xml') {
|
||||||
common_user_error(_('API method not found!'), $code = 404);
|
header('Content-Type: application/xml; charset=utf-8');
|
||||||
return;
|
print '<authorized>true</authorized>';
|
||||||
|
} elseif ($apidata['content-type'] == 'json') {
|
||||||
|
header('Content-Type: application/json; charset=utf-8');
|
||||||
|
print '{"authorized":true}';
|
||||||
|
} else {
|
||||||
|
common_user_error(_('API method not found!'), $code=404);
|
||||||
}
|
}
|
||||||
|
|
||||||
$this->show_extended_profile($apidata['user'], $apidata);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
function end_session($args, $apidata) {
|
function end_session($args, $apidata) {
|
||||||
|
|||||||
@ -31,6 +31,7 @@ class TwitapiusersAction extends TwitterapiAction {
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
$this->auth_user = $apidata['user'];
|
||||||
$user = null;
|
$user = null;
|
||||||
$email = $this->arg('email');
|
$email = $this->arg('email');
|
||||||
|
|
||||||
@ -46,7 +47,72 @@ class TwitapiusersAction extends TwitterapiAction {
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
$this->show_extended_profile($user, $apidata);
|
$profile = $user->getProfile();
|
||||||
|
|
||||||
|
if (!$profile) {
|
||||||
|
common_server_error(_('User has no profile.'));
|
||||||
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
$twitter_user = $this->twitter_user_array($profile, true);
|
||||||
|
|
||||||
|
// Add in extended user fields offered up by this method
|
||||||
|
$twitter_user['created_at'] = $this->date_twitter($profile->created);
|
||||||
|
|
||||||
|
$subbed = DB_DataObject::factory('subscription');
|
||||||
|
$subbed->subscriber = $profile->id;
|
||||||
|
$subbed_count = (int) $subbed->count() - 1;
|
||||||
|
|
||||||
|
$notices = DB_DataObject::factory('notice');
|
||||||
|
$notices->profile_id = $profile->id;
|
||||||
|
$notice_count = (int) $notices->count();
|
||||||
|
|
||||||
|
$twitter_user['friends_count'] = (is_int($subbed_count)) ? $subbed_count : 0;
|
||||||
|
$twitter_user['statuses_count'] = (is_int($notice_count)) ? $notice_count : 0;
|
||||||
|
|
||||||
|
// Other fields Twitter sends...
|
||||||
|
$twitter_user['profile_background_color'] = '';
|
||||||
|
$twitter_user['profile_text_color'] = '';
|
||||||
|
$twitter_user['profile_link_color'] = '';
|
||||||
|
$twitter_user['profile_sidebar_fill_color'] = '';
|
||||||
|
|
||||||
|
$faves = DB_DataObject::factory('fave');
|
||||||
|
$faves->user_id = $user->id;
|
||||||
|
$faves_count = (int) $faves->count();
|
||||||
|
$twitter_user['favourites_count'] = $faves_count;
|
||||||
|
|
||||||
|
$timezone = 'UTC';
|
||||||
|
|
||||||
|
if ($user->timezone) {
|
||||||
|
$timezone = $user->timezone;
|
||||||
|
}
|
||||||
|
|
||||||
|
$t = new DateTime;
|
||||||
|
$t->setTimezone(new DateTimeZone($timezone));
|
||||||
|
$twitter_user['utc_offset'] = $t->format('Z');
|
||||||
|
$twitter_user['time_zone'] = $timezone;
|
||||||
|
|
||||||
|
if (isset($this->auth_user)) {
|
||||||
|
|
||||||
|
if ($this->auth_user->isSubscribed($profile)) {
|
||||||
|
$twitter_user['following'] = 'true';
|
||||||
|
} else {
|
||||||
|
$twitter_user['following'] = 'false';
|
||||||
|
}
|
||||||
|
|
||||||
|
// Not implemented yet
|
||||||
|
$twitter_user['notifications'] = 'false';
|
||||||
|
}
|
||||||
|
|
||||||
|
if ($apidata['content-type'] == 'xml') {
|
||||||
|
$this->init_document('xml');
|
||||||
|
$this->show_twitter_xml_user($twitter_user);
|
||||||
|
$this->end_document('xml');
|
||||||
|
} elseif ($apidata['content-type'] == 'json') {
|
||||||
|
$this->init_document('json');
|
||||||
|
$this->show_json_objects($twitter_user);
|
||||||
|
$this->end_document('json');
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@ -580,78 +580,4 @@ class TwitterapiAction extends Action {
|
|||||||
return $source_name;
|
return $source_name;
|
||||||
}
|
}
|
||||||
|
|
||||||
function show_extended_profile($user, $apidata) {
|
|
||||||
|
|
||||||
$this->auth_user = $apidata['user'];
|
|
||||||
|
|
||||||
$profile = $user->getProfile();
|
|
||||||
|
|
||||||
if (!$profile) {
|
|
||||||
common_server_error(_('User has no profile.'));
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
$twitter_user = $this->twitter_user_array($profile, true);
|
|
||||||
|
|
||||||
// Add in extended user fields offered up by this method
|
|
||||||
$twitter_user['created_at'] = $this->date_twitter($profile->created);
|
|
||||||
|
|
||||||
$subbed = DB_DataObject::factory('subscription');
|
|
||||||
$subbed->subscriber = $profile->id;
|
|
||||||
$subbed_count = (int) $subbed->count() - 1;
|
|
||||||
|
|
||||||
$notices = DB_DataObject::factory('notice');
|
|
||||||
$notices->profile_id = $profile->id;
|
|
||||||
$notice_count = (int) $notices->count();
|
|
||||||
|
|
||||||
$twitter_user['friends_count'] = (is_int($subbed_count)) ? $subbed_count : 0;
|
|
||||||
$twitter_user['statuses_count'] = (is_int($notice_count)) ? $notice_count : 0;
|
|
||||||
|
|
||||||
// Other fields Twitter sends...
|
|
||||||
$twitter_user['profile_background_color'] = '';
|
|
||||||
$twitter_user['profile_text_color'] = '';
|
|
||||||
$twitter_user['profile_link_color'] = '';
|
|
||||||
$twitter_user['profile_sidebar_fill_color'] = '';
|
|
||||||
|
|
||||||
$faves = DB_DataObject::factory('fave');
|
|
||||||
$faves->user_id = $user->id;
|
|
||||||
$faves_count = (int) $faves->count();
|
|
||||||
$twitter_user['favourites_count'] = $faves_count;
|
|
||||||
|
|
||||||
$timezone = 'UTC';
|
|
||||||
|
|
||||||
if ($user->timezone) {
|
|
||||||
$timezone = $user->timezone;
|
|
||||||
}
|
|
||||||
|
|
||||||
$t = new DateTime;
|
|
||||||
$t->setTimezone(new DateTimeZone($timezone));
|
|
||||||
$twitter_user['utc_offset'] = $t->format('Z');
|
|
||||||
$twitter_user['time_zone'] = $timezone;
|
|
||||||
|
|
||||||
$following = 'false';
|
|
||||||
|
|
||||||
if (isset($this->auth_user)) {
|
|
||||||
if ($this->auth_user->isSubscribed($profile)) {
|
|
||||||
$following = 'true';
|
|
||||||
}
|
|
||||||
|
|
||||||
// Not implemented yet
|
|
||||||
$twitter_user['notifications'] = 'false';
|
|
||||||
}
|
|
||||||
|
|
||||||
$twitter_user['following'] = $following;
|
|
||||||
|
|
||||||
if ($apidata['content-type'] == 'xml') {
|
|
||||||
$this->init_document('xml');
|
|
||||||
$this->show_twitter_xml_user($twitter_user);
|
|
||||||
$this->end_document('xml');
|
|
||||||
} elseif ($apidata['content-type'] == 'json') {
|
|
||||||
$this->init_document('json');
|
|
||||||
$this->show_json_objects($twitter_user);
|
|
||||||
$this->end_document('json');
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
}
|
||||||
Loading…
Reference in New Issue
Block a user