X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=lib%2Fconversationnoticestream.php;fp=lib%2Fconversationnoticestream.php;h=c43b5deb24a3bd12d5d26da534a21036bcc17ac3;hb=d3399e93e82f8b9a59fc096c7900a569a8195546;hp=adf610ffe7b2841c0d15260cc093b3d0216a573b;hpb=0a17e7cf9f4983cf3e96b65c548c39dff0d80b72;p=quix0rs-gnu-social.git
diff --git a/lib/conversationnoticestream.php b/lib/conversationnoticestream.php
index adf610ffe7..c43b5deb24 100644
--- a/lib/conversationnoticestream.php
+++ b/lib/conversationnoticestream.php
@@ -20,7 +20,7 @@
* You should have received a copy of the GNU Affero General Public License
* along with this program. If not, see .
*
- * @category Cache
+ * @category NoticeStream
* @package StatusNet
* @author Evan Prodromou
* @copyright 2011 StatusNet, Inc.
@@ -52,8 +52,7 @@ class ConversationNoticeStream extends ScopingNoticeStream
$profile = Profile::current();
}
- parent::__construct(new CachingNoticeStream(new RawConversationNoticeStream($id),
- 'notice:conversation_ids:'.$id),
+ parent::__construct(new RawConversationNoticeStream($id),
$profile);
}
}
@@ -77,24 +76,35 @@ class RawConversationNoticeStream extends NoticeStream
$this->id = $id;
}
- function getNoticeIds($offset, $limit, $since_id, $max_id)
+ function getNotices($offset, $limit, $sinceId = null, $maxId = null)
{
- $notice = new Notice();
-
- $notice->selectAdd(); // clears it
- $notice->selectAdd('id');
-
- $notice->conversation = $this->id;
+ $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);
+ }
- $notice->orderBy('created DESC, id DESC');
+ function getNoticeIds($offset, $limit, $since_id, $max_id)
+ {
+ $notice = $this->getNotices($offset, $limit, $since_id, $max_id);
+ $ids = $notice->fetchAll('id');
+ return $ids;
+ }
- if (!is_null($offset)) {
- $notice->limit($offset, $limit);
+ 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;
}
-
- Notice::addWhereSinceId($notice, $since_id);
- Notice::addWhereMaxId($notice, $max_id);
-
- return $notice->fetchAll('id');
}
-}
\ No newline at end of file
+}