function prepare($args)
{
parent::prepare($args);
- $cur = common_current_user();
- if (!empty($cur) && $cur->id == $this->user->id) {
- $this->notice = $this->user->noticeInbox(($this->page-1)*NOTICES_PER_PAGE, NOTICES_PER_PAGE + 1);
- } else {
- $this->notice = $this->user->noticesWithFriends(($this->page-1)*NOTICES_PER_PAGE, NOTICES_PER_PAGE + 1);
- }
+ $stream = new ThreadingInboxNoticeStream($this->user, Profile::current());
+
+ $this->notice = $stream->getNotices(($this->page-1)*NOTICES_PER_PAGE,
+ NOTICES_PER_PAGE + 1);
if ($this->page > 1 && $this->notice->N == 0) {
- // TRANS: Server error when page not found (404)
- $this->serverError(_('No such page.'), $code = 404);
+ // TRANS: Server error when page not found (404).
+ $this->serverError(_('No such page.'), 404);
}
return true;
parent::handle($args);
if (!$this->user) {
+ // TRANS: Client error when user not found for an action.
$this->clientError(_('No such user.'));
return;
}
function title()
{
- if ($this->page > 1) {
- // TRANS: Page title. %1$s is user nickname, %2$d is page number
- return sprintf(_('%1$s and friends, page %2$d'), $this->user->nickname, $this->page);
+ $user = common_current_user();
+ if ($user->id == $this->user->id) {
+ // TRANS: Title of a user's own start page.
+ return _('Home timeline');
} else {
- // TRANS: Page title. %s is user nickname
- return sprintf(_("%s and friends"), $this->user->nickname);
+ $profile = $this->user->getProfile();
+ // TRANS: Title of another user's start page.
+ // TRANS: %s is the other user's name.
+ return sprintf(_("%s's home timeline"), $profile->getBestName());
}
}
function getFeeds()
{
return array(
+ new Feed(Feed::JSON,
+ common_local_url(
+ 'ApiTimelineFriends', array(
+ 'format' => 'as',
+ 'id' => $this->user->nickname
+ )
+ ),
+ // TRANS: %s is user nickname.
+ sprintf(_('Feed for friends of %s (Activity Streams JSON)'), $this->user->nickname)),
new Feed(Feed::RSS1,
common_local_url(
'allrss', array(
'nickname' =>
$this->user->nickname)
),
- // TRANS: %s is user nickname
+ // TRANS: %s is user nickname.
sprintf(_('Feed for friends of %s (RSS 1.0)'), $this->user->nickname)),
new Feed(Feed::RSS2,
common_local_url(
'id' => $this->user->nickname
)
),
- // TRANS: %s is user nickname
+ // TRANS: %s is user nickname.
sprintf(_('Feed for friends of %s (RSS 2.0)'), $this->user->nickname)),
new Feed(Feed::ATOM,
common_local_url(
'id' => $this->user->nickname
)
),
- // TRANS: %s is user nickname
+ // TRANS: %s is user nickname.
sprintf(_('Feed for friends of %s (Atom)'), $this->user->nickname))
);
}
- function showLocalNav()
- {
- $nav = new PersonalGroupNav($this);
- $nav->show();
- }
-
function showEmptyListMessage()
{
- // TRANS: %s is user nickname
+ // TRANS: Empty list message. %s is a user nickname.
$message = sprintf(_('This is the timeline for %s and friends but no one has posted anything yet.'), $this->user->nickname) . ' ';
if (common_logged_in()) {
// TRANS: This message contains Markdown links. Keep "](" together.
$message .= _('Try subscribing to more people, [join a group](%%action.groups%%) or post something yourself.');
} else {
- // TRANS: %1$s is user nickname, %2$s is user nickname, %2$s is user nickname prefixed with "@"
+ // TRANS: %1$s is user nickname, %2$s is user nickname, %2$s is user nickname prefixed with "@".
// TRANS: This message contains Markdown links. Keep "](" together.
$message .= sprintf(_('You can try to [nudge %1$s](../%2$s) from their profile or [post something to them](%%%%action.newnotice%%%%?status_textarea=%3$s).'), $this->user->nickname, $this->user->nickname, '@' . $this->user->nickname);
}
} else {
- // TRANS: Encoutagement displayed on empty timeline user pages for anonymous users.
+ // TRANS: Encouragement displayed on empty timeline user pages for anonymous users.
// TRANS: %s is a user nickname. This message contains Markdown links. Keep "](" together.
$message .= sprintf(_('Why not [register an account](%%%%action.register%%%%) and then nudge %s or post a notice to them.'), $this->user->nickname);
}
function showContent()
{
if (Event::handle('StartShowAllContent', array($this))) {
- $nl = new NoticeList($this->notice, $this);
+
+ $profile = null;
+
+ $current_user = common_current_user();
+
+ if (!empty($current_user)) {
+ $profile = $current_user->getProfile();
+ }
+
+ $nl = new ThreadedNoticeList($this->notice, $this, $profile);
$cnt = $nl->show();
}
}
- function showPageTitle()
+ function showSections()
{
- $user = common_current_user();
- if ($user && ($user->id == $this->user->id)) {
- // TRANS: H1 text
- $this->element('h1', null, _("You and friends"));
- } else {
- // TRANS: H1 text. %s is a user nickname
- $this->element('h1', null, sprintf(_('%s and friends'), $this->user->nickname));
+ // Show invite button, as long as site isn't closed, and
+ // we have a logged in user.
+ if (!common_config('site', 'closed') && common_logged_in()) {
+ if (!common_config('site', 'private')) {
+ $ibs = new InviteButtonSection(
+ $this,
+ // TRANS: Button text for inviting more users to the StatusNet instance.
+ // TRANS: Less business/enterprise-oriented language for public sites.
+ _m('BUTTON', 'Send invite')
+ );
+ } else {
+ $ibs = new InviteButtonSection($this);
+ }
+ $ibs->show();
}
+ $pop = new PopularNoticeSection($this);
+ $pop->show();
+ // $pop = new InboxTagCloudSection($this, $this->user);
+ // $pop->show();
+ }
+}
+
+class ThreadingInboxNoticeStream extends ThreadingNoticeStream
+{
+ function __construct($user, $profile)
+ {
+ parent::__construct(new InboxNoticeStream($user, $profile));
}
}
projects / quix0rs-gnu-social.git / blobdiff