X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=lib%2Fthreadednoticelist.php;h=6d8570fbee6a5c422eeb186fae31e5ed755cec17;hb=7f3611c51c53acb46e17189194f0ed82beee7914;hp=759efd7fd83667c914f71600a8b7d339279f6bd9;hpb=413d9e2fd014f447a7ee5eac3e2e37fe22fbedc9;p=quix0rs-gnu-social.git diff --git a/lib/threadednoticelist.php b/lib/threadednoticelist.php index 759efd7fd8..6d8570fbee 100644 --- a/lib/threadednoticelist.php +++ b/lib/threadednoticelist.php @@ -27,9 +27,7 @@ * @link http://status.net/ */ -if (!defined('STATUSNET') && !defined('LACONICA')) { - exit(1); -} +if (!defined('GNUSOCIAL') && !defined('STATUSNET')) { exit(1); } /** * widget for displaying a list of notices @@ -76,19 +74,21 @@ class ThreadedNoticeList extends NoticeList $this->out->element('h2', null, _m('HEADER','Notices')); $this->out->elementStart('ol', array('class' => 'notices threaded-notices xoxo')); - $cnt = 0; + $notices = $this->notice->fetchAll(); + $total = count($notices); + $notices = array_slice($notices, 0, NOTICES_PER_PAGE); + + $allnotices = self::_allNotices($notices); + self::prefill($allnotices); + $conversations = array(); - while ($this->notice->fetch() && $cnt <= NOTICES_PER_PAGE) { - $cnt++; - - if ($cnt > NOTICES_PER_PAGE) { - break; - } + + foreach ($notices as $notice) { // Collapse repeats into their originals... - $notice = $this->notice; + if ($notice->repeat_of) { - $orig = Notice::staticGet('id', $notice->repeat_of); + $orig = Notice::getKV('id', $notice->repeat_of); if ($orig) { $notice = $orig; } @@ -119,7 +119,22 @@ class ThreadedNoticeList extends NoticeList $this->out->elementEnd('ol'); $this->out->elementEnd('div'); - return $cnt; + return $total; + } + + function _allNotices($notices) + { + $convId = array(); + foreach ($notices as $notice) { + $convId[] = $notice->conversation; + } + $convId = array_unique($convId); + $allMap = Notice::listGet('conversation', $convId); + $allArray = array(); + foreach ($allMap as $convId => $convNotices) { + $allArray = array_merge($allArray, $convNotices); + } + return $allArray; } /** @@ -420,7 +435,7 @@ abstract class NoticeListActorsItem extends NoticeListItem // TRANS: Reference to the logged in user in favourite list. array_unshift($links, _m('FAVELIST', 'You')); } else { - $profile = Profile::staticGet('id', $id); + $profile = Profile::getKV('id', $id); if ($profile) { $links[] = sprintf('%s', htmlspecialchars($profile->profileurl), @@ -452,9 +467,9 @@ abstract class NoticeListActorsItem extends NoticeListItem } else { $first = array_slice($items, 0, -1); $last = array_slice($items, -1, 1); - // TRANS: Separator in list of user names like "You, Bob, Mary". + // TRANS: Separator in list of user names like "Jim, Bob, Mary". $separator = _(', '); - // TRANS: For building a list such as "You, bob, mary and 5 others have favored this notice". + // TRANS: For building a list such as "Jim, Bob, Mary and 5 others like this". // TRANS: %1$s is a list of users, separated by a separator (default: ", "), %2$s is the last user in the list. return sprintf(_m('FAVELIST', '%1$s and %2$s'), implode($separator, $first), implode($separator, $last)); } @@ -468,9 +483,9 @@ class ThreadedNoticeListFavesItem extends NoticeListActorsItem { function getProfiles() { - $fave = Fave::byNotice($this->notice->id); + $faves = $this->notice->getFaves(); $profiles = array(); - while ($fave->fetch()) { + foreach ($faves as $fave) { $profiles[] = $fave->user_id; } return $profiles; @@ -487,18 +502,22 @@ class ThreadedNoticeListFavesItem extends NoticeListActorsItem function getListMessage($count, $you) { - // @todo FIXME:: Does not look correct. %%? if ($count == 1 && $you) { // darn first person being different from third person! // TRANS: List message for notice favoured by logged in user. return _m('FAVELIST', 'You like this.'); } else if ($count > 4) { // TRANS: List message for when more than 4 people like something. - return sprintf(_m('FAVELIST', '%%s and %d others like this.'), + // TRANS: %%s is a list of users liking a notice, %d is the number over 4 that like the notice. + // TRANS: Plural is decided on the total number of users liking the notice (count of %%s + %d). + return sprintf(_m('%%s and %d others like this.', + '%%s and %d others like this.', + $count), $count - 3); } else { // TRANS: List message for favoured notices. - // TRANS: %d is the number of users that have favoured a notice. + // TRANS: %%s is a list of users liking a notice. + // TRANS: Plural is based on the number of of users that have favoured a notice. return sprintf(_m('%%s likes this.', '%%s like this.', $count), @@ -538,26 +557,46 @@ class ThreadedNoticeListRepeatsItem extends NoticeListActorsItem { function getProfiles() { - $rep = $this->notice->repeatStream(); + $repeats = $this->notice->getRepeats(); $profiles = array(); - while ($rep->fetch()) { + + foreach ($repeats as $rep) { $profiles[] = $rep->profile_id; } + return $profiles; } + function magicList($items) + { + if (count($items) > 4) { + return parent::magicList(array_slice($items, 0, 3)); + } else { + return parent::magicList($items); + } + } + function getListMessage($count, $you) { if ($count == 1 && $you) { // darn first person being different from third person! // TRANS: List message for notice repeated by logged in user. - return _m('REPEATLIST', 'You have repeated this notice.'); + return _m('REPEATLIST', 'You repeated this.'); + } else if ($count > 4) { + // TRANS: List message for when more than 4 people repeat something. + // TRANS: %%s is a list of users liking a notice, %d is the number over 4 that like the notice. + // TRANS: Plural is decided on the total number of users liking the notice (count of %%s + %d). + return sprintf(_m('%%s and %d other repeated this.', + '%%s and %d others repeated this.', + $count - 3), + $count - 3); } else { - // TRANS: List message for repeated notices. - // TRANS: %d is the number of users that have repeated a notice. - return sprintf(_m('One person has repeated this notice.', - '%d people have repeated this notice.', + // TRANS: List message for favoured notices. + // TRANS: %%s is a list of users liking a notice. + // TRANS: Plural is based on the number of of users that have favoured a notice. + return sprintf(_m('%%s repeated this.', + '%%s repeated this.', $count), $count); }