X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=lib%2Fatomusernoticefeed.php;h=b899ecff4aa4c15da5173ddf9f40f81b49cc9c72;hb=c137ead909eddd4a6c08333c42079cba271091bf;hp=ec368f5ca1648b9c447bbea3abe01a6e800db95c;hpb=8aa9c271dffe6ec6766b94486c0635c9db588db7;p=quix0rs-gnu-social.git diff --git a/lib/atomusernoticefeed.php b/lib/atomusernoticefeed.php index ec368f5ca1..b899ecff4a 100644 --- a/lib/atomusernoticefeed.php +++ b/lib/atomusernoticefeed.php @@ -59,9 +59,14 @@ class AtomUserNoticeFeed extends AtomNoticeFeed 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. @@ -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');