X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;ds=sidebyside;f=classes%2FUser.php;h=916524b8e8ac90ceef33992780a70e46e261a67f;hb=c197b228eb6627bf560de1b00d84dba9c70095a0;hp=2d689fd2b9743316280c2b7165a8c6f9aafc4fe1;hpb=67cf415b7eaa65e2e0b6480638eaffcebcb10dca;p=quix0rs-gnu-social.git

diff --git a/classes/User.php b/classes/User.php
index 2d689fd2b9..916524b8e8 100644
--- a/classes/User.php
+++ b/classes/User.php
@@ -291,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 ' .
@@ -299,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 ' .
@@ -310,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) {
@@ -324,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() {