UA-Fediland/pixelfed
2
0
Fork 0
mirror of https://github.com/pixelfed/pixelfed.git synced 2025-01-26 14:30:46 +00:00
Code Issues Projects Releases Packages Wiki Activity

Update AP Status Transformer, fix inReplyTo. Fixes #5409

Browse source
This commit is contained in:
Daniel Supernault 2025-01-05 15:24:10 -07:00
parent 138b07598d
commit 83cc932fe9
No known key found for this signature in database
GPG key ID: 23740873EE6F76A1
1 changed files with 12 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
app/Transformer/ActivityPub/StatusTransformer.php
View file

@ -3,6 +3,7 @@
namespace App\Transformer\ActivityPub; namespace App\Transformer\ActivityPub;
use App\Services\MediaService; use App\Services\MediaService;
use App\Services\StatusService;
use App\Status; use App\Status;
use App\Util\Lexer\Autolink; use App\Util\Lexer\Autolink;
use League\Fractal; use League\Fractal;
@ -11,7 +12,16 @@ class StatusTransformer extends Fractal\TransformerAbstract
{ {
public function transform(Status $status) public function transform(Status $status)
{ {
$content = $status->caption ? nl2br(Autolink::create()->autolink($status->caption)) : ""; $content = $status->caption ? nl2br(Autolink::create()->autolink($status->caption)) : '';
$inReplyTo = null;
if ($status->in_reply_to_id) {
$reply = StatusService::get($status->in_reply_to_id, true);
if ($reply && isset($reply['url'])) {
$inReplyTo = $reply['url'];
}
}
return [ return [
'@context' => [ '@context' => [
@ -25,30 +35,20 @@ class StatusTransformer extends Fractal\TransformerAbstract
], ],
], ],
'id' => $status->url(), 'id' => $status->url(),
// TODO: handle other types
'type' => 'Note', 'type' => 'Note',
// XXX: CW Title
'summary' => null, 'summary' => null,
'content' => $content, 'content' => $content,
'inReplyTo' => null, 'inReplyTo' => $inReplyTo,
// TODO: fix date format
'published' => $status->created_at->toAtomString(), 'published' => $status->created_at->toAtomString(),
'url' => $status->url(), 'url' => $status->url(),
'attributedTo' => $status->profile->permalink(), 'attributedTo' => $status->profile->permalink(),
'to' => [ 'to' => [
// TODO: handle proper scope
'https://www.w3.org/ns/activitystreams#Public', 'https://www.w3.org/ns/activitystreams#Public',
], ],
'cc' => [ 'cc' => [
// TODO: add cc's
$status->profile->permalink('/followers'), $status->profile->permalink('/followers'),
], ],
'sensitive' => (bool) $status->is_nsfw, 'sensitive' => (bool) $status->is_nsfw,
'atomUri' => $status->url(),
'inReplyToAtomUri' => null,
'attachment' => MediaService::activitypub($status->id), 'attachment' => MediaService::activitypub($status->id),
'tag' => [], 'tag' => [],
'location' => $status->place_id ? [ 'location' => $status->place_id ? [