Merge branch 'master' into 0.9.x

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

diff --git a/classes/Reply.php b/classes/Reply.php
index 49b1e05e517e1bd34bb7645cead3148990f27c0b..da8a4f685b52b83e014952228ef139024d86bf58 100644 (file)
--- a/classes/Reply.php
+++ b/classes/Reply.php
@@ -22,16 +22,30 @@ class Reply extends Memcached_DataObject
     /* 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, $since=null)
+    /**
+     * Wrapper for record insertion to update related caches
+     */
+    function insert()
+    {
+        $result = parent::insert();
+
+        if ($result) {
+            self::blow('reply:stream:%d', $this->profile_id);
+        }
+
+        return $result;
+    }
+
+    function stream($user_id, $offset=0, $limit=NOTICES_PER_PAGE, $since_id=0, $max_id=0)
     {
         $ids = Notice::stream(array('Reply', '_streamDirect'),
                               array($user_id),
                               'reply:stream:' . $user_id,
-                              $offset, $limit, $since_id, $max_id, $since);
+                              $offset, $limit, $since_id, $max_id);
         return $ids;
     }
 
-    function _streamDirect($user_id, $offset=0, $limit=NOTICES_PER_PAGE, $since_id=0, $max_id=0, $since=null)
+    function _streamDirect($user_id, $offset=0, $limit=NOTICES_PER_PAGE, $since_id=0, $max_id=0)
     {
         $reply = new Reply();
         $reply->profile_id = $user_id;
@@ -41,11 +55,7 @@ class Reply extends Memcached_DataObject
         }
 
         if ($max_id != 0) {
-            $reply->whereAdd('notice_id < ' . $max_id);
-        }
-
-        if (!is_null($since)) {
-            $reply->whereAdd('modified > \'' . date('Y-m-d H:i:s', $since) . '\'');
+            $reply->whereAdd('notice_id <= ' . $max_id);
         }
 
         $reply->orderBy('notice_id DESC');