Move prefill call to noticelist class

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

diff --git a/lib/threadednoticelist.php b/lib/threadednoticelist.php
index 96be0df0c58d037eb2eb988665c077b84a0739f4..45c11453a7a63699f9cfb866c39939375d08f9c2 100644 (file)
--- a/lib/threadednoticelist.php
+++ b/lib/threadednoticelist.php
@@ -76,17 +76,18 @@ class ThreadedNoticeList extends NoticeList
         $this->out->element('h2', null, _m('HEADER','Notices'));
         $this->out->elementStart('ol', array('class' => 'notices threaded-notices xoxo'));
 
+               $notices = $this->notice->fetchAll();
+               $notices = array_slice($notices, 0, NOTICES_PER_PAGE);
+               
+       $this->prefill($notices);
+       
         $cnt = 0;
         $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) {
@@ -192,17 +193,20 @@ class ThreadedNoticeListItem extends NoticeListItem
             $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))) {
+                    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))) {
@@ -215,10 +219,13 @@ class ThreadedNoticeListItem extends NoticeListItem
                 $hasRepeats = $item->show();
 
                 if ($notices) {
+
                     if ($moreCutoff) {
-                        $item = new ThreadedNoticeListMoreItem($moreCutoff, $this->out);
+                        $item = new ThreadedNoticeListMoreItem($moreCutoff, $this->out, count($notices));
                         $item->show();
                     }
+                    // XXX: replicating NoticeList::prefill(), annoyingly
+                    $this->prefill($notices);
                     foreach (array_reverse($notices) as $notice) {
                         if (Event::handle('StartShowThreadedNoticeSub', array($this, $this->notice, $notice))) {
                             $item = new ThreadedNoticeListSubItem($notice, $this->notice, $this->out);
@@ -243,6 +250,12 @@ class ThreadedNoticeListItem extends NoticeListItem
 
         parent::showEnd();
     }
+    
+    function prefill(&$notices)
+    {       
+       // Prefill the profiles
+       Notice::fillProfiles($notices);
+    }
 }
 
 // @todo FIXME: needs documentation.
@@ -306,6 +319,14 @@ class ThreadedNoticeListSubItem extends NoticeListItem
  */
 class ThreadedNoticeListMoreItem extends NoticeListItem
 {
+    protected $cnt;
+
+    function __construct($notice, $out, $cnt)
+    {
+        parent::__construct($notice, $out);
+        $this->cnt = $cnt;
+    }
+
     /**
      * recipe function for displaying a single notice.
      *
@@ -410,10 +431,9 @@ abstract class NoticeListActorsItem extends NoticeListItem
             } else {
                 $profile = Profile::staticGet('id', $id);
                 if ($profile) {
-                    $links[] = sprintf('<a href="%s" title="%s">%s</a>',
+                    $links[] = sprintf('<a href="%s">%s</a>',
                                        htmlspecialchars($profile->profileurl),
-                                       htmlspecialchars($profile->getBestName()),
-                                       htmlspecialchars($profile->nickname));
+                                       htmlspecialchars($profile->getBestName()));
                 }
             }
         }
@@ -441,9 +461,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));
         }
@@ -465,17 +485,35 @@ class ThreadedNoticeListFavesItem extends NoticeListActorsItem
         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 favoured by logged in user.
-            return _m('FAVELIST', 'You have favored this notice.');
+            return _m('FAVELIST', 'You like this.');
+        } else if ($count > 4) {
+            // TRANS: List message for when more than 4 people like 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),
+                           $count - 3);
         } 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.',
+            // 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),
                            $count);
         }
@@ -490,7 +528,6 @@ class ThreadedNoticeListFavesItem extends NoticeListActorsItem
     {
         $this->out->elementEnd('li');
     }
-
 }
 
 // @todo FIXME: needs documentation.