friendica
/
friendica-addons
7
2
Fork 13
Code Issues 3 Pull Requests 3 Releases 16 Wiki Activity

Merge pull request #647 from MrPetovan/task/add-mastodoncustomemojis-addon 

[mastodoncustomenojis] Add shorter ttl for API call fail
This commit is contained in:
Tobias Diekershoff 2018-07-18 06:22:02 +02:00 committed by GitHub
parent 79e686b326 ca1b27d10f
commit 4a442c995c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
mastodoncustomemojis/mastodoncustomemojis.php
View File

@ -12,6 +12,7 @@ use Friendica\App;
use Friendica\Content\Smilies;
use Friendica\Core\Addon;
use Friendica\Core\Cache;
use Friendica\Core\Config;
use Friendica\Core\Protocol;
use Friendica\Util\Network;
@ -73,7 +74,7 @@ function mastodoncustomemojis_get_custom_emojis_for_author($author_link)
$cache_key = 'mastodoncustomemojis:' . $api_base_url;
$emojis = Cache::get($cache_key);
if (empty($emojis)) {
if (empty($emojis['texts']) || Config::get('system', 'ignore_cache')) {
// Reset the emojis array
$emojis = $return;
@ -90,9 +91,13 @@ function mastodoncustomemojis_get_custom_emojis_for_author($author_link)
$emojis['icons'][] = '<img class="emoji mastodon" src="' . proxy_url($emoji['static_url']) . '" alt=":' . $emoji['shortcode'] . ':" title=":' . $emoji['shortcode'] . ':"/>';
}
}
$ttl = Cache::WEEK;
} else {
$ttl = Cache::HALF_HOUR;
}
Cache::set($cache_key, $emojis, Cache::WEEK);
Cache::set($cache_key, $emojis, $ttl);
$return = $emojis;
}