Replies don't have verbs (we'll do some join magic later)

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

diff --git a/lib/publicnoticestream.php b/lib/publicnoticestream.php
index 5c8d313d46591dd3650d80a6bd78352a9aceca48..222eead0efb1c940db610388f5392c0684763d45 100644 (file)
--- a/lib/publicnoticestream.php
+++ b/lib/publicnoticestream.php
@@ -47,10 +47,11 @@ if (!defined('STATUSNET')) {
 
 class PublicNoticeStream extends ScopingNoticeStream
 {
-    function __construct()
+    function __construct($profile=null)
     {
         parent::__construct(new CachingNoticeStream(new RawPublicNoticeStream(),
-                                                    'public'));
+                                                    'public'),
+                            $profile);
     }
 }
 
@@ -91,6 +92,12 @@ class RawPublicNoticeStream extends NoticeStream
         Notice::addWhereSinceId($notice, $since_id);
         Notice::addWhereMaxId($notice, $max_id);
 
+        if (!$this->allVerbs) {
+            $notice->whereAdd(sprintf('verb="%s" OR verb="%s"',
+                                      ActivityVerb::POST,
+                                      ActivityUtils::resolveUri(ActivityVerb::POST, true)));
+        }
+
         $ids = array();
 
         if ($notice->find()) {
@@ -104,4 +111,4 @@ class RawPublicNoticeStream extends NoticeStream
 
         return $ids;
     }
-}
\ No newline at end of file
+}