GNUsocial/gnu-social
4
0
Fork 1
Code Issues Releases Wiki Activity

[PLUGIN][ActivityPub] Implement Avatar support

Browse Source
This commit is contained in:
Diogo Peralta Cordeiro 2021-12-05 03:36:37 +00:00
parent 2a161c9c66
commit 19b8a7648e
Signed by: diogo
GPG Key ID: 18D2D35001FBFAB0
1 changed files with 54 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

64
plugins/ActivityPub/Util/Model/Actor.php
View File

@ -34,11 +34,15 @@ namespace Plugin\ActivityPub\Util\Model;
use ActivityPhp\Type\AbstractObject; use ActivityPhp\Type\AbstractObject;
use App\Core\DB\DB; use App\Core\DB\DB;
use App\Core\Event; use App\Core\Event;
use App\Core\GSFile;
use App\Core\HTTPClient;
use App\Core\Log;
use App\Core\Router\Router; use App\Core\Router\Router;
use App\Core\Security; use App\Core\Security;
use App\Entity\Actor as GSActor; use App\Entity\Actor as GSActor;
use App\Util\Exception\ServerException; use App\Util\Exception\ServerException;
use App\Util\Formatting; use App\Util\Formatting;
use App\Util\TemporaryFile;
use Component\Avatar\Avatar; use Component\Avatar\Avatar;
use Component\Avatar\Exception\NoAvatarException; use Component\Avatar\Exception\NoAvatarException;
use DateTime; use DateTime;
@ -116,14 +120,46 @@ class Actor extends Model
} }
// Avatar // Avatar
//if (isset($res['icon']['url'])) { if ($person->has('icon')) {
// try { try {
// $this->update_avatar($profile, $res['icon']['url']); // Retrieve media
// } catch (Exception $e) { $get_response = HTTPClient::get($person->get('icon')->get('url'));
// // Let the exception go, it isn't a serious issue $media = $get_response->getContent();
// Log::debug('ActivityPub Explorer: An error occurred while grabbing remote avatar: ' . $e->getMessage()); $mimetype = $get_response->getHeaders()['content-type'][0] ?? null;
// } unset($get_response);
//}
// Only handle if it is an image
if (GSFile::mimetypeMajor($mimetype) === 'image') {
// Ignore empty files
if (!empty($media)) {
// Create an attachment for this
$temp_file = new TemporaryFile();
$temp_file->write($media);
$attachment = GSFile::storeFileAsAttachment($temp_file);
// Delete current avatar if there's one
$avatar = DB::find('avatar', ['actor_id' => $actor->getId()]);
$avatar?->delete();
DB::wrapInTransaction(function() use ($attachment, $actor) {
DB::persist($attachment);
DB::persist(\Component\Avatar\Entity\Avatar::create(['actor_id' => $actor->getId(), 'attachment_id' => $attachment->getId()]));
});
Event::handle('AvatarUpdate', [$actor->getId()]);
}
}
} catch (Exception $e) {
// Let the exception go, it isn't a serious issue
Log::warning('ActivityPub Explorer: An error occurred while grabbing remote avatar: ' . $e->getMessage());
}
} else {
// Delete existing avatar if any
try {
$avatar = DB::findOneBy('avatar', ['actor_id' => $actor->getId()]);
$avatar->delete();
Event::handle('AvatarUpdate', [$actor->getId()]);
} catch (Exception) {
// No avatar set, so cannot delete
}
}
Event::handle('ActivityPubNewActor', [&$ap_actor, &$actor, &$apRSA]); Event::handle('ActivityPubNewActor', [&$ap_actor, &$actor, &$apRSA]);
return $ap_actor; return $ap_actor;
@ -169,13 +205,21 @@ class Actor extends Model
'updated' => $object->getModified()->format(DateTimeInterface::RFC3339), 'updated' => $object->getModified()->format(DateTimeInterface::RFC3339),
'url' => $object->getUrl(Router::ABSOLUTE_URL), 'url' => $object->getUrl(Router::ABSOLUTE_URL),
]; ];
// Avatar
try { try {
$attr['icon'] = Avatar::getAvatar($object->getId())->getUrl(type: Router::ABSOLUTE_URL); $avatar = Avatar::getAvatar($object->getId());
} catch (NoAvatarException) { $attr['icon'] = $attr['image'] = [
'type' => 'Image',
'mediaType' => $avatar->getAttachment()->getMimetype(),
'url' => $avatar->getUrl(type: Router::ABSOLUTE_URL),
];
} catch (Exception) {
// No icon for this actor // No icon for this actor
} }
$type = self::jsonToType($attr); $type = self::jsonToType($attr);
Event::handle('ActivityPubAddActivityStreamsTwoData', [$type->get('type'), &$type]);
return $type->toJson($options); return $type->toJson($options);
} }
} }