Merge pull request #995 from pixelfed/frontend-ui-refactor

Update AP Note transformers to return media attachments in proper order
6 years ago · 917010e2e5
parent 01d6f5d9c4 24c052aea5
commit 917010e2e5
2 changed files with 2 additions and 2 deletions
--- 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,
--- 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,