summaryrefslogtreecommitdiff
path: root/classes
diff options
context:
space:
mode:
Diffstat (limited to 'classes')
-rw-r--r--classes/Notice.php4
-rwxr-xr-xclasses/User_group.php53
2 files changed, 47 insertions, 10 deletions
diff --git a/classes/Notice.php b/classes/Notice.php
index eceed325b..c036e6e9e 100644
--- a/classes/Notice.php
+++ b/classes/Notice.php
@@ -299,9 +299,9 @@ class Notice extends Memcached_DataObject
$group_inbox->notice_id = $this->id;
if ($group_inbox->find()) {
while ($group_inbox->fetch()) {
- $cache->delete(common_cache_key('group:notices:'.$group_inbox->group_id));
+ $cache->delete(common_cache_key('user_group:notice_ids:' . $group_inbox->group_id));
if ($blowLast) {
- $cache->delete(common_cache_key('group:notices:'.$group_inbox->group_id.';last'));
+ $cache->delete(common_cache_key('user_group:notice_ids:' . $group_inbox->group_id.';last'));
}
$member = new Group_member();
$member->group_id = $group_inbox->group_id;
diff --git a/classes/User_group.php b/classes/User_group.php
index d152f9d56..7cc31e702 100755
--- a/classes/User_group.php
+++ b/classes/User_group.php
@@ -50,13 +50,50 @@ class User_group extends Memcached_DataObject
function getNotices($offset, $limit)
{
- $qry =
- 'SELECT notice.* ' .
- 'FROM notice JOIN group_inbox ON notice.id = group_inbox.notice_id ' .
- 'WHERE group_inbox.group_id = %d ';
- return Notice::getStream(sprintf($qry, $this->id),
- 'group:notices:'.$this->id,
- $offset, $limit);
+ $ids = Notice::stream(array($this, '_streamDirect'),
+ array(),
+ 'user_group:notice_ids:' . $this->id,
+ $offset, $limit);
+
+ return Notice::getStreamByIds($ids);
+ }
+
+ function _streamDirect($offset, $limit, $since_id, $before_id, $since)
+ {
+ $inbox = new Group_inbox();
+
+ $inbox->group_id = $this->id;
+
+ $inbox->selectAdd();
+ $inbox->selectAdd('notice_id');
+
+ if ($since_id != 0) {
+ $inbox->whereAdd('notice_id > ' . $since_id);
+ }
+
+ if ($before_id != 0) {
+ $inbox->whereAdd('notice_id < ' . $before_id);
+ }
+
+ if (!is_null($since)) {
+ $inbox->whereAdd('created > \'' . date('Y-m-d H:i:s', $since) . '\'');
+ }
+
+ $inbox->orderBy('notice_id DESC');
+
+ if (!is_null($offset)) {
+ $inbox->limit($offset, $limit);
+ }
+
+ $ids = array();
+
+ if ($inbox->find()) {
+ while ($inbox->fetch()) {
+ $ids[] = $inbox->notice_id;
+ }
+ }
+
+ return $ids;
}
function allowedNickname($nickname)
@@ -91,7 +128,7 @@ class User_group extends Memcached_DataObject
function setOriginal($filename)
{
$imagefile = new ImageFile($this->id, Avatar::path($filename));
-
+
$orig = clone($this);
$this->original_logo = Avatar::url($filename);
$this->homepage_logo = Avatar::url($imagefile->resize(AVATAR_PROFILE_SIZE));