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

Make user group stream use IDs

Browse Source
This commit is contained in:
Evan Prodromou 2009-05-01 11:38:50 -07:00
parent 3328ec545c
commit 021b520a11
2 changed files with 47 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
classes/Notice.php
View File

@ -299,9 +299,9 @@ class Notice extends Memcached_DataObject
$group_inbox->notice_id = $this->id; $group_inbox->notice_id = $this->id;
if ($group_inbox->find()) { if ($group_inbox->find()) {
while ($group_inbox->fetch()) { while ($group_inbox->fetch()) {
$cache->delete(common_cache_key('group:notices:'.$group_inbox->group_id)); $cache->delete(common_cache_key('user_group:notice_ids:' . $group_inbox->group_id));
if ($blowLast) { if ($blowLast) {
$cache->delete(common_cache_key('group:notices:'.$group_inbox->group_id.';last')); $cache->delete(common_cache_key('user_group:notice_ids:' . $group_inbox->group_id.';last'));
} }
$member = new Group_member(); $member = new Group_member();
$member->group_id = $group_inbox->group_id; $member->group_id = $group_inbox->group_id;

49
classes/User_group.php
View File

@ -50,13 +50,50 @@ class User_group extends Memcached_DataObject
function getNotices($offset, $limit) function getNotices($offset, $limit)
{ {
$qry = $ids = Notice::stream(array($this, '_streamDirect'),
'SELECT notice.* ' . array(),
'FROM notice JOIN group_inbox ON notice.id = group_inbox.notice_id ' . 'user_group:notice_ids:' . $this->id,
'WHERE group_inbox.group_id = %d ';
return Notice::getStream(sprintf($qry, $this->id),
'group:notices:'.$this->id,
$offset, $limit); $offset, $limit);
return Notice::getStreamByIds($ids);
}
function _streamDirect($offset, $limit, $since_id, $before_id, $since)
{
$inbox = new Group_inbox();
$inbox->group_id = $this->id;
$inbox->selectAdd();
$inbox->selectAdd('notice_id');
if ($since_id != 0) {
$inbox->whereAdd('notice_id > ' . $since_id);
}
if ($before_id != 0) {
$inbox->whereAdd('notice_id < ' . $before_id);
}
if (!is_null($since)) {
$inbox->whereAdd('created > \'' . date('Y-m-d H:i:s', $since) . '\'');
}
$inbox->orderBy('notice_id DESC');
if (!is_null($offset)) {
$inbox->limit($offset, $limit);
}
$ids = array();
if ($inbox->find()) {
while ($inbox->fetch()) {
$ids[] = $inbox->notice_id;
}
}
return $ids;
} }
function allowedNickname($nickname) function allowedNickname($nickname)