wamo/gnu-social
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

use new Subscription stream methods for AtomPub

Browse Source
This commit is contained in:
Evan Prodromou 2010-12-11 11:24:07 -05:00
parent 8dea5144a9
commit d9a614c57e
1 changed files with 18 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
actions/atompubsubscriptionfeed.php
View File

@ -51,8 +51,8 @@ require_once INSTALLDIR . '/lib/apiauth.php';
class AtompubsubscriptionfeedAction extends ApiAuthAction class AtompubsubscriptionfeedAction extends ApiAuthAction
{ {
private $_profile = null; private $_profile = null;
private $_subscribed = null; private $_subscriptions = null;
/** /**
* For initializing members of the class. * For initializing members of the class.
@ -76,11 +76,12 @@ class AtompubsubscriptionfeedAction extends ApiAuthAction
} }
// page and count from ApiAction // page and count from ApiAction
// Note: this is a list of profiles, not subscriptions
$this->_subscribed = $offset = ($this->page-1) * $this->count;
$this->_profile->getSubscriptions(($this->page-1) * $this->count,
$this->count + 1); $this->_subscriptions = Subscription::bySubscriber($subscriber,
$offset,
$this->count + 1);
return true; return true;
} }
@ -174,7 +175,7 @@ class AtompubsubscriptionfeedAction extends ApiAuthAction
'type' => 'application/atom+xml')); 'type' => 'application/atom+xml'));
} }
if ($this->_subscribed->N > $this->count) { if ($this->_subscriptions->N > $this->count) {
$feed->addLink(common_local_url('AtomPubSubscriptionFeed', $feed->addLink(common_local_url('AtomPubSubscriptionFeed',
array('subscriber' => array('subscriber' =>
@ -189,7 +190,7 @@ class AtompubsubscriptionfeedAction extends ApiAuthAction
// XXX: This is kind of inefficient // XXX: This is kind of inefficient
while ($this->_subscribed->fetch()) { while ($this->_subscriptions->fetch()) {
// We get one more than needed; skip that one // We get one more than needed; skip that one
@ -199,17 +200,21 @@ class AtompubsubscriptionfeedAction extends ApiAuthAction
break; break;
} }
$sub = Subscription::pkeyGet(array('subscriber' => $act = $this->_subscriptions->asActivity();
$this->_profile->id,
'subscribed' =>
$this->_subscribed->id));
$act = $sub->asActivity();
$feed->addEntryRaw($act->asString(false, false, false)); $feed->addEntryRaw($act->asString(false, false, false));
} }
$this->raw($feed->getString()); $this->raw($feed->getString());
} }
/**
* Add a new subscription
*
* Handling the POST method for AtomPub
*
* @return void
*/
function addSubscription() function addSubscription()
{ {
if (empty($this->auth_user) || if (empty($this->auth_user) ||