From 02a3f24b92f70531c9bf761729d569b8ce5d307c Mon Sep 17 00:00:00 2001
From: Evan Prodromou <evan@controlyourself.ca>
Date: Sun, 28 Sep 2008 08:01:19 -0400
Subject: single function for important streams, with memcached support

I moved the 4 streams for a user (with friends, faves, replies,
personal) into functions on the User object. Added a helper function
in Notice for making notice streams. Also, will fetch notice streams
out of the memcached server, if possible. Made the API, RSS, and HTML
output all use the same streams (hopefully cached).

Added some code to Notice to blow the cache when a notice is posted.
Also, added code to favor and disfavor actions to blow the faves
cache, too.

darcs-hash:20080928120119-5ed1f-ead542348bcd3cf315be6f42934353154402eb16.gz
---
 classes/User.php | 116 ++++++++++++++++++++++++-------------------------------
 1 file changed, 51 insertions(+), 65 deletions(-)

(limited to 'classes/User.php')

diff --git a/classes/User.php b/classes/User.php
index de260035a..b8af0d0a6 100644
--- a/classes/User.php
+++ b/classes/User.php
@@ -19,11 +19,6 @@
 
 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
  */
@@ -153,60 +148,8 @@ 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 = common_memcache();
-		
-		if (!$cache) {
-			return NULL;
-		}
-		
-		$notices = $cache->get(common_cache_key('user:notices_with_friends:' . $this->id));
-
-		if ($notices) {
-			return $notices;
-		}
 		
 		$notice = new Notice();
 		
@@ -216,14 +159,6 @@ class User extends Memcached_DataObject
 					   '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) {
@@ -383,4 +318,55 @@ class User extends Memcached_DataObject
 
 		return $user;
 	}
+
+	function getReplies($offset=0, $limit=NOTICES_PER_PAGE) {
+		$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);
+	}
+	
+	function getNotices($offset=0, $limit=NOTICES_PER_PAGE) {
+		$qry =
+		  'SELECT * ' .
+		  'FROM notice ' .
+		  'WHERE profile_id = %d ';
+		
+		return Notice::getStream(sprintf($qry, $this->id),
+								 'user:notices:'.$this->id,
+								 $offset, $limit);
+	}
+	
+	function favoriteNotices($offset=0, $limit=NOTICES_PER_PAGE) {
+		$qry =
+		  'SELECT notice.* ' .
+		  'FROM notice JOIN fave ON notice.id = fave.notice_id ' .
+		  'WHERE fave.profile_id = %d ';
+		
+		return Notice::getStream(sprintf($qry, $this->id),
+								 'user:faves:'.$this->id,
+								 $offset, $limit);
+	}
+	
+	function noticesWithFriends($offset=0, $limit=NOTICES_PER_PAGE) {
+		$qry =
+		  'SELECT notice.* ' .
+		  'FROM notice JOIN subscription ON notice.profile_id = subscription.subscribed ' .
+		  'WHERE subscription.subscriber = %d';
+		
+		return Notice::getStream(sprintf($qry, $this->id),
+								 'user:notices_with_friends:' . $this->id,
+								 $offset, $limit);
+	}
+	
+	function blowFavesCache() {
+		$cache = common_memcache();
+		if ($cache) {
+			$cache->delete(common_cache_key('user:faves:'.$this->id));
+		}
+	}
 }
-- 
cgit v1.2.3-54-g00ecf