Repeated and Favorited CSS/mf2 fixes

[quix0rs-gnu-social.git] / actions / showfavorites.php

diff --git a/actions/showfavorites.php b/actions/showfavorites.php
index eda2cf38ebe3fc83db5cbdb93263149040e536d8..0e028416da2cfa1314237403bf0b44bdcb576b4d 100644 (file)
--- a/actions/showfavorites.php
+++ b/actions/showfavorites.php
@@ -22,7 +22,7 @@
  * @category  Personal
  * @package   StatusNet
  * @author    Evan Prodromou <evan@status.net>
- * @copyright 2008-2009 StatusNet, Inc.
+ * @copyright 2008-2011 StatusNet, Inc.
  * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
  * @link      http://status.net/
  */
@@ -44,7 +44,7 @@ require_once INSTALLDIR.'/lib/feedlist.php';
  * @license  http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
  * @link     http://status.net/
  */
-class ShowfavoritesAction extends OwnerDesignAction
+class ShowfavoritesAction extends Action
 {
     /** User we're getting the faves of */
     var $user = null;
@@ -99,12 +99,11 @@ class ShowfavoritesAction extends OwnerDesignAction
 
         $nickname = common_canonical_nickname($this->arg('nickname'));
 
-        $this->user = User::staticGet('nickname', $nickname);
+        $this->user = User::getKV('nickname', $nickname);
 
         if (!$this->user) {
             // TRANS: Client error displayed when trying to display favourite notices for a non-existing user.
             $this->clientError(_('No such user.'));
-            return false;
         }
 
         $this->page = $this->trimmed('page');
@@ -132,7 +131,6 @@ class ShowfavoritesAction extends OwnerDesignAction
         if (empty($this->notice)) {
             // TRANS: Server error displayed when favourite notices could not be retrieved from the database.
             $this->serverError(_('Could not retrieve favorite notices.'));
-            return;
         }
 
         if($this->page > 1 && $this->notice->N == 0){
@@ -165,7 +163,15 @@ class ShowfavoritesAction extends OwnerDesignAction
      */
     function getFeeds()
     {
-        return array(new Feed(Feed::RSS1,
+        return array(new Feed(Feed::JSON,
+                              common_local_url('ApiTimelineFavorites',
+                                               array(
+                                                    'id' => $this->user->nickname,
+                                                    'format' => 'as')),
+                              // TRANS: Feed link text. %s is a username.
+                              sprintf(_('Feed for favorites of %s (Activity Streams JSON)'),
+                                      $this->user->nickname)),
+                     new Feed(Feed::RSS1,
                               common_local_url('favoritesrss',
                                                array('nickname' => $this->user->nickname)),
                               // TRANS: Feed link text. %s is a username.
@@ -189,17 +195,6 @@ class ShowfavoritesAction extends OwnerDesignAction
                                       $this->user->nickname)));
     }
 
-    /**
-     * show the personal group nav
-     *
-     * @return void
-     */
-    function showLocalNav()
-    {
-        $nav = new PersonalGroupNav($this);
-        $nav->show();
-    }
-
     function showEmptyListMessage()
     {
         if (common_logged_in()) {