Merge branch 'profile' into 'nightly'

[quix0rs-gnu-social.git] / lib / threadednoticelist.php

diff --git a/lib/threadednoticelist.php b/lib/threadednoticelist.php
index 3a6e5e76c4d89473134da9b1717bf0c8312cf6ab..a68347b9042f6f85469f03ca48a08997e6ac4368 100644 (file)
--- 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,17 +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'));
-        $this->out->elementStart('ol', array('class' => 'notices xoxo'));
-
-        $cnt = 0;
+        // TRANS: Header for Notices section.
+        $this->out->element('h2', null, _m('HEADER','Notices'));
+        $this->out->elementStart('ol', array('class' => 'notices threaded-notices xoxo'));
+
+               $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) {
-            $convo = $this->notice->conversation;
+        
+        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 = $notice->conversation;
             if (!empty($conversations[$convo])) {
                 // Seen this convo already -- skip!
                 continue;
@@ -77,19 +101,9 @@ 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);
-
-            $cnt++;
-
-            if ($cnt > NOTICES_PER_PAGE) {
-                break;
+            $root = $notice->conversationRoot($this->userProfile);
+            if ($root instanceof Notice) {
+                $notice = $root;
             }
 
             try {
@@ -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,64 +147,8 @@ class ThreadedNoticeList extends NoticeList
      *
      * @return NoticeListItem a list item for displaying the notice
      */
-
-    function newListItem($notice)
-    {
-        return new ThreadedNoticeListItem($notice, $this->out);
-    }
-}
-
-/**
- * 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 <evan@status.net>
- * @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
-{
-    /**
-     * finish the notice
-     *
-     * Close the last elements in the notice list item
-     *
-     * @return void
-     */
-
-    function showEnd()
+    function newListItem(Notice $notice)
     {
-        $notice = Notice::conversationStream($this->notice->conversation);
-        $notices = array();
-        while ($notice->fetch()) {
-            if ($notice->id == $this->notice->id) {
-                // Skip!
-                continue;
-            }
-            $notices[] = clone($notice); // *grumble* inefficient as hell
-        }
-
-        if ($notices) {
-            $this->out->elementStart('ul', 'notices threaded-notices xoxo');
-            foreach (array_reverse($notices) as $notice) {
-                $this->out->elementStart('li');
-                $item = new NoticeListItem($notice, $this->out);
-                $item->show();
-                $this->out->elementEnd('li');
-            }
-            $this->out->elementEnd('ul');
-        }
-
-        parent::showEnd();
+        return new ThreadedNoticeListItem($notice, $this->out, $this->userProfile);
     }
 }