Merge branch 'nightly' into 'nightly'

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

diff --git a/lib/conversationnoticestream.php b/lib/conversationnoticestream.php
index 7d2e70354590015304018e8fb35a99f8eee5637c..bcb16c2d4b5a87a05773dcac134afe2b652d39a0 100644 (file)
--- a/lib/conversationnoticestream.php
+++ b/lib/conversationnoticestream.php
@@ -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,14 +42,10 @@ if (!defined('STATUSNET')) {
  */
 class ConversationNoticeStream extends ScopingNoticeStream
 {
-    function __construct($id, $profile = -1)
+    function __construct($id, Profile $scoped=null)
     {
-        if (is_int($profile) && $profile == -1) {
-            $profile = Profile::current();
-        }
-
         parent::__construct(new RawConversationNoticeStream($id),
-                            $profile);
+                            $scoped);
     }
 }
 
@@ -73,15 +65,12 @@ 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)
     {
-        $conv = Conversation::getKV('id', $this->id);
-        if (!$conv instanceof Conversation) {
-            throw new ServerException('Could not find conversation');
-        }
         $notice = new Notice();
         // SELECT
         $notice->selectAdd();
@@ -95,11 +84,16 @@ class RawConversationNoticeStream extends NoticeStream
         if (!empty($max_id)) {
             $notice->whereAdd(sprintf('notice.id <= %d', $max_id));
         }
-        $notice->limit($offset, $limit);
+        if (!is_null($offset)) {
+            $notice->limit($offset, $limit);
+        }
+
+        self::filterVerbs($notice, $this->selectVerbs);
 
         // ORDER BY
         // currently imitates the previously used "_reverseChron" sorting
         $notice->orderBy('notice.created DESC');
+        $notice->find();
         return $notice->fetchAll('id');
     }
 }