better output for registration confirmation

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

diff --git a/classes/Notice_tag.php b/classes/Notice_tag.php
index 813242253dbd2d7dc2706c5188f2e293b8defc5c..809403a9bd99ac89be0785ad0e1c01655f15d307 100644 (file)
--- a/classes/Notice_tag.php
+++ b/classes/Notice_tag.php
@@ -38,42 +38,11 @@ class Notice_tag extends Memcached_DataObject
 
     static function getStream($tag, $offset=0, $limit=20, $sinceId=0, $maxId=0)
     {
-        $stream = new NoticeStream(array('Notice_tag', '_streamDirect'),
-                                   array($tag),
-                                   'notice_tag:notice_ids:' . Cache::keyize($tag));
+        $stream = new TagNoticeStream($tag);
         
         return $stream->getNotices($offset, $limit, $sinceId, $maxId);
     }
 
-    function _streamDirect($tag, $offset, $limit, $since_id, $max_id)
-    {
-        $nt = new Notice_tag();
-
-        $nt->tag = $tag;
-
-        $nt->selectAdd();
-        $nt->selectAdd('notice_id');
-
-        Notice::addWhereSinceId($nt, $since_id, 'notice_id');
-        Notice::addWhereMaxId($nt, $max_id, 'notice_id');
-
-        $nt->orderBy('created DESC, notice_id DESC');
-
-        if (!is_null($offset)) {
-            $nt->limit($offset, $limit);
-        }
-
-        $ids = array();
-
-        if ($nt->find()) {
-            while ($nt->fetch()) {
-                $ids[] = $nt->notice_id;
-            }
-        }
-
-        return $ids;
-    }
-
     function blowCache($blowLast=false)
     {
         self::blow('notice_tag:notice_ids:%s', Cache::keyize($this->tag));