exit(1);
}
-require_once INSTALLDIR . '/lib/apibareauth.php';
-
/**
* Returns the most recent notices (default 20) posted by the authenticating
* user. Another user's timeline can be requested via the id parameter. This
*
* @return boolean success flag
*/
- function prepare($args)
+ protected function prepare(array $args=array())
{
parent::prepare($args);
- $this->user = $this->getTargetUser($this->arg('id'));
+ $this->target = $this->getTargetProfile($this->arg('id'));
- if (empty($this->user)) {
+ if (!($this->target instanceof Profile)) {
// TRANS: Client error displayed requesting most recent notices for a non-existing user.
- $this->clientError(_('No such user.'), 404, $this->format);
- return;
+ $this->clientError(_('No such user.'), 404);
}
$this->notices = $this->getNotices();
*
* Just show the notices
*
- * @param array $args $_REQUEST data (unused)
- *
* @return void
*/
- function handle($args)
+ protected function handle()
{
- parent::handle($args);
+ parent::handle();
if ($this->isPost()) {
$this->handlePost();
*/
function showTimeline()
{
- $profile = $this->user->getProfile();
-
// We'll use the shared params from the Atom stub
// for other feed types.
- $atom = new AtomUserNoticeFeed($this->user, $this->auth_user);
+ $atom = new AtomUserNoticeFeed($this->target->getUser(), $this->auth_user);
$link = common_local_url(
'showstream',
- array('nickname' => $this->user->nickname)
+ array('nickname' => $this->target->nickname)
);
$self = $this->getSelfUri();
// FriendFeed's SUP protocol
// Also added RSS and Atom feeds
- $suplink = common_local_url('sup', null, null, $this->user->id);
+ $suplink = common_local_url('sup', null, null, $this->target->id);
header('X-SUP-ID: ' . $suplink);
switch($this->format) {
if (!empty($this->next_id)) {
$nextUrl = common_local_url('ApiTimelineUser',
array('format' => 'atom',
- 'id' => $this->user->id),
+ 'id' => $this->target->id),
array('max_id' => $this->next_id));
$atom->addLink($nextUrl,
$prevUrl = common_local_url('ApiTimelineUser',
array('format' => 'atom',
- 'id' => $this->user->id),
+ 'id' => $this->target->id),
array('since_id' => $lastId));
$atom->addLink($prevUrl,
$firstUrl = common_local_url('ApiTimelineUser',
array('format' => 'atom',
- 'id' => $this->user->id));
+ 'id' => $this->target->id));
$atom->addLink($firstUrl,
array('rel' => 'first',
case 'json':
$this->showJsonTimeline($this->notices);
break;
+ case 'as':
+ header('Content-Type: ' . ActivityStreamJSONDocument::CONTENT_TYPE);
+ $doc = new ActivityStreamJSONDocument($this->auth_user);
+ $doc->setTitle($atom->title);
+ $doc->addLink($link, 'alternate', 'text/html');
+ $doc->addItemsFromNotices($this->notices);
+
+ // XXX: Add paging extension?
+
+ $this->raw($doc->asString());
+ break;
default:
- // TRANS: Client error displayed when trying to handle an unknown API method.
+ // TRANS: Client error displayed when coming across a non-supported API method.
$this->clientError(_('API method not found.'), $code = 404);
- break;
}
}
{
$notices = array();
- $notice = $this->user->getNotices(($this->page-1) * $this->count,
+ $notice = $this->target->getNotices(($this->page-1) * $this->count,
$this->count + 1,
$this->since_id,
- $this->max_id);
+ $this->max_id,
+ $this->scoped);
while ($notice->fetch()) {
if (count($notices) < $this->count) {
*
* @return boolean true
*/
-
+
function isReadOnly($args)
{
return ($_SERVER['REQUEST_METHOD'] == 'GET' || $_SERVER['REQUEST_METHOD'] == 'HEAD');
array($this->arg('action'),
common_user_cache_hash($this->auth_user),
common_language(),
- $this->user->id,
+ $this->target->id,
strtotime($this->notices[0]->created),
strtotime($this->notices[$last]->created))
)
function handlePost()
{
if (empty($this->auth_user) ||
- $this->auth_user->id != $this->user->id) {
+ $this->auth_user->id != $this->target->id) {
// TRANS: Client error displayed trying to add a notice to another user's timeline.
$this->clientError(_('Only the user can add to their own timeline.'));
- return;
}
// Only handle posts for Atom
if ($this->format != 'atom') {
// TRANS: Client error displayed when using another format than AtomPub.
$this->clientError(_('Only accept AtomPub for Atom feeds.'));
- return;
}
$xml = trim(file_get_contents('php://input'));
if (empty($xml)) {
+ // TRANS: Client error displayed attempting to post an empty API notice.
$this->clientError(_('Atom post must not be empty.'));
}
- $dom = DOMDocument::loadXML($xml);
- if (!$dom) {
+ $old = error_reporting(error_reporting() & ~(E_WARNING | E_NOTICE));
+ $dom = new DOMDocument();
+ $ok = $dom->loadXML($xml);
+ error_reporting($old);
+ if (!$ok) {
+ // TRANS: Client error displayed attempting to post an API that is not well-formed XML.
$this->clientError(_('Atom post must be well-formed XML.'));
}
$dom->documentElement->localName != 'entry') {
// TRANS: Client error displayed when not using an Atom entry.
$this->clientError(_('Atom post must be an Atom entry.'));
- return;
}
$activity = new Activity($dom->documentElement);
$saved = null;
- if (Event::handle('StartAtomPubNewActivity', array(&$activity, $this->user, &$saved))) {
-
+ if (Event::handle('StartAtomPubNewActivity', array(&$activity, $this->target->getUser(), &$saved))) {
if ($activity->verb != ActivityVerb::POST) {
- // TRANS: Client error displayed when not using the POST verb.
- // TRANS: Do not translate POST.
+ // TRANS: Client error displayed when not using the POST verb. Do not translate POST.
$this->clientError(_('Can only handle POST activities.'));
- return;
}
$note = $activity->objects[0];
// TRANS: %s is the unsupported activity object type.
$this->clientError(sprintf(_('Cannot handle activity object type "%s".'),
$note->type));
- return;
}
$saved = $this->postNote($activity);
- Event::handle('EndAtomPubNewActivity', array($activity, $this->user, $saved));
+ Event::handle('EndAtomPubNewActivity', array($activity, $this->target->getUser(), $saved));
}
if (!empty($saved)) {
} else {
// @fixme fetch from $sourceUrl?
// TRANS: Client error displayed when posting a notice without content through the API.
- $this->clientError(sprintf(_('No content for notice %d.'),
- $note->id));
- return;
+ // TRANS: %d is the notice ID (number).
+ $this->clientError(sprintf(_('No content for notice %d.'), $note->id));
}
// Get (safe!) HTML and text versions of the content
common_debug("Note ID is {$note->id}");
if (!empty($note->id)) {
- $notice = Notice::staticGet('uri', trim($note->id));
+ $notice = Notice::getKV('uri', trim($note->id));
if (!empty($notice)) {
// TRANS: Client error displayed when using another format than AtomPub.
- $this->clientError(sprintf(_('Notice with URI "%s" already exists.'),
- $note->id));
- return;
+ // TRANS: %s is the notice URI.
+ $this->clientError(sprintf(_('Notice with URI "%s" already exists.'), $note->id));
}
common_log(LOG_NOTICE, "Saving client-supplied notice URI '$note->id'");
$options['uri'] = $note->id;
// Check for optional attributes...
- if (!empty($activity->context)) {
+ if ($activity->context instanceof ActivityContext) {
- foreach ($activity->context->attention as $uri) {
+ foreach ($activity->context->attention as $uri=>$type) {
$profile = Profile::fromURI($uri);
if (!empty($profile)) {
$options['replies'][] = $uri;
} else {
- $group = User_group::staticGet('uri', $uri);
+ $group = User_group::getKV('uri', $uri);
if (!empty($group)) {
- $options['groups'][] = $uri;
+ $options['groups'][] = $group->id;
} else {
// @fixme: hook for discovery here
- common_log(LOG_WARNING, sprintf(_('AtomPub post with unknown attention URI %s'), $uri));
+ common_log(LOG_WARNING, sprintf('AtomPub post with unknown attention URI %s', $uri));
}
}
}
// @fixme what about conversation ID?
if (!empty($activity->context->replyToID)) {
- $orig = Notice::staticGet('uri',
+ $orig = Notice::getKV('uri',
$activity->context->replyToID);
if (!empty($orig)) {
$options['reply_to'] = $orig->id;
$options['urls'][] = $href;
}
- $saved = Notice::saveNew($this->user->id,
+ $saved = Notice::saveNew($this->target->id,
$content,
'atompub', // TODO: deal with this
$options);
projects / quix0rs-gnu-social.git / blobdiff