save notice to inbox on saveNew

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

diff --git a/actions/userrss.php b/actions/userrss.php
index e608519157c6058b4521244ce3c77303fc90293a..e57f861054bc70964b7108092246cf1ceff36077 100644 (file)
--- a/actions/userrss.php
+++ b/actions/userrss.php
@@ -42,16 +42,13 @@ class UserrssAction extends Rss10Action {
        function get_notices($limit=0) {
 
                $user = $this->user;
-               $notices = array();
-
-               $notice = DB_DataObject::factory('notice');
-               $notice->profile_id = $user->id; # user id === profile id
-               $notice->orderBy('created DESC, notice.id DESC');
-               if ($limit != 0) {
-                       $notice->limit(0, $limit);
+               
+               if (is_null($user)) {
+                       return NULL;
                }
-               $notice->find();
-
+               
+               $notice = $user->getNotices(0, ($limit == 0) ? NOTICES_PER_PAGE : $limit);
+               
                while ($notice->fetch()) {
                        $notices[] = clone($notice);
                }
@@ -82,4 +79,12 @@ class UserrssAction extends Rss10Action {
                $avatar = $profile->getAvatar(AVATAR_PROFILE_SIZE);
                return ($avatar) ? $avatar->url : NULL;
        }
+
+       # override parent to add X-SUP-ID URL
+       
+       function init_rss($limit=0) {
+               $url = common_local_url('sup', NULL, $this->user->id);
+               header('X-SUP-ID: '.$url);
+               parent::init_rss($limit);
+       }
 }
\ No newline at end of file