Merge remote-tracking branch 'upstream/master' into social-master

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

diff --git a/classes/Reply.php b/classes/Reply.php
index 659e04c9253934ad82dad90b0cd2ce4d198b32f5..d3405e6581c26213a9d658e5e8408ef9c2912a71 100644 (file)
--- a/classes/Reply.php
+++ b/classes/Reply.php
@@ -4,7 +4,7 @@
  */
 require_once INSTALLDIR.'/classes/Memcached_DataObject.php';
 
-class Reply extends Memcached_DataObject
+class Reply extends Managed_DataObject
 {
     ###START_AUTOCODE
     /* the code below is auto generated do not remove the above tag */
@@ -15,49 +15,49 @@ class Reply extends Memcached_DataObject
     public $modified;                        // timestamp()   not_null default_CURRENT_TIMESTAMP
     public $replied_id;                      // int(4)
 
-    /* Static get */
-    function staticGet($k,$v=null)
-    { return Memcached_DataObject::staticGet('Reply',$k,$v); }
-
     /* the code above is auto generated do not remove the tag below */
     ###END_AUTOCODE
 
-    function stream($user_id, $offset=0, $limit=NOTICES_PER_PAGE, $since_id=0, $max_id=0)
+    public static function schemaDef()
     {
-        $ids = Notice::stream(array('Reply', '_streamDirect'),
-                              array($user_id),
-                              'reply:stream:' . $user_id,
-                              $offset, $limit, $since_id, $max_id);
-        return $ids;
-    }
-
-    function _streamDirect($user_id, $offset=0, $limit=NOTICES_PER_PAGE, $since_id=0, $max_id=0)
+        return array(
+            'fields' => array(
+                'notice_id' => array('type' => 'int', 'not null' => true, 'description' => 'notice that is the reply'),
+                'profile_id' => array('type' => 'int', 'not null' => true, 'description' => 'profile replied to'),
+                'modified' => array('type' => 'timestamp', 'not null' => true, 'description' => 'date this record was modified'),
+                'replied_id' => array('type' => 'int', 'description' => 'notice replied to (not used, see notice.reply_to)'),
+            ),
+            'primary key' => array('notice_id', 'profile_id'),
+            'foreign keys' => array(
+                'reply_notice_id_fkey' => array('notice', array('notice_id' => 'id')),
+                'reply_profile_id_fkey' => array('profile', array('profile_id' => 'id')),
+            ),
+            'indexes' => array(
+                'reply_notice_id_idx' => array('notice_id'),
+                'reply_profile_id_idx' => array('profile_id'),
+                'reply_replied_id_idx' => array('replied_id'),
+                'reply_profile_id_modified_notice_id_idx' => array('profile_id', 'modified', 'notice_id')
+            ),
+        );
+    }    
+       
+    /**
+     * Wrapper for record insertion to update related caches
+     */
+    function insert()
     {
-        $reply = new Reply();
-        $reply->profile_id = $user_id;
-
-        if ($since_id != 0) {
-            $reply->whereAdd('notice_id > ' . $since_id);
-        }
-
-        if ($max_id != 0) {
-            $reply->whereAdd('notice_id < ' . $max_id);
-        }
-
-        $reply->orderBy('notice_id DESC');
+        $result = parent::insert();
 
-        if (!is_null($offset)) {
-            $reply->limit($offset, $limit);
+        if ($result) {
+            self::blow('reply:stream:%d', $this->profile_id);
         }
 
-        $ids = array();
-
-        if ($reply->find()) {
-            while ($reply->fetch()) {
-                $ids[] = $reply->notice_id;
-            }
-        }
+        return $result;
+    }
 
-        return $ids;
+    static function stream($user_id, $offset=0, $limit=NOTICES_PER_PAGE, $since_id=0, $max_id=0)
+    {
+        $stream = new ReplyNoticeStream($user_id);
+        return $stream->getNotices($offset, $limit, $since_id, $max_id);
     }
 }