Revert "Add threading notice stream class to threaded pages"

This reverts commit 97a8bae4a95bdf793ade7f0cc2ab5802f32d3694.

diff --git a/lib/groupnoticestream.php b/lib/groupnoticestream.php
index 02baa4b9cafe3461cb12581ca64051c4e15923a5..26784458e0ea1c7a7590cd068593098bcc13dab5 100644 (file)
--- a/lib/groupnoticestream.php
+++ b/lib/groupnoticestream.php
@@ -44,18 +44,16 @@ if (!defined('STATUSNET')) {
  * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html AGPL 3.0
  * @link      http://status.net/
  */
-class GroupNoticeStream extends ThreadingNoticeStream
+class GroupNoticeStream extends ScopingNoticeStream
 {
     function __construct($group, $profile = -1)
     {
         if (is_int($profile) && $profile == -1) {
             $profile = Profile::current();
         }
-
-        $stream = new ScopingNoticeStream(new CachingNoticeStream(new RawGroupNoticeStream($group),
-                                                                  'user_group:notice_ids:' . $group->id),
-                                          $profile);
-        parent::__construct($stream);
+        parent::__construct(new CachingNoticeStream(new RawGroupNoticeStream($group),
+                                                    'user_group:notice_ids:' . $group->id),
+                            $profile);
     }
 }
 

diff --git a/lib/inboxnoticestream.php b/lib/inboxnoticestream.php
index 55c382072a86fcbd3e2345c1fbcbf436ecf6d02a..3250351d17aea2fc865a94d1f5b4ee2822df7ccb 100644 (file)
--- a/lib/inboxnoticestream.php
+++ b/lib/inboxnoticestream.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  
+ * @category  Cache
  * @package   StatusNet
  * @author    Evan Prodromou <evan@status.net>
  * @copyright 2011 StatusNet, Inc.
@@ -44,7 +44,7 @@ if (!defined('STATUSNET')) {
  * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html AGPL 3.0
  * @link      http://status.net/
  */
-class InboxNoticeStream extends ThreadingNoticeStream
+class InboxNoticeStream extends ScopingNoticeStream
 {
     /**
      * Constructor
@@ -58,8 +58,7 @@ class InboxNoticeStream extends ThreadingNoticeStream
         }
         // Note: we don't use CachingNoticeStream since RawInboxNoticeStream
         // uses Inbox::staticGet(), which is cached.
-        $stream = new ScopingNoticeStream(new RawInboxNoticeStream($user), $profile);
-        parent::__construct($stream);
+        parent::__construct(new RawInboxNoticeStream($user), $profile);
     }
 }
 

diff --git a/lib/publicnoticestream.php b/lib/publicnoticestream.php
index 143d748dbdbd1bc4205d979e51f745a7fdd491c6..044701aaf68bb2b7e983a2ec4e8837910b6bd446 100644 (file)
--- a/lib/publicnoticestream.php
+++ b/lib/publicnoticestream.php
@@ -45,13 +45,13 @@ if (!defined('STATUSNET')) {
  * @link      http://status.net/
  */
 
-class PublicNoticeStream extends ThreadingNoticeStream
+class PublicNoticeStream extends ScopingNoticeStream
 {
     function __construct($profile=null)
     {
-        $stream = new ScopingNoticeStream(new CachingNoticeStream(new RawPublicNoticeStream(), 'public'),
-                                          $profile);
-        parent::__construct($stream);
+        parent::__construct(new CachingNoticeStream(new RawPublicNoticeStream(),
+                                                    'public'),
+                            $profile);
     }
 }
 

diff --git a/lib/threadingnoticestream.php b/lib/threadingnoticestream.php
deleted file mode 100644 (file)
index c4b35f4..0000000
--- a/lib/threadingnoticestream.php
+++ /dev/null
@@ -1,70 +0,0 @@
-<?php
-/**
- * StatusNet - the distributed open-source microblogging tool
- * Copyright (C) 2011, StatusNet, Inc.
- *
- * Notice stream that's good for threading lists
- * 
- * 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  Notice 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/
- */
-
-if (!defined('STATUSNET')) {
-    // This check helps protect against security problems;
-    // your code file can't be executed directly from the web.
-    exit(1);
-}
-
-/**
- * This notice stream filters notices by whether their conversation
- * has been seen before. It's a good (well, OK) way to get streams
- * for a ThreadedNoticeList display.
- *
- * @category  Notice 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 ThreadingNoticeStream extends FilteringNoticeStream
-{
-    protected $seen = array();
-
-    function getNotices($offset, $limit, $sinceId=null, $maxId=null)
-    {
-        // Clear this each time we're called
-        $this->seen = array();
-        return parent::getNotices($offset, $limit, $sinceId, $maxId);
-    }
-
-    function filter($notice)
-    {
-        if (!array_key_exists($notice->id, $this->seen)) {
-            $this->seen[$notice->id] = true;
-            return true;
-        } else {
-            return false;
-        }
-    }
-}