wamo/gnu-social
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Public stream uses IDs method

Browse Source 
Public stream now uses IDs method
This commit is contained in:
Evan Prodromou 2009-04-29 12:05:31 -04:00
parent 10ef8a2f71
commit a4d959b8a2
1 changed files with 44 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

55
classes/Notice.php
View File

@ -635,25 +635,58 @@ class Notice extends Memcached_DataObject
function publicStream($offset=0, $limit=20, $since_id=0, $before_id=0, $since=null) function publicStream($offset=0, $limit=20, $since_id=0, $before_id=0, $since=null)
{ {
$ids = Notice::stream(array('Notice', '_publicStreamDirect'),
array(),
'public',
$offset, $limit, $since_id, $before_id, $since);
$parts = array(); return Notice::getStreamByIds($ids);
}
$qry = 'SELECT * FROM notice '; function _publicStreamDirect($offset=0, $limit=20, $since_id=0, $before_id=0, $since=null)
{
$notice = new Notice();
$notice->selectAdd(); // clears it
$notice->selectAdd('id');
$notice->orderBy('id DESC');
if (!is_null($offset)) {
$notice->limit($offset, $limit);
}
if (common_config('public', 'localonly')) { if (common_config('public', 'localonly')) {
$parts[] = 'is_local = 1'; $notice->whereAdd('is_local = 1');
} else { } else {
# -1 == blacklisted # -1 == blacklisted
$parts[] = 'is_local != -1'; $notice->whereAdd('is_local != -1');
} }
if ($parts) { if ($since_id != 0) {
$qry .= ' WHERE ' . implode(' AND ', $parts); $notice->whereAdd('id > ' . $since_id);
} }
return Notice::getStream($qry, if ($before_id != 0) {
'public', $notice->whereAdd('id < ' . $before_id);
$offset, $limit, $since_id, $before_id, null, $since); }
if (!is_null($since)) {
$notice->whereAdd('created > \'' . date('Y-m-d H:i:s', $since) . '\'');
}
$ids = array();
if ($notice->find()) {
while ($notice->fetch()) {
$ids[] = $notice->id;
}
}
$notice->free();
$notice = NULL;
return $ids;
} }
function addToInboxes() function addToInboxes()
@ -990,7 +1023,7 @@ class Notice extends Memcached_DataObject
return $ids; return $ids;
} }
$laststr = common_cache_key($idkey.';last'); $laststr = $cache->get($idkey.';last');
if (!empty($laststr)) { if (!empty($laststr)) {
$window = explode(',', $laststr); $window = explode(',', $laststr);
@ -1013,7 +1046,7 @@ class Notice extends Memcached_DataObject
$window = call_user_func_array($fn, array_merge($args, array(0, NOTICE_CACHE_WINDOW, $window = call_user_func_array($fn, array_merge($args, array(0, NOTICE_CACHE_WINDOW,
0, 0, null))); 0, 0, null)));
$windowstr = implode(',', $new_window); $windowstr = implode(',', $window);
$result = $cache->set($idkey, $windowstr); $result = $cache->set($idkey, $windowstr);
$result = $cache->set($idkey . ';last', $windowstr); $result = $cache->set($idkey . ';last', $windowstr);