summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSarven Capadisli <csarven@controlyourself.ca>2009-06-25 16:56:02 +0000
committerSarven Capadisli <csarven@controlyourself.ca>2009-06-25 16:56:02 +0000
commitbebe7b99f9d430369c1caf84c78025df6230929e (patch)
tree2f64f6c841fe18bfb9bc65c18c849a3796f6a78d
parent1e17f1256a1166db6bd3acd35fd437262ba27ffd (diff)
parent3ca9e85ce4f0db7f160f9a8e989bec898bfbbf55 (diff)
Merge branch '0.8.x' of git@gitorious.org:laconica/dev into 0.8.x
-rw-r--r--actions/conversation.php12
-rw-r--r--classes/Notice.php53
2 files changed, 54 insertions, 11 deletions
diff --git a/actions/conversation.php b/actions/conversation.php
index d3fc5b6a9..654a670f5 100644
--- a/actions/conversation.php
+++ b/actions/conversation.php
@@ -63,6 +63,7 @@ class ConversationAction extends Action
if (empty($this->id)) {
return false;
}
+ $this->id = $this->id+0;
$this->page = $this->trimmed('page');
if (empty($this->page)) {
$this->page = 1;
@@ -106,18 +107,10 @@ class ConversationAction extends Action
function showContent()
{
- // FIXME this needs to be a tree, not a list
-
- $qry = 'SELECT * FROM notice WHERE conversation = %s ';
-
$offset = ($this->page-1) * NOTICES_PER_PAGE;
$limit = NOTICES_PER_PAGE + 1;
- $txt = sprintf($qry, $this->id);
-
- $notices = Notice::getStream($txt,
- 'notice:conversation:'.$this->id,
- $offset, $limit);
+ $notices = Notice::conversationStream($this->id, $offset, $limit);
$ct = new ConversationTree($notices, $this);
@@ -126,7 +119,6 @@ class ConversationAction extends Action
$this->pagination($this->page > 1, $cnt > NOTICES_PER_PAGE,
$this->page, 'conversation', array('id' => $this->id));
}
-
}
/**
diff --git a/classes/Notice.php b/classes/Notice.php
index 59ffef91a..44179b254 100644
--- a/classes/Notice.php
+++ b/classes/Notice.php
@@ -346,7 +346,7 @@ class Notice extends Memcached_DataObject
{
$cache = common_memcache();
if ($cache) {
- $ck = 'notice:conversation:'.$this->conversation;
+ $ck = 'notice:conversation_ids:'.$this->conversation;
$cache->delete($ck);
if ($blowLast) {
$cache->delete($ck.';last');
@@ -762,6 +762,57 @@ class Notice extends Memcached_DataObject
return $ids;
}
+ function conversationStream($id, $offset=0, $limit=20, $since_id=0, $max_id=0, $since=null)
+ {
+ $ids = Notice::stream(array('Notice', '_conversationStreamDirect'),
+ array($id),
+ 'notice:conversation_ids:'.$id,
+ $offset, $limit, $since_id, $max_id, $since);
+
+ return Notice::getStreamByIds($ids);
+ }
+
+ function _conversationStreamDirect($id, $offset=0, $limit=20, $since_id=0, $max_id=0, $since=null)
+ {
+ $notice = new Notice();
+
+ $notice->selectAdd(); // clears it
+ $notice->selectAdd('id');
+
+ $notice->whereAdd('conversation = '.$id);
+
+ $notice->orderBy('id DESC');
+
+ if (!is_null($offset)) {
+ $notice->limit($offset, $limit);
+ }
+
+ if ($since_id != 0) {
+ $notice->whereAdd('id > ' . $since_id);
+ }
+
+ if ($max_id != 0) {
+ $notice->whereAdd('id <= ' . $max_id);
+ }
+
+ if (!is_null($since)) {
+ $notice->whereAdd('created > \'' . date('Y-m-d H:i:s', $since) . '\'');
+ }
+
+ $ids = array();
+
+ if ($notice->find()) {
+ while ($notice->fetch()) {
+ $ids[] = $notice->id;
+ }
+ }
+
+ $notice->free();
+ $notice = NULL;
+
+ return $ids;
+ }
+
function addToInboxes()
{
$enabled = common_config('inboxes', 'enabled');