diff options
Diffstat (limited to 'classes/User.php')
| -rw-r--r-- | classes/User.php | 39 |
1 files changed, 3 insertions, 36 deletions
diff --git a/classes/User.php b/classes/User.php index 831b18f6f..bbc33f72a 100644 --- a/classes/User.php +++ b/classes/User.php @@ -297,20 +297,9 @@ class User extends Memcached_DataObject 'FROM notice JOIN reply ON notice.id = reply.notice_id ' . 'WHERE reply.profile_id = %d '; - if ($since_id > 0) { - $qry .= ' AND notice.id > ' . $since_id . ' '; - $needAnd = FALSE; - } - - // NOTE: before_id is an extension to Twitter API - if ($before_id > 0) { - $qry .= ' AND notice.id < ' . $before_id . ' '; - $needAnd = FALSE; - } - 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, $since_id=0, $before_id=0) { @@ -319,20 +308,9 @@ class User extends Memcached_DataObject 'FROM notice ' . 'WHERE profile_id = %d '; - if ($since_id > 0) { - $qry .= ' AND notice.id > ' . $since_id . ' '; - $needAnd = FALSE; - } - - // NOTE: before_id is an extension to Twitter API - if ($before_id > 0) { - $qry .= ' AND notice.id < ' . $before_id . ' '; - $needAnd = FALSE; - } - 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) { @@ -352,20 +330,9 @@ class User extends Memcached_DataObject 'FROM notice JOIN notice_inbox ON notice.id = notice_inbox.notice_id ' . 'WHERE notice_inbox.user_id = %d '; - if ($since_id > 0) { - $qry .= ' AND notice.id > ' . $since_id . ' '; - $needAnd = FALSE; - } - - // NOTE: before_id is an extension to Twitter API - if ($before_id > 0) { - $qry .= ' AND notice.id < ' . $before_id . ' '; - $needAnd = FALSE; - } - return Notice::getStream(sprintf($qry, $this->id), 'user:notices_with_friends:' . $this->id, - $offset, $limit); + $offset, $limit, $since_id, $before_id); } function blowFavesCache() { |