clones/friendica-addons
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #716 from MrPetovan/bug/5653-mastodoncustomemojis-fix-caching 

[mastodoncustomemojis] Fix caching
This commit is contained in:
Tobias Diekershoff 2018-08-23 06:20:55 +02:00 committed by GitHub
parent 4e72cef2f6 0c73b90f04
commit 4cae40ec63
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 26 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
mastodoncustomemojis/mastodoncustomemojis.php
View File

@ -66,18 +66,26 @@ function mastodoncustomemojis_put_item_in_cache(App $a, array &$hook_data)
function mastodoncustomemojis_get_custom_emojis_for_author($author_link) function mastodoncustomemojis_get_custom_emojis_for_author($author_link)
{ {
$return = ['texts' => [], 'icons' => []];
$url_parts = parse_url($author_link); $url_parts = parse_url($author_link);
$api_base_url = $url_parts['scheme'] . '://' . $url_parts['host'] . (isset($url_parts['port']) ? ':' . $url_parts['port'] : ''); $api_base_url = $url_parts['scheme'] . '://' . $url_parts['host'] . (isset($url_parts['port']) ? ':' . $url_parts['port'] : '');
$cache_key = 'mastodoncustomemojis:' . $api_base_url; $cache_key = 'mastodoncustomemojis:' . $api_base_url;
$emojis = Cache::get($cache_key); $return = Cache::get($cache_key);
if (empty($emojis['texts']) || Config::get('system', 'ignore_cache')) {
// Reset the emojis array if (empty($return) || Config::get('system', 'ignore_cache')) {
$emojis = $return; $return = mastodoncustomemojis_fetch_custom_emojis_for_url($api_base_url);
Cache::set($cache_key, $return, empty($return['texts']) ? Cache::HALF_HOUR : Cache::WEEK);
}
return $return;
}
function mastodoncustomemojis_fetch_custom_emojis_for_url($api_base_url)
{
$return = ['texts' => [], 'icons' => []];
$api_url = $api_base_url . '/api/v1/custom_emojis'; $api_url = $api_base_url . '/api/v1/custom_emojis';
@ -86,21 +94,12 @@ function mastodoncustomemojis_get_custom_emojis_for_author($author_link)
if ($ret['success']) { if ($ret['success']) {
$emojis_array = json_decode($ret['body'], true); $emojis_array = json_decode($ret['body'], true);
if (is_array($emojis_array)) { if (is_array($emojis_array) && count($emojis_array)) {
foreach ($emojis_array as $emoji) { foreach ($emojis_array as $emoji) {
$emojis['texts'][] = ':' . $emoji['shortcode'] . ':'; $return['texts'][] = ':' . $emoji['shortcode'] . ':';
$emojis['icons'][] = '<img class="emoji mastodon" src="' . ProxyUtils::proxifyUrl($emoji['static_url']) . '" alt=":' . $emoji['shortcode'] . ':" title=":' . $emoji['shortcode'] . ':"/>'; $return['icons'][] = '<img class="emoji mastodon" src="' . ProxyUtils::proxifyUrl($emoji['static_url']) . '" alt=":' . $emoji['shortcode'] . ':" title=":' . $emoji['shortcode'] . ':"/>';
} }
} }
$ttl = Cache::WEEK;
} else {
$ttl = Cache::HALF_HOUR;
}
Cache::set($cache_key, $emojis, $ttl);
$return = $emojis;
} }
return $return; return $return;