X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=lib%2Fthreadednoticelist.php;h=acb9efb972efd702b9ba5a3c3a82b3809cd39ec3;hb=b53e1439969bfa2c0b551d8cc2fc8fe15652c62a;hp=c5cd2d308156034005a1e90fad6a6c03165717af;hpb=e75c9988ebe33822e493ac225859bc593ff9b855;p=quix0rs-gnu-social.git diff --git a/lib/threadednoticelist.php b/lib/threadednoticelist.php index c5cd2d3081..acb9efb972 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')) { exit(1); } /** * widget for displaying a list of notices @@ -50,6 +48,17 @@ if (!defined('STATUSNET') && !defined('LACONICA')) { */ class ThreadedNoticeList extends NoticeList { + protected $userProfile; + + function __construct(Notice $notice, Action $out=null, $profile=-1) + { + parent::__construct($notice, $out); + if (is_int($profile) && $profile == -1) { + $profile = Profile::current(); + } + $this->userProfile = $profile; + } + /** * show the list of notices * @@ -65,20 +74,22 @@ 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); - if ($orig) { + $orig = Notice::getKV('id', $notice->repeat_of); + if ($orig instanceof Notice) { $notice = $orig; } } @@ -90,8 +101,8 @@ class ThreadedNoticeList extends NoticeList $conversations[$convo] = true; // Get the convo's root notice - $root = $notice->conversationRoot(); - if ($root) { + $root = $notice->conversationRoot($this->userProfile); + if ($root instanceof Notice) { $notice = $root; } @@ -108,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; } /** @@ -121,9 +147,9 @@ 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); + return new ThreadedNoticeListItem($notice, $this->out, $this->userProfile); } } @@ -146,14 +172,17 @@ class ThreadedNoticeList extends NoticeList */ class ThreadedNoticeListItem extends NoticeListItem { - function initialItems() + protected $userProfile = null; + + function __construct(Notice $notice, Action $out=null, $profile=null) { - return 3; + parent::__construct($notice, $out); + $this->userProfile = $profile; } - function showContext() + function initialItems() { - // Silence! + return 3; } /** @@ -167,57 +196,59 @@ class ThreadedNoticeListItem extends NoticeListItem { $max = $this->initialItems(); if (!$this->repeat) { - $notice = Notice::conversationStream($this->notice->conversation, 0, $max + 2); + $stream = new ConversationNoticeStream($this->notice->conversation, $this->userProfile); + $notice = $stream->getNotices(0, $max + 2); $notices = array(); $cnt = 0; $moreCutoff = null; while ($notice->fetch()) { - if ($notice->id == $this->notice->id) { - // Skip! - continue; - } - $cnt++; - if ($cnt > $max) { - // boo-yah - $moreCutoff = clone($notice); - break; + 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; + } + $cnt++; + if ($cnt > $max) { + // boo-yah + $moreCutoff = clone($notice); + break; + } + $notices[] = clone($notice); // *grumble* inefficient as hell + Event::handle('EndAddNoticeReply', array($this, $this->notice, $notice)); } - $notices[] = clone($notice); // *grumble* inefficient as hell } if (Event::handle('StartShowThreadedNoticeTail', array($this, $this->notice, &$notices))) { - $this->out->elementStart('ul', 'notices threaded-replies xoxo'); + $threadActive = count($notices) > 0; // has this thread had any activity? - $item = new ThreadedNoticeListFavesItem($this->notice, $this->out); - $hasFaves = $item->show(); + $this->out->elementStart('ul', 'notices threaded-replies xoxo'); - $item = new ThreadedNoticeListRepeatsItem($this->notice, $this->out); - $hasRepeats = $item->show(); + if (Event::handle('StartShowThreadedNoticeTailItems', array($this, $this->notice, &$threadActive))) { + // Repeats and Faves/Likes are handled in plugins. + Event::handle('EndShowThreadedNoticeTailItems', array($this, $this->notice, &$threadActive)); + } - if ($notices) { + if (count($notices)>0) { if ($moreCutoff) { - $item = new ThreadedNoticeListMoreItem($moreCutoff, $this->out); + $item = new ThreadedNoticeListMoreItem($moreCutoff, $this->out, count($notices)); $item->show(); } foreach (array_reverse($notices) as $notice) { if (Event::handle('StartShowThreadedNoticeSub', array($this, $this->notice, $notice))) { - $item = new ThreadedNoticeListSubItem($notice, $this->out); + $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) { - // @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(); - } - } - $this->out->elementEnd('ul'); Event::handle('EndShowThreadedNoticeTail', array($this, $this->notice, $notices)); + $this->out->elementEnd('ul'); } } @@ -228,6 +259,14 @@ class ThreadedNoticeListItem extends NoticeListItem // @todo FIXME: needs documentation. class ThreadedNoticeListSubItem extends NoticeListItem { + protected $root = null; + + function __construct(Notice $notice, $root, $out) + { + $this->root = $root; + parent::__construct($notice, $out); + } + function avatarSize() { return AVATAR_STREAM_SIZE; // @fixme would like something in between @@ -243,15 +282,30 @@ class ThreadedNoticeListSubItem extends NoticeListItem // } - function showContext() + function getReplyProfiles() { - // + $all = parent::getReplyProfiles(); + + $profiles = array(); + + $rootAuthor = $this->root->getProfile(); + + foreach ($all as $profile) { + if ($profile->id != $rootAuthor->id) { + $profiles[] = $profile; + } + } + + return $profiles; } 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))) { + // Repeats and Faves/Likes are handled in plugins. + Event::handle('EndShowThreadedNoticeTailItems', array($this, $this->notice, &$threadActive)); + } parent::showEnd(); } } @@ -261,52 +315,14 @@ class ThreadedNoticeListSubItem extends NoticeListItem */ class ThreadedNoticeListMoreItem extends NoticeListItem { - /** - * recipe function for displaying a single notice. - * - * This uses all the other methods to correctly display a notice. Override - * it or one of the others to fine-tune the output. - * - * @return void - */ - function show() - { - $this->showStart(); - $this->showMiniForm(); - $this->showEnd(); - } + protected $cnt; - /** - * start a single notice. - * - * @return void - */ - function showStart() - { - $this->out->elementStart('li', array('class' => 'notice-reply-comments')); - } - - function showMiniForm() + function __construct(Notice $notice, Action $out, $cnt) { - $id = $this->notice->conversation; - $url = common_local_url('conversationreplies', array('id' => $id)); - - $n = Conversation::noticeCount($id) - 1; - - // TRANS: Link to show replies for a notice. - // TRANS: %d is the number of replies to a notice and used for plural. - $msg = sprintf(_m('Show reply', 'Show all %d replies', $n), $n); - - $this->out->element('a', array('href' => $url), $msg); + parent::__construct($notice, $out); + $this->cnt = $cnt; } -} -/** - * Placeholder for reply form... - * Same as get added at runtime via SN.U.NoticeInlineReplyPlaceholder - */ -class ThreadedNoticeListReplyItem extends NoticeListItem -{ /** * recipe function for displaying a single notice. * @@ -329,116 +345,7 @@ class ThreadedNoticeListReplyItem extends NoticeListItem */ function showStart() { - $this->out->elementStart('li', array('class' => 'notice-reply-placeholder')); - } - - function showMiniForm() - { - $this->out->element('input', array('class' => 'placeholder', - // TRANS: Field label for reply mini form. - 'value' => _('Write a reply...'))); - } -} - -/** - * Placeholder for showing faves... - */ -abstract class NoticeListActorsItem extends NoticeListItem -{ - /** - * @return array of profile IDs - */ - abstract function getProfiles(); - - abstract function getListMessage($count, $you); - - function show() - { - $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()), - htmlspecialchars($profile->nickname)); - } - } - } - - if ($links) { - $count = count($links); - $msg = $this->getListMessage($count, $you); - $out = sprintf($msg, $this->magicList($links)); - - $this->showStart(); - $this->out->raw($out); - $this->showEnd(); - return $count; - } else { - return 0; - } - } - - 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 "You, Bob, Mary". - $separator = _(', '); - // TRANS: For building a list such as "You, bob, mary and 5 others have favored this notice". - // 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)); - } - } -} - -/** - * 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; - } - - function getListMessage($count, $you) - { - 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 have favored this notice.'); - } else { - // TRANS: List message for favoured notices. - // TRANS: %d is the number of users that have favoured a notice. - return sprintf(_m('One person has favored this notice.', - '%d people have favored this notice.', - $count), - $count); - } - } - - function showStart() - { - $this->out->elementStart('li', array('class' => 'notice-data notice-faves')); + $this->out->elementStart('li', array('class' => 'notice-reply-comments')); } function showEnd() @@ -446,61 +353,17 @@ class ThreadedNoticeListFavesItem extends NoticeListActorsItem $this->out->elementEnd('li'); } -} - -// @todo FIXME: needs documentation. -class ThreadedNoticeListInlineFavesItem extends ThreadedNoticeListFavesItem -{ - function showStart() - { - $this->out->elementStart('div', array('class' => 'entry-content notice-faves')); - } - - function showEnd() - { - $this->out->elementEnd('div'); - } -} - -/** - * Placeholder for showing faves... - */ -class ThreadedNoticeListRepeatsItem extends NoticeListActorsItem -{ - function getProfiles() + function showMiniForm() { - $rep = $this->notice->repeatStream(); - - $profiles = array(); - while ($rep->fetch()) { - $profiles[] = $rep->profile_id; - } - return $profiles; - } + $id = $this->notice->conversation; + $url = common_local_url('conversation', array('id' => $id)); - 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); - } - } + $n = Conversation::noticeCount($id) - 1; - function showStart() - { - $this->out->elementStart('li', array('class' => 'notice-data notice-repeats')); - } + // TRANS: Link to show replies for a notice. + // TRANS: %d is the number of replies to a notice and used for plural. + $msg = sprintf(_m('Show reply', 'Show all %d replies', $n), $n); - function showEnd() - { - $this->out->elementEnd('li'); + $this->out->element('a', array('href' => $url), $msg); } }