chris
/
pixelfed
forked from mirror/pixelfed
1
0
Fork 0
Code Pull Requests Activity

Merge pull request #3172 from pixelfed/staging 

Update custom emoji json-ld
This commit is contained in:
daniel 2022-01-21 01:56:54 -07:00 committed by GitHub
parent b0006478ee 46d5f12590
commit e9f3bbe8ad
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/Models/CustomEmoji.php
View File

@ -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',

4
app/Transformer/ActivityPub/Verb/CreateNote.php
View File

@ -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(),

4
app/Transformer/ActivityPub/Verb/Note.php
View File

@ -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(),