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 4242d0109192bfda403b838c55638f1564414ec7..916524b8e8ac90ceef33992780a70e46e261a67f 100644 (file)
--- a/classes/User.php
+++ b/classes/User.php
@@ -65,21 +65,15 @@ class User extends Memcached_DataObject
     ###END_AUTOCODE
 
        function getProfile() {
-               $profile = DB_DataObject::factory('profile');
-               $profile->id = $this->id;
-               if ($profile->find()) {
-                       $profile->fetch();
-                       return $profile;
-               }
-               return NULL;
+               return Profile::staticGet('id', $this->id);
        }
 
        function isSubscribed($other) {
                assert(!is_null($other));
-               $sub = DB_DataObject::factory('subscription');
-               $sub->subscriber = $this->id;
-               $sub->subscribed = $other->id;
-               return $sub->find();
+               # XXX: cache results of this query
+               $sub = Subscription::pkeyGet(array('subscriber' => $this->id,
+                                                                                  'subscribed' => $other->id));
+               return (is_null($sub)) ? false : true;
        }
 
        # 'update' won't write key columns, so we have to do it ourselves.
@@ -130,7 +124,7 @@ class User extends Memcached_DataObject
        }
 
        function getCarrier() {
-               return Sms_carrier::staticGet($this->carrier);
+               return Sms_carrier::staticGet('id', $this->carrier);
        }
 
        function subscribeTo($other) {
@@ -147,19 +141,6 @@ class User extends Memcached_DataObject
                return true;
        }
 
-       function noticesWithFriendsWindow() {
-               
-               
-               $notice = new Notice();
-               
-               $notice->query('SELECT notice.* ' .
-                                          'FROM notice JOIN subscription on notice.profile_id = subscription.subscribed ' .
-                                          'WHERE subscription.subscriber = ' . $this->id . ' ' .
-                                          'ORDER BY created DESC, notice.id DESC ' .
-                                          'LIMIT 0, ' . WITHFRIENDS_CACHE_WINDOW);
-               
-       }
-       
        static function register($fields) {
 
                # MAGICALLY put fields into current scope
@@ -284,17 +265,9 @@ class User extends Memcached_DataObject
        }
 
        function hasFave($notice) {
-               $fave = new Fave();
-               $fave->user_id = $this->id;
-               $fave->notice_id = $notice->id;
-               if ($fave->find()) {
-                       $result = true;
-               } else {
-                       $result = false;
-               }
-               $fave->free();
-               unset($fave);
-               return $result;
+               $fave = Fave::pkeyGet(array('user_id' => $this->id,
+                                                                       'notice_id' => $notice->id));
+               return ((is_null($fave)) ? false : true);
        }
        
        function mutuallySubscribed($other) {
@@ -318,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 ' .
@@ -326,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 ' .
@@ -337,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) {
@@ -351,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() {