X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=actions%2Fshowstream.php;h=eb6300fec21665947de705cc167cb5754d3d9470;hb=c85e78ac3c03bd584a6da3a0a7b5cb9160cc9324;hp=1f5d85ea4e9d0ac786d0c8a71391d37e6dfa33af;hpb=880b1b666eeaedee2c9570142b2d0cd56f1d96f1;p=quix0rs-gnu-social.git diff --git a/actions/showstream.php b/actions/showstream.php index 1f5d85ea4e..eb6300fec2 100644 --- a/actions/showstream.php +++ b/actions/showstream.php @@ -28,16 +28,7 @@ * @link http://status.net/ */ -if (!defined('STATUSNET') && !defined('LACONICA')) { - exit(1); -} - -require_once INSTALLDIR.'/lib/personalgroupnav.php'; -require_once INSTALLDIR.'/lib/userprofile.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 @@ -56,58 +47,59 @@ require_once INSTALLDIR.'/lib/feedlist.php'; */ class ShowstreamAction extends ProfileAction { - function isReadOnly($args) + var $notice; + + protected function prepare(array $args=array()) { + parent::prepare($args); + + if (empty($this->tag)) { + $stream = new ProfileNoticeStream($this->profile, $this->scoped); + } else { + $stream = new TaggedProfileNoticeStream($this->profile, $this->tag, $this->scoped); + } + + $this->notice = $stream->getNotices(($this->page-1)*NOTICES_PER_PAGE, NOTICES_PER_PAGE + 1); + return true; } + function title() { $base = $this->profile->getFancyName(); if (!empty($this->tag)) { if ($this->page == 1) { - // TRANS: Page title showing tagged notices in one user's stream. %1$s is the username, %2$s is the hash tag. - return sprintf(_('%1$s tagged %2$s'), $base, $this->tag); + // TRANS: Page title showing tagged notices in one user's timeline. + // TRANS: %1$s is the username, %2$s is the hash tag. + return sprintf(_('Notices by %1$s tagged %2$s'), $base, $this->tag); } else { - // TRANS: Page title showing tagged notices in one user's stream. + // TRANS: Page title showing tagged notices in one user's timeline. // TRANS: %1$s is the username, %2$s is the hash tag, %3$d is the page number. - return sprintf(_('%1$s tagged %2$s, page %3$d'), $base, $this->tag, $this->page); + return sprintf(_('Notices by %1$s tagged %2$s, page %3$d'), $base, $this->tag, $this->page); } } else { if ($this->page == 1) { return $base; } else { - // TRANS: Extended page title showing tagged notices in one user's stream. + // TRANS: Extended page title showing tagged notices in one user's timeline. // TRANS: %1$s is the username, %2$d is the page number. - return sprintf(_('%1$s, page %2$d'), + return sprintf(_('Notices by %1$s, page %2$d'), $base, $this->page); } } } - function handle($args) - { - // Looks like we're good; start output - - // For YADIS discovery, we also have a tag - - header('X-XRDS-Location: '. common_local_url('xrds', array('nickname' => - $this->user->nickname))); - - $this->showPage(); - } - function showContent() { - $this->showProfile(); $this->showNotices(); } - function showLocalNav() + function showProfileBlock() { - $nav = new PersonalGroupNav($this); - $nav->show(); + $block = new AccountProfileBlock($this, $this->profile); + $block->show(); } function showPageNoticeBlock() @@ -120,21 +112,30 @@ 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::RSS1, + return array(new Feed(Feed::JSON, + common_local_url('ApiTimelineUser', + array( + 'id' => $this->user->id, + '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)), + 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( @@ -143,29 +144,26 @@ 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( 'id' => $this->user->id, 'format' => 'atom')), + // 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() { - // for remote subscriptions etc. - $this->element('meta', array('http-equiv' => 'X-XRDS-Location', - 'content' => common_local_url('xrds', array('nickname' => - $this->user->nickname)))); - if ($this->profile->bio) { $this->element('meta', array('name' => 'description', 'content' => $this->profile->bio)); @@ -177,12 +175,6 @@ class ShowstreamAction extends ProfileAction $this->element('meta', array('name' => 'microid', 'content' => $id->toString())); } - if ($this->user->jabbermicroid && $this->user->jabber && $this->profile->profileurl) { - $id = new Microid('xmpp:'.$this->user->jabber, - $this->selfUrl()); - $this->element('meta', array('name' => 'microid', - 'content' => $id->toString())); - } // See https://wiki.mozilla.org/Microsummaries @@ -197,18 +189,17 @@ class ShowstreamAction extends ProfileAction $this->element('link', array('rel' => 'EditURI', 'type' => 'application/rsd+xml', 'href' => $rsd)); - } - function showProfile() - { - $profile = new UserProfile($this, $this->user, $this->profile); - $profile->show(); + 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 stream. $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) . ' '; + // 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) . ' '; if (common_logged_in()) { $current_user = common_current_user(); @@ -216,15 +207,15 @@ class ShowstreamAction extends ProfileAction // 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 stream. %1$s is a user nickname, %2$s is a part of a URL. + // 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'); @@ -234,20 +225,16 @@ class ShowstreamAction extends ProfileAction function showNotices() { - $notice = empty($this->tag) - ? $this->user->getNotices(($this->page-1)*NOTICES_PER_PAGE, NOTICES_PER_PAGE + 1) - : $this->user->getTaggedNotices($this->tag, ($this->page-1)*NOTICES_PER_PAGE, NOTICES_PER_PAGE + 1, 0, 0, null); - $pnl = null; - if (Event::handle('ShowStreamNoticeList', array($notice, $this, &$pnl))) { - $pnl = new ProfileNoticeList($notice, $this); + if (Event::handle('ShowStreamNoticeList', array($this->notice, $this, &$pnl))) { + $pnl = new ProfileNoticeList($this->notice, $this); } $cnt = $pnl->show(); if (0 == $cnt) { $this->showEmptyListMessage(); } - $args = array('nickname' => $this->user->nickname); + $args = array('nickname' => $this->target->nickname); if (!empty($this->tag)) { $args['tag'] = $this->tag; @@ -259,18 +246,18 @@ class ShowstreamAction extends ProfileAction function showAnonymousMessage() { if (!(common_config('site','closed') || common_config('site','inviteonly'))) { - // TRANS: Announcement for anonymous users showing a stream if site registrations are open. + // TRANS: Announcement for anonymous users showing a timeline if site registrations are open. // 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. ' . '[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 stream if site registrations are closed or invite only. + // 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)); @@ -280,54 +267,21 @@ class ShowstreamAction extends ProfileAction function showSections() { parent::showSections(); - $cloud = new PersonalTagCloudSection($this, $this->user); - $cloud->show(); - } -} - -// We don't show the author for a profile, since we already know who it is! - -class ProfileNoticeList extends NoticeList -{ - function newListItem($notice) - { - return new ProfileNoticeListItem($notice, $this->out); - } -} - -class ProfileNoticeListItem extends DoFollowListItem -{ - function showAuthor() - { - return; + if (!common_config('performance', 'high')) { + $cloud = new PersonalTagCloudSection($this, $this->user); + $cloud->show(); + } } - /** - * show a link to the author of repeat - * - * @return void - */ - function showRepeat() + function noticeFormOptions() { - if (!empty($this->repeat)) { - - // FIXME: this code is almost identical to default; need to refactor - - $attrs = array('href' => $this->profile->profileurl, - 'class' => 'url'); + $options = parent::noticeFormOptions(); + $cur = common_current_user(); - 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'); + if (empty($cur) || $cur->id != $this->profile->id) { + $options['to_profile'] = $this->profile; } + + return $options; } }