X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=actions%2Fshowstream.php;h=890c1e711b316a99207fb7a2ac736cb2ba70264c;hb=c4f60ab444ab4768d12c5a4e6de010b185da7528;hp=a2320909fcf57e7db664f0611c937a68a9506e91;hpb=57198a74647f8350db4de03b0b7ef157091a4359;p=quix0rs-gnu-social.git diff --git a/actions/showstream.php b/actions/showstream.php index a2320909fc..890c1e711b 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 @@ -53,23 +45,30 @@ require_once INSTALLDIR.'/lib/feedlist.php'; * @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 { - function isReadOnly($args) + public function getStream() { - return true; + if (empty($this->tag)) { + $stream = new ProfileNoticeStream($this->target, $this->scoped); + } else { + $stream = new TaggedProfileNoticeStream($this->target, $this->tag, $this->scoped); + } + + 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 stream. + // 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(_('Notices by %1$s tagged %2$s, page %3$d'), $base, $this->tag, $this->page); } @@ -77,7 +76,7 @@ class ShowstreamAction extends ProfileAction 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(_('Notices by %1$s, page %2$d'), $base, @@ -86,32 +85,14 @@ class ShowstreamAction extends ProfileAction } } - 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->showNotices(); } - function showObjectNav() - { - $nav = new SubGroupNav($this, $this->user); - $nav->show(); - } - function showProfileBlock() { - $block = new AccountProfileBlock($this, $this->profile); + $block = new AccountProfileBlock($this, $this->target); $block->show(); } @@ -125,101 +106,102 @@ 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->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->user->nickname, $this->tag))); + $this->target->getNickname(), $this->tag))); } - return array(new Feed(Feed::RSS1, + return array(new Feed(Feed::JSON, + common_local_url('ApiTimelineUser', + array( + '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->getNickname())), + new Feed(Feed::RSS1, common_local_url('userrss', - array('nickname' => $this->user->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->user->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->user->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->user->nickname)), + $this->target->getNickname())), new Feed(Feed::FOAF, common_local_url('foaf', array('nickname' => - $this->user->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->user->nickname))); + sprintf(_('FOAF for %s'), $this->target->getNickname()))); } 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) { + if ($this->target->bio) { $this->element('meta', array('name' => 'description', - 'content' => $this->profile->bio)); - } - - if ($this->user->emailmicroid && $this->user->email && $this->profile->profileurl) { - $id = new Microid('mailto:'.$this->user->email, - $this->selfUrl()); - $this->element('meta', array('name' => 'microid', - 'content' => $id->toString())); + 'content' => $this->target->getDescription())); } // See https://wiki.mozilla.org/Microsummaries $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', 'type' => 'application/rsd+xml', 'href' => $rsd)); + + if ($this->page != 1) { + $this->element('link', array('rel' => 'canonical', + 'href' => $this->target->getUrl())); + } } 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->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 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->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->user->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'); @@ -229,20 +211,13 @@ 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); - } + $pnl = new NoticeList($this->notice, $this); $cnt = $pnl->show(); if (0 == $cnt) { $this->showEmptyListMessage(); } - $args = array('nickname' => $this->user->nickname); + $args = array('nickname' => $this->target->getNickname()); if (!empty($this->tag)) { $args['tag'] = $this->tag; @@ -254,18 +229,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->getNickname(), $this->target->getNickname()); } 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->getNickname(), $this->target->getNickname()); } $this->elementStart('div', array('id' => 'anon_notice')); $this->raw(common_markup_to_html($m)); @@ -275,73 +250,20 @@ class ShowstreamAction extends ProfileAction function showSections() { parent::showSections(); - $cloud = new PersonalTagCloudSection($this, $this->user); - $cloud->show(); + if (!common_config('performance', 'high')) { + $cloud = new PersonalTagCloudSection($this->target, $this); + $cloud->show(); + } } 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->sameAs($this->target)) { + $options['to_profile'] = $this->target; } 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'); - } - } -}