X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=lib%2Fconversationnoticestream.php;h=9c32159d42aabe90de6fa2284e3c0ac281671fca;hb=0cefab3603321b304914c7ee840e64a478ce050c;hp=b26e898612cd5d86e4a1b9fc293de4a2b4056be2;hpb=0c3f8208cdccc4a402d976a53628f00652b2e50e;p=quix0rs-gnu-social.git

diff --git a/lib/conversationnoticestream.php b/lib/conversationnoticestream.php
index b26e898612..9c32159d42 100644
--- a/lib/conversationnoticestream.php
+++ b/lib/conversationnoticestream.php
@@ -1,52 +1,109 @@
 <?php
+/**
+ * StatusNet - the distributed open-source microblogging tool
+ * Copyright (C) 2011, StatusNet, Inc.
+ *
+ * Notice stream for a conversation
+ * 
+ * PHP version 5
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * 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  NoticeStream
+ * @package   StatusNet
+ * @author    Evan Prodromou <evan@status.net>
+ * @copyright 2011 StatusNet, Inc.
+ * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html AGPL 3.0
+ * @link      http://status.net/
+ */
 
-class ConversationNoticeStream extends CachingNoticeStream
+if (!defined('STATUSNET')) {
+    // This check helps protect against security problems;
+    // your code file can't be executed directly from the web.
+    exit(1);
+}
+
+/**
+ * Notice stream for a conversation
+ *
+ * @category  Stream
+ * @package   StatusNet
+ * @author    Evan Prodromou <evan@status.net>
+ * @copyright 2011 StatusNet, Inc.
+ * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html AGPL 3.0
+ * @link      http://status.net/
+ */
+class ConversationNoticeStream extends ScopingNoticeStream
 {
-    function __construct($id)
+    function __construct($id, $profile = -1)
     {
+        if (is_int($profile) && $profile == -1) {
+            $profile = Profile::current();
+        }
+
         parent::__construct(new RawConversationNoticeStream($id),
-                            'notice:conversation_ids:'.$id);
+                            $profile);
     }
 }
 
+/**
+ * Notice stream for a conversation
+ *
+ * @category  Stream
+ * @package   StatusNet
+ * @author    Evan Prodromou <evan@status.net>
+ * @copyright 2011 StatusNet, Inc.
+ * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html AGPL 3.0
+ * @link      http://status.net/
+ */
 class RawConversationNoticeStream extends NoticeStream
 {
     protected $id;
 
     function __construct($id)
     {
+        parent::__construct();
         $this->id = $id;
     }
 
-    function getNoticeIds($offset=0, $limit=20, $since_id=0, $max_id=0)
+    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();
-
-        if ($notice->find()) {
-            while ($notice->fetch()) {
-                $ids[] = $notice->id;
-            }
+        if (!empty($this->selectVerbs)) {
+            $notice->whereAddIn('verb', $this->selectVerbs, $notice->columnType('verb'));
         }
 
-        $notice->free();
-        $notice = NULL;
-
-        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
+}