From 02a3f24b92f70531c9bf761729d569b8ce5d307c Mon Sep 17 00:00:00 2001 From: Evan Prodromou 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 --- actions/twitapistatuses.php | 51 +++++++-------------------------------------- 1 file changed, 7 insertions(+), 44 deletions(-) (limited to 'actions/twitapistatuses.php') diff --git a/actions/twitapistatuses.php b/actions/twitapistatuses.php index 87e805e87..723c19499 100644 --- a/actions/twitapistatuses.php +++ b/actions/twitapistatuses.php @@ -54,22 +54,12 @@ class TwitapistatusesAction extends TwitterapiAction { // Number of public statuses to return by default -- Twitter sends 20 $MAX_PUBSTATUSES = 20; - $notice = new Notice(); - // FIXME: To really live up to the spec we need to build a list // of notices by users who have custom avatars, so fix this SQL -- Zach - # XXX: sub-optimal performance - - if (common_config('public', 'localonly')) { - $notice->is_local = 1; - } - - $notice->orderBy('created DESC, notice.id DESC'); - $notice->limit($MAX_PUBSTATUSES); - $cnt = $notice->find(); - - if ($cnt > 0) { + $notice = Notice::publicStream(0, $MAX_PUBSTATUSES); + + if ($notice) { switch($apidata['content-type']) { case 'xml': @@ -341,18 +331,10 @@ class TwitapistatusesAction extends TwitterapiAction { $link = common_local_url('showstream', array('nickname' => $user->nickname)); $subtitle = sprintf(_('Updates from %1$s on %2$s!'), $user->nickname, $sitename); - $notice = new Notice(); - - $notice->profile_id = $user->id; - # XXX: since # XXX: since_id - $notice->orderBy('created DESC, notice.id DESC'); - - $notice->limit((($page-1)*20), $count); - - $cnt = $notice->find(); + $notice = $user->getNotices((($page-1)*20), $count); switch($apidata['content-type']) { case 'xml': @@ -490,30 +472,11 @@ class TwitapistatusesAction extends TwitterapiAction { $count = 20; } - $reply = new Reply(); - - $reply->profile_id = $user->id; - - $reply->orderBy('modified DESC'); - - $page = ($this->arg('page')) ? ($this->arg('page')+0) : 1; - - $reply->limit((($page-1)*20), $count); - - $cnt = $reply->find(); - + $notice = $user->getReplies((($page-1)*20), $count); $notices = array(); - if ($cnt) { - while ($reply->fetch()) { - $notice = new Notice(); - $notice->id = $reply->notice_id; - $result = $notice->find(true); - if (!$result) { - continue; - } - $notices[] = clone($notice); - } + while ($notice->fetch()) { + $notices[] = clone($notice); } switch($apidata['content-type']) { -- cgit v1.2.3-54-g00ecf