We are no longer offering accounts on this server. Consider https://gitlab.freedesktop.org/ as a place to host projects.

Commit 1e4e9a84 authored by Evan Prodromou's avatar Evan Prodromou

Revert "stream for direct responses"

I don't actually need this so I'm reverting it.

This reverts commit 04a31576.
parent 04a31576
......@@ -463,10 +463,6 @@ class Notice extends Memcached_DataObject
// was not the root of the conversation. What to do now?
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)) {
self::blow('notice:repeats:%d', $this->repeat_of);
......@@ -496,7 +492,6 @@ class Notice extends Memcached_DataObject
self::blow('profile:notice_ids:%d;last', $this->profile_id);
self::blow('notice:responses:%d', $this->id);
if ($this->isPublic()) {
......@@ -2138,46 +2133,4 @@ class Notice extends Memcached_DataObject
($this->is_local != Notice::GATEWAY));
function responseStream($offset=0, $limit=20, $since_id=0, $max_id=0)
$ids = Notice::stream(array($this, '_responseStreamDirect'),
$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->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 = NULL;
return $ids;
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment