generate an etag for shownotice

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

diff --git a/actions/repliesrss.php b/actions/repliesrss.php
index 549182fb900033e94afe62564d29d76e7e95d432..7369db5e047ae6f16d8ddbf17f53f512512d0a86 100644 (file)
--- a/actions/repliesrss.php
+++ b/actions/repliesrss.php
@@ -32,7 +32,7 @@ class RepliesrssAction extends Rss10Action {
                $this->user = User::staticGet('nickname', $nickname);
 
                if (!$this->user) {
-                       common_user_error(_('No such nickname.'));
+                       common_user_error(_('No such user.'));
                        return false;
                } else {
                        return true;
@@ -42,27 +42,13 @@ class RepliesrssAction extends Rss10Action {
        function get_notices($limit=0) {
 
                $user = $this->user;
-               $notices = array();
-
-               $reply = new Reply();
-               $reply->profile_id = $user->id;
-               $reply->orderBy('modified DESC');
-               if ($limit) {
-                       $reply->limit(0, $limit);
-               }
 
-               $cnt = $reply->find();
+               $notice = $user->getReplies(0, ($limit == 0) ? 48 : $limit);
 
-               if ($cnt) {
-                       while ($reply->fetch()) {
-                               $notice = new Notice();
-                               $notice->id = $reply->notice_id;
-                               $result = $notice->find(true);
-                               if (!$result) {
-                                       continue;
-                               }
-                               $notices[] = clone($notice);
-                       }
+               $notices = array();
+               
+               while ($notice->fetch()) {
+                       $notices[] = clone($notice);
                }
 
                return $notices;
@@ -73,17 +59,20 @@ class RepliesrssAction extends Rss10Action {
                $c = array('url' => common_local_url('repliesrss',
                                                                                         array('nickname' =>
                                                                                                   $user->nickname)),
-                                  'title' => sprintf(_("Replies to %s"), $profile->nickname),
+                                  'title' => sprintf(_("Replies to %s"), $user->nickname),
                                   'link' => common_local_url('replies',
                                                                                          array('nickname' =>
                                                                                                        $user->nickname)),
-                                  'description' => sprintf(_('Feed for replies to '), $user->nickname));
+                                  'description' => sprintf(_('Feed for replies to %s'), $user->nickname));
                return $c;
        }
 
        function get_image() {
                $user = $this->user;
                $profile = $user->getProfile();
+               if (!$profile) {
+                       return NULL;
+               }
                $avatar = $profile->getAvatar(AVATAR_PROFILE_SIZE);
                return ($avatar) ? $avatar->url : NULL;
        }