diff --git a/catavatar/avatars/body_12.png b/catavatar/avatars/body_12.png index b1070c0f..a6329aff 100644 Binary files a/catavatar/avatars/body_12.png and b/catavatar/avatars/body_12.png differ diff --git a/catavatar/avatars/fur_5.png b/catavatar/avatars/fur_5.png index 76a9efd8..f85aa695 100644 Binary files a/catavatar/avatars/fur_5.png and b/catavatar/avatars/fur_5.png differ diff --git a/catavatar/avatars/fur_6.png b/catavatar/avatars/fur_6.png index 144dacab..e76c3909 100644 Binary files a/catavatar/avatars/fur_6.png and b/catavatar/avatars/fur_6.png differ diff --git a/ifttt/ifttt.png b/ifttt/ifttt.png index 364edb08..8a8b62f3 100644 Binary files a/ifttt/ifttt.png and b/ifttt/ifttt.png differ diff --git a/jappixmini/jappix/img/wait/wait-medium.png b/jappixmini/jappix/img/wait/wait-medium.png index 4b9a780b..14a5fd66 100644 Binary files a/jappixmini/jappix/img/wait/wait-medium.png and b/jappixmini/jappix/img/wait/wait-medium.png differ diff --git a/js_upload/file-uploader/tests/jquery-ui/ui-lightness/images/ui-bg_gloss-wave_35_f6a828_500x100.png b/js_upload/file-uploader/tests/jquery-ui/ui-lightness/images/ui-bg_gloss-wave_35_f6a828_500x100.png index 1b1972b5..ee0b63f8 100644 Binary files a/js_upload/file-uploader/tests/jquery-ui/ui-lightness/images/ui-bg_gloss-wave_35_f6a828_500x100.png and b/js_upload/file-uploader/tests/jquery-ui/ui-lightness/images/ui-bg_gloss-wave_35_f6a828_500x100.png differ diff --git a/mastodoncustomemojis/README.md b/mastodoncustomemojis/README.md new file mode 100644 index 00000000..5dda7fa3 --- /dev/null +++ b/mastodoncustomemojis/README.md @@ -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 diff --git a/mastodoncustomemojis/mastodoncustomemojis.php b/mastodoncustomemojis/mastodoncustomemojis.php new file mode 100644 index 00000000..d7ce7426 --- /dev/null +++ b/mastodoncustomemojis/mastodoncustomemojis.php @@ -0,0 +1,95 @@ +page['htmlhead'] .= << + + + +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'][] = ':' . $emoji['shortcode'] . ':'; + } + } + } + + Friendica\Core\Cache::set($cache_key, $emojis, Friendica\Core\Cache::WEEK); + + $return = $emojis; + } + + return $return; +} diff --git a/smiley_pack/icons/confused/shrug.gif b/smiley_pack/icons/confused/shrug.gif index 31ce007f..df56f507 100644 Binary files a/smiley_pack/icons/confused/shrug.gif and b/smiley_pack/icons/confused/shrug.gif differ diff --git a/smiley_pack/icons/devilangel/angel.gif b/smiley_pack/icons/devilangel/angel.gif index 8e585416..dca2d829 100644 Binary files a/smiley_pack/icons/devilangel/angel.gif and b/smiley_pack/icons/devilangel/angel.gif differ diff --git a/smiley_pack/icons/fight/army.gif b/smiley_pack/icons/fight/army.gif index 75067008..e35a1383 100644 Binary files a/smiley_pack/icons/fight/army.gif and b/smiley_pack/icons/fight/army.gif differ diff --git a/smiley_pack/icons/fight/crusader.gif b/smiley_pack/icons/fight/crusader.gif index 95848aea..ef1f9ad6 100644 Binary files a/smiley_pack/icons/fight/crusader.gif and b/smiley_pack/icons/fight/crusader.gif differ diff --git a/smiley_pack/icons/fight/dead.gif b/smiley_pack/icons/fight/dead.gif index 31adaba3..738a1986 100644 Binary files a/smiley_pack/icons/fight/dead.gif and b/smiley_pack/icons/fight/dead.gif differ diff --git a/smiley_pack/icons/fight/gangs.gif b/smiley_pack/icons/fight/gangs.gif index 2c655b1f..fe8e4cfd 100644 Binary files a/smiley_pack/icons/fight/gangs.gif and b/smiley_pack/icons/fight/gangs.gif differ diff --git a/smiley_pack/icons/food/cake.gif b/smiley_pack/icons/food/cake.gif index 22d0ebd9..9e4f08f5 100644 Binary files a/smiley_pack/icons/food/cake.gif and b/smiley_pack/icons/food/cake.gif differ diff --git a/smiley_pack/icons/happy/cloud9.gif b/smiley_pack/icons/happy/cloud9.gif index 801c1a39..61979d4a 100644 Binary files a/smiley_pack/icons/happy/cloud9.gif and b/smiley_pack/icons/happy/cloud9.gif differ diff --git a/smiley_pack/icons/respect/bravo.gif b/smiley_pack/icons/respect/bravo.gif index 34f72abb..c8f24849 100644 Binary files a/smiley_pack/icons/respect/bravo.gif and b/smiley_pack/icons/respect/bravo.gif differ diff --git a/smiley_pack/icons/sad/crying.png b/smiley_pack/icons/sad/crying.png index 62b9646d..7d378a04 100644 Binary files a/smiley_pack/icons/sad/crying.png and b/smiley_pack/icons/sad/crying.png differ diff --git a/smileybutton/view/smoothly.png b/smileybutton/view/smoothly.png index 312a0c33..5c617be1 100644 Binary files a/smileybutton/view/smoothly.png and b/smileybutton/view/smoothly.png differ diff --git a/smileybutton/view/vier.png b/smileybutton/view/vier.png index 440f6a37..c30940e4 100644 Binary files a/smileybutton/view/vier.png and b/smileybutton/view/vier.png differ diff --git a/smilies_adult/icons/bong.gif b/smilies_adult/icons/bong.gif index 4b671226..2d06a652 100644 Binary files a/smilies_adult/icons/bong.gif and b/smilies_adult/icons/bong.gif differ diff --git a/smilies_adult/icons/drunk.gif b/smilies_adult/icons/drunk.gif index 4a1c064a..1e433b12 100644 Binary files a/smilies_adult/icons/drunk.gif and b/smilies_adult/icons/drunk.gif differ diff --git a/sniper/100x100.jpg b/sniper/100x100.jpg index 315bd664..002ea22b 100644 Binary files a/sniper/100x100.jpg and b/sniper/100x100.jpg differ diff --git a/sniper/100x75.jpg b/sniper/100x75.jpg index 693e7c9d..94d9462c 100644 Binary files a/sniper/100x75.jpg and b/sniper/100x75.jpg differ diff --git a/sniper/100x80.jpg b/sniper/100x80.jpg index 594391e2..0734ed15 100644 Binary files a/sniper/100x80.jpg and b/sniper/100x80.jpg differ diff --git a/sniper/120x90hotshotsniper.jpg b/sniper/120x90hotshotsniper.jpg index 52d0f005..96ec1a97 100644 Binary files a/sniper/120x90hotshotsniper.jpg and b/sniper/120x90hotshotsniper.jpg differ diff --git a/sniper/125x125.jpg b/sniper/125x125.jpg index 047a505f..7fd9e10d 100644 Binary files a/sniper/125x125.jpg and b/sniper/125x125.jpg differ diff --git a/sniper/140x90.jpg b/sniper/140x90.jpg index e98df44e..b2d4f1d3 100644 Binary files a/sniper/140x90.jpg and b/sniper/140x90.jpg differ diff --git a/sniper/150x150.jpg b/sniper/150x150.jpg index 225d1e9c..606d5f4c 100644 Binary files a/sniper/150x150.jpg and b/sniper/150x150.jpg differ diff --git a/sniper/180x135.jpg b/sniper/180x135.jpg index 6fdfaf32..3cf2fa0a 100644 Binary files a/sniper/180x135.jpg and b/sniper/180x135.jpg differ diff --git a/sniper/250x180.jpg b/sniper/250x180.jpg index 41fbe9f6..6afb6342 100644 Binary files a/sniper/250x180.jpg and b/sniper/250x180.jpg differ diff --git a/sniper/300x200.jpg b/sniper/300x200.jpg index 0aeef9a7..90aaefe4 100644 Binary files a/sniper/300x200.jpg and b/sniper/300x200.jpg differ diff --git a/sniper/300x300.jpg b/sniper/300x300.jpg index d4d4f274..9edc48f7 100644 Binary files a/sniper/300x300.jpg and b/sniper/300x300.jpg differ diff --git a/sniper/32x32.jpg b/sniper/32x32.jpg index 8b4c2093..8e5eb4a6 100644 Binary files a/sniper/32x32.jpg and b/sniper/32x32.jpg differ diff --git a/sniper/335x185.jpg b/sniper/335x185.jpg index 9bb38c1a..15d2e768 100644 Binary files a/sniper/335x185.jpg and b/sniper/335x185.jpg differ diff --git a/sniper/60x60.jpg b/sniper/60x60.jpg index 4ad72577..760c9a47 100644 Binary files a/sniper/60x60.jpg and b/sniper/60x60.jpg differ diff --git a/sniper/70x45.jpg b/sniper/70x45.jpg index b722a5a0..64c1aae0 100644 Binary files a/sniper/70x45.jpg and b/sniper/70x45.jpg differ diff --git a/sniper/70x60.jpg b/sniper/70x60.jpg index 58152198..7415a0d2 100644 Binary files a/sniper/70x60.jpg and b/sniper/70x60.jpg differ diff --git a/sniper/73x80.jpg b/sniper/73x80.jpg index 9f6753ec..c1d5f993 100644 Binary files a/sniper/73x80.jpg and b/sniper/73x80.jpg differ diff --git a/sniper/75x57.jpg b/sniper/75x57.jpg index 54753f1e..a0dd0bc7 100644 Binary files a/sniper/75x57.jpg and b/sniper/75x57.jpg differ diff --git a/sniper/80x60.jpg b/sniper/80x60.jpg index dfd0b371..69a06a39 100644 Binary files a/sniper/80x60.jpg and b/sniper/80x60.jpg differ diff --git a/sniper/80x70.jpg b/sniper/80x70.jpg index 2f416fa6..a906d7cc 100644 Binary files a/sniper/80x70.jpg and b/sniper/80x70.jpg differ diff --git a/sniper/80x80hotshotsniper.jpg b/sniper/80x80hotshotsniper.jpg index db26ff6a..65e5a41c 100644 Binary files a/sniper/80x80hotshotsniper.jpg and b/sniper/80x80hotshotsniper.jpg differ diff --git a/sniper/81x67.jpg b/sniper/81x67.jpg index 0a4d7fdc..757f4b01 100644 Binary files a/sniper/81x67.jpg and b/sniper/81x67.jpg differ diff --git a/statusnet/signinwithstatusnet.png b/statusnet/signinwithstatusnet.png index a33998d5..eb33b66b 100644 Binary files a/statusnet/signinwithstatusnet.png and b/statusnet/signinwithstatusnet.png differ diff --git a/twitter/vendor/abraham/twitteroauth/tests/kitten.jpg b/twitter/vendor/abraham/twitteroauth/tests/kitten.jpg index 47006b45..9f7acf1a 100644 Binary files a/twitter/vendor/abraham/twitteroauth/tests/kitten.jpg and b/twitter/vendor/abraham/twitteroauth/tests/kitten.jpg differ diff --git a/xmpp/converse/css/images/bitcoin_qr_code.png b/xmpp/converse/css/images/bitcoin_qr_code.png index 7ba47ef6..d7d063d4 100644 Binary files a/xmpp/converse/css/images/bitcoin_qr_code.png and b/xmpp/converse/css/images/bitcoin_qr_code.png differ diff --git a/xmpp/converse/css/images/header.jpg b/xmpp/converse/css/images/header.jpg index 1bab8adf..c98ab88a 100644 Binary files a/xmpp/converse/css/images/header.jpg and b/xmpp/converse/css/images/header.jpg differ diff --git a/xmpp/converse/css/images/overlay.png b/xmpp/converse/css/images/overlay.png index 2141c781..dfbadc3c 100644 Binary files a/xmpp/converse/css/images/overlay.png and b/xmpp/converse/css/images/overlay.png differ diff --git a/xmpp/converse/css/images/user.png b/xmpp/converse/css/images/user.png index f6a362d7..0a431713 100644 Binary files a/xmpp/converse/css/images/user.png and b/xmpp/converse/css/images/user.png differ