UA-Fediland/pixelfed
2
0
Fork 0
mirror of https://github.com/pixelfed/pixelfed.git synced 2024-11-27 16:53:17 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #3172 from pixelfed/staging

Browse source 
Update custom emoji json-ld
This commit is contained in:
daniel 2022-01-21 01:56:54 -07:00 committed by GitHub
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); $url = url('/storage/' . $tag->media_path);
if($activitypub == true) { if($activitypub == true) {
$mediaType = Str::endsWith($url, '.png') ? 'image/png' : 'image/jpeg'; $mediaType = Str::endsWith($url, '.png') ? 'image/png' : 'image/jpg';
return [ return [
'id' => url('emojis/' . $tag->id), 'id' => url('emojis/' . $tag->id),
'type' => 'Emoji', 'type' => 'Emoji',

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

@ -64,7 +64,9 @@ class CreateNote extends Fractal\TransformerAbstract
'announce' => ['@type' => '@id'], 'announce' => ['@type' => '@id'],
'like' => ['@type' => '@id'], 'like' => ['@type' => '@id'],
'reply' => ['@type' => '@id'] 'reply' => ['@type' => '@id']
] ],
'toot' => 'http://joinmastodon.org/ns#',
'Emoji' => 'toot:Emoji'
] ]
], ],
'id' => $status->permalink(), 'id' => $status->permalink(),

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

@ -65,7 +65,9 @@ class Note extends Fractal\TransformerAbstract
'announce' => ['@type' => '@id'], 'announce' => ['@type' => '@id'],
'like' => ['@type' => '@id'], 'like' => ['@type' => '@id'],
'reply' => ['@type' => '@id'], 'reply' => ['@type' => '@id'],
] ],
'toot' => 'http://joinmastodon.org/ns#',
'Emoji' => 'toot:Emoji'
] ]
], ],
'id' => $status->url(), 'id' => $status->url(),