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

Merge pull request #3348 from shadowfacts/emoji-schema 

Change static_path on custom emojis to static_url
This commit is contained in:
daniel 2022-04-01 17:21:22 -06:00 committed by GitHub
parent d8ff40ebf9 0a7f8fd142
commit a5114bf35a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/Models/CustomEmoji.php
View File

@ -47,7 +47,7 @@ class CustomEmoji extends Model
return [ return [
'shortcode' => $match, 'shortcode' => $match,
'url' => $url, 'url' => $url,
'static_path' => $url, 'static_url' => $url,
'visible_in_picker' => $tag->disabled == false 'visible_in_picker' => $tag->disabled == false
]; ];
} }
@ -57,7 +57,7 @@ class CustomEmoji extends Model
if($activitypub == true) { if($activitypub == true) {
return $tag && isset($tag['icon']); return $tag && isset($tag['icon']);
} else { } else {
return $tag && isset($tag['static_path']); return $tag && isset($tag['static_url']);
} }
}) })
->values() ->values()

2
app/Services/CustomEmojiService.php
View File

@ -118,7 +118,7 @@ class CustomEmojiService
return [ return [
'shortcode' => str_replace(':', '', $emojo->shortcode), 'shortcode' => str_replace(':', '', $emojo->shortcode),
'url' => $url, 'url' => $url,
'static_path' => $url, 'static_url' => $url,
'visible_in_picker' => $emojo->disabled == false 'visible_in_picker' => $emojo->disabled == false
]; ];
}) })