X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=actions%2Fapitimelineuser.php;h=246daddfb3a7515d47ac8cf20b01b7f0c2d3427a;hb=627d84a1e2db2aca5d2ce1272f6e83fb7faa8ad2;hp=3fe73c691cf7bec1a329de3fa0f48297465d334d;hpb=9e9cbdf505e9ec66c7e9d60bfe170f8d41a146e2;p=quix0rs-gnu-social.git diff --git a/actions/apitimelineuser.php b/actions/apitimelineuser.php index 3fe73c691c..246daddfb3 100644 --- a/actions/apitimelineuser.php +++ b/actions/apitimelineuser.php @@ -38,8 +38,6 @@ if (!defined('STATUSNET')) { 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 @@ -61,6 +59,8 @@ class ApiTimelineUserAction extends ApiBareAuthAction { var $notices = null; + var $next_id = null; + /** * Take arguments for running * @@ -68,16 +68,15 @@ 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); } $this->notices = $this->getNotices(); @@ -90,13 +89,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 +109,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->auth_user); $link = common_local_url( 'showstream', - array('nickname' => $this->user->nickname) + array('nickname' => $this->target->nickname) ); $self = $this->getSelfUri(); @@ -128,9 +123,27 @@ 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->id); header('X-SUP-ID: ' . $suplink); + + // paging links + $nextUrl = !empty($this->next_id) + ? common_local_url('ApiTimelineUser', + array('format' => $this->format, + 'id' => $this->target->id), + array('max_id' => $this->next_id)) + : null; + $lastNotice = $this->notices[0]; + $lastId = $lastNotice->id; + $prevUrl = common_local_url('ApiTimelineUser', + array('format' => $this->format, + 'id' => $this->target->id), + array('since_id' => $lastId)); + $firstUrl = common_local_url('ApiTimelineUser', + array('format' => $this->format, + 'id' => $this->target->id)); + switch($this->format) { case 'xml': $this->showXmlTimeline($this->notices); @@ -157,37 +170,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 +196,35 @@ class ApiTimelineUserAction extends ApiBareAuthAction $this->showJsonTimeline($this->notices); break; case 'as': - header('Content-Type: application/json; charset=utf-8'); + 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? + 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. + // TRANS: Client error displayed when coming across a non-supported API method. $this->clientError(_('API method not found.'), $code = 404); - break; } } @@ -228,10 +237,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) { @@ -253,7 +263,7 @@ class ApiTimelineUserAction extends ApiBareAuthAction * @return boolean true */ - function isReadOnly($args) + function isReadOnly(array $args=array()) { return ($_SERVER['REQUEST_METHOD'] == 'GET' || $_SERVER['REQUEST_METHOD'] == 'HEAD'); } @@ -290,7 +300,7 @@ class ApiTimelineUserAction extends ApiBareAuthAction 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)) ) @@ -303,17 +313,15 @@ class ApiTimelineUserAction extends ApiBareAuthAction 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')); @@ -335,18 +343,16 @@ 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 (Event::handle('StartAtomPubNewActivity', array(&$activity, $this->target->getUser(), &$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]; @@ -358,12 +364,11 @@ class ApiTimelineUserAction extends ApiBareAuthAction // 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)) { @@ -390,15 +395,13 @@ class ApiTimelineUserAction extends ApiBareAuthAction // @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; + $this->clientError(sprintf(_('No content for notice %d.'), $note->id)); } // Get (safe!) HTML and text versions of the content $rendered = $this->purify($sourceContent); - $content = html_entity_decode(strip_tags($rendered), ENT_QUOTES, 'UTF-8'); + $content = common_strip_html($rendered); $shortened = $this->auth_user->shortenLinks($content); @@ -414,14 +417,12 @@ class ApiTimelineUserAction extends ApiBareAuthAction 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. // TRANS: %s is the notice URI. - $this->clientError(sprintf(_('Notice with URI "%s" already exists.'), - $note->id)); - return; + $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; @@ -436,22 +437,18 @@ class ApiTimelineUserAction extends ApiBareAuthAction // Check for optional attributes... - if (!empty($activity->context)) { - - foreach ($activity->context->attention as $uri) { - - $profile = Profile::fromURI($uri); + if ($activity->context instanceof ActivityContext) { - if (!empty($profile)) { - $options['replies'][] = $uri; - } else { - $group = User_group::staticGet('uri', $uri); - if (!empty($group)) { - $options['groups'][] = $uri; + foreach ($activity->context->attention as $uri=>$type) { + try { + $profile = Profile::fromUri($uri); + if ($profile->isGroup()) { + $options['groups'][] = $profile->id; } else { - // @fixme: hook for discovery here - common_log(LOG_WARNING, sprintf('AtomPub post with unknown attention URI %s', $uri)); + $options['replies'][] = $uri; } + } catch (UnknownUriException $e) { + common_log(LOG_WARNING, sprintf('AtomPub post with unknown attention URI %s', $uri)); } } @@ -459,7 +456,7 @@ class ApiTimelineUserAction extends ApiBareAuthAction // @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; @@ -495,7 +492,7 @@ class ApiTimelineUserAction extends ApiBareAuthAction $options['urls'][] = $href; } - $saved = Notice::saveNew($this->user->id, + $saved = Notice::saveNew($this->target->id, $content, 'atompub', // TODO: deal with this $options);