X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=lib%2Fatomusernoticefeed.php;h=7b7f0a749f32910598d9b7c357b325422f95fdf3;hb=89704bcdeec2bac07b0528d21cd2d15bedf8c4ec;hp=785db4915b9c405be2cee021b4b1378360947ae0;hpb=83c2e0b379a8a6a81c211ed5c4d837e047f919f7;p=quix0rs-gnu-social.git

diff --git a/lib/atomusernoticefeed.php b/lib/atomusernoticefeed.php
index 785db4915b..7b7f0a749f 100644
--- a/lib/atomusernoticefeed.php
+++ b/lib/atomusernoticefeed.php
@@ -44,7 +44,7 @@ if (!defined('STATUSNET'))
  */
 class AtomUserNoticeFeed extends AtomNoticeFeed
 {
-    private $user;
+    protected $user;
 
     /**
      * Constructor
@@ -55,14 +55,18 @@ class AtomUserNoticeFeed extends AtomNoticeFeed
      *
      * @return void
      */
-
     function __construct($user, $cur = null, $indent = true) {
         parent::__construct($cur, $indent);
         $this->user = $user;
         if (!empty($user)) {
+
             $profile = $user->getProfile();
-            $this->addAuthor($profile->nickname, $user->uri);
-            $this->setActivitySubject($profile->asActivityNoun('subject'));
+
+            $ao = $profile->asActivityObject();
+            
+            array_push($ao->extra, $profile->profileInfo($this->scoped));
+
+            $this->addAuthorRaw($ao->asString('author'));
         }
 
         // TRANS: Title in atom user notice feed. %s is a user name.
@@ -78,9 +82,7 @@ class AtomUserNoticeFeed extends AtomNoticeFeed
         );
         $this->setSubtitle($subtitle);
 
-        $avatar = $profile->getAvatar(AVATAR_PROFILE_SIZE);
-        $logo = ($avatar) ? $avatar->displayUrl() : Avatar::defaultImage(AVATAR_PROFILE_SIZE);
-        $this->setLogo($logo);
+        $this->setLogo($profile->avatarUrl(AVATAR_PROFILE_SIZE));
 
         $this->setUpdated('now');
 
@@ -90,7 +92,7 @@ class AtomUserNoticeFeed extends AtomNoticeFeed
                 array('nickname' => $user->nickname)
             )
         );
-        
+
         $self = common_local_url('ApiTimelineUser',
                                  array('id' => $user->id,
                                        'format' => 'atom'));