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 7aab423b2725d8100c4494e92be62c9edfae5eb3..e49ac55401435d9cd0d4d7e262e0eaac9e58adc2 100644 (file)
--- a/actions/allrss.php
+++ b/actions/allrss.php
@@ -30,54 +30,47 @@ class AllrssAction extends Rss10Action {
        function init() {
                $nickname = $this->trimmed('nickname');
                $this->user = User::staticGet('nickname', $nickname);
-               
+
                if (!$this->user) {
-                       common_user_error(_t('No such nickname.'));
+                       common_user_error(_('No such user.'));
                        return false;
                } else {
                        return true;
                }
        }
-       
-       function get_notices($limit=0) {
-               
-               $user = $this->user;
-               $notices = array();
-               
-               $notice = DB_DataObject::factory('notice');
 
-               $notice->whereAdd('EXISTS (SELECT subscribed from subscription where subscriber = '.$profile->id.' and subscribed = notice.profile_id)', 'OR');
-               $notice->whereAdd('profile_id = ' . $user->id, 'OR');
+       function get_notices($limit=0) {
 
-               $notice->orderBy('created DESC');
-               if ($limit != 0) {
-                       $notice->limit(0, $limit);
-               }
-               $notice->find();
+               $user = $this->user;
                
+               $notice = $user->noticesWithFriends(0, $limit);
+                                                                                       
                while ($notice->fetch()) {
                        $notices[] = clone($notice);
                }
-               
+
                return $notices;
        }
-       
+
        function get_channel() {
                $user = $this->user;
                $c = array('url' => common_local_url('allrss',
-                                                                                        array('nickname' => 
+                                                                                        array('nickname' =>
                                                                                                   $user->nickname)),
-                                  'title' => $user->nickname . _t(' and friends'),
+                                  'title' => sprintf(_('%s and friends'), $user->nickname),
                                   'link' => common_local_url('all',
                                                                                         array('nickname' =>
                                                                                                   $user->nickname)),
-                                  'description' => _t('Microblog feed for ') . $user->nickname);
+                                  'description' => sprintf(_('Feed for friends of %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;
        }