forked from GNUsocial/gnu-social
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
This commit is contained in:
@@ -59,32 +59,17 @@ class PublicAction extends StreamAction {
|
||||
|
||||
function show_notices($page) {
|
||||
|
||||
$notice = new Notice();
|
||||
|
||||
# XXX: sub-optimal
|
||||
|
||||
if (common_config('public', 'localonly')) {
|
||||
$notice->is_local = 1;
|
||||
}
|
||||
|
||||
$notice->orderBy('created DESC, notice.id DESC');
|
||||
|
||||
# We fetch one extra, to see if we need an "older" link
|
||||
|
||||
$notice->limit((($page-1)*NOTICES_PER_PAGE), NOTICES_PER_PAGE + 1);
|
||||
|
||||
$cnt = $notice->find();
|
||||
|
||||
if ($cnt > 0) {
|
||||
$cnt = 0;
|
||||
$notice = Notice::publicStream($page);
|
||||
|
||||
if ($notice) {
|
||||
common_element_start('ul', array('id' => 'notices'));
|
||||
$iMax = min($cnt, NOTICES_PER_PAGE);
|
||||
for ($i = 0; $i < $iMax; $i++) {
|
||||
if ($notice->fetch()) {
|
||||
$this->show_notice($notice);
|
||||
} else {
|
||||
// shouldn't happen!
|
||||
while ($notice->fetch()) {
|
||||
$cnt++;
|
||||
if ($cnt > NOTICES_PER_PAGE) {
|
||||
break;
|
||||
}
|
||||
$this->show_notice($notice);
|
||||
}
|
||||
common_element_end('ul');
|
||||
}
|
||||
@@ -92,5 +77,4 @@ class PublicAction extends StreamAction {
|
||||
common_pagination($page > 1, $cnt > NOTICES_PER_PAGE,
|
||||
$page, 'public');
|
||||
}
|
||||
}
|
||||
|
||||
}
|
Reference in New Issue
Block a user