Use NoticeStream::filterVerbs for filtering in noticestreams

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

diff --git a/lib/conversationnoticestream.php b/lib/conversationnoticestream.php
index 56850fe98248dc03b1ed12704b7adb34ff970c61..21b2d7f0be59a0561e6ecf1994cfcc7e89a451dd 100644 (file)
--- a/lib/conversationnoticestream.php
+++ b/lib/conversationnoticestream.php
@@ -20,7 +20,7 @@
  * You should have received a copy of the GNU Affero General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *
- * @category  Cache
+ * @category  NoticeStream
  * @package   StatusNet
  * @author    Evan Prodromou <evan@status.net>
  * @copyright 2011 StatusNet, Inc.
@@ -28,11 +28,7 @@
  * @link      http://status.net/
  */
 
-if (!defined('STATUSNET')) {
-    // This check helps protect against security problems;
-    // your code file can't be executed directly from the web.
-    exit(1);
-}
+if (!defined('GNUSOCIAL')) { exit(1); }
 
 /**
  * Notice stream for a conversation
@@ -46,10 +42,13 @@ if (!defined('STATUSNET')) {
  */
 class ConversationNoticeStream extends ScopingNoticeStream
 {
-    function __construct($id, $profile = null)
+    function __construct($id, $profile = -1)
     {
-        parent::__construct(new CachingNoticeStream(new RawConversationNoticeStream($id),
-                                                    'notice:conversation_ids:'.$id),
+        if (is_int($profile) && $profile == -1) {
+            $profile = Profile::current();
+        }
+
+        parent::__construct(new RawConversationNoticeStream($id),
                             $profile);
     }
 }
@@ -70,35 +69,35 @@ class RawConversationNoticeStream extends NoticeStream
 
     function __construct($id)
     {
+        parent::__construct();
         $this->id = $id;
     }
 
-    function getNoticeIds($offset, $limit, $since_id, $max_id)
+    function getNoticeIds($offset, $limit, $since_id=null, $max_id=null)
     {
         $notice = new Notice();
-
-        $notice->selectAdd(); // clears it
+        // SELECT
+        $notice->selectAdd();
         $notice->selectAdd('id');
 
+        // WHERE
         $notice->conversation = $this->id;
-
-        $notice->orderBy('created DESC, id DESC');
-
+        if (!empty($since_id)) {
+            $notice->whereAdd(sprintf('notice.id > %d', $since_id));
+        }
+        if (!empty($max_id)) {
+            $notice->whereAdd(sprintf('notice.id <= %d', $max_id));
+        }
         if (!is_null($offset)) {
             $notice->limit($offset, $limit);
         }
 
-        Notice::addWhereSinceId($notice, $since_id);
-        Notice::addWhereMaxId($notice, $max_id);
-
-        $ids = array();
+        self::filterVerbs($notice, $this->selectVerbs);
 
-        if ($notice->find()) {
-            while ($notice->fetch()) {
-                $ids[] = $notice->id;
-            }
-        }
-
-        return $ids;
+        // ORDER BY
+        // currently imitates the previously used "_reverseChron" sorting
+        $notice->orderBy('notice.created DESC');
+        $notice->find();
+        return $notice->fetchAll('id');
     }
-}
\ No newline at end of file
+}