GNUsocial/gnu-social
4
0
Fork 1
Code Issues Releases Wiki Activity

Use InboxNoticeStream class for inbox

Browse Source 
Move the code for inbox fetching to the InboxNoticeStream class.
This commit is contained in:
Evan Prodromou
2011-04-07 14:52:44 -04:00
parent 5b9319d081
commit 5dfb8e2bc4
4 changed files with 165 additions and 175 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
classes/User.php
View File

@@ -478,34 +478,45 @@ class User extends Memcached_DataObject
return Fave::stream($this->id, $offset, $limit, $own, $since_id, $max_id);
}
function noticeInbox($offset=0, $limit=NOTICES_PER_PAGE, $since_id=0, $before_id=0)
{
$stream = new InboxNoticeStream($this);
return $stream->getNotices($offset, $limit, $since_id, $before_id);
}
// DEPRECATED, use noticeInbox()
function noticesWithFriends($offset=0, $limit=NOTICES_PER_PAGE, $since_id=0, $before_id=0)
{
return Inbox::streamNotices($this->id, $offset, $limit, $since_id, $before_id, false);
$this->noticeInbox($offset, $limit, $since_id, $before_id);
}
// DEPRECATED, use noticeInbox()
function noticesWithFriendsThreaded($offset=0, $limit=NOTICES_PER_PAGE, $since_id=0, $before_id=0)
{
return Inbox::streamNoticesThreaded($this->id, $offset, $limit, $since_id, $before_id, false);
$this->noticeInbox($offset, $limit, $since_id, $before_id);
}
function noticeInbox($offset=0, $limit=NOTICES_PER_PAGE, $since_id=0, $before_id=0)
{
return Inbox::streamNotices($this->id, $offset, $limit, $since_id, $before_id, true);
}
// DEPRECATED, use noticeInbox()
function noticeInboxThreaded($offset=0, $limit=NOTICES_PER_PAGE, $since_id=0, $before_id=0)
{
return Inbox::streamNoticesThreaded($this->id, $offset, $limit, $since_id, $before_id, true);
$this->noticeInbox($offset, $limit, $since_id, $before_id);
}
// DEPRECATED, use noticeInbox()
function friendsTimeline($offset=0, $limit=NOTICES_PER_PAGE, $since_id=0, $before_id=0)
{
return Inbox::streamNotices($this->id, $offset, $limit, $since_id, $before_id, false);
$this->noticeInbox($offset, $limit, $since_id, $before_id);
}
// DEPRECATED, use noticeInbox()
function ownFriendsTimeline($offset=0, $limit=NOTICES_PER_PAGE, $since_id=0, $before_id=0)
{
return Inbox::streamNotices($this->id, $offset, $limit, $since_id, $before_id, true);
$this->noticeInbox($offset, $limit, $since_id, $before_id);
}
function blowFavesCache()