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

Twitter-compatible API - factored out redundant JSON printing functions 

darcs-hash:20080930212526-462f3-abe9f1f2fc395c751b2861e686d638ea0a8ca001.gz
This commit is contained in:
zach 2008-09-30 17:25:26 -04:00
parent 37b3bd5489
commit 1c4f7722da
3 changed files with 7 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
actions/twitapidirect_messages.php
View File

@ -215,7 +215,7 @@ class Twitapidirect_messagesAction extends TwitterapiAction {
}
}
$this->show_twitter_json_dmsgs($dmsgs);
$this->show_json_objects($dmsgs);
$this->end_document('json');
}

2
actions/twitapiusers.php
View File

@ -116,7 +116,7 @@ class TwitapiusersAction extends TwitterapiAction {
$this->end_document('xml');
} elseif ($apidata['content-type'] == 'json') {
$this->init_document('json');
$this->show_twitter_json_users($twitter_user);
$this->show_json_objects($twitter_user);
$this->end_document('json');
} else {
common_user_error(_('API method not found!'), $code = 404);

18
lib/twitterapi.php
View File

@ -185,16 +185,8 @@ class TwitterapiAction extends Action {
common_element_end('entry');
}
function show_twitter_json_statuses($twitter_statuses) {
print(json_encode($twitter_statuses));
}
function show_twitter_json_users($twitter_users) {
print(json_encode($twitter_users));
}
function show_twitter_json_dmsgs($twitter_dms) {
print(json_encode($twitter_dms));
function show_json_objects($objects) {
print(json_encode($objects));
}
function show_single_xml_status($notice) {
@ -208,7 +200,7 @@ class TwitterapiAction extends Action {
function show_single_json_status($notice) {
$this->init_document('json');
$status = $this->twitter_status_array($notice);
$this->show_twitter_json_statuses($status);
$this->show_json_objects($status);
$this->end_document('json');
exit();
}
@ -331,7 +323,7 @@ class TwitterapiAction extends Action {
}
}
$this->show_twitter_json_statuses($statuses);
$this->show_json_objects($statuses);
$this->end_document('json');
}
@ -507,7 +499,7 @@ class TwitterapiAction extends Action {
$this->show_twitter_xml_user($profile_array);
break;
case 'json':
$this->show_twitter_json_users($profile_array);
$this->show_json_objects($profile_array);
break;
default:
$this->client_error(_('Not a supported data format.'));