Use an Event to present notices conversations

[quix0rs-gnu-social.git] / lib / atomusernoticefeed.php

diff --git a/lib/atomusernoticefeed.php b/lib/atomusernoticefeed.php
index 5ca089b859a85d753f7af13903e598e9eb876d95..b899ecff4aa4c15da5173ddf9f40f81b49cc9c72 100644 (file)
--- a/lib/atomusernoticefeed.php
+++ b/lib/atomusernoticefeed.php
@@ -59,8 +59,13 @@ class AtomUserNoticeFeed extends AtomNoticeFeed
         parent::__construct($cur, $indent);
         $this->user = $user;
         if (!empty($user)) {
+
             $profile = $user->getProfile();
+
             $ao = ActivityObject::fromProfile($profile);
+
+            array_push($ao->extra, $profile->profileInfo($cur));
+
             $this->addAuthorRaw($ao->asString('author'));
         }
 
@@ -77,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');