exit(1);
}
+class ApiValidationException extends Exception { }
+
/**
* Contains most of the Twitter-compatible API output functions.
*
? Design::url($design->backgroundimage) : '';
$twitter_user['profile_background_tile']
- = empty($design->disposition)
- ? '' : ($design->disposition & BACKGROUND_TILE) ? 'true' : 'false';
+ = (bool)($design->disposition & BACKGROUND_TILE);
$twitter_user['statuses_count'] = $profile->noticeCount();
{
$twitter_group = array();
- $twitter_group['id'] = $group->id;
+ $twitter_group['id'] = intval($group->id);
$twitter_group['url'] = $group->permalink();
$twitter_group['nickname'] = $group->nickname;
$twitter_group['fullname'] = $group->fullname;
$entry = array();
if (Event::handle('StartRssEntryArray', array($notice, &$entry))) {
-
$profile = $notice->getProfile();
// We trim() to avoid extraneous whitespace in the output
$notifications = false;
if ($source->isSubscribed($target)) {
-
$sub = Subscription::pkeyGet(array('subscriber' =>
$source->id, 'subscribed' => $target->id));
$details['notifications_enabled'] = $notifications;
$details['blocking'] = $source->hasBlocked($target);
- $details['id'] = $source->id;
+ $details['id'] = intval($source->id);
return $details;
}
$this->endDocument('xml');
}
+ function showSingleAtomStatus($notice)
+ {
+ header('Content-Type: application/atom+xml; charset=utf-8');
+ print $notice->asAtomEntry(true, true, true, $this->auth_user);
+ }
+
function show_single_json_status($notice)
{
$this->initDocument('json');
function showXmlTimeline($notice)
{
-
$this->initDocument('xml');
$this->elementStart('statuses', array('type' => 'array',
'xmlns:statusnet' => 'http://status.net/schema/api/1/'));
function showRssTimeline($notice, $title, $link, $subtitle, $suplink = null, $logo = null, $self = null)
{
-
$this->initDocument('rss');
$this->element('title', null, $title);
function showAtomTimeline($notice, $title, $id, $link, $subtitle=null, $suplink=null, $selfuri=null, $logo=null)
{
-
$this->initDocument('atom');
$this->element('title', null, $title);
function showRssGroups($group, $title, $link, $subtitle)
{
-
$this->initDocument('rss');
$this->element('title', null, $title);
$from_profile = $message->getFrom();
$to_profile = $message->getTo();
- $dmsg['id'] = $message->id;
- $dmsg['sender_id'] = $message->from_profile;
+ $dmsg['id'] = intval($message->id);
+ $dmsg['sender_id'] = intval($from_profile);
$dmsg['text'] = trim($message->content);
- $dmsg['recipient_id'] = $message->to_profile;
+ $dmsg['recipient_id'] = intval($to_profile);
$dmsg['created_at'] = $this->dateTwitter($message->created);
$dmsg['sender_screen_name'] = $from_profile->nickname;
$dmsg['recipient_screen_name'] = $to_profile->nickname;
return;
}
- function clientError($msg, $code = 400, $format = 'xml')
+ function clientError($msg, $code = 400, $format = null)
{
$action = $this->trimmed('action');
+ if ($format === null) {
+ $format = $this->format;
+ }
common_debug("User error '$code' on '$action': $msg", __FILE__);
// Do not emit error header for JSONP
if (!isset($this->callback)) {
- header('HTTP/1.1 '.$code.' '.$status_string);
+ header('HTTP/1.1 ' . $code . ' ' . $status_string);
}
- if ($format == 'xml') {
+ switch($format) {
+ case 'xml':
$this->initDocument('xml');
$this->elementStart('hash');
$this->element('error', null, $msg);
$this->element('request', null, $_SERVER['REQUEST_URI']);
$this->elementEnd('hash');
$this->endDocument('xml');
- } elseif ($format == 'json'){
+ break;
+ case 'json':
$this->initDocument('json');
$error_array = array('error' => $msg, 'request' => $_SERVER['REQUEST_URI']);
print(json_encode($error_array));
$this->endDocument('json');
- } else {
-
+ break;
+ case 'text':
+ header('Content-Type: text/plain; charset=utf-8');
+ print $msg;
+ break;
+ default:
// If user didn't request a useful format, throw a regular client error
throw new ClientException($msg, $code);
}
}
- function serverError($msg, $code = 500, $content_type = 'xml')
+ function serverError($msg, $code = 500, $content_type = null)
{
$action = $this->trimmed('action');
+ if ($content_type === null) {
+ $content_type = $this->format;
+ }
common_debug("Server error '$code' on '$action': $msg", __FILE__);
return;
}
+ private static function is_decimal($str)
+ {
+ return preg_match('/^[0-9]+$/', $str);
+ }
+
function getTargetUser($id)
{
if (empty($id)) {
-
// Twitter supports these other ways of passing the user ID
- if (is_numeric($this->arg('id'))) {
+ if (self::is_decimal($this->arg('id'))) {
return User::staticGet($this->arg('id'));
} else if ($this->arg('id')) {
$nickname = common_canonical_nickname($this->arg('id'));
} else if ($this->arg('user_id')) {
// This is to ensure that a non-numeric user_id still
// overrides screen_name even if it doesn't get used
- if (is_numeric($this->arg('user_id'))) {
+ if (self::is_decimal($this->arg('user_id'))) {
return User::staticGet('id', $this->arg('user_id'));
}
} else if ($this->arg('screen_name')) {
return $this->auth_user;
}
- } else if (is_numeric($id)) {
+ } else if (self::is_decimal($id)) {
return User::staticGet($id);
} else {
$nickname = common_canonical_nickname($id);
if (empty($id)) {
// Twitter supports these other ways of passing the user ID
- if (is_numeric($this->arg('id'))) {
+ if (self::is_decimal($this->arg('id'))) {
return Profile::staticGet($this->arg('id'));
} else if ($this->arg('id')) {
+ // Screen names currently can only uniquely identify a local user.
$nickname = common_canonical_nickname($this->arg('id'));
- return Profile::staticGet('nickname', $nickname);
+ $user = User::staticGet('nickname', $nickname);
+ return $user ? $user->getProfile() : null;
} else if ($this->arg('user_id')) {
// This is to ensure that a non-numeric user_id still
// overrides screen_name even if it doesn't get used
- if (is_numeric($this->arg('user_id'))) {
+ if (self::is_decimal($this->arg('user_id'))) {
return Profile::staticGet('id', $this->arg('user_id'));
}
} else if ($this->arg('screen_name')) {
$nickname = common_canonical_nickname($this->arg('screen_name'));
- return Profile::staticGet('nickname', $nickname);
+ $user = User::staticGet('nickname', $nickname);
+ return $user ? $user->getProfile() : null;
}
- } else if (is_numeric($id)) {
+ } else if (self::is_decimal($id)) {
return Profile::staticGet($id);
} else {
$nickname = common_canonical_nickname($id);
- return Profile::staticGet('nickname', $nickname);
+ $user = User::staticGet('nickname', $nickname);
+ return $user ? $user->getProfile() : null;
}
}
function getTargetGroup($id)
{
if (empty($id)) {
- if (is_numeric($this->arg('id'))) {
- return User_group::staticGet($this->arg('id'));
+ if (self::is_decimal($this->arg('id'))) {
+ return User_group::staticGet('id', $this->arg('id'));
} else if ($this->arg('id')) {
- $nickname = common_canonical_nickname($this->arg('id'));
- $local = Local_group::staticGet('nickname', $nickname);
- if (empty($local)) {
- return null;
- } else {
- return User_group::staticGet('id', $local->id);
- }
+ return User_group::getForNickname($this->arg('id'));
} else if ($this->arg('group_id')) {
- // This is to ensure that a non-numeric user_id still
- // overrides screen_name even if it doesn't get used
- if (is_numeric($this->arg('group_id'))) {
+ // This is to ensure that a non-numeric group_id still
+ // overrides group_name even if it doesn't get used
+ if (self::is_decimal($this->arg('group_id'))) {
return User_group::staticGet('id', $this->arg('group_id'));
}
} else if ($this->arg('group_name')) {
- $nickname = common_canonical_nickname($this->arg('group_name'));
- $local = Local_group::staticGet('nickname', $nickname);
- if (empty($local)) {
- return null;
- } else {
- return User_group::staticGet('id', $local->group_id);
- }
+ return User_group::getForNickname($this->arg('group_name'));
}
- } else if (is_numeric($id)) {
- return User_group::staticGet($id);
+ } else if (self::is_decimal($id)) {
+ return User_group::staticGet('id', $id);
} else {
- $nickname = common_canonical_nickname($id);
- $local = Local_group::staticGet('nickname', $nickname);
- if (empty($local)) {
- return null;
- } else {
- return User_group::staticGet('id', $local->group_id);
- }
+ return User_group::getForNickname($id);
}
}
projects / quix0rs-gnu-social.git / blobdiff