rename config option site/logdebug to log/debugtrace

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

diff --git a/lib/networkpublicnoticestream.php b/lib/networkpublicnoticestream.php
index 3320b7cd5a65e89d60e5f3a1d81ed7faab7d3367..c722bd8c1405ddb07bf71717e4eb1c97e2e98187 100644 (file)
--- a/lib/networkpublicnoticestream.php
+++ b/lib/networkpublicnoticestream.php
@@ -2,7 +2,7 @@
 
 if (!defined('GNUSOCIAL')) { exit(1); } 
 
-class NetworkPublicNoticeStream extends ScopingNoticeStream
+class NetworkPublicNoticeStream extends ModeratedNoticeStream
 {
     function __construct(Profile $scoped=null)
     {
@@ -23,7 +23,7 @@ class NetworkPublicNoticeStream extends ScopingNoticeStream
  * @link      http://status.net/
  */
 
-class RawNetworkPublicNoticeStream extends NoticeStream
+class RawNetworkPublicNoticeStream extends FullNoticeStream
 {
     function getNoticeIds($offset, $limit, $since_id, $max_id)
     {
@@ -46,9 +46,7 @@ class RawNetworkPublicNoticeStream extends NoticeStream
         Notice::addWhereSinceId($notice, $since_id);
         Notice::addWhereMaxId($notice, $max_id);
 
-        if (!empty($this->selectVerbs)) {
-            $notice->whereAddIn('verb', $this->selectVerbs, $notice->columnType('verb'));
-        }
+        self::filterVerbs($notice, $this->selectVerbs);
 
         $ids = array();