From 24c052aea57fa2462c1c7f6559eae0a8a9d76153 Mon Sep 17 00:00:00 2001 From: Daniel Supernault Date: Fri, 8 Mar 2019 23:49:41 -0700 Subject: [PATCH] Update AP Note transformers to return media attachments in proper order --- app/Transformer/ActivityPub/Verb/CreateNote.php | 2 +- app/Transformer/ActivityPub/Verb/Note.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/app/Transformer/ActivityPub/Verb/CreateNote.php b/app/Transformer/ActivityPub/Verb/CreateNote.php index dd42757d7..258fa4991 100644 --- a/app/Transformer/ActivityPub/Verb/CreateNote.php +++ b/app/Transformer/ActivityPub/Verb/CreateNote.php @@ -49,7 +49,7 @@ class CreateNote extends Fractal\TransformerAbstract 'to' => $status->scopeToAudience('to'), 'cc' => $status->scopeToAudience('cc'), 'sensitive' => (bool) $status->is_nsfw, - 'attachment' => $status->media->map(function ($media) { + 'attachment' => $status->media()->orderBy('order')->get()->map(function ($media) { return [ 'type' => $media->activityVerb(), 'mediaType' => $media->mime, diff --git a/app/Transformer/ActivityPub/Verb/Note.php b/app/Transformer/ActivityPub/Verb/Note.php index dda165dd3..b9ec5fd44 100644 --- a/app/Transformer/ActivityPub/Verb/Note.php +++ b/app/Transformer/ActivityPub/Verb/Note.php @@ -42,7 +42,7 @@ class Note extends Fractal\TransformerAbstract 'to' => $status->scopeToAudience('to'), 'cc' => $status->scopeToAudience('cc'), 'sensitive' => (bool) $status->is_nsfw, - 'attachment' => $status->media->map(function ($media) { + 'attachment' => $status->media()->orderBy('order')->get()->map(function ($media) { return [ 'type' => $media->activityVerb(), 'mediaType' => $media->mime,