X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=lib%2Fthreadednoticelist.php;h=15d286dbf97529c621e376461615881e243924d0;hb=aadc7398dc40f500db98aaba4606726edf5a64ce;hp=407f7bdde3c608fea1af559f1165064e044cd77c;hpb=575ecd9f4c7e2544f1ae43e7838f1be6a9af4dc4;p=quix0rs-gnu-social.git diff --git a/lib/threadednoticelist.php b/lib/threadednoticelist.php index 407f7bdde3..15d286dbf9 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 @@ -52,7 +50,7 @@ class ThreadedNoticeList extends NoticeList { protected $userProfile; - function __construct($notice, $out=null, $profile=-1) + function __construct(Notice $notice, Action $out=null, $profile=-1) { parent::__construct($notice, $out); if (is_int($profile) && $profile == -1) { @@ -80,7 +78,8 @@ class ThreadedNoticeList extends NoticeList $total = count($notices); $notices = array_slice($notices, 0, NOTICES_PER_PAGE); - self::prefill($notices); + $allnotices = self::_allNotices($notices); + self::prefill($allnotices); $conversations = array(); @@ -89,8 +88,8 @@ class ThreadedNoticeList extends NoticeList // Collapse repeats into their originals... if ($notice->repeat_of) { - $orig = Notice::staticGet('id', $notice->repeat_of); - if ($orig) { + $orig = Notice::getKV('id', $notice->repeat_of); + if ($orig instanceof Notice) { $notice = $orig; } } @@ -103,7 +102,7 @@ class ThreadedNoticeList extends NoticeList // Get the convo's root notice $root = $notice->conversationRoot($this->userProfile); - if ($root) { + if ($root instanceof Notice) { $notice = $root; } @@ -123,6 +122,21 @@ class ThreadedNoticeList extends NoticeList 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; + } + /** * returns a new list item for the current notice * @@ -133,7 +147,7 @@ class ThreadedNoticeList extends NoticeList * * @return NoticeListItem a list item for displaying the notice */ - function newListItem($notice) + function newListItem(Notice $notice) { return new ThreadedNoticeListItem($notice, $this->out, $this->userProfile); } @@ -160,7 +174,7 @@ class ThreadedNoticeListItem extends NoticeListItem { protected $userProfile = null; - function __construct($notice, $out=null, $profile=null) + function __construct(Notice $notice, Action $out=null, $profile=null) { parent::__construct($notice, $out); $this->userProfile = $profile; @@ -194,6 +208,11 @@ class ThreadedNoticeListItem extends NoticeListItem $moreCutoff = null; while ($notice->fetch()) { if (Event::handle('StartAddNoticeReply', array($this, $this->notice, $notice))) { + // Don't list repeats as separate notices in a conversation + if (!empty($notice->repeat_of)) { + continue; + } + if ($notice->id == $this->notice->id) { // Skip! continue; @@ -210,37 +229,40 @@ class ThreadedNoticeListItem extends NoticeListItem } if (Event::handle('StartShowThreadedNoticeTail', array($this, $this->notice, &$notices))) { + $threadActive = count($notices) > 0; // has this thread had any activity? + $this->out->elementStart('ul', 'notices threaded-replies xoxo'); - $item = new ThreadedNoticeListFavesItem($this->notice, $this->out); - $hasFaves = $item->show(); + if (Event::handle('StartShowThreadedNoticeTailItems', array($this, $this->notice, &$threadActive))) { - $item = new ThreadedNoticeListRepeatsItem($this->notice, $this->out); - $hasRepeats = $item->show(); + // Show the repeats-button for this notice. If there are repeats, + // the show() function will return true, definitely setting our + // $threadActive flag, which will be used later to show a reply box. + $item = new ThreadedNoticeListRepeatsItem($this->notice, $this->out); + $threadActive = $item->show() || $threadActive; - if ($notices) { + Event::handle('EndShowThreadedNoticeTailItems', array($this, $this->notice, &$threadActive)); + } + if (count($notices)>0) { if ($moreCutoff) { $item = new ThreadedNoticeListMoreItem($moreCutoff, $this->out, count($notices)); $item->show(); } - NoticeList::prefill($notices, AVATAR_MINI_SIZE); foreach (array_reverse($notices) as $notice) { if (Event::handle('StartShowThreadedNoticeSub', array($this, $this->notice, $notice))) { $item = new ThreadedNoticeListSubItem($notice, $this->notice, $this->out); $item->show(); - Event::handle('StartShowThreadedNoticeSub', array($this, $this->notice, $notice)); + Event::handle('EndShowThreadedNoticeSub', array($this, $this->notice, $notice)); } } } - if ($notices || $hasFaves || $hasRepeats) { + if ($threadActive && Profile::current() instanceof Profile) { // @fixme do a proper can-post check that's consistent // with the JS side - if (common_current_user()) { - $item = new ThreadedNoticeListReplyItem($this->notice, $this->out); - $item->show(); - } + $item = new ThreadedNoticeListReplyItem($this->notice, $this->out); + $item->show(); } $this->out->elementEnd('ul'); Event::handle('EndShowThreadedNoticeTail', array($this, $this->notice, $notices)); @@ -256,7 +278,7 @@ class ThreadedNoticeListSubItem extends NoticeListItem { protected $root = null; - function __construct($notice, $root, $out) + function __construct(Notice $notice, $root, $out) { $this->root = $root; parent::__construct($notice, $out); @@ -301,8 +323,12 @@ class ThreadedNoticeListSubItem extends NoticeListItem function showEnd() { - $item = new ThreadedNoticeListInlineFavesItem($this->notice, $this->out); - $hasFaves = $item->show(); + $threadActive = null; // unused here for now, but maybe in the future? + if (Event::handle('StartShowThreadedNoticeTailItems', array($this, $this->notice, &$threadActive))) { + $item = new ThreadedNoticeListInlineRepeatsItem($this->notice, $this->out); + $hasRepeats = $item->show(); + Event::handle('EndShowThreadedNoticeTailItems', array($this, $this->notice, &$threadActive)); + } parent::showEnd(); } } @@ -314,7 +340,7 @@ class ThreadedNoticeListMoreItem extends NoticeListItem { protected $cnt; - function __construct($notice, $out, $cnt) + function __construct(Notice $notice, Action $out, $cnt) { parent::__construct($notice, $out); $this->cnt = $cnt; @@ -345,10 +371,15 @@ class ThreadedNoticeListMoreItem extends NoticeListItem $this->out->elementStart('li', array('class' => 'notice-reply-comments')); } + function showEnd() + { + $this->out->elementEnd('li'); + } + function showMiniForm() { $id = $this->notice->conversation; - $url = common_local_url('conversationreplies', array('id' => $id)); + $url = common_local_url('conversation', array('id' => $id)); $n = Conversation::noticeCount($id) - 1; @@ -400,81 +431,20 @@ class ThreadedNoticeListReplyItem extends NoticeListItem } /** - * Placeholder for showing faves... + * Placeholder for showing repeats... */ -abstract class NoticeListActorsItem extends NoticeListItem +class ThreadedNoticeListRepeatsItem extends NoticeListActorsItem { - /** - * @return array of profile IDs - */ - abstract function getProfiles(); - - abstract function getListMessage($count, $you); - - function show() + function getProfiles() { - $links = array(); - $you = false; - $cur = common_current_user(); - foreach ($this->getProfiles() as $id) { - if ($cur && $cur->id == $id) { - $you = true; - // TRANS: Reference to the logged in user in favourite list. - array_unshift($links, _m('FAVELIST', 'You')); - } else { - $profile = Profile::staticGet('id', $id); - if ($profile) { - $links[] = sprintf('%s', - htmlspecialchars($profile->profileurl), - htmlspecialchars($profile->getBestName())); - } - } - } - - if ($links) { - $count = count($links); - $msg = $this->getListMessage($count, $you); - $out = sprintf($msg, $this->magicList($links)); + $repeats = $this->notice->getRepeats(); - $this->showStart(); - $this->out->raw($out); - $this->showEnd(); - return $count; - } else { - return 0; - } - } + $profiles = array(); - function magicList($items) - { - if (count($items) == 0) { - return ''; - } else if (count($items) == 1) { - return $items[0]; - } else { - $first = array_slice($items, 0, -1); - $last = array_slice($items, -1, 1); - // TRANS: Separator in list of user names like "Jim, Bob, Mary". - $separator = _(', '); - // 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)); + foreach ($repeats as $rep) { + $profiles[] = $rep->profile_id; } - } -} -/** - * Placeholder for showing faves... - */ -class ThreadedNoticeListFavesItem extends NoticeListActorsItem -{ - function getProfiles() - { - $fave = Fave::byNotice($this->notice->id); - $profiles = array(); - while ($fave->fetch()) { - $profiles[] = $fave->user_id; - } return $profiles; } @@ -491,22 +461,22 @@ class ThreadedNoticeListFavesItem extends NoticeListActorsItem { 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.'); + // TRANS: List message for notice repeated by logged in user. + return _m('REPEATLIST', 'You repeated this.'); } else if ($count > 4) { - // TRANS: List message for when more than 4 people like something. + // 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 others like this.', - '%%s and %d others like this.', - $count), + return sprintf(_m('%%s and %d other repeated this.', + '%%s and %d others repeated this.', + $count - 3), $count - 3); } else { - // 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 likes this.', - '%%s like this.', + // TRANS: List message for repeated notices. + // TRANS: %%s is a list of users who have repeated a notice. + // TRANS: Plural is based on the number of of users that have repeated a notice. + return sprintf(_m('%%s repeated this.', + '%%s repeated this.', $count), $count); } @@ -514,7 +484,7 @@ class ThreadedNoticeListFavesItem extends NoticeListActorsItem function showStart() { - $this->out->elementStart('li', array('class' => 'notice-data notice-faves')); + $this->out->elementStart('li', array('class' => 'notice-data notice-repeats')); } function showEnd() @@ -524,11 +494,11 @@ class ThreadedNoticeListFavesItem extends NoticeListActorsItem } // @todo FIXME: needs documentation. -class ThreadedNoticeListInlineFavesItem extends ThreadedNoticeListFavesItem +class ThreadedNoticeListInlineRepeatsItem extends ThreadedNoticeListRepeatsItem { function showStart() { - $this->out->elementStart('div', array('class' => 'entry-content notice-faves')); + $this->out->elementStart('div', array('class' => 'notice-repeats')); } function showEnd() @@ -536,46 +506,3 @@ class ThreadedNoticeListInlineFavesItem extends ThreadedNoticeListFavesItem $this->out->elementEnd('div'); } } - -/** - * Placeholder for showing faves... - */ -class ThreadedNoticeListRepeatsItem extends NoticeListActorsItem -{ - function getProfiles() - { - $rep = $this->notice->repeatStream(); - - $profiles = array(); - while ($rep->fetch()) { - $profiles[] = $rep->profile_id; - } - return $profiles; - } - - 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.'); - } 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.', - $count), - $count); - } - } - - function showStart() - { - $this->out->elementStart('li', array('class' => 'notice-data notice-repeats')); - } - - function showEnd() - { - $this->out->elementEnd('li'); - } -}