]> git.mxchange.org Git - quix0rs-gnu-social.git/commitdiff
Merge branch '0.9.x' into activityatompub
authorEvan Prodromou <evan@status.net>
Sat, 11 Dec 2010 16:03:02 +0000 (11:03 -0500)
committerEvan Prodromou <evan@status.net>
Sat, 11 Dec 2010 16:03:02 +0000 (11:03 -0500)
actions/atompubshowfavorite.php [new file with mode: 0644]
actions/atompubshowsubscription.php [new file with mode: 0644]
actions/atompubsubscriptionfeed.php [new file with mode: 0644]
actions/subscriptions.php
classes/Fave.php
classes/Subscription.php
lib/router.php

diff --git a/actions/atompubshowfavorite.php b/actions/atompubshowfavorite.php
new file mode 100644 (file)
index 0000000..5fe680b
--- /dev/null
@@ -0,0 +1,228 @@
+<?php
+/**
+ * StatusNet - the distributed open-source microblogging tool
+ * Copyright (C) 2010, StatusNet, Inc.
+ *
+ * Show a single favorite in Atom Activity Streams format
+ * 
+ * PHP version 5
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * @category  AtomPub
+ * @package   StatusNet
+ * @author    Evan Prodromou <evan@status.net>
+ * @copyright 2010 StatusNet, Inc.
+ * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html AGPL 3.0
+ * @link      http://status.net/
+ */
+
+if (!defined('STATUSNET')) {
+    // This check helps protect against security problems;
+    // your code file can't be executed directly from the web.
+    exit(1);
+}
+
+require_once INSTALLDIR . '/lib/apiauth.php';
+
+/**
+ * Show a single favorite in Atom Activity Streams format.
+ *
+ * Can also be used to delete a favorite.
+ *
+ * @category  Action
+ * @package   StatusNet
+ * @author    Evan Prodromou <evan@status.net>
+ * @copyright 2010 StatusNet, Inc.
+ * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html AGPL 3.0
+ * @link      http://status.net/
+ */
+
+class AtompubshowfavoriteAction extends ApiAuthAction
+{
+    private $_profile = null;
+    private $_notice  = null;
+    private $_fave    = null;
+
+    /**
+     * For initializing members of the class.
+     *
+     * @param array $argarray misc. arguments
+     *
+     * @return boolean true
+     */
+
+    function prepare($argarray)
+    {
+        parent::prepare($argarray);
+
+        $profileId = $this->trimmed('profile');
+        $noticeId  = $this->trimmed('notice');
+
+        $this->_profile = Profile::staticGet('id', $profileId);
+
+        if (empty($this->_profile)) {
+            throw new ClientException(_('No such profile.'), 404);
+        }
+
+        $this->_notice = Notice::staticGet('id', $noticeId);
+
+        if (empty($this->_notice)) {
+            throw new ClientException(_('No such notice.'), 404);
+        }
+
+        $this->_fave = Fave::pkeyGet(array('user_id' => $profileId,
+                                           'notice_id' => $noticeId));
+
+        if (empty($this->_fave)) {
+            throw new ClientException(_('No such favorite.'), 404);
+        }
+
+        return true;
+    }
+
+    /**
+     * Handler method
+     *
+     * @param array $argarray is ignored since it's now passed in in prepare()
+     *
+     * @return void
+     */
+
+    function handle($argarray=null)
+    {
+        parent::handle($argarray);
+
+        switch ($_SERVER['REQUEST_METHOD']) {
+        case GET:
+        case HEAD:
+            $this->showFave();
+            break;
+        case DELETE:
+            $this->deleteFave();
+            break;
+        default:
+            throw new ClientException(_('HTTP method not supported.'),
+                                      405);
+        }
+        return true;
+    }
+
+    /**
+     * Show a single favorite, in ActivityStreams format
+     * 
+     * @return void
+     */
+
+    function showFave()
+    {
+        $activity = $this->_fave->asActivity();
+
+        header('Content-Type: application/atom+xml; charset=utf-8');
+
+        $this->startXML();
+        $this->raw($activity->asString(true, true, true));
+        $this->endXML();
+
+        return;
+    }
+
+    /**
+     * Delete the favorite
+     * 
+     * @return void
+     */
+
+    function deleteFave()
+    {
+        if (empty($this->auth_user) ||
+            $this->auth_user->id != $this->_profile->id) {
+            throw new ClientException(_("Can't delete someone else's".
+                                        " favorite"), 403);
+        }
+
+        $this->_fave->delete();
+
+        return;
+    }
+
+    /**
+     * Return true if read only.
+     *
+     * MAY override
+     *
+     * @param array $args other arguments
+     *
+     * @return boolean is read only action?
+     */
+
+    function isReadOnly($args)
+    {
+        if ($_SERVER['REQUEST_METHOD'] == 'GET' ||
+            $_SERVER['REQUEST_METHOD'] == 'HEAD') {
+            return true;
+        } else {
+            return false;
+        }
+    }
+
+    /**
+     * Return last modified, if applicable.
+     *
+     * MAY override
+     *
+     * @return string last modified http header
+     */
+
+    function lastModified()
+    {
+        return max(strtotime($this->_profile->modified),
+                   strtotime($this->_notice->modified),
+                   strtotime($this->_fave->modified));
+    }
+
+    /**
+     * Return etag, if applicable.
+     *
+     * MAY override
+     *
+     * @return string etag http header
+     */
+
+    function etag()
+    {
+        $mtime = strtotime($this->_fave->modified);
+
+        return 'W/"' . implode(':', array('AtomPubShowFavorite',
+                                          $this->_profile->id,
+                                          $this->_notice->id,
+                                          $mtime)) . '"';
+    }
+
+    /**
+     * Does this require authentication?
+     *
+     * @return boolean true if delete, else false
+     */
+
+    function requiresAuth()
+    {
+        if ($_SERVER['REQUEST_METHOD'] == 'GET' ||
+            $_SERVER['REQUEST_METHOD'] == 'HEAD') {
+            return false;
+        } else {
+            return true;
+        }
+    }
+}
diff --git a/actions/atompubshowsubscription.php b/actions/atompubshowsubscription.php
new file mode 100644 (file)
index 0000000..55ba68a
--- /dev/null
@@ -0,0 +1,224 @@
+<?php
+/**
+ * StatusNet - the distributed open-source microblogging tool
+ * Copyright (C) 2010, StatusNet, Inc.
+ *
+ * Single subscription
+ * 
+ * PHP version 5
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * @category  AtomPub
+ * @package   StatusNet
+ * @author    Evan Prodromou <evan@status.net>
+ * @copyright 2010 StatusNet, Inc.
+ * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html AGPL 3.0
+ * @link      http://status.net/
+ */
+
+if (!defined('STATUSNET')) {
+    // This check helps protect against security problems;
+    // your code file can't be executed directly from the web.
+    exit(1);
+}
+
+require_once INSTALLDIR . '/lib/apiauth.php';
+
+/**
+ * Show a single subscription
+ *
+ * @category  AtomPub
+ * @package   StatusNet
+ * @author    Evan Prodromou <evan@status.net>
+ * @copyright 2010 StatusNet, Inc.
+ * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html AGPL 3.0
+ * @link      http://status.net/
+ */
+
+class AtompubshowsubscriptionAction extends ApiAuthAction
+{
+    private $_subscriber   = null;
+    private $_subscribed   = null;
+    private $_subscription = null;
+
+    /** 
+     * For initializing members of the class.
+     *
+     * @param array $argarray misc. arguments
+     *
+     * @return boolean true
+     */
+
+    function prepare($argarray)
+    {
+        parent::prepare($argarray);
+        $subscriberId = $this->trimmed('subscriber');
+
+        $this->_subscriber = Profile::staticGet('id', $subscriberId);
+
+        if (empty($this->_subscriber)) {
+            throw new ClientException(sprintf(_('No such profile id: %d'),
+                                              $subscriberId), 404);
+        }
+
+        $subscribedId = $this->trimmed('subscribed');
+
+        $this->_subscribed = Profile::staticGet('id', $subscribedId);
+
+        if (empty($this->_subscribed)) {
+            throw new ClientException(sprintf(_('No such profile id: %d'),
+                                              $subscribedId), 404);
+        }
+
+        $this->_subscription = 
+            Subscription::pkeyGet(array('subscriber' => $subscriberId,
+                                        'subscribed' => $subscribedId));
+
+        if (empty($this->_subscription)) {
+            $msg = sprintf(_('Profile %d not subscribed to profile %d'),
+                           $subscriberId, $subscribedId);
+            throw new ClientException($msg, 404);
+        }
+
+        return true;
+    }
+
+    /**
+     * Handler method
+     *
+     * @param array $argarray is ignored since it's now passed in in prepare()
+     *
+     * @return void
+     */
+
+    function handle($argarray=null)
+    {
+        parent::handle($argarray);
+        switch ($_SERVER['REQUEST_METHOD']) {
+        case 'HEAD':
+        case 'GET':
+            $this->showSubscription();
+            break;
+        case 'DELETE':
+            $this->deleteSubscription();
+            break;
+        default:
+            $this->clientError(_('HTTP method not supported.'), 405);
+            return;
+        }
+
+        return;
+    }
+
+    /**
+     * Show the subscription in ActivityStreams Atom format.
+     *
+     * @return void
+     */
+
+    function showSubscription()
+    {
+        $activity = $this->_subscription->asActivity();
+
+        header('Content-Type: application/atom+xml; charset=utf-8');
+
+        $this->startXML();
+        $this->raw($activity->asString(true, true, true));
+        $this->endXML();
+
+        return;
+    }
+
+    /**
+     * Delete the subscription
+     *
+     * @return void
+     */
+
+    function deleteSubscription()
+    {
+        if (empty($this->auth_user) ||
+            $this->auth_user->id != $this->_subscriber->id) {
+            throw new ClientException(_("Can't delete someone else's".
+                                        " subscription"), 403);
+        }
+
+        Subscription::cancel($this->_subscriber,
+                             $this->_subscribed);
+
+        return;
+    }
+
+    /**
+     * Is this action read only?
+     *
+     * @param array $args other arguments
+     *
+     * @return boolean true
+     */
+    
+    function isReadOnly($args)
+    {
+        if ($_SERVER['REQUEST_METHOD'] == 'DELETE') {
+            return false;
+        } else {
+            return true;
+        }
+    }
+
+    /**
+     * Return last modified, if applicable.
+     *
+     * @return string last modified http header
+     */
+
+    function lastModified()
+    {
+        return max(strtotime($this->_subscriber->modified),
+                   strtotime($this->_subscribed->modified),
+                   strtotime($this->_subscription->modified));
+    }
+
+    /**
+     * Etag for this object
+     *
+     * @return string etag http header
+     */
+
+    function etag()
+    {
+        $mtime = strtotime($this->_subscription->modified);
+
+        return 'W/"' . implode(':', array('AtomPubShowSubscription',
+                                          $this->_subscriber->id,
+                                          $this->_subscribed->id,
+                                          $mtime)) . '"';
+    }
+
+    /**
+     * Does this require authentication?
+     *
+     * @return boolean true if delete, else false
+     */
+
+    function requiresAuth()
+    {
+        if ($_SERVER['REQUEST_METHOD'] == 'DELETE') {
+            return true;
+        } else {
+            return false;
+        }
+    }
+}
diff --git a/actions/atompubsubscriptionfeed.php b/actions/atompubsubscriptionfeed.php
new file mode 100644 (file)
index 0000000..b5577b7
--- /dev/null
@@ -0,0 +1,330 @@
+<?php
+/**
+ * StatusNet - the distributed open-source microblogging tool
+ * Copyright (C) 2010, StatusNet, Inc.
+ *
+ * AtomPub subscription feed
+ * 
+ * PHP version 5
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * @category  Cache
+ * @package   StatusNet
+ * @author    Evan Prodromou <evan@status.net>
+ * @copyright 2010 StatusNet, Inc.
+ * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html AGPL 3.0
+ * @link      http://status.net/
+ */
+
+if (!defined('STATUSNET')) {
+    // This check helps protect against security problems;
+    // your code file can't be executed directly from the web.
+    exit(1);
+}
+
+require_once INSTALLDIR . '/lib/apiauth.php';
+
+/**
+ * Subscription feed class for AtomPub
+ *
+ * Generates a list of the user's subscriptions
+ * 
+ * @category  AtomPub
+ * @package   StatusNet
+ * @author    Evan Prodromou <evan@status.net>
+ * @copyright 2010 StatusNet, Inc.
+ * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html AGPL 3.0
+ * @link      http://status.net/
+ */
+
+class AtompubsubscriptionfeedAction extends ApiAuthAction
+{
+    private $_profile    = null;
+    private $_subscribed = null;
+
+    /**
+     * For initializing members of the class.
+     *
+     * @param array $argarray misc. arguments
+     *
+     * @return boolean true
+     */
+
+    function prepare($argarray)
+    {
+        parent::prepare($argarray);
+        
+        $subscriber = $this->trimmed('subscriber');
+
+        $this->_profile = Profile::staticGet('id', $subscriber);
+
+        if (empty($this->_profile)) {
+            throw new ClientException(sprintf(_('No such profile id: %d'),
+                                              $subscriber), 404);
+        }
+
+        // page and count from ApiAction
+        // Note: this is a list of profiles, not subscriptions
+
+        $this->_subscribed = 
+            $this->_profile->getSubscriptions(($this->page-1) * $this->count, 
+                                              $this->count + 1);
+
+        return true;
+    }
+
+    /**
+     * Handler method
+     *
+     * @param array $argarray is ignored since it's now passed in in prepare()
+     *
+     * @return void
+     */
+
+    function handle($argarray=null)
+    {
+        parent::handle($argarray);
+        switch ($_SERVER['REQUEST_METHOD']) {
+        case 'HEAD':
+        case 'GET':
+            $this->showFeed();
+            break;
+        case 'POST':
+            $this->addSubscription();
+            break;
+        default:
+            $this->clientError(_('HTTP method not supported.'), 405);
+            return;
+        }
+
+        return;
+    }
+
+    /**
+     * Show the feed of subscriptions
+     *
+     * @return void
+     */
+
+    function showFeed()
+    {
+        header('Content-Type: application/atom+xml; charset=utf-8');
+
+        $url = common_local_url('AtomPubSubscriptionFeed',
+                                array('subscriber' => $this->_profile->id));
+
+        $feed = new Atom10Feed(true);
+
+        $feed->addNamespace('activity',
+                            'http://activitystrea.ms/spec/1.0/');
+
+        $feed->addNamespace('poco',
+                            'http://portablecontacts.net/spec/1.0');
+
+        $feed->addNamespace('media',
+                            'http://purl.org/syndication/atommedia');
+
+        $feed->id = $url;
+
+        $feed->setUpdated('now');
+
+        $feed->addAuthor($this->_profile->getBestName(),
+                         $this->_profile->getURI());
+
+        $feed->setTitle(sprintf(_("%s subscriptions"),
+                                $this->_profile->getBestName()));
+
+        $feed->setSubtitle(sprintf(_("People %s has subscribed to on %s"),
+                                   $this->_profile->getBestName()),
+                           common_config('site', 'name'));
+
+        $feed->addLink(common_local_url('subscriptions',
+                                        array('nickname' => 
+                                              $this->_profile->nickname)));
+
+        $feed->addLink($url,
+                       array('rel' => 'self',
+                             'type' => 'application/atom+xml'));
+                                        
+        // If there's more...
+
+        if ($this->page > 1) {
+            $feed->addLink($url,
+                           array('rel' => 'first',
+                                 'type' => 'application/atom+xml'));
+
+            $feed->addLink(common_local_url('AtomPubSubscriptionFeed',
+                                            array('subscriber' => 
+                                                  $this->_profile->id,
+                                                  'page' => 
+                                                  $this->page - 1)),
+                           array('rel' => 'prev',
+                                 'type' => 'application/atom+xml'));
+        }
+
+        if ($this->_subscribed->N > $this->count) {
+
+            $feed->addLink(common_local_url('AtomPubSubscriptionFeed',
+                                            array('subscriber' =>
+                                                  $this->_profile->id,
+                                                  'page' =>
+                                                  $this->page + 1)),
+                           array('rel' => 'next',
+                                 'type' => 'application/atom+xml'));
+        }
+
+        $i = 0;
+
+        // XXX: This is kind of inefficient
+
+        while ($this->_subscribed->fetch()) {
+
+            // We get one more than needed; skip that one
+
+            $i++;
+
+            if ($i > $this->count) {
+                break;
+            }
+
+            $sub = Subscription::pkeyGet(array('subscriber' =>
+                                               $this->_profile->id,
+                                               'subscribed' =>
+                                               $this->_subscribed->id));
+            $act = $sub->asActivity();
+            $feed->addEntryRaw($act->asString(false, false, false));
+        }
+
+        $this->raw($feed->getString());
+    }
+
+    function addSubscription()
+    {
+        if (empty($this->auth_user) ||
+            $this->auth_user->id != $this->_profile->id) {
+            throw new ClientException(_("Can't add someone else's".
+                                        " subscription"), 403);
+        }
+        
+        $xml = file_get_contents('php://input');
+
+        $dom = DOMDocument::loadXML($xml);
+
+        if ($dom->documentElement->namespaceURI != Activity::ATOM ||
+            $dom->documentElement->localName != 'entry') {
+            // TRANS: Client error displayed when not using an Atom entry.
+            $this->clientError(_('Atom post must be an Atom entry.'));
+            return;
+        }
+
+        $activity = new Activity($dom->documentElement);
+
+        $sub = null;
+
+        if (Event::handle('StartAtomPubNewActivity', array(&$activity))) {
+
+            if ($activity->verb != ActivityVerb::FOLLOW) {
+                // TRANS: Client error displayed when not using the POST verb.
+                // TRANS: Do not translate POST.
+                $this->clientError(_('Can only handle Follow activities.'));
+                return;
+            }
+
+            $person = $activity->objects[0];
+
+            if ($person->type != ActivityObject::PERSON) {
+                $this->clientError(_('Can only follow people.'));
+                return;
+            }
+
+            // XXX: OStatus discovery (maybe)
+
+            $profile = Profile::fromURI($person->id);
+
+            if (empty($profile)) {
+                $this->clientError(sprintf(_('Unknown profile %s'), $person->id));
+                return;
+            }
+
+            if (Subscription::start($this->_profile, $profile)) {
+                $sub = Subscription::pkeyGet(array('subscriber' => $this->_profile->id,
+                                                   'subscribed' => $profile->id));
+            }
+
+            Event::handle('EndAtomPubNewActivity', array($activity, $sub));
+        }
+
+        if (!empty($sub)) {
+            $act = $sub->asActivity();
+
+            header('Content-Type: application/atom+xml; charset=utf-8');
+            header('Content-Location: ' . $act->selfLink);
+
+            $this->startXML();
+            $this->raw($act->asString(true, true, true));
+            $this->endXML();
+        }
+    }
+
+    /**
+     * Return true if read only.
+     *
+     * @param array $args other arguments
+     *
+     * @return boolean is read only action?
+     */
+
+    function isReadOnly($args)
+    {
+        return $_SERVER['REQUEST_METHOD'] != 'POST';
+    }
+
+    /**
+     * Return last modified, if applicable.
+     *
+     * @return string last modified http header
+     */
+
+    function lastModified()
+    {
+        return null;
+    }
+
+    /**
+     * Return etag, if applicable.
+     *
+     * @return string etag http header
+     */
+
+    function etag()
+    {
+        return null;
+    }
+
+    /**
+     * Does this require authentication?
+     *
+     * @return boolean true if delete, else false
+     */
+
+    function requiresAuth()
+    {
+        if ($_SERVER['REQUEST_METHOD'] == 'POST') {
+            return true;
+        } else {
+            return false;
+        }
+    }
+}
index ba2f67f2da8e59e18012a27f5032eee8666b4039..a814a4f354172dd4d24ec2c3156590f576ecdc01 100644 (file)
@@ -163,6 +163,22 @@ class SubscriptionsAction extends GalleryAction
         $cloud2 = new SubscriptionsPeopleSelfTagCloudSection($this);
         $cloud2->show();
     }
+
+    /**
+     * Link to feeds of subscriptions
+     *
+     * @return array of Feed objects
+     */
+
+    function getFeeds()
+    {
+        return array(new Feed(Feed::ATOM,
+                              common_local_url('AtomPubSubscriptionFeed',
+                                               array('subscriber' => $this->profile->id)),
+                              sprintf(_('Subscription feed for %s (Atom)'),
+                                      $this->profile->nickname)));
+
+    }
 }
 
 // XXX SubscriptionsList and SubscriptionList are dangerously close
@@ -247,4 +263,5 @@ class SubscriptionsListItem extends SubscriptionListItem
         $this->out->elementEnd('form');
         return;
     }
+
 }
index 9922ae45c54bbc626965624f7bce05b9d9c0b735..030e67b56138fc796552e8edd149126a880b9d97 100644 (file)
@@ -138,6 +138,9 @@ class Fave extends Memcached_DataObject
         $act = new Activity();
 
         $act->verb = ActivityVerb::FAVORITE;
+
+        // FIXME: rationalize this with URL below
+
         $act->id   = TagURI::mint('favor:%d:%d:%s',
                                   $profile->id,
                                   $notice->id,
@@ -155,6 +158,13 @@ class Fave extends Memcached_DataObject
         $act->actor     = ActivityObject::fromProfile($profile);
         $act->objects[] = ActivityObject::fromNotice($notice);
 
+        $url = common_local_url('AtomPubShowFavorite',
+                                          array('profile' => $this->user_id,
+                                                'notice'  => $this->notice_id));
+
+        $act->selfLink = $url;
+        $act->editLink = $url;
+
         return $act;
     }
 }
index 763e3835b8b05f2dad789d356b8d92e657290993..1d4f37929b900bd740d173939516401bd693988b 100644 (file)
@@ -253,6 +253,8 @@ class Subscription extends Memcached_DataObject
 
         $act->verb = ActivityVerb::FOLLOW;
 
+        // XXX: rationalize this with the URL
+
         $act->id   = TagURI::mint('follow:%d:%d:%s',
                                   $subscriber->id,
                                   $subscribed->id,
@@ -270,6 +272,13 @@ class Subscription extends Memcached_DataObject
         $act->actor     = ActivityObject::fromProfile($subscriber);
         $act->objects[] = ActivityObject::fromProfile($subscribed);
 
+        $url = common_local_url('AtomPubShowSubscription',
+                                array('subscriber' => $subscriber->id,
+                                      'subscribed' => $subscribed->id));
+
+        $act->selfLink = $url;
+        $act->editLink = $url;
+
         return $act;
     }
 
index d747493ded5426f0a7d6ac26793b1da11fd990dc..0ced86f34ef94bccb75385fb9e97e2a80f57df5e 100644 (file)
@@ -761,13 +761,6 @@ class Router
             $m->connect('api/oauth/authorize',
                         array('action' => 'ApiOauthAuthorize'));
 
-            $m->connect('api/statusnet/app/service/:id.xml',
-                        array('action' => 'ApiAtomService',
-                              'id' => Nickname::INPUT_FMT));
-
-            $m->connect('api/statusnet/app/service.xml',
-                        array('action' => 'ApiAtomService'));
-
             // Admin
 
             $m->connect('admin/site', array('action' => 'siteadminpanel'));
@@ -909,6 +902,33 @@ class Router
                             array('nickname' => Nickname::DISPLAY_FMT));
             }
 
+            // AtomPub API
+
+            $m->connect('api/statusnet/app/service/:id.xml',
+                        array('action' => 'ApiAtomService',
+                              'id' => Nickname::DISPLAY_FMT));
+
+            $m->connect('api/statusnet/app/service.xml',
+                        array('action' => 'ApiAtomService'));
+
+            $m->connect('api/statusnet/app/subscriptions/:subscriber/:subscribed.atom',
+                        array('action' => 'AtomPubShowSubscription'),
+                        array('subscriber' => '[0-9]+',
+                              'subscribed' => '[0-9]+'));
+
+            $m->connect('api/statusnet/app/subscriptions/:subscriber.atom',
+                        array('action' => 'AtomPubSubscriptionFeed'),
+                        array('subscriber' => '[0-9]+'));
+
+            $m->connect('api/statusnet/app/favorites/:profile/:notice.atom',
+                        array('action' => 'AtomPubShowFavorite'),
+                        array('profile' => '[0-9]+',
+                              'notice' => '[0-9]+'));
+
+            $m->connect('api/statusnet/app/favorites/:profile.atom',
+                        array('action' => 'AtomPubFavoriteFeed'),
+                        array('profile' => '[0-9]+'));
+
             // user stuff
 
             Event::handle('RouterInitialized', array($m));