X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=lib%2Fatomusernoticefeed.php;h=b899ecff4aa4c15da5173ddf9f40f81b49cc9c72;hb=a7a4eeef09ee8929bb9ca563eb2bc52d198d202f;hp=34a18701754a505cf0a3002c36502a112f556134;hpb=f0b39defb24bcc9c9e403ac66e7d6a1621a4bd18;p=quix0rs-gnu-social.git diff --git a/lib/atomusernoticefeed.php b/lib/atomusernoticefeed.php index 34a1870175..b899ecff4a 100644 --- a/lib/atomusernoticefeed.php +++ b/lib/atomusernoticefeed.php @@ -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 = ActivityObject::fromProfile($profile); + + array_push($ao->extra, $profile->profileInfo($cur)); + + $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');