Merge commit 'refs/merge-requests/41' of https://gitorious.org/social/mainline into...

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

diff --git a/lib/noticestream.php b/lib/noticestream.php
index 010bfab60e4221d4dc67d3f9c0d939a25414aeb4..0f53daf83f407e15a878d747d1268b972eb451c9 100644 (file)
--- a/lib/noticestream.php
+++ b/lib/noticestream.php
@@ -46,6 +46,14 @@ if (!defined('STATUSNET')) {
  */
 abstract class NoticeStream
 {
+    // Will only get notices with the 'post' activityverb by default.
+    protected $selectVerbs = array();
+
+    public function __construct()
+    {
+        $this->selectVerbs = array(ActivityVerb::POST, ActivityUtils::resolveUri(ActivityVerb::POST, true));
+    }
+
     abstract function getNoticeIds($offset, $limit, $since_id, $max_id);
 
     function getNotices($offset, $limit, $sinceId = null, $maxId = null)
@@ -59,9 +67,6 @@ abstract class NoticeStream
 
     static function getStreamByIds($ids)
     {
-       $notices = Notice::multiGet('id', $ids);
-       // Prefill the profiles
-       Notice::fillProfiles($notices->fetchAll());
-       return $notices;
+       return Notice::multiGet('id', $ids);
     }
 }