notice_inbox.id -> notice_inbox.notice_id

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

diff --git a/actions/allrss.php b/actions/allrss.php
index e9280024c4886bf09d51b660695ae9970437534f..e49ac55401435d9cd0d4d7e262e0eaac9e58adc2 100644 (file)
--- a/actions/allrss.php
+++ b/actions/allrss.php
@@ -32,7 +32,7 @@ class AllrssAction 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,19 +42,9 @@ class AllrssAction extends Rss10Action {
        function get_notices($limit=0) {
 
                $user = $this->user;
-               $notices = array();
-
-               $notice = DB_DataObject::factory('notice');
-
-               $notice->whereAdd('EXISTS (SELECT subscribed from subscription where subscriber = '.$user->id.' and subscribed = notice.profile_id)', 'OR');
-               $notice->whereAdd('profile_id = ' . $user->id, 'OR');
-
-               $notice->orderBy('created DESC');
-               if ($limit != 0) {
-                       $notice->limit(0, $limit);
-               }
-               $notice->find();
-
+               
+               $notice = $user->noticesWithFriends(0, $limit);
+                                                                                       
                while ($notice->fetch()) {
                        $notices[] = clone($notice);
                }
@@ -78,6 +68,9 @@ class AllrssAction extends Rss10Action {
        function get_image() {
                $user = $this->user;
                $profile = $user->getProfile();
+               if (!$profile) {
+                       return NULL;
+               }
                $avatar = $profile->getAvatar(AVATAR_PROFILE_SIZE);
                return ($avatar) ? $avatar->url : NULL;
        }