X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=lib%2Fthreadednoticelist.php;h=a68347b9042f6f85469f03ca48a08997e6ac4368;hb=dd8e17a3874aa99063b62b51e9a637a5abb0b923;hp=919c9128311ed6be4df361132944c101d2e4826b;hpb=7cf12f093ed48849ec901038b4cfd44595343c06;p=quix0rs-gnu-social.git diff --git a/lib/threadednoticelist.php b/lib/threadednoticelist.php index 919c912831..a68347b904 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 @@ -48,9 +46,19 @@ if (!defined('STATUSNET') && !defined('LACONICA')) { * @see NoticeListItem * @see ProfileNoticeList */ - 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 * @@ -59,23 +67,33 @@ class ThreadedNoticeList extends NoticeList * * @return int count of notices listed. */ - function show() { $this->out->elementStart('div', array('id' =>'notices_primary')); - $this->out->element('h2', null, _('Notices')); + // TRANS: Header for Notices section. + $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... + + if ($notice->repeat_of) { + $orig = Notice::getKV('id', $notice->repeat_of); + if ($orig instanceof Notice) { + $notice = $orig; + } } - - $convo = $this->notice->conversation; + $convo = $notice->conversation; if (!empty($conversations[$convo])) { // Seen this convo already -- skip! continue; @@ -83,14 +101,10 @@ class ThreadedNoticeList extends NoticeList $conversations[$convo] = true; // Get the convo's root notice - // @fixme stream goes in wrong direction, this needs sane caching - //$notice = Notice::conversationStream($convo, 0, 1); - //$notice->fetch(); - $notice = new Notice(); - $notice->conversation = $this->notice->conversation; - $notice->orderBy('CREATED'); - $notice->limit(1); - $notice->find(true); + $root = $notice->conversationRoot($this->userProfile); + if ($root instanceof Notice) { + $notice = $root; + } try { $item = $this->newListItem($notice); @@ -105,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; } /** @@ -118,202 +147,8 @@ 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); } } - -/** - * widget for displaying a single notice - * - * This widget has the core smarts for showing a single notice: what to display, - * where, and under which circumstances. Its key method is show(); this is a recipe - * that calls all the other show*() methods to build up a single notice. The - * ProfileNoticeListItem subclass, for example, overrides showAuthor() to skip - * author info (since that's implicit by the data in the page). - * - * @category UI - * @package StatusNet - * @author Evan Prodromou - * @license http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0 - * @link http://status.net/ - * @see NoticeList - * @see ProfileNoticeListItem - */ - -class ThreadedNoticeListItem extends NoticeListItem -{ - const INITIAL_ITEMS = 3; - - function showContext() - { - // Silence! - } - - /** - * finish the notice - * - * Close the last elements in the notice list item - * - * @return void - */ - - function showEnd() - { - if (!$this->repeat) { - $notice = Notice::conversationStream($this->notice->conversation, 0, self::INITIAL_ITEMS + 2); - $notices = array(); - $cnt = 0; - $moreCutoff = null; - while ($notice->fetch()) { - if ($notice->id == $this->notice->id) { - // Skip! - continue; - } - $cnt++; - if ($cnt > self::INITIAL_ITEMS) { - // boo-yah - $moreCutoff = clone($notice); - break; - } - $notices[] = clone($notice); // *grumble* inefficient as hell - } - - if ($notices) { - $this->out->elementStart('ul', 'notices threaded-replies xoxo'); - if ($moreCutoff) { - $item = new ThreadedNoticeListMoreItem($moreCutoff, $this->out); - $item->show(); - } - foreach (array_reverse($notices) as $notice) { - $item = new ThreadedNoticeListSubItem($notice, $this->out); - $item->show(); - } - // @fixme do a proper can-post check that's consistent - // with the JS side - if (common_current_user()) { - $item = new ThreadedNoticeListReplyItem($notice, $this->out); - $item->show(); - } - $this->out->elementEnd('ul'); - } - } - - parent::showEnd(); - } -} - -class ThreadedNoticeListSubItem extends NoticeListItem -{ - - function avatarSize() - { - return AVATAR_STREAM_SIZE; // @fixme would like something in between - } - - function showNoticeLocation() - { - // - } - - function showNoticeSource() - { - // - } - - function showContext() - { - // - } -} - -/** - * Placeholder for loading more replies... - */ -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(); - } - - /** - * start a single notice. - * - * @return void - */ - - function showStart() - { - $this->out->elementStart('li', array('class' => 'notice-reply-comments')); - } - - function showMiniForm() - { - $id = $this->notice->conversation; - $url = common_local_url('conversation', array('id' => $id)) . '#notice-' . $this->notice->id; - - $notice = new Notice(); - $notice->conversation = $id; - $n = $notice->count() - 1; - $msg = sprintf(_m('Show %d reply', 'Show all %d replies', $n), $n); - - $this->out->element('a', array('href' => $url), $msg); - } -} - - -/** - * 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. - * - * 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(); - } - - /** - * start a single notice. - * - * @return void - */ - - function showStart() - { - $this->out->elementStart('li', array('class' => 'notice-reply-placeholder')); - } - - function showMiniForm() - { - $this->out->element('input', array('class' => 'placeholder', - 'value' => _('Write a reply...'))); - } -} \ No newline at end of file