New NoticeStream class to reify streams of notices

[quix0rs-gnu-social.git] / classes / User_group.php

diff --git a/classes/User_group.php b/classes/User_group.php
index 707acbd13cca7f77cc286ade0a74e1de176c970b..4d6dcfab689d536834e7b79e7f3bc6ddb16f6e0f 100644 (file)
--- a/classes/User_group.php
+++ b/classes/User_group.php
@@ -87,12 +87,11 @@ class User_group extends Memcached_DataObject
 
     function getNotices($offset, $limit, $since_id=null, $max_id=null)
     {
-        $ids = Notice::stream(array($this, '_streamDirect'),
-                              array(),
-                              'user_group:notice_ids:' . $this->id,
-                              $offset, $limit, $since_id, $max_id);
+        $stream = new NoticeStream(array($this, '_streamDirect'),
+                                   array(),
+                                   'user_group:notice_ids:' . $this->id);
 
-        return Notice::getStreamByIds($ids);
+        return $stream->getNotices($offset, $limit, $since_id, $max_id);
     }
 
     function _streamDirect($offset, $limit, $since_id, $max_id)