X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=classes%2FNotice_tag.php;h=77c89dc8ce8713bc0b0306d22cd24302b19dce49;hb=2892f70d18065e1478c729f2de96218c9500e2df;hp=ea38bb3502f86d47e8a0aeec5c3affd8af41ee8f;hpb=04ca706601a2a3b556cc52fa21b61fcd842c4e87;p=quix0rs-gnu-social.git

diff --git a/classes/Notice_tag.php b/classes/Notice_tag.php
index ea38bb3502..77c89dc8ce 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 */
@@ -36,48 +36,31 @@ class Notice_tag extends Memcached_DataObject
     /* the code above is auto generated do not remove the tag below */
     ###END_AUTOCODE
 
-    static function getStream($tag, $offset=0, $limit=20) {
-
-        $ids = Notice::stream(array('Notice_tag', '_streamDirect'),
-                              array($tag),
-                              'notice_tag:notice_ids:' . Cache::keyize($tag),
-                              $offset, $limit);
-
-        return Notice::getStreamByIds($ids);
+    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'),
+            ),
+        );
     }
-
-    function _streamDirect($tag, $offset, $limit, $since_id, $max_id)
+    
+    static function getStream($tag, $offset=0, $limit=20, $sinceId=0, $maxId=0)
     {
-        $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);
-        }
-
-        $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;
+        $stream = new TagNoticeStream($tag);
+        
+        return $stream->getNotices($offset, $limit, $sinceId, $maxId);
     }
 
     function blowCache($blowLast=false)
@@ -92,4 +75,19 @@ class Notice_tag extends Memcached_DataObject
     {
         return Memcached_DataObject::pkeyGet('Notice_tag', $kv);
     }
+
+	static function url($tag)
+	{
+		if (common_config('singleuser', 'enabled')) {
+			// regular TagAction isn't set up in 1user mode
+			$nickname = User::singleUserNickname();
+			$url = common_local_url('showstream',
+									array('nickname' => $nickname,
+										  'tag' => $tag));
+		} else {
+			$url = common_local_url('tag', array('tag' => $tag));
+		}
+
+		return $url;
+	}
 }