X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=actions%2Fshowstream.php;h=ccd976a0e30fe30a2151335451b554b60241c117;hb=0cbb7411a69f63a4c2947d5c66e62f28e0714532;hp=1f5d85ea4e9d0ac786d0c8a71391d37e6dfa33af;hpb=59a413cf5e246c33c684b2338ab8443232776b3f;p=quix0rs-gnu-social.git diff --git a/actions/showstream.php b/actions/showstream.php index 1f5d85ea4e..ccd976a0e3 100644 --- a/actions/showstream.php +++ b/actions/showstream.php @@ -33,7 +33,6 @@ if (!defined('STATUSNET') && !defined('LACONICA')) { } 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'; @@ -56,6 +55,25 @@ require_once INSTALLDIR.'/lib/feedlist.php'; */ class ShowstreamAction extends ProfileAction { + var $notice; + + function prepare($args) + { + parent::prepare($args); + + $p = Profile::current(); + + if (empty($this->tag)) { + $stream = new ProfileNoticeStream($this->profile, $p); + } else { + $stream = new TaggedProfileNoticeStream($this->profile, $this->tag, $p); + } + + $this->notice = $stream->getNotices(($this->page-1)*NOTICES_PER_PAGE, NOTICES_PER_PAGE + 1); + + return true; + } + function isReadOnly($args) { return true; @@ -66,20 +84,21 @@ class ShowstreamAction extends ProfileAction $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); } @@ -92,22 +111,18 @@ class ShowstreamAction extends ProfileAction // 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() @@ -128,7 +143,16 @@ class ShowstreamAction extends ProfileAction $this->user->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->user->nickname)), + new Feed(Feed::RSS1, common_local_url('userrss', array('nickname' => $this->user->nickname)), // TRANS: Title for link to notice feed. @@ -149,6 +173,8 @@ class ShowstreamAction extends ProfileAction 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)), new Feed(Feed::FOAF, @@ -161,11 +187,6 @@ class ShowstreamAction extends ProfileAction 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 +198,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 @@ -199,15 +214,9 @@ class ShowstreamAction extends ProfileAction 'href' => $rsd)); } - function showProfile() - { - $profile = new UserProfile($this, $this->user, $this->profile); - $profile->show(); - } - function showEmptyListMessage() { - // TRANS: First sentence of empty list message for a stream. $1%s is a 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->user->nickname) . ' '; if (common_logged_in()) { @@ -216,7 +225,7 @@ 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); } @@ -234,13 +243,9 @@ 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) { @@ -259,14 +264,14 @@ 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); } 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. '), @@ -283,10 +288,34 @@ class ShowstreamAction extends ProfileAction $cloud = new PersonalTagCloudSection($this, $this->user); $cloud->show(); } + + function noticeFormOptions() + { + $options = parent::noticeFormOptions(); + $cur = common_current_user(); + + if (empty($cur) || $cur->id != $this->profile->id) { + $options['to_profile'] = $this->profile; + } + + 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) @@ -297,11 +326,6 @@ class ProfileNoticeList extends NoticeList class ProfileNoticeListItem extends DoFollowListItem { - function showAuthor() - { - return; - } - /** * show a link to the author of repeat *