more work on firehose

This commit is contained in:
friendica
2014-03-26 18:45:01 -07:00
parent 150bc9866a
commit ed14c1f224
6 changed files with 44 additions and 10 deletions

View File

@@ -346,9 +346,10 @@ function stream_perms_api_uids($perms_min = PERMS_SITE) {
$ret = array();
if(local_user())
$ret[] = local_user();
$r = q("select channel_id from channel where channel_r_stream > 0 and channel_r_stream <= %d and not (channel_pageflags & %d)",
$r = q("select channel_id from channel where channel_r_stream > 0 and channel_r_stream <= %d and not (channel_pageflags & %d) and not (channel_pageflags & %d)",
intval($perms_min),
intval(PAGE_CENSORED)
intval(PAGE_CENSORED),
intval(PAGE_SYSTEM)
);
if($r)
foreach($r as $rr)
@@ -371,9 +372,10 @@ function stream_perms_xchans($perms_min = PERMS_SITE) {
if(local_user())
$ret[] = get_observer_hash();
$r = q("select channel_hash from channel where channel_r_stream > 0 and channel_r_stream <= %d and not (channel_pageflags & %d)",
$r = q("select channel_hash from channel where channel_r_stream > 0 and channel_r_stream <= %d and not (channel_pageflags & %d) and not (channel_pageflags & %d)",
intval($perms_min),
intval(PAGE_CENSORED)
intval(PAGE_CENSORED),
intval(PAGE_SYSTEM)
);
if($r)
foreach($r as $rr)