X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=classes%2FNotice_tag.php;h=b864de80092b31001b03a8048519b0ab97b6e5ee;hb=cd23c78800b0e2b80200f8e4b1156190330f39c9;hp=809403a9bd99ac89be0785ad0e1c01655f15d307;hpb=513c54fa89085fde783a73c298d61576f834b131;p=quix0rs-gnu-social.git

diff --git a/classes/Notice_tag.php b/classes/Notice_tag.php
index 809403a9bd..b864de8009 100644
--- a/classes/Notice_tag.php
+++ b/classes/Notice_tag.php
@@ -19,7 +19,7 @@
 
 require_once INSTALLDIR.'/classes/Memcached_DataObject.php';
 
-class Notice_tag extends Memcached_DataObject
+class Notice_tag extends Managed_DataObject
 {
     ###START_AUTOCODE
     /* the code below is auto generated do not remove the above tag */
@@ -29,18 +29,34 @@ class Notice_tag extends Memcached_DataObject
     public $notice_id;                       // int(4)  primary_key not_null
     public $created;                         // datetime()   not_null
 
-    /* Static get */
-    function staticGet($k,$v=null)
-    { return Memcached_DataObject::staticGet('Notice_tag',$k,$v); }
-
     /* the code above is auto generated do not remove the tag below */
     ###END_AUTOCODE
 
+    public static function schemaDef()
+    {
+        return array(
+            'description' => 'Hash tags',
+            'fields' => array(
+                'tag' => array('type' => 'varchar', 'length' => 64, 'not null' => true, 'description' => 'hash tag associated with this notice'),
+                'notice_id' => array('type' => 'int', 'not null' => true, 'description' => 'notice tagged'),
+                'created' => array('type' => 'datetime', 'not null' => true, 'description' => 'date this record was created'),
+            ),
+            'primary key' => array('tag', 'notice_id'),
+            'foreign keys' => array(
+                'notice_tag_notice_id_fkey' => array('notice', array('notice_id' => 'id')),
+            ),
+            'indexes' => array(
+                'notice_tag_created_idx' => array('created'),
+                'notice_tag_notice_id_idx' => array('notice_id'),
+                'notice_tag_tag_created_notice_id_idx' => array('tag', 'created', 'notice_id')
+            ),
+        );
+    }
+    
     static function getStream($tag, $offset=0, $limit=20, $sinceId=0, $maxId=0)
     {
         $stream = new TagNoticeStream($tag);
-        
-        return $stream->getNotices($offset, $limit, $sinceId, $maxId);
+        return $stream;
     }
 
     function blowCache($blowLast=false)
@@ -51,11 +67,6 @@ class Notice_tag extends Memcached_DataObject
         }
     }
 
-    function pkeyGet($kv)
-    {
-        return Memcached_DataObject::pkeyGet('Notice_tag', $kv);
-    }
-
 	static function url($tag)
 	{
 		if (common_config('singleuser', 'enabled')) {