X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=classes%2FUser.php;h=916524b8e8ac90ceef33992780a70e46e261a67f;hb=2cc3136dca5c46051934ca94684c514584184d71;hp=94fcff9c8e6c89370d2b28bc4bf11bd52200c57c;hpb=8da61dc1d36e2ac600a50450038ce69d458b0e7b;p=quix0rs-gnu-social.git

diff --git a/classes/User.php b/classes/User.php
index 94fcff9c8e..916524b8e8 100644
--- a/classes/User.php
+++ b/classes/User.php
@@ -19,17 +19,11 @@
 
 if (!defined('LACONICA')) { exit(1); }
 
-/* We keep the first three 20-notice pages, plus one for pagination check,
- * in the memcached cache. */
-
-define('WITHFRIENDS_CACHE_WINDOW', 61);
-
 /**
  * Table Definition for user
  */
 require_once INSTALLDIR.'/classes/Memcached_DataObject.php';
 require_once 'Validate.php';
-require_once(INSTALLDIR.'/lib/noticewrapper.php');
 
 class User extends Memcached_DataObject 
 {
@@ -71,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.
@@ -136,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) {
@@ -153,80 +141,6 @@ class User extends Memcached_DataObject
 		return true;
 	}
 
-	function noticesWithFriends($offset=0, $limit=20) {
-
-		# We clearly need a more elegant way to make this work.
-		
-		if (common_config('memcached', 'enabled')) {
-			if ($offset + $limit <= WITHFRIENDS_CACHE_WINDOW) {
-				$cached = $this->noticesWithFriendsWindow();
-				$wrapper = new NoticeWrapper(array_slice($cached, $offset, $limit));
-				return $wrapper;
-			} 
-		}
-		
-		$notice = new 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 ';
-		if(common_config('db','type')=='pgsql') {
-			$query=$query . 'LIMIT ' . $limit . ' OFFSET ' . $offset;
-		} else {
-			$query=$query . 'LIMIT ' . $offset . ', ' . $limit;
-		}
-		$notice->query($query);
-
-		return $notice;
-	}
-
-	function favoriteNotices($offset=0, $limit=20) {
-
-		$notice = new Notice();
-
-		$notice->query('SELECT notice.* ' .
-					   'FROM notice JOIN fave on notice.id = fave.notice_id ' .
-					   'WHERE fave.user_id = ' . $this->id . ' ' .
-					   'ORDER BY notice.created DESC, notice.id DESC ' .
-					   'LIMIT ' . $offset . ', ' . $limit);
-
-		return $notice;
-	}
-
-	function noticesWithFriendsWindow() {
-		
-		$cache = new Memcache();
-		$res = $cache->connect(common_config('memcached', 'server'), common_config('memcached', 'port'));
-		
-		if (!$res) {
-			return NULL;
-		}
-		
-		$notices = $cache->get(common_cache_key('user:notices_with_friends:' . $this->id));
-
-		if ($notices) {
-			return $notices;
-		}
-		
-		$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);
-		
-		$notices = array();
-		
-		while ($notice->fetch()) {
-			$notices[] = clone($notice);
-		}
-
-		$cache->set(common_cache_key('user:notices_with_friends:' . $this->id), $notices);
-		return $notices;
-	}
-	
 	static function register($fields) {
 
 		# MAGICALLY put fields into current scope
@@ -351,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) {
@@ -384,4 +290,58 @@ class User extends Memcached_DataObject
 
 		return $user;
 	}
+
+	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 ' .
+		  'WHERE reply.profile_id = %d ';
+		
+		return Notice::getStream(sprintf($qry, $this->id),
+								 'user:replies:'.$this->id,
+								 $offset, $limit, $since_id, $before_id);
+	}
+	
+	function getNotices($offset=0, $limit=NOTICES_PER_PAGE, $since_id=0, $before_id=0) {
+		$qry =
+		  'SELECT * ' .
+		  'FROM notice ' .
+		  'WHERE profile_id = %d ';
+		
+		return Notice::getStream(sprintf($qry, $this->id),
+								 'user:notices:'.$this->id,
+								 $offset, $limit, $since_id, $before_id);
+	}
+	
+	function favoriteNotices($offset=0, $limit=NOTICES_PER_PAGE) {
+		$qry =
+		  'SELECT notice.* ' .
+		  'FROM notice JOIN fave ON notice.id = fave.notice_id ' .
+		  'WHERE fave.user_id = %d ';
+		
+		return Notice::getStream(sprintf($qry, $this->id),
+								 'user:faves:'.$this->id,
+								 $offset, $limit);
+	}
+	
+	function noticesWithFriends($offset=0, $limit=NOTICES_PER_PAGE, $since_id=0, $before_id=0) {
+		$qry =
+		  'SELECT notice.* ' .
+		  '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, $since_id, $before_id,
+								 'ORDER BY notice_inbox.created DESC, notice_inbox.notice_id DESC ');
+	}
+	
+	function blowFavesCache() {
+		$cache = common_memcache();
+		if ($cache) {
+			$cache->delete(common_cache_key('user:faves:'.$this->id));
+		}
+	}
 }