eliseuamaro/gnu-social
1
0
Fork 0
forked from GNUsocial/gnu-social
Code Issues Pull Requests Releases Wiki Activity

Modernising subscribers/subscriptions to use $this->scoped/target

Browse Source 
They extend GalleryAction from ProfileAction, where $this->target is set.
This commit is contained in:
Mikael Nordfeldth 2014-05-28 17:00:34 +02:00
parent 9e6599b9fb
commit eb7f964598
2 changed files with 31 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
actions/subscribers.php
View File

@ -48,20 +48,19 @@ class SubscribersAction extends GalleryAction
if ($this->page == 1) { if ($this->page == 1) {
// TRANS: Header for list of subscribers for a user (first page). // TRANS: Header for list of subscribers for a user (first page).
// TRANS: %s is the user's nickname. // TRANS: %s is the user's nickname.
return sprintf(_('%s subscribers'), $this->user->nickname); return sprintf(_('%s subscribers'), $this->target->getNickname());
} else { } else {
// TRANS: Header for list of subscribers for a user (not first page). // TRANS: Header for list of subscribers for a user (not first page).
// TRANS: %1$s is the user's nickname, $2$d is the page number. // TRANS: %1$s is the user's nickname, $2$d is the page number.
return sprintf(_('%1$s subscribers, page %2$d'), return sprintf(_('%1$s subscribers, page %2$d'),
$this->user->nickname, $this->target->getNickname(),
$this->page); $this->page);
} }
} }
function showPageNotice() function showPageNotice()
{ {
$user = common_current_user(); if ($this->scoped instanceof Profile && $this->scoped->id === $this->target->id) {
if ($user && ($user->id == $this->profile->id)) {
$this->element('p', null, $this->element('p', null,
// TRANS: Page notice for page with an overview of all subscribers // TRANS: Page notice for page with an overview of all subscribers
// TRANS: of the logged in user's own profile. // TRANS: of the logged in user's own profile.
@ -73,7 +72,7 @@ class SubscribersAction extends GalleryAction
// TRANS: than the logged in user. %s is the user nickname. // TRANS: than the logged in user. %s is the user nickname.
sprintf(_('These are the people who '. sprintf(_('These are the people who '.
'listen to %s\'s notices.'), 'listen to %s\'s notices.'),
$this->profile->nickname)); $this->target->getNickname()));
} }
} }
@ -87,13 +86,13 @@ class SubscribersAction extends GalleryAction
$cnt = 0; $cnt = 0;
if ($this->tag) { if ($this->tag) {
$subscribers = $this->user->getTaggedSubscribers($this->tag, $offset, $limit); $subscribers = $this->target->getTaggedSubscribers($this->tag, $offset, $limit);
} else { } else {
$subscribers = $this->user->getSubscribers($offset, $limit); $subscribers = $this->target->getSubscribers($offset, $limit);
} }
if ($subscribers) { if ($subscribers) {
$subscribers_list = new SubscribersList($subscribers, $this->user, $this); $subscribers_list = new SubscribersList($subscribers, $this->target, $this);
$cnt = $subscribers_list->show(); $cnt = $subscribers_list->show();
if (0 == $cnt) { if (0 == $cnt) {
$this->showEmptyListMessage(); $this->showEmptyListMessage();
@ -102,29 +101,25 @@ class SubscribersAction extends GalleryAction
$this->pagination($this->page > 1, $cnt > PROFILES_PER_PAGE, $this->pagination($this->page > 1, $cnt > PROFILES_PER_PAGE,
$this->page, 'subscribers', $this->page, 'subscribers',
array('nickname' => $this->user->nickname)); array('nickname' => $this->target->getNickname()));
} }
function showEmptyListMessage() function showEmptyListMessage()
{ {
if (common_logged_in()) { if ($this->scoped instanceof Profile && $this->target->id === $this->scoped->id) {
$current_user = common_current_user(); // TRANS: Subscriber list text when the logged in user has no subscribers.
if ($this->user->id === $current_user->id) { $message = _('You have no subscribers. Try subscribing to people you know and they might return the favor.');
// TRANS: Subscriber list text when the logged in user has no subscribers. } elseif ($this->scoped instanceof Profile) {
$message = _('You have no subscribers. Try subscribing to people you know and they might return the favor.'); // TRANS: Subscriber list text when looking at the subscribers for a of a user other
} else { // TRANS: than the logged in user that has no subscribers. %s is the user nickname.
// TRANS: Subscriber list text when looking at the subscribers for a of a user other $message = sprintf(_('%s has no subscribers. Want to be the first?'), $this->target->getNickname());
// TRANS: than the logged in user that has no subscribers. %s is the user nickname. } else {
$message = sprintf(_('%s has no subscribers. Want to be the first?'), $this->user->nickname);
}
}
else {
// TRANS: Subscriber list text when looking at the subscribers for a of a user that has none // TRANS: Subscriber list text when looking at the subscribers for a of a user that has none
// TRANS: as an anonymous user. %s is the user nickname. // TRANS: as an anonymous user. %s is the user nickname.
// TRANS: This message contains a Markdown URL. The link description is between // TRANS: This message contains a Markdown URL. The link description is between
// TRANS: square brackets, and the link between parentheses. Do not separate "](" // TRANS: square brackets, and the link between parentheses. Do not separate "]("
// TRANS: and do not change the URL part. // TRANS: and do not change the URL part.
$message = sprintf(_('%s has no subscribers. Why not [register an account](%%%%action.register%%%%) and be the first?'), $this->user->nickname); $message = sprintf(_('%s has no subscribers. Why not [register an account](%%%%action.register%%%%) and be the first?'), $this->target->getNickname());
} }
$this->elementStart('div', 'guide'); $this->elementStart('div', 'guide');
@ -166,7 +161,7 @@ class SubscribersListItem extends SubscriptionListItem
if (!empty($user) && $this->owner->id == $user->id) { if (!empty($user) && $this->owner->id == $user->id) {
$returnto = array('action' => 'subscribers', $returnto = array('action' => 'subscribers',
'nickname' => $this->owner->nickname); 'nickname' => $this->owner->getNickname());
$page = $this->out->arg('page'); $page = $this->out->arg('page');
if ($page) { if ($page) {
$returnto['param-page'] = $page; $returnto['param-page'] = $page;

35
actions/subscriptions.php
View File

@ -48,20 +48,19 @@ class SubscriptionsAction extends GalleryAction
if ($this->page == 1) { if ($this->page == 1) {
// TRANS: Header for subscriptions overview for a user (first page). // TRANS: Header for subscriptions overview for a user (first page).
// TRANS: %s is a user nickname. // TRANS: %s is a user nickname.
return sprintf(_('%s subscriptions'), $this->user->nickname); return sprintf(_('%s subscriptions'), $this->target->getNickname());
} else { } else {
// TRANS: Header for subscriptions overview for a user (not first page). // TRANS: Header for subscriptions overview for a user (not first page).
// TRANS: %1$s is a user nickname, %2$d is the page number. // TRANS: %1$s is a user nickname, %2$d is the page number.
return sprintf(_('%1$s subscriptions, page %2$d'), return sprintf(_('%1$s subscriptions, page %2$d'),
$this->user->nickname, $this->target->getNickname(),
$this->page); $this->page);
} }
} }
function showPageNotice() function showPageNotice()
{ {
$user = common_current_user(); if ($this->scoped instanceof Profile && $this->scoped->id === $this->target->id) {
if ($user && ($user->id == $this->profile->id)) {
$this->element('p', null, $this->element('p', null,
// TRANS: Page notice for page with an overview of all subscriptions // TRANS: Page notice for page with an overview of all subscriptions
// TRANS: of the logged in user's own profile. // TRANS: of the logged in user's own profile.
@ -73,7 +72,7 @@ class SubscriptionsAction extends GalleryAction
// TRANS: than the logged in user. %s is the user nickname. // TRANS: than the logged in user. %s is the user nickname.
sprintf(_('These are the people whose '. sprintf(_('These are the people whose '.
'notices %s listens to.'), 'notices %s listens to.'),
$this->profile->nickname)); $this->target->getNickname()));
} }
} }
@ -93,13 +92,13 @@ class SubscriptionsAction extends GalleryAction
$cnt = 0; $cnt = 0;
if ($this->tag) { if ($this->tag) {
$subscriptions = $this->user->getTaggedSubscriptions($this->tag, $offset, $limit); $subscriptions = $this->target->getTaggedSubscriptions($this->tag, $offset, $limit);
} else { } else {
$subscriptions = $this->user->getSubscribed($offset, $limit); $subscriptions = $this->target->getSubscribed($offset, $limit);
} }
if ($subscriptions) { if ($subscriptions) {
$subscriptions_list = new SubscriptionsList($subscriptions, $this->user, $this); $subscriptions_list = new SubscriptionsList($subscriptions, $this->target, $this);
$cnt = $subscriptions_list->show(); $cnt = $subscriptions_list->show();
if (0 == $cnt) { if (0 == $cnt) {
$this->showEmptyListMessage(); $this->showEmptyListMessage();
@ -108,7 +107,7 @@ class SubscriptionsAction extends GalleryAction
$this->pagination($this->page > 1, $cnt > PROFILES_PER_PAGE, $this->pagination($this->page > 1, $cnt > PROFILES_PER_PAGE,
$this->page, 'subscriptions', $this->page, 'subscriptions',
array('nickname' => $this->user->nickname)); array('nickname' => $this->target->getNickname()));
Event::handle('EndShowSubscriptionsContent', array($this)); Event::handle('EndShowSubscriptionsContent', array($this));
@ -123,9 +122,7 @@ class SubscriptionsAction extends GalleryAction
function showEmptyListMessage() function showEmptyListMessage()
{ {
if (common_logged_in()) { if ($this->scoped instanceof Profile && $this->target->id === $this->scoped->id) {
$current_user = common_current_user();
if ($this->user->id === $current_user->id) {
// TRANS: Subscription list text when the logged in user has no subscriptions. // TRANS: Subscription list text when the logged in user has no subscriptions.
// TRANS: This message contains Markdown URLs. The link description is between // TRANS: This message contains Markdown URLs. The link description is between
// TRANS: square brackets, and the link between parentheses. Do not separate "](" // TRANS: square brackets, and the link between parentheses. Do not separate "]("
@ -133,16 +130,10 @@ class SubscriptionsAction extends GalleryAction
$message = _('You\'re not listening to anyone\'s notices right now, try subscribing to people you know. '. $message = _('You\'re not listening to anyone\'s notices right now, try subscribing to people you know. '.
'Try [people search](%%action.peoplesearch%%), look for members in groups you\'re interested '. 'Try [people search](%%action.peoplesearch%%), look for members in groups you\'re interested '.
'in and in our [featured users](%%action.featured%%).'); 'in and in our [featured users](%%action.featured%%).');
} else { } else {
// TRANS: Subscription list text when looking at the subscriptions for a of a user other
// TRANS: than the logged in user that has no subscriptions. %s is the user nickname.
$message = sprintf(_('%s is not listening to anyone.'), $this->user->nickname);
}
}
else {
// TRANS: Subscription list text when looking at the subscriptions for a of a user that has none // TRANS: Subscription list text when looking at the subscriptions for a of a user that has none
// TRANS: as an anonymous user. %s is the user nickname. // TRANS: as an anonymous user. %s is the user nickname.
$message = sprintf(_('%s is not listening to anyone.'), $this->user->nickname); $message = sprintf(_('%s is not listening to anyone.'), $this->target->getNickname());
} }
$this->elementStart('div', 'guide'); $this->elementStart('div', 'guide');
@ -159,10 +150,10 @@ class SubscriptionsAction extends GalleryAction
{ {
return array(new Feed(Feed::ATOM, return array(new Feed(Feed::ATOM,
common_local_url('AtomPubSubscriptionFeed', common_local_url('AtomPubSubscriptionFeed',
array('subscriber' => $this->profile->id)), array('subscriber' => $this->target->id)),
// TRANS: Atom feed title. %s is a profile nickname. // TRANS: Atom feed title. %s is a profile nickname.
sprintf(_('Subscription feed for %s (Atom)'), sprintf(_('Subscription feed for %s (Atom)'),
$this->profile->nickname))); $this->target->getNickname())));
} }
} }