Merge branch 'fixes/private_scope_on_tags' into social-master

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

diff --git a/lib/conversationnoticestream.php b/lib/conversationnoticestream.php
index 7d2e70354590015304018e8fb35a99f8eee5637c..9c32159d42aabe90de6fa2284e3c0ac281671fca 100644 (file)
--- a/lib/conversationnoticestream.php
+++ b/lib/conversationnoticestream.php
@@ -73,15 +73,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 +92,18 @@ 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);
+        }
+
+        if (!empty($this->selectVerbs)) {
+            $notice->whereAddIn('verb', $this->selectVerbs, $notice->columnType('verb'));
+        }
 
         // ORDER BY
         // currently imitates the previously used "_reverseChron" sorting
         $notice->orderBy('notice.created DESC');
+        $notice->find();
         return $notice->fetchAll('id');
     }
 }