X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=actions%2Fshowstream.php;h=eb6300fec21665947de705cc167cb5754d3d9470;hb=c85e78ac3c03bd584a6da3a0a7b5cb9160cc9324;hp=9e89b1b48ceccd767df5f0d49664d4b70aac2462;hpb=f21f09f8b87cb84486e8316218d52f42a436f2a5;p=quix0rs-gnu-social.git diff --git a/actions/showstream.php b/actions/showstream.php index 9e89b1b48c..eb6300fec2 100644 --- a/actions/showstream.php +++ b/actions/showstream.php @@ -28,15 +28,7 @@ * @link http://status.net/ */ -if (!defined('STATUSNET') && !defined('LACONICA')) { - exit(1); -} - -require_once INSTALLDIR.'/lib/personalgroupnav.php'; -require_once INSTALLDIR.'/lib/noticelist.php'; -require_once INSTALLDIR.'/lib/profileminilist.php'; -require_once INSTALLDIR.'/lib/groupminilist.php'; -require_once INSTALLDIR.'/lib/feedlist.php'; +if (!defined('GNUSOCIAL')) { exit(1); } /** * User profile page @@ -57,16 +49,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 +64,6 @@ class ShowstreamAction extends ProfileAction return true; } - function isReadOnly($args) - { - return true; - } function title() { @@ -105,15 +91,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 +112,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 +128,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 +144,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 +153,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() @@ -222,7 +199,7 @@ class ShowstreamAction extends ProfileAction 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(); @@ -232,13 +209,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'); @@ -257,7 +234,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; @@ -274,13 +251,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); + $this->target->nickname, $this->target->nickname); } $this->elementStart('div', array('id' => 'anon_notice')); $this->raw(common_markup_to_html($m)); @@ -308,57 +285,3 @@ class ShowstreamAction extends ProfileAction return $options; } } - -// We don't show the author for a profile, since we already know who it is! - -/** - * Slightly modified from standard list; the author & avatar are hidden - * in CSS. We used to remove them here too, but as it turns out that - * confuses the inline reply code... and we hide them in CSS anyway - * since realtime updates come through in original form. - * - * Remaining customization right now is for the repeat marker, where - * it'll list who the original poster was instead of who did the repeat - * (since the repeater is you, and the repeatee isn't shown!) - * This will remain inconsistent if realtime updates come through, - * since those'll get rendered as a regular NoticeListItem. - */ -class ProfileNoticeList extends NoticeList -{ - function newListItem($notice) - { - return new ProfileNoticeListItem($notice, $this->out); - } -} - -class ProfileNoticeListItem extends DoFollowListItem -{ - /** - * show a link to the author of repeat - * - * @return void - */ - function showRepeat() - { - if (!empty($this->repeat)) { - - // FIXME: this code is almost identical to default; need to refactor - - $attrs = array('href' => $this->profile->profileurl, - 'class' => 'url'); - - if (!empty($this->profile->fullname)) { - $attrs['title'] = $this->profile->getFancyName(); - } - - $this->out->elementStart('span', 'repeat'); - - $text_link = XMLStringer::estring('a', $attrs, $this->profile->nickname); - - // TRANS: Link to the author of a repeated notice. %s is a linked nickname. - $this->out->raw(sprintf(_('Repeat of %s'), $text_link)); - - $this->out->elementEnd('span'); - } - } -}