X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=actions%2Fapitimelineuser.php;h=5debe3ed8ca0d6550e6161bd53d21e21f24f7e77;hb=64b72a3c9b8c9ee2d8716a3271834293d1e863f8;hp=3fe73c691cf7bec1a329de3fa0f48297465d334d;hpb=cd4b23aa399a51744787e580f8dfdb3886bfc8f5;p=quix0rs-gnu-social.git diff --git a/actions/apitimelineuser.php b/actions/apitimelineuser.php index 3fe73c691c..5debe3ed8c 100644 --- a/actions/apitimelineuser.php +++ b/actions/apitimelineuser.php @@ -34,11 +34,7 @@ * @link http://status.net/ */ -if (!defined('STATUSNET')) { - exit(1); -} - -require_once INSTALLDIR . '/lib/apibareauth.php'; +if (!defined('GNUSOCIAL')) { exit(1); } /** * Returns the most recent notices (default 20) posted by the authenticating @@ -61,6 +57,8 @@ class ApiTimelineUserAction extends ApiBareAuthAction { var $notices = null; + var $next_id = null; + /** * Take arguments for running * @@ -68,16 +66,19 @@ class ApiTimelineUserAction extends ApiBareAuthAction * * @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); + } + + if (!$this->target->isLocal()) { + $this->serverError(_('Remote user timelines are not available here yet.'), 501); } $this->notices = $this->getNotices(); @@ -90,13 +91,11 @@ class ApiTimelineUserAction extends ApiBareAuthAction * * 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(); @@ -112,15 +111,13 @@ class ApiTimelineUserAction extends ApiBareAuthAction */ 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->scoped); $link = common_local_url( 'showstream', - array('nickname' => $this->user->nickname) + array('nickname' => $this->target->getNickname()) ); $self = $this->getSelfUri(); @@ -128,9 +125,32 @@ class ApiTimelineUserAction extends ApiBareAuthAction // 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->getID()); header('X-SUP-ID: ' . $suplink); + + // paging links + $nextUrl = !empty($this->next_id) + ? common_local_url('ApiTimelineUser', + array('format' => $this->format, + 'id' => $this->target->getID()), + array('max_id' => $this->next_id)) + : null; + + $prevExtra = array(); + if (!empty($this->notices)) { + assert($this->notices[0] instanceof Notice); + $prevExtra['since_id'] = $this->notices[0]->id; + } + + $prevUrl = common_local_url('ApiTimelineUser', + array('format' => $this->format, + 'id' => $this->target->getID()), + $prevExtra); + $firstUrl = common_local_url('ApiTimelineUser', + array('format' => $this->format, + 'id' => $this->target->getID())); + switch($this->format) { case 'xml': $this->showXmlTimeline($this->notices); @@ -157,37 +177,18 @@ class ApiTimelineUserAction extends ApiBareAuthAction // change too quickly! if (!empty($this->next_id)) { - $nextUrl = common_local_url('ApiTimelineUser', - array('format' => 'atom', - 'id' => $this->user->id), - array('max_id' => $this->next_id)); - $atom->addLink($nextUrl, array('rel' => 'next', 'type' => 'application/atom+xml')); } if (($this->page > 1 || !empty($this->max_id)) && !empty($this->notices)) { - - $lastNotice = $this->notices[0]; - $lastId = $lastNotice->id; - - $prevUrl = common_local_url('ApiTimelineUser', - array('format' => 'atom', - 'id' => $this->user->id), - array('since_id' => $lastId)); - $atom->addLink($prevUrl, array('rel' => 'prev', 'type' => 'application/atom+xml')); } if ($this->page > 1 || !empty($this->since_id) || !empty($this->max_id)) { - - $firstUrl = common_local_url('ApiTimelineUser', - array('format' => 'atom', - 'id' => $this->user->id)); - $atom->addLink($firstUrl, array('rel' => 'first', 'type' => 'application/atom+xml')); @@ -202,20 +203,35 @@ class ApiTimelineUserAction extends ApiBareAuthAction $this->showJsonTimeline($this->notices); break; case 'as': - header('Content-Type: application/json; charset=utf-8'); - $doc = new ActivityStreamJSONDocument($this->auth_user); + header('Content-Type: ' . ActivityStreamJSONDocument::CONTENT_TYPE); + $doc = new ActivityStreamJSONDocument($this->scoped); $doc->setTitle($atom->title); $doc->addLink($link, 'alternate', 'text/html'); $doc->addItemsFromNotices($this->notices); - // XXX: Add paging extension? + if (!empty($this->next_id)) { + $doc->addLink($nextUrl, + array('rel' => 'next', + 'type' => ActivityStreamJSONDocument::CONTENT_TYPE)); + } + + if (($this->page > 1 || !empty($this->max_id)) && !empty($this->notices)) { + $doc->addLink($prevUrl, + array('rel' => 'prev', + 'type' => ActivityStreamJSONDocument::CONTENT_TYPE)); + } + + if ($this->page > 1 || !empty($this->since_id) || !empty($this->max_id)) { + $doc->addLink($firstUrl, + array('rel' => 'first', + 'type' => ActivityStreamJSONDocument::CONTENT_TYPE)); + } $this->raw($doc->asString()); break; default: - // TRANS: Client error displayed when trying to handle an unknown API method. - $this->clientError(_('API method not found.'), $code = 404); - break; + // TRANS: Client error displayed when coming across a non-supported API method. + $this->clientError(_('API method not found.'), 404); } } @@ -228,10 +244,11 @@ class ApiTimelineUserAction extends ApiBareAuthAction { $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) { @@ -288,9 +305,9 @@ class ApiTimelineUserAction extends ApiBareAuthAction return '"' . implode( ':', array($this->arg('action'), - common_user_cache_hash($this->auth_user), + common_user_cache_hash($this->scoped), common_language(), - $this->user->id, + $this->target->getID(), strtotime($this->notices[0]->created), strtotime($this->notices[$last]->created)) ) @@ -302,18 +319,16 @@ class ApiTimelineUserAction extends ApiBareAuthAction function handlePost() { - if (empty($this->auth_user) || - $this->auth_user->id != $this->user->id) { + if (!$this->scoped instanceof Profile || + !$this->target->sameAs($this->scoped)) { // 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; + $this->clientError(_('Only the user can add to their own timeline.'), 403); } // 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')); @@ -335,180 +350,32 @@ class ApiTimelineUserAction extends ApiBareAuthAction $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 ($activity->verb != ActivityVerb::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]; - - if (!in_array($note->type, array(ActivityObject::NOTE, - ActivityObject::BLOGENTRY, - ActivityObject::STATUS))) { - // TRANS: Client error displayed when using an unsupported activity object type. - // 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)); - } - - if (!empty($saved)) { - header('HTTP/1.1 201 Created'); - header("Location: " . common_local_url('ApiStatusesShow', array('id' => $saved->id, - 'format' => 'atom'))); - $this->showSingleAtomStatus($saved); - } - } - - function postNote($activity) - { - $note = $activity->objects[0]; - - // Use summary as fallback for content - - if (!empty($note->content)) { - $sourceContent = $note->content; - } else if (!empty($note->summary)) { - $sourceContent = $note->summary; - } else if (!empty($note->title)) { - $sourceContent = $note->title; - } else { - // @fixme fetch from $sourceUrl? - // TRANS: Client error displayed when posting a notice without content through the API. - // TRANS: %d is the notice ID (number). - $this->clientError(sprintf(_('No content for notice %d.'), - $note->id)); - return; - } - - // Get (safe!) HTML and text versions of the content - - $rendered = $this->purify($sourceContent); - $content = html_entity_decode(strip_tags($rendered), ENT_QUOTES, 'UTF-8'); - - $shortened = $this->auth_user->shortenLinks($content); - - $options = array('is_local' => Notice::LOCAL_PUBLIC, - 'rendered' => $rendered, - 'replies' => array(), - 'groups' => array(), - 'tags' => array(), - 'urls' => array()); - - // accept remote URI (not necessarily a good idea) - - common_debug("Note ID is {$note->id}"); - - if (!empty($note->id)) { - $notice = Notice::staticGet('uri', trim($note->id)); - - if (!empty($notice)) { - // TRANS: Client error displayed when using another format than AtomPub. - // TRANS: %s is the notice URI. - $this->clientError(sprintf(_('Notice with URI "%s" already exists.'), - $note->id)); - return; - } - common_log(LOG_NOTICE, "Saving client-supplied notice URI '$note->id'"); - $options['uri'] = $note->id; - } - - // accept remote create time (also maybe not such a good idea) - - if (!empty($activity->time)) { - common_log(LOG_NOTICE, "Saving client-supplied create time {$activity->time}"); - $options['created'] = common_sql_date($activity->time); - } - - // Check for optional attributes... - - if (!empty($activity->context)) { - - foreach ($activity->context->attention as $uri) { - - $profile = Profile::fromURI($uri); - - if (!empty($profile)) { - $options['replies'][] = $uri; - } else { - $group = User_group::staticGet('uri', $uri); - if (!empty($group)) { - $options['groups'][] = $uri; - } else { - // @fixme: hook for discovery here - common_log(LOG_WARNING, sprintf('AtomPub post with unknown attention URI %s', $uri)); - } - } - } - - // Maintain direct reply associations - // @fixme what about conversation ID? - - if (!empty($activity->context->replyToID)) { - $orig = Notice::staticGet('uri', - $activity->context->replyToID); - if (!empty($orig)) { - $options['reply_to'] = $orig->id; - } - } - - $location = $activity->context->location; + common_debug('AtomPub: Ignoring right now, but this POST was made to collection: '.$activity->id); - if ($location) { - $options['lat'] = $location->lat; - $options['lon'] = $location->lon; - if ($location->location_id) { - $options['location_ns'] = $location->location_ns; - $options['location_id'] = $location->location_id; - } - } - } - - // Atom categories <-> hashtags + // Reset activity data so we can handle it in the same functions as with OStatus + // because we don't let clients set their own UUIDs... Not sure what AtomPub thinks + // about that though. + $activity->id = null; + $activity->actor = null; // not used anyway, we use $this->target + $activity->objects[0]->id = null; - foreach ($activity->categories as $cat) { - if ($cat->term) { - $term = common_canonical_tag($cat->term); - if ($term) { - $options['tags'][] = $term; - } - } + $stored = null; + if (Event::handle('StartAtomPubNewActivity', array($activity, $this->target, &$stored))) { + // TRANS: Client error displayed when not using the POST verb. Do not translate POST. + throw new ClientException(_('Could not handle this Atom Activity.')); } - - // Atom enclosures -> attachment URLs - foreach ($activity->enclosures as $href) { - // @fixme save these locally or....? - $options['urls'][] = $href; + if (!$stored instanceof Notice) { + throw new ServerException('Server did not create a Notice object from handled AtomPub activity.'); } + Event::handle('EndAtomPubNewActivity', array($activity, $this->target, $stored)); - $saved = Notice::saveNew($this->user->id, - $content, - 'atompub', // TODO: deal with this - $options); - - return $saved; - } - - function purify($content) - { - require_once INSTALLDIR.'/extlib/htmLawed/htmLawed.php'; - - $config = array('safe' => 1, - 'deny_attribute' => 'id,style,on*'); - return htmLawed($content, $config); + header('HTTP/1.1 201 Created'); + header("Location: " . common_local_url('ApiStatusesShow', array('id' => $stored->getID(), + 'format' => 'atom'))); + $this->showSingleAtomStatus($stored); } }