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

use listGet() for ConversationNoticeStream

Browse Source
This commit is contained in:
Evan Prodromou 2011-08-22 12:25:04 -04:00
parent 0a17e7cf9f
commit d3399e93e8
2 changed files with 32 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
classes/Notice.php
View File

@ -577,10 +577,7 @@ class Notice extends Memcached_DataObject
$this->blowStream('public'); $this->blowStream('public');
} }
// XXX: Before we were blowing the casche only if the notice id self::blow('notice:list-ids:conversation:%s', $this->conversation);
// was not the root of the conversation. What to do now?
self::blow('notice:conversation_ids:%d', $this->conversation);
self::blow('conversation::notice_count:%d', $this->conversation); self::blow('conversation::notice_count:%d', $this->conversation);
if (!empty($this->repeat_of)) { if (!empty($this->repeat_of)) {

52
lib/conversationnoticestream.php
View File

@ -20,7 +20,7 @@
* You should have received a copy of the GNU Affero General Public License * You should have received a copy of the GNU Affero General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>. * along with this program. If not, see <http://www.gnu.org/licenses/>.
* *
* @category Cache * @category NoticeStream
* @package StatusNet * @package StatusNet
* @author Evan Prodromou <evan@status.net> * @author Evan Prodromou <evan@status.net>
* @copyright 2011 StatusNet, Inc. * @copyright 2011 StatusNet, Inc.
@ -52,8 +52,7 @@ class ConversationNoticeStream extends ScopingNoticeStream
$profile = Profile::current(); $profile = Profile::current();
} }
parent::__construct(new CachingNoticeStream(new RawConversationNoticeStream($id), parent::__construct(new RawConversationNoticeStream($id),
'notice:conversation_ids:'.$id),
$profile); $profile);
} }
} }
@ -77,24 +76,35 @@ class RawConversationNoticeStream extends NoticeStream
$this->id = $id; $this->id = $id;
} }
function getNotices($offset, $limit, $sinceId = null, $maxId = null)
{
$all = Memcached_DataObject::listGet('Notice', 'conversation', array($this->id));
$notices = $all[$this->id];
// Re-order in reverse-chron
usort($notices, array('RawConversationNoticeStream', '_reverseChron'));
// FIXME: handle since and max
$wanted = array_slice($notices, $offset, $limit);
return new ArrayWrapper($wanted);
}
function getNoticeIds($offset, $limit, $since_id, $max_id) function getNoticeIds($offset, $limit, $since_id, $max_id)
{ {
$notice = new Notice(); $notice = $this->getNotices($offset, $limit, $since_id, $max_id);
$ids = $notice->fetchAll('id');
$notice->selectAdd(); // clears it return $ids;
$notice->selectAdd('id');
$notice->conversation = $this->id;
$notice->orderBy('created DESC, id DESC');
if (!is_null($offset)) {
$notice->limit($offset, $limit);
}
Notice::addWhereSinceId($notice, $since_id);
Notice::addWhereMaxId($notice, $max_id);
return $notice->fetchAll('id');
} }
}
function _reverseChron($a, $b)
{
$at = strtotime($a->created);
$bt = strtotime($b->created);
if ($at == $bt) {
return 0;
} else if ($at > $bt) {
return -1;
} else {
return 1;
}
}
}