Merge remote-tracking branch 'upstream/develop' into notices
Michael
|
Before Width: | Height: | Size: 13 KiB After Width: | Height: | Size: 13 KiB |
|
Before Width: | Height: | Size: 6.6 KiB After Width: | Height: | Size: 6.5 KiB |
|
Before Width: | Height: | Size: 5.7 KiB After Width: | Height: | Size: 5.7 KiB |
BIN
ifttt/ifttt.png
|
Before Width: | Height: | Size: 7.6 KiB After Width: | Height: | Size: 4.8 KiB |
|
Before Width: | Height: | Size: 4 KiB After Width: | Height: | Size: 698 B |
|
Before Width: | Height: | Size: 4.3 KiB After Width: | Height: | Size: 2.1 KiB |
12
mastodoncustomemojis/README.md
Normal file
|
|
@ -0,0 +1,12 @@
|
|||
Mastodon Custom Emojis
|
||||
======================
|
||||
|
||||
Main author Hypolite Petovan.
|
||||
|
||||
Replace emojis shortcodes in Mastodon posts with their originating server custom emojis images.
|
||||
|
||||
## License
|
||||
|
||||
The _Mastodon Custom Emojis_ addon is licensed under the [3-clause BSD license][2] see the LICENSE file in the addons directory.
|
||||
|
||||
[1]: http://opensource.org/licenses/BSD-3-Clause
|
||||
95
mastodoncustomemojis/mastodoncustomemojis.php
Normal file
|
|
@ -0,0 +1,95 @@
|
|||
<?php
|
||||
|
||||
/*
|
||||
* Name: Mastodon Custom Emojis
|
||||
* Description: Replace emojis shortcodes in Mastodon posts with their originating server custom emojis images.
|
||||
* Version: 1.0
|
||||
* Author: Hypolite Petovan
|
||||
*/
|
||||
|
||||
use Friendica\Core\Addon;
|
||||
|
||||
function mastodoncustomemojis_install()
|
||||
{
|
||||
Addon::registerHook('put_item_in_cache', __FILE__, 'mastodoncustomemojis_put_item_in_cache');
|
||||
Addon::registerHook('network_mod_init', __FILE__, 'mastodoncustomemojis_css_hook');
|
||||
Addon::registerHook('display_mod_init', __FILE__, 'mastodoncustomemojis_css_hook');
|
||||
Addon::registerHook('search_mod_init', __FILE__, 'mastodoncustomemojis_css_hook');
|
||||
Addon::registerHook('community_mod_init', __FILE__, 'mastodoncustomemojis_css_hook');
|
||||
Addon::registerHook('contacts_mod_init', __FILE__, 'mastodoncustomemojis_css_hook');
|
||||
}
|
||||
|
||||
function mastodoncustomemojis_uninstall()
|
||||
{
|
||||
Addon::unregisterHook('put_item_in_cache', __FILE__, 'mastodoncustomemojis_put_item_in_cache');
|
||||
Addon::unregisterHook('network_mod_init', __FILE__, 'mastodoncustomemojis_css_hook');
|
||||
Addon::unregisterHook('display_mod_init', __FILE__, 'mastodoncustomemojis_css_hook');
|
||||
Addon::unregisterHook('search_mod_init', __FILE__, 'mastodoncustomemojis_css_hook');
|
||||
Addon::unregisterHook('community_mod_init', __FILE__, 'mastodoncustomemojis_css_hook');
|
||||
Addon::unregisterHook('contacts_mod_init', __FILE__, 'mastodoncustomemojis_css_hook');
|
||||
}
|
||||
|
||||
function mastodoncustomemojis_css_hook(Friendica\App $a)
|
||||
{
|
||||
$a->page['htmlhead'] .= <<<HTML
|
||||
<!-- Style added by mastodoncustomemojis -->
|
||||
<style type="text/css">
|
||||
.emoji.mastodon {
|
||||
height: 1.2em;
|
||||
vertical-align: middle;
|
||||
}
|
||||
</style>
|
||||
|
||||
|
||||
HTML;
|
||||
}
|
||||
|
||||
function mastodoncustomemojis_put_item_in_cache(Friendica\App $a, &$hook_data)
|
||||
{
|
||||
// Mastodon uses OStatus, skipping other network protocols
|
||||
if ($hook_data['item']['network'] != Friendica\Core\Protocol::OSTATUS) {
|
||||
return;
|
||||
}
|
||||
|
||||
$emojis = mastodoncustomemojis_get_custom_emojis_for_author($hook_data['item']['author-link']);
|
||||
|
||||
$hook_data["rendered-html"] = Friendica\Content\Smilies::replaceFromArray($hook_data["rendered-html"], $emojis);
|
||||
}
|
||||
|
||||
function mastodoncustomemojis_get_custom_emojis_for_author($author_link)
|
||||
{
|
||||
$return = ['texts' => [], 'icons' => []];
|
||||
|
||||
$url_parts = parse_url($author_link);
|
||||
|
||||
$api_base_url = $url_parts['scheme'] . '://' . $url_parts['host'] . ($url_parts['port'] ? ':' . $url_parts['port'] : '');
|
||||
|
||||
$cache_key = 'mastodoncustomemojis:' . $api_base_url;
|
||||
|
||||
$emojis = Friendica\Core\Cache::get($cache_key);
|
||||
if (empty($emojis)) {
|
||||
// Reset the emojis array
|
||||
$emojis = $return;
|
||||
|
||||
$api_url = $api_base_url . '/api/v1/custom_emojis';
|
||||
|
||||
$ret = Friendica\Util\Network::fetchUrlFull($api_url);
|
||||
|
||||
if ($ret['success']) {
|
||||
$emojis_array = json_decode($ret['body'], true);
|
||||
|
||||
if (is_array($emojis_array)) {
|
||||
foreach ($emojis_array as $emoji) {
|
||||
$emojis['texts'][] = ':' . $emoji['shortcode'] . ':';
|
||||
$emojis['icons'][] = '<img class="emoji mastodon" src="' . proxy_url($emoji['static_url']) . '" alt=":' . $emoji['shortcode'] . ':" title=":' . $emoji['shortcode'] . ':"/>';
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
Friendica\Core\Cache::set($cache_key, $emojis, Friendica\Core\Cache::WEEK);
|
||||
|
||||
$return = $emojis;
|
||||
}
|
||||
|
||||
return $return;
|
||||
}
|
||||
|
Before Width: | Height: | Size: 184 B After Width: | Height: | Size: 183 B |
|
Before Width: | Height: | Size: 312 B After Width: | Height: | Size: 310 B |
|
Before Width: | Height: | Size: 3 KiB After Width: | Height: | Size: 2.9 KiB |
|
Before Width: | Height: | Size: 403 B After Width: | Height: | Size: 401 B |
|
Before Width: | Height: | Size: 167 B After Width: | Height: | Size: 165 B |
|
Before Width: | Height: | Size: 1.7 KiB After Width: | Height: | Size: 1.7 KiB |
|
Before Width: | Height: | Size: 668 B After Width: | Height: | Size: 576 B |
|
Before Width: | Height: | Size: 265 B After Width: | Height: | Size: 264 B |
|
Before Width: | Height: | Size: 761 B After Width: | Height: | Size: 742 B |
|
Before Width: | Height: | Size: 1.2 KiB After Width: | Height: | Size: 814 B |
|
Before Width: | Height: | Size: 977 B After Width: | Height: | Size: 813 B |
|
Before Width: | Height: | Size: 940 B After Width: | Height: | Size: 803 B |
|
Before Width: | Height: | Size: 1.8 KiB After Width: | Height: | Size: 988 B |
|
Before Width: | Height: | Size: 648 B After Width: | Height: | Size: 321 B |
|
Before Width: | Height: | Size: 30 KiB After Width: | Height: | Size: 15 KiB |
|
Before Width: | Height: | Size: 12 KiB After Width: | Height: | Size: 8.1 KiB |
|
Before Width: | Height: | Size: 12 KiB After Width: | Height: | Size: 8.4 KiB |
|
Before Width: | Height: | Size: 16 KiB After Width: | Height: | Size: 11 KiB |
|
Before Width: | Height: | Size: 31 KiB After Width: | Height: | Size: 15 KiB |
|
Before Width: | Height: | Size: 17 KiB After Width: | Height: | Size: 12 KiB |
|
Before Width: | Height: | Size: 43 KiB After Width: | Height: | Size: 24 KiB |
|
Before Width: | Height: | Size: 10 KiB After Width: | Height: | Size: 6.1 KiB |
|
Before Width: | Height: | Size: 39 KiB After Width: | Height: | Size: 32 KiB |
|
Before Width: | Height: | Size: 16 KiB After Width: | Height: | Size: 12 KiB |
|
Before Width: | Height: | Size: 19 KiB After Width: | Height: | Size: 14 KiB |
BIN
sniper/32x32.jpg
|
Before Width: | Height: | Size: 14 KiB After Width: | Height: | Size: 5.2 KiB |
|
Before Width: | Height: | Size: 15 KiB After Width: | Height: | Size: 11 KiB |
BIN
sniper/60x60.jpg
|
Before Width: | Height: | Size: 19 KiB After Width: | Height: | Size: 8.7 KiB |
BIN
sniper/70x45.jpg
|
Before Width: | Height: | Size: 15 KiB After Width: | Height: | Size: 5.1 KiB |
BIN
sniper/70x60.jpg
|
Before Width: | Height: | Size: 8 KiB After Width: | Height: | Size: 5.2 KiB |
BIN
sniper/73x80.jpg
|
Before Width: | Height: | Size: 9.2 KiB After Width: | Height: | Size: 6.3 KiB |
BIN
sniper/75x57.jpg
|
Before Width: | Height: | Size: 8.1 KiB After Width: | Height: | Size: 5.3 KiB |
BIN
sniper/80x60.jpg
|
Before Width: | Height: | Size: 7.7 KiB After Width: | Height: | Size: 4.8 KiB |
BIN
sniper/80x70.jpg
|
Before Width: | Height: | Size: 5.1 KiB After Width: | Height: | Size: 2.3 KiB |
|
Before Width: | Height: | Size: 23 KiB After Width: | Height: | Size: 11 KiB |
BIN
sniper/81x67.jpg
|
Before Width: | Height: | Size: 9.6 KiB After Width: | Height: | Size: 6.4 KiB |
|
Before Width: | Height: | Size: 5.7 KiB After Width: | Height: | Size: 5.5 KiB |
BIN
twitter/vendor/abraham/twitteroauth/tests/kitten.jpg
vendored
|
Before Width: | Height: | Size: 211 KiB After Width: | Height: | Size: 203 KiB |
|
Before Width: | Height: | Size: 4.1 KiB After Width: | Height: | Size: 1.1 KiB |
|
Before Width: | Height: | Size: 30 KiB After Width: | Height: | Size: 29 KiB |
|
Before Width: | Height: | Size: 48 KiB After Width: | Height: | Size: 40 KiB |
|
Before Width: | Height: | Size: 1.7 KiB After Width: | Height: | Size: 950 B |