X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=mastodoncustomemojis%2Fmastodoncustomemojis.php;h=c84f1a4f39c2c1eae4a3725330b1e402a1bcf072;hb=8400258f07c308d3a6ea64cb12fb07db97ff54cc;hp=a6c95d340a42a7a049575674f7a37a6d1954a0e4;hpb=1357817fc38de7be7dc8ebffc1fa0961796fd32d;p=friendica-addons.git diff --git a/mastodoncustomemojis/mastodoncustomemojis.php b/mastodoncustomemojis/mastodoncustomemojis.php index a6c95d34..c84f1a4f 100644 --- a/mastodoncustomemojis/mastodoncustomemojis.php +++ b/mastodoncustomemojis/mastodoncustomemojis.php @@ -11,11 +11,10 @@ use Friendica\App; use Friendica\Content\Smilies; -use Friendica\Core\Cache\Duration; +use Friendica\Core\Cache\Enum\Duration; use Friendica\Core\Hook; use Friendica\Core\Protocol; use Friendica\DI; -use Friendica\Util\Network; use Friendica\Util\Proxy as ProxyUtils; function mastodoncustomemojis_install() @@ -28,17 +27,7 @@ function mastodoncustomemojis_install() Hook::register('contacts_mod_init', __FILE__, 'mastodoncustomemojis_css_hook'); } -function mastodoncustomemojis_uninstall() -{ - Hook::unregister('put_item_in_cache', __FILE__, 'mastodoncustomemojis_put_item_in_cache'); - Hook::unregister('network_mod_init', __FILE__, 'mastodoncustomemojis_css_hook'); - Hook::unregister('display_mod_init', __FILE__, 'mastodoncustomemojis_css_hook'); - Hook::unregister('search_mod_init', __FILE__, 'mastodoncustomemojis_css_hook'); - Hook::unregister('community_mod_init', __FILE__, 'mastodoncustomemojis_css_hook'); - Hook::unregister('contacts_mod_init', __FILE__, 'mastodoncustomemojis_css_hook'); -} - -function mastodoncustomemojis_css_hook(App $a) +function mastodoncustomemojis_css_hook() { DI::page()['htmlhead'] .= << @@ -53,7 +42,7 @@ function mastodoncustomemojis_css_hook(App $a) HTML; } -function mastodoncustomemojis_put_item_in_cache(App $a, array &$hook_data) +function mastodoncustomemojis_put_item_in_cache(array &$hook_data) { // Mastodon uses OStatus and ActivityPub, skipping other network protocols if (empty($hook_data['item']['author-link']) || !in_array($hook_data['item']['network'], [Protocol::OSTATUS, Protocol::ACTIVITYPUB])) { @@ -90,7 +79,7 @@ function mastodoncustomemojis_fetch_custom_emojis_for_url($api_base_url) $api_url = $api_base_url . '/api/v1/custom_emojis'; - $fetchResult = Network::fetchUrlFull($api_url); + $fetchResult = DI::httpClient()->fetchFull($api_url); if ($fetchResult->isSuccess()) { $emojis_array = json_decode($fetchResult->getBody(), true);