diff --git a/app/Models/CustomEmoji.php b/app/Models/CustomEmoji.php index 9d4ed1bdd..720ea136b 100644 --- a/app/Models/CustomEmoji.php +++ b/app/Models/CustomEmoji.php @@ -31,7 +31,7 @@ class CustomEmoji extends Model $url = url('/storage/' . $tag->media_path); if($activitypub == true) { - $mediaType = Str::endsWith($url, '.png') ? 'image/png' : 'image/jpeg'; + $mediaType = Str::endsWith($url, '.png') ? 'image/png' : 'image/jpg'; return [ 'id' => url('emojis/' . $tag->id), 'type' => 'Emoji', diff --git a/app/Transformer/ActivityPub/Verb/CreateNote.php b/app/Transformer/ActivityPub/Verb/CreateNote.php index 09c4ab66d..e7d542414 100644 --- a/app/Transformer/ActivityPub/Verb/CreateNote.php +++ b/app/Transformer/ActivityPub/Verb/CreateNote.php @@ -64,7 +64,9 @@ class CreateNote extends Fractal\TransformerAbstract 'announce' => ['@type' => '@id'], 'like' => ['@type' => '@id'], 'reply' => ['@type' => '@id'] - ] + ], + 'toot' => 'http://joinmastodon.org/ns#', + 'Emoji' => 'toot:Emoji' ] ], 'id' => $status->permalink(), diff --git a/app/Transformer/ActivityPub/Verb/Note.php b/app/Transformer/ActivityPub/Verb/Note.php index e30848a01..2c34412f5 100644 --- a/app/Transformer/ActivityPub/Verb/Note.php +++ b/app/Transformer/ActivityPub/Verb/Note.php @@ -65,7 +65,9 @@ class Note extends Fractal\TransformerAbstract 'announce' => ['@type' => '@id'], 'like' => ['@type' => '@id'], 'reply' => ['@type' => '@id'], - ] + ], + 'toot' => 'http://joinmastodon.org/ns#', + 'Emoji' => 'toot:Emoji' ] ], 'id' => $status->url(),