summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEvan Prodromou <evan@controlyourself.ca>2009-06-17 15:04:57 -0700
committerEvan Prodromou <evan@controlyourself.ca>2009-06-17 15:04:57 -0700
commit07f5797f2fd1a425027190d424e359a1b4c4c8be (patch)
tree36db357296bdaf8074f33a48e15e6c3d912d1307
parent2fbd141361b6ddab0e036b52fc23f2bfcdfd0075 (diff)
Make the personal tag streams actually work
-rw-r--r--actions/showstream.php2
-rw-r--r--classes/Notice.php6
-rw-r--r--classes/Profile.php37
3 files changed, 26 insertions, 19 deletions
diff --git a/actions/showstream.php b/actions/showstream.php
index 72316b259..cd5d4bb70 100644
--- a/actions/showstream.php
+++ b/actions/showstream.php
@@ -370,7 +370,7 @@ class ShowstreamAction extends ProfileAction
{
$notice = empty($this->tag)
? $this->user->getNotices(($this->page-1)*NOTICES_PER_PAGE, NOTICES_PER_PAGE + 1)
- : $this->user->getTaggedNotices(($this->page-1)*NOTICES_PER_PAGE, NOTICES_PER_PAGE + 1, 0, 0, null, $this->tag);
+ : $this->user->getTaggedNotices($this->tag, ($this->page-1)*NOTICES_PER_PAGE, NOTICES_PER_PAGE + 1, 0, 0, null);
$pnl = new ProfileNoticeList($notice, $this);
$cnt = $pnl->show();
diff --git a/classes/Notice.php b/classes/Notice.php
index 6c5558d88..50242300d 100644
--- a/classes/Notice.php
+++ b/classes/Notice.php
@@ -375,6 +375,12 @@ class Notice extends Memcached_DataObject
if ($tag->find()) {
while ($tag->fetch()) {
$tag->blowCache($blowLast);
+ $ck = 'profile:notice_ids_tagged:' . $this->profile_id . ':' . $tag->tag;
+
+ $cache->delete($ck);
+ if ($blowLast) {
+ $cache->delete($ck . ';last');
+ }
}
}
$tag->free();
diff --git a/classes/Profile.php b/classes/Profile.php
index 4a459b974..2f432ae8e 100644
--- a/classes/Profile.php
+++ b/classes/Profile.php
@@ -153,18 +153,16 @@ class Profile extends Memcached_DataObject
return null;
}
- function getTaggedNotices($offset=0, $limit=NOTICES_PER_PAGE, $since_id=0, $before_id=0, $since=null, $tag=null)
+ function getTaggedNotices($tag, $offset=0, $limit=NOTICES_PER_PAGE, $since_id=0, $max_id=0, $since=null)
{
- // XXX: I'm not sure this is going to be any faster. It probably isn't.
$ids = Notice::stream(array($this, '_streamTaggedDirect'),
- array(),
- 'profile:notice_ids:' . $this->id,
- $offset, $limit, $since_id, $before_id, $since, $tag);
- common_debug(print_r($ids, true));
+ array($tag),
+ 'profile:notice_ids_tagged:' . $this->id . ':' . $tag,
+ $offset, $limit, $since_id, $max_id, $since);
return Notice::getStreamByIds($ids);
}
- function getNotices($offset=0, $limit=NOTICES_PER_PAGE, $since_id=0, $before_id=0, $since=null)
+ function getNotices($offset=0, $limit=NOTICES_PER_PAGE, $since_id=0, $max_id=0, $since=null)
{
// XXX: I'm not sure this is going to be any faster. It probably isn't.
$ids = Notice::stream(array($this, '_streamDirect'),
@@ -175,18 +173,23 @@ class Profile extends Memcached_DataObject
return Notice::getStreamByIds($ids);
}
- function _streamTaggedDirect($offset, $limit, $since_id, $before_id, $since=null, $tag=null)
+ function _streamTaggedDirect($tag, $offset, $limit, $since_id, $max_id, $since)
{
- common_debug('_streamTaggedDirect()');
+ // XXX It would be nice to do this without a join
+
$notice = new Notice();
- $notice->profile_id = $this->id;
- $query = "select id from notice join notice_tag on id=notice_id where tag='" . $notice->escape($tag) . "' and profile_id=" . $notice->escape($notice->profile_id);
+
+ $query =
+ "select id from notice join notice_tag on id=notice_id where tag='".
+ $notice->escape($tag) .
+ "' and profile_id=" . $notice->escape($this->id);
+
if ($since_id != 0) {
$query .= " and id > $since_id";
}
- if ($before_id != 0) {
- $query .= " and id < $before_id";
+ if ($max_id != 0) {
+ $query .= " and id < $max_id";
}
if (!is_null($since)) {
@@ -198,21 +201,19 @@ class Profile extends Memcached_DataObject
if (!is_null($offset)) {
$query .= " limit $offset, $limit";
}
+
$notice->query($query);
+
$ids = array();
while ($notice->fetch()) {
- common_debug(print_r($notice, true));
$ids[] = $notice->id;
}
return $ids;
}
-
-
-
- function _streamDirect($offset, $limit, $since_id, $before_id, $since = null)
+ function _streamDirect($offset, $limit, $since_id, $max_id, $since = null)
{
$notice = new Notice();