add LOW_PRIORITY and IGNORE extensions for INSERT

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

diff --git a/classes/User.php b/classes/User.php
index 8c9ffbb6d6be837d2c4f20e9221fd18ca1ed067f..916524b8e8ac90ceef33992780a70e46e261a67f 100644 (file)
--- a/classes/User.php
+++ b/classes/User.php
@@ -267,14 +267,7 @@ class User extends Memcached_DataObject
        function hasFave($notice) {
                $fave = Fave::pkeyGet(array('user_id' => $this->id,
                                                                        'notice_id' => $notice->id));
-               if (!is_null($fave)) {
-                       $result = true;
-               } else {
-                       $result = false;
-               }
-               $fave->free();
-               unset($fave);
-               return $result;
+               return ((is_null($fave)) ? false : true);
        }
        
        function mutuallySubscribed($other) {
@@ -298,7 +291,7 @@ class User extends Memcached_DataObject
                return $user;
        }
 
-       function getReplies($offset=0, $limit=NOTICES_PER_PAGE) {
+       function getReplies($offset=0, $limit=NOTICES_PER_PAGE, $since_id=0, $before_id=0) {
                $qry =
                  'SELECT notice.* ' .
                  'FROM notice JOIN reply ON notice.id = reply.notice_id ' .
@@ -306,10 +299,10 @@ class User extends Memcached_DataObject
                
                return Notice::getStream(sprintf($qry, $this->id),
                                                                 'user:replies:'.$this->id,
-                                                                $offset, $limit);
+                                                                $offset, $limit, $since_id, $before_id);
        }
        
-       function getNotices($offset=0, $limit=NOTICES_PER_PAGE) {
+       function getNotices($offset=0, $limit=NOTICES_PER_PAGE, $since_id=0, $before_id=0) {
                $qry =
                  'SELECT * ' .
                  'FROM notice ' .
@@ -317,7 +310,7 @@ class User extends Memcached_DataObject
                
                return Notice::getStream(sprintf($qry, $this->id),
                                                                 'user:notices:'.$this->id,
-                                                                $offset, $limit);
+                                                                $offset, $limit, $since_id, $before_id);
        }
        
        function favoriteNotices($offset=0, $limit=NOTICES_PER_PAGE) {
@@ -331,15 +324,18 @@ class User extends Memcached_DataObject
                                                                 $offset, $limit);
        }
        
-       function noticesWithFriends($offset=0, $limit=NOTICES_PER_PAGE) {
+       function noticesWithFriends($offset=0, $limit=NOTICES_PER_PAGE, $since_id=0, $before_id=0) {
                $qry =
                  'SELECT notice.* ' .
-                 'FROM notice JOIN subscription ON notice.profile_id = subscription.subscribed ' .
-                 'WHERE subscription.subscriber = %d ';
+                 'FROM notice JOIN notice_inbox ON notice.id = notice_inbox.notice_id ' .
+                 'WHERE notice_inbox.user_id = %d ';
+
+               # NOTE: we override ORDER
                
                return Notice::getStream(sprintf($qry, $this->id),
                                                                 'user:notices_with_friends:' . $this->id,
-                                                                $offset, $limit);
+                                                                $offset, $limit, $since_id, $before_id,
+                                                                'ORDER BY notice_inbox.created DESC, notice_inbox.notice_id DESC ');
        }
        
        function blowFavesCache() {