X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=lib%2Fpublicnoticestream.php;h=1dd59059fd7e357f8ce2c2d1676ec6ea391c44ff;hb=b4271a3533bdf12329f27dd75452c1ef2a6ee3d1;hp=08ac790fabf7889270f0a07b9f47dbd709818d13;hpb=880661de4e8fd6735e9eba57e059fca0c719666b;p=quix0rs-gnu-social.git

diff --git a/lib/publicnoticestream.php b/lib/publicnoticestream.php
index 08ac790fab..1dd59059fd 100644
--- a/lib/publicnoticestream.php
+++ b/lib/publicnoticestream.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); }
 
 /**
  * Public stream
@@ -47,16 +43,11 @@ if (!defined('STATUSNET')) {
 
 class PublicNoticeStream extends ScopingNoticeStream
 {
-    const THREADED=true;
-
-    /**
-     *
-     * @param boolean $threaded set to true to exclude replies, for later fetching
-     */
-    function __construct($threaded=false)
+    function __construct(Profile $scoped=null)
     {
-        parent::__construct(new CachingNoticeStream(new RawPublicNoticeStream($threaded),
-                                                    $threaded ? 'public:threaded' : 'public'));
+        parent::__construct(new CachingNoticeStream(new RawPublicNoticeStream(),
+                                                    'public'),
+                            $scoped);
     }
 }
 
@@ -71,15 +62,8 @@ class PublicNoticeStream extends ScopingNoticeStream
  * @link      http://status.net/
  */
 
-class RawPublicNoticeStream extends NoticeStream
+class RawPublicNoticeStream extends FullNoticeStream
 {
-    var $threaded;
-
-    function __construct($threaded=false)
-    {
-        $this->threaded = $threaded;
-    }
-
     function getNoticeIds($offset, $limit, $since_id, $max_id)
     {
         $notice = new Notice();
@@ -93,20 +77,14 @@ class RawPublicNoticeStream extends NoticeStream
             $notice->limit($offset, $limit);
         }
 
-        if (common_config('public', 'localonly')) {
-            $notice->whereAdd('is_local = ' . Notice::LOCAL_PUBLIC);
-        } else {
-            // -1 == blacklisted, -2 == gateway (i.e. Twitter)
-            $notice->whereAdd('is_local !='. Notice::LOCAL_NONPUBLIC);
-            $notice->whereAdd('is_local !='. Notice::GATEWAY);
-        }
-        if ($this->threaded) {
-            $notice->whereAdd('reply_to IS NULL');
-        }
+        // This feed always gives only local activities.
+        $notice->whereAdd('is_local = ' . Notice::LOCAL_PUBLIC);
 
         Notice::addWhereSinceId($notice, $since_id);
         Notice::addWhereMaxId($notice, $max_id);
 
+        self::filterVerbs($notice, $this->selectVerbs);
+
         $ids = array();
 
         if ($notice->find()) {
@@ -120,4 +98,4 @@ class RawPublicNoticeStream extends NoticeStream
 
         return $ids;
     }
-}
\ No newline at end of file
+}