Missed change when refactoring groups. Thanks macno

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

diff --git a/classes/Notice_tag.php b/classes/Notice_tag.php
index f2247299a4d137fba865e32cc350a97de0590fbb..4fd76e8ea85e8c04c9119b370bf3c89a462d7dec 100644 (file)
--- a/classes/Notice_tag.php
+++ b/classes/Notice_tag.php
@@ -1,7 +1,7 @@
 <?php
 /*
- * Laconica - a distributed open-source microblogging tool
- * Copyright (C) 2008, Controlez-Vous, Inc.
+ * StatusNet - the distributed open-source microblogging tool
+ * Copyright (C) 2008, 2009, StatusNet, Inc.
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
@@ -37,25 +37,62 @@ class Notice_tag extends Memcached_DataObject
     ###END_AUTOCODE
 
     static function getStream($tag, $offset=0, $limit=20) {
-        $qry =
-          'SELECT notice.* ' .
-          'FROM notice JOIN notice_tag ON notice.id = notice_tag.notice_id ' .
-          "WHERE notice_tag.tag = '%s' ";
-
-        return Notice::getStream(sprintf($qry, $tag),
-                                 'notice_tag:notice_stream:' . common_keyize($tag),
-                                 $offset, $limit);
+
+        $ids = Notice::stream(array('Notice_tag', '_streamDirect'),
+                              array($tag),
+                              'notice_tag:notice_ids:' . common_keyize($tag),
+                              $offset, $limit);
+
+        return Notice::getStreamByIds($ids);
+    }
+
+    function _streamDirect($tag, $offset, $limit, $since_id, $max_id, $since)
+    {
+        $nt = new Notice_tag();
+
+        $nt->tag = $tag;
+
+        $nt->selectAdd();
+        $nt->selectAdd('notice_id');
+
+        if ($since_id != 0) {
+            $nt->whereAdd('notice_id > ' . $since_id);
+        }
+
+        if ($max_id != 0) {
+            $nt->whereAdd('notice_id < ' . $max_id);
+        }
+
+        if (!is_null($since)) {
+            $nt->whereAdd('created > \'' . date('Y-m-d H:i:s', $since) . '\'');
+        }
+
+        $nt->orderBy('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()
+    function blowCache($blowLast=false)
     {
-        $cache = common_memcache();
-        if ($cache) {
-            $cache->delete(common_cache_key('notice_tag:notice_stream:' . $this->tag));
+        self::blow('notice_tag:notice_ids:%s', common_keyize($this->tag));
+        if ($blowLast) {
+            self::blow('notice_tag:notice_ids:%s;last', common_keyize($this->tag));
         }
     }
 
-    function &pkeyGet($kv)
+    function pkeyGet($kv)
     {
         return Memcached_DataObject::pkeyGet('Notice_tag', $kv);
     }