diff options
| author | Brion Vibber <brion@pobox.com> | 2010-02-09 18:32:52 -0800 |
|---|---|---|
| committer | Brion Vibber <brion@pobox.com> | 2010-02-09 18:32:52 -0800 |
| commit | 8449256817f5a2bd7a7cac6bc04e4cb477d7dc49 (patch) | |
| tree | a975ae92a53a0cb23291f9e97f61306361db73fa /classes | |
| parent | 5509f923ea48aecd1422aa1a4173fc85938e2b74 (diff) | |
OStatus partial support for group subscriptions:
* detection of group feeds is currently a nasty hack based on presence of '/groups/' in URL -- should use some property on the feed?
* listing for the remote group is kinda cruddy; needs to be named more cleanly
* still need to establish per-author profiles (easier once we have the updated Atom code in)
* group delivery probably not right yet
* saving of group messages still triggering some weird behavior
Added support for since_id and max_id on group timeline feeds as a free extra. Enjoy!
Diffstat (limited to 'classes')
| -rw-r--r-- | classes/Notice.php | 4 | ||||
| -rw-r--r-- | classes/User_group.php | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/classes/Notice.php b/classes/Notice.php index fca1c599c..247440f29 100644 --- a/classes/Notice.php +++ b/classes/Notice.php @@ -783,7 +783,7 @@ class Notice extends Memcached_DataObject $result = $gi->insert(); - if (!result) { + if (!$result) { common_log_db_error($gi, 'INSERT', __FILE__); throw new ServerException(_('Problem saving group inbox.')); } @@ -917,7 +917,7 @@ class Notice extends Memcached_DataObject /** * Same calculation as saveGroups but without the saving * @fixme merge the functions - * @return array of Group objects + * @return array of Group_inbox objects */ function getGroups() { diff --git a/classes/User_group.php b/classes/User_group.php index c86eadf8f..1fbb50a6e 100644 --- a/classes/User_group.php +++ b/classes/User_group.php @@ -49,12 +49,12 @@ class User_group extends Memcached_DataObject array('id' => $this->id)); } - function getNotices($offset, $limit) + function getNotices($offset, $limit, $since_id=null, $max_id=null) { $ids = Notice::stream(array($this, '_streamDirect'), array(), 'user_group:notice_ids:' . $this->id, - $offset, $limit); + $offset, $limit, $since_id, $max_id); return Notice::getStreamByIds($ids); } |