Revert "stream for direct responses"
I don't actually need this so I'm reverting it.
This reverts commit 04a3157681
.
This commit is contained in:
parent
04a3157681
commit
1e4e9a8456
@ -464,10 +464,6 @@ class Notice extends Memcached_DataObject
|
|||||||
|
|
||||||
self::blow('notice:conversation_ids:%d', $this->conversation);
|
self::blow('notice:conversation_ids:%d', $this->conversation);
|
||||||
|
|
||||||
if (!empty($this->reply_to)) {
|
|
||||||
self::blow('notice:responses:%d', $this->reply_to);
|
|
||||||
}
|
|
||||||
|
|
||||||
if (!empty($this->repeat_of)) {
|
if (!empty($this->repeat_of)) {
|
||||||
self::blow('notice:repeats:%d', $this->repeat_of);
|
self::blow('notice:repeats:%d', $this->repeat_of);
|
||||||
}
|
}
|
||||||
@ -496,7 +492,6 @@ class Notice extends Memcached_DataObject
|
|||||||
$this->blowOnInsert();
|
$this->blowOnInsert();
|
||||||
|
|
||||||
self::blow('profile:notice_ids:%d;last', $this->profile_id);
|
self::blow('profile:notice_ids:%d;last', $this->profile_id);
|
||||||
self::blow('notice:responses:%d', $this->id);
|
|
||||||
|
|
||||||
if ($this->isPublic()) {
|
if ($this->isPublic()) {
|
||||||
self::blow('public;last');
|
self::blow('public;last');
|
||||||
@ -2138,46 +2133,4 @@ class Notice extends Memcached_DataObject
|
|||||||
($this->is_local != Notice::GATEWAY));
|
($this->is_local != Notice::GATEWAY));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
function responseStream($offset=0, $limit=20, $since_id=0, $max_id=0)
|
|
||||||
{
|
|
||||||
$ids = Notice::stream(array($this, '_responseStreamDirect'),
|
|
||||||
array(),
|
|
||||||
'notice:responses:'.$id,
|
|
||||||
$offset, $limit, $since_id, $max_id);
|
|
||||||
|
|
||||||
return Notice::getStreamByIds($ids);
|
|
||||||
}
|
|
||||||
|
|
||||||
function _responseStreamDirect($offset=0, $limit=20, $since_id=0, $max_id=0)
|
|
||||||
{
|
|
||||||
$notice = new Notice();
|
|
||||||
|
|
||||||
$notice->selectAdd(); // clears it
|
|
||||||
$notice->selectAdd('id');
|
|
||||||
|
|
||||||
$notice->reply_to = $this->reply_to;
|
|
||||||
|
|
||||||
$notice->orderBy('created DESC, id DESC');
|
|
||||||
|
|
||||||
if (!is_null($offset)) {
|
|
||||||
$notice->limit($offset, $limit);
|
|
||||||
}
|
|
||||||
|
|
||||||
Notice::addWhereSinceId($notice, $since_id);
|
|
||||||
Notice::addWhereMaxId($notice, $max_id);
|
|
||||||
|
|
||||||
$ids = array();
|
|
||||||
|
|
||||||
if ($notice->find()) {
|
|
||||||
while ($notice->fetch()) {
|
|
||||||
$ids[] = $notice->id;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
$notice->free();
|
|
||||||
$notice = NULL;
|
|
||||||
|
|
||||||
return $ids;
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user