X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=actions%2Fshowstream.php;h=6eccbd06bf49db0f33db1394df1ca3f828918f63;hb=4694d068f965ec733edcfe5c9afe8244ae01f00a;hp=8dd6c7deff0522f9410b8770bc1c6ce98061bb38;hpb=abd90bbdf562614755802885dfb5673645df8575;p=quix0rs-gnu-social.git diff --git a/actions/showstream.php b/actions/showstream.php index 8dd6c7deff..6eccbd06bf 100644 --- a/actions/showstream.php +++ b/actions/showstream.php @@ -45,29 +45,54 @@ if (!defined('GNUSOCIAL')) { exit(1); } * @license http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0 * @link http://status.net/ */ -class ShowstreamAction extends ProfileAction +class ShowstreamAction extends NoticestreamAction { var $notice; - protected function prepare(array $args=array()) + protected function doPreparation() { - parent::prepare($args); + // showstream requires a nickname + $nickname_arg = $this->arg('nickname'); + $nickname = common_canonical_nickname($nickname_arg); + // Permanent redirect on non-canonical nickname + + if ($nickname_arg != $nickname) { + $args = array('nickname' => $nickname); + if ($this->arg('page') && $this->arg('page') != 1) { + $args['page'] = $this->arg['page']; + } + common_redirect(common_local_url($this->getActionName(), $args), 301); + } + $this->user = User::getKV('nickname', $nickname); + + if (!$this->user) { + $group = Local_group::getKV('nickname', $nickname); + if ($group instanceof Local_group) { + common_redirect($group->getProfile()->getUrl()); + } + // TRANS: Client error displayed when calling a profile action without specifying a user. + $this->clientError(_('No such user.'), 404); + } + + $this->target = $this->user->getProfile(); + } + + public function getStream() + { if (empty($this->tag)) { - $stream = new ProfileNoticeStream($this->profile, $this->scoped); + $stream = new ProfileNoticeStream($this->target, $this->scoped); } else { - $stream = new TaggedProfileNoticeStream($this->profile, $this->tag, $this->scoped); + $stream = new TaggedProfileNoticeStream($this->target, $this->tag, $this->scoped); } - $this->notice = $stream->getNotices(($this->page-1)*NOTICES_PER_PAGE, NOTICES_PER_PAGE + 1); - - return true; + return $stream; } function title() { - $base = $this->profile->getFancyName(); + $base = $this->target->getFancyName(); if (!empty($this->tag)) { if ($this->page == 1) { // TRANS: Page title showing tagged notices in one user's timeline. @@ -98,7 +123,7 @@ class ShowstreamAction extends ProfileAction function showProfileBlock() { - $block = new AccountProfileBlock($this, $this->profile); + $block = new AccountProfileBlock($this, $this->target); $block->show(); } @@ -112,65 +137,65 @@ class ShowstreamAction extends ProfileAction if (!empty($this->tag)) { return array(new Feed(Feed::RSS1, common_local_url('userrss', - array('nickname' => $this->target->nickname, + array('nickname' => $this->target->getNickname(), 'tag' => $this->tag)), // TRANS: Title for link to notice feed. // TRANS: %1$s is a user nickname, %2$s is a hashtag. sprintf(_('Notice feed for %1$s tagged %2$s (RSS 1.0)'), - $this->target->nickname, $this->tag))); + $this->target->getNickname(), $this->tag))); } return array(new Feed(Feed::JSON, common_local_url('ApiTimelineUser', array( - 'id' => $this->user->id, + 'id' => $this->target->getID(), 'format' => 'as')), // TRANS: Title for link to notice feed. // TRANS: %s is a user nickname. sprintf(_('Notice feed for %s (Activity Streams JSON)'), - $this->target->nickname)), + $this->target->getNickname())), new Feed(Feed::RSS1, common_local_url('userrss', - array('nickname' => $this->target->nickname)), + array('nickname' => $this->target->getNickname())), // TRANS: Title for link to notice feed. // TRANS: %s is a user nickname. sprintf(_('Notice feed for %s (RSS 1.0)'), - $this->target->nickname)), + $this->target->getNickname())), new Feed(Feed::RSS2, common_local_url('ApiTimelineUser', array( - 'id' => $this->user->id, + 'id' => $this->target->getID(), 'format' => 'rss')), // TRANS: Title for link to notice feed. // TRANS: %s is a user nickname. sprintf(_('Notice feed for %s (RSS 2.0)'), - $this->target->nickname)), + $this->target->getNickname())), new Feed(Feed::ATOM, common_local_url('ApiTimelineUser', array( - 'id' => $this->user->id, + 'id' => $this->target->getID(), 'format' => 'atom')), // TRANS: Title for link to notice feed. // TRANS: %s is a user nickname. sprintf(_('Notice feed for %s (Atom)'), - $this->target->nickname)), + $this->target->getNickname())), new Feed(Feed::FOAF, common_local_url('foaf', array('nickname' => - $this->target->nickname)), + $this->target->getNickname())), // TRANS: Title for link to notice feed. FOAF stands for Friend of a Friend. // TRANS: More information at http://www.foaf-project.org. %s is a user nickname. - sprintf(_('FOAF for %s'), $this->target->nickname))); + sprintf(_('FOAF for %s'), $this->target->getNickname()))); } function extraHead() { - if ($this->profile->bio) { + if ($this->target->bio) { $this->element('meta', array('name' => 'description', - 'content' => $this->profile->bio)); + 'content' => $this->target->getDescription())); } - if ($this->user->emailmicroid && $this->user->email && $this->profile->profileurl) { - $id = new Microid('mailto:'.$this->user->email, + if ($this->target->isLocal() && $this->target->getUser()->emailmicroid && $this->target->getUser()->email && $this->target->getUrl()) { + $id = new Microid('mailto:'.$this->target->getUser()->email, $this->selfUrl()); $this->element('meta', array('name' => 'microid', 'content' => $id->toString())); @@ -180,10 +205,10 @@ class ShowstreamAction extends ProfileAction $this->element('link', array('rel' => 'microsummary', 'href' => common_local_url('microsummary', - array('nickname' => $this->profile->nickname)))); + array('nickname' => $this->target->getNickname())))); $rsd = common_local_url('rsd', - array('nickname' => $this->profile->nickname)); + array('nickname' => $this->target->getNickname())); // RSD, http://tales.phrasewise.com/rfc/rsd $this->element('link', array('rel' => 'EditURI', @@ -192,30 +217,29 @@ class ShowstreamAction extends ProfileAction if ($this->page != 1) { $this->element('link', array('rel' => 'canonical', - 'href' => $this->profile->profileurl)); + 'href' => $this->target->getUrl())); } } function showEmptyListMessage() { // TRANS: First sentence of empty list message for a timeline. $1%s is a user nickname. - $message = sprintf(_('This is the timeline for %1$s, but %1$s hasn\'t posted anything yet.'), $this->target->nickname) . ' '; + $message = sprintf(_('This is the timeline for %1$s, but %1$s hasn\'t posted anything yet.'), $this->target->getNickname()) . ' '; - if (common_logged_in()) { - $current_user = common_current_user(); - if ($this->user->id === $current_user->id) { + if ($this->scoped instanceof Profile) { + if ($this->target->getID() === $this->scoped->getID()) { // TRANS: Second sentence of empty list message for a stream for the user themselves. $message .= _('Seen anything interesting recently? You haven\'t posted any notices yet, now would be a good time to start :)'); } else { // TRANS: Second sentence of empty list message for a non-self timeline. %1$s is a user nickname, %2$s is a part of a URL. // TRANS: This message contains a Markdown link. Keep "](" together. - $message .= sprintf(_('You can try to nudge %1$s or [post something to them](%%%%action.newnotice%%%%?status_textarea=%2$s).'), $this->target->nickname, '@' . $this->target->nickname); + $message .= sprintf(_('You can try to nudge %1$s or [post something to them](%%%%action.newnotice%%%%?status_textarea=%2$s).'), $this->target->getNickname(), '@' . $this->target->getNickname()); } } else { // TRANS: Second sentence of empty message for anonymous users. %s is a user nickname. // TRANS: This message contains a Markdown link. Keep "](" together. - $message .= sprintf(_('Why not [register an account](%%%%action.register%%%%) and then nudge %s or post a notice to them.'), $this->target->nickname); + $message .= sprintf(_('Why not [register an account](%%%%action.register%%%%) and then nudge %s or post a notice to them.'), $this->target->getNickname()); } $this->elementStart('div', 'guide'); @@ -231,7 +255,7 @@ class ShowstreamAction extends ProfileAction $this->showEmptyListMessage(); } - $args = array('nickname' => $this->target->nickname); + $args = array('nickname' => $this->target->getNickname()); if (!empty($this->tag)) { $args['tag'] = $this->tag; @@ -248,13 +272,13 @@ class ShowstreamAction extends ProfileAction $m = sprintf(_('**%s** has an account on %%%%site.name%%%%, a [micro-blogging](http://en.wikipedia.org/wiki/Micro-blogging) service ' . 'based on the Free Software [StatusNet](http://status.net/) tool. ' . '[Join now](%%%%action.register%%%%) to follow **%s**\'s notices and many more! ([Read more](%%%%doc.help%%%%))'), - $this->target->nickname, $this->target->nickname); + $this->target->getNickname(), $this->target->getNickname()); } else { // TRANS: Announcement for anonymous users showing a timeline if site registrations are closed or invite only. // TRANS: This message contains a Markdown link. Keep "](" together. $m = sprintf(_('**%s** has an account on %%%%site.name%%%%, a [micro-blogging](http://en.wikipedia.org/wiki/Micro-blogging) service ' . 'based on the Free Software [StatusNet](http://status.net/) tool.'), - $this->target->nickname, $this->target->nickname); + $this->target->getNickname(), $this->target->getNickname()); } $this->elementStart('div', array('id' => 'anon_notice')); $this->raw(common_markup_to_html($m)); @@ -273,10 +297,9 @@ class ShowstreamAction extends ProfileAction function noticeFormOptions() { $options = parent::noticeFormOptions(); - $cur = common_current_user(); - if (empty($cur) || $cur->id != $this->profile->id) { - $options['to_profile'] = $this->profile; + if (!$this->scoped instanceof Profile || $this->scoped->id != $this->target->id) { + $options['to_profile'] = $this->target; } return $options;