X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=actions%2Fshowstream.php;h=a3c461915a8c79ab3a3d34727e7e42fc0d26c497;hb=9ca8df301dfe944e90f48cd1abeed0bad8585301;hp=6e5ba84511ff8c3161b25ee46fad3a39c2d7d4f6;hpb=31d056029461c5f61e0667ab6f80c21a505e36cc;p=quix0rs-gnu-social.git diff --git a/actions/showstream.php b/actions/showstream.php index 6e5ba84511..a3c461915a 100644 --- a/actions/showstream.php +++ b/actions/showstream.php @@ -57,16 +57,14 @@ class ShowstreamAction extends ProfileAction { var $notice; - function prepare($args) + protected function prepare(array $args=array()) { parent::prepare($args); - $p = Profile::current(); - if (empty($this->tag)) { - $stream = new ProfileNoticeStream($this->profile, $p); + $stream = new ProfileNoticeStream($this->profile, $this->scoped); } else { - $stream = new TaggedProfileNoticeStream($this->profile, $this->tag, $p); + $stream = new TaggedProfileNoticeStream($this->profile, $this->tag, $this->scoped); } $this->notice = $stream->getNotices(($this->page-1)*NOTICES_PER_PAGE, NOTICES_PER_PAGE + 1); @@ -74,10 +72,6 @@ class ShowstreamAction extends ProfileAction return true; } - function isReadOnly($args) - { - return true; - } function title() { @@ -105,15 +99,6 @@ class ShowstreamAction extends ProfileAction } } - function handle($args) - { - // Looks like we're good; start output - - // For YADIS discovery, we also have a tag - - $this->showPage(); - } - function showContent() { $this->showNotices(); @@ -135,12 +120,12 @@ class ShowstreamAction extends ProfileAction if (!empty($this->tag)) { return array(new Feed(Feed::RSS1, common_local_url('userrss', - array('nickname' => $this->user->nickname, + array('nickname' => $this->target->nickname, '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->user->nickname, $this->tag))); + $this->target->nickname, $this->tag))); } return array(new Feed(Feed::JSON, @@ -151,14 +136,14 @@ class ShowstreamAction extends ProfileAction // TRANS: Title for link to notice feed. // TRANS: %s is a user nickname. sprintf(_('Notice feed for %s (Activity Streams JSON)'), - $this->user->nickname)), + $this->target->nickname)), new Feed(Feed::RSS1, common_local_url('userrss', - array('nickname' => $this->user->nickname)), + array('nickname' => $this->target->nickname)), // TRANS: Title for link to notice feed. // TRANS: %s is a user nickname. sprintf(_('Notice feed for %s (RSS 1.0)'), - $this->user->nickname)), + $this->target->nickname)), new Feed(Feed::RSS2, common_local_url('ApiTimelineUser', array( @@ -167,7 +152,7 @@ class ShowstreamAction extends ProfileAction // TRANS: Title for link to notice feed. // TRANS: %s is a user nickname. sprintf(_('Notice feed for %s (RSS 2.0)'), - $this->user->nickname)), + $this->target->nickname)), new Feed(Feed::ATOM, common_local_url('ApiTimelineUser', array( @@ -176,13 +161,13 @@ class ShowstreamAction extends ProfileAction // TRANS: Title for link to notice feed. // TRANS: %s is a user nickname. sprintf(_('Notice feed for %s (Atom)'), - $this->user->nickname)), + $this->target->nickname)), new Feed(Feed::FOAF, common_local_url('foaf', array('nickname' => - $this->user->nickname)), + $this->target->nickname)), // 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->user->nickname))); + sprintf(_('FOAF for %s'), $this->target->nickname))); } function extraHead() @@ -212,12 +197,17 @@ class ShowstreamAction extends ProfileAction $this->element('link', array('rel' => 'EditURI', 'type' => 'application/rsd+xml', 'href' => $rsd)); + + if ($this->page != 1) { + $this->element('link', array('rel' => 'canonical', + 'href' => $this->profile->profileurl)); + } } 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->user->nickname) . ' '; + $message = sprintf(_('This is the timeline for %1$s, but %1$s hasn\'t posted anything yet.'), $this->target->nickname) . ' '; if (common_logged_in()) { $current_user = common_current_user(); @@ -227,13 +217,13 @@ class ShowstreamAction extends ProfileAction } 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->user->nickname, '@' . $this->user->nickname); + $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); } } 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->user->nickname); + $message .= sprintf(_('Why not [register an account](%%%%action.register%%%%) and then nudge %s or post a notice to them.'), $this->target->nickname); } $this->elementStart('div', 'guide'); @@ -252,7 +242,7 @@ class ShowstreamAction extends ProfileAction $this->showEmptyListMessage(); } - $args = array('nickname' => $this->user->nickname); + $args = array('nickname' => $this->target->nickname); if (!empty($this->tag)) { $args['tag'] = $this->tag; @@ -269,13 +259,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->user->nickname, $this->user->nickname); + $this->target->nickname, $this->target->nickname); } 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->user->nickname, $this->user->nickname); + 'based on the Free Software [StatusNet](http://status.net/) tool.'), + $this->target->nickname, $this->target->nickname); } $this->elementStart('div', array('id' => 'anon_notice')); $this->raw(common_markup_to_html($m)); @@ -320,7 +310,7 @@ class ShowstreamAction extends ProfileAction */ class ProfileNoticeList extends NoticeList { - function newListItem($notice) + function newListItem(Notice $notice) { return new ProfileNoticeListItem($notice, $this->out); }