mirror of
https://github.com/pixelfed/pixelfed.git
synced 2024-11-22 14:31:26 +00:00
Merge pull request #3348 from shadowfacts/emoji-schema
Change static_path on custom emojis to static_url
This commit is contained in:
commit
a5114bf35a
2 changed files with 3 additions and 3 deletions
|
@ -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()
|
||||||
|
|
|
@ -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
|
||||||
];
|
];
|
||||||
})
|
})
|
||||||
|
|
Loading…
Reference in a new issue