X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=include%2Foembed.php;h=c362ab45e6516fd31c9a0078a9067a6f5c12f6f0;hb=247f866655440bac8f3cd8b1eecdaeb08400ae3a;hp=c848a4580c9dafc407c649fc2a36e0e2130eb399;hpb=771d0c4bfab68a13c57b3ada3649d5eead0550fd;p=friendica.git diff --git a/include/oembed.php b/include/oembed.php index c848a4580c..c362ab45e6 100755 --- a/include/oembed.php +++ b/include/oembed.php @@ -13,7 +13,13 @@ function oembed_fetch_url($embedurl, $no_rich_type = false){ $a = get_app(); - $txt = Cache::get($a->videowidth . $embedurl); + $r = q("SELECT * FROM `oembed` WHERE `url` = '%s'", + dbesc(normalise_link($embedurl))); + + if ($r) + $txt = $r[0]["content"]; + else + $txt = Cache::get($a->videowidth . $embedurl); // These media files should now be caught in bbcode.php // left here as a fallback in case this is called from another source @@ -66,8 +72,17 @@ function oembed_fetch_url($embedurl, $no_rich_type = false){ if ($txt[0]!="{") $txt='{"type":"error"}'; - else //save in cache - Cache::set($a->videowidth . $embedurl,$txt, CACHE_DAY); + else { //save in cache + $j = json_decode($txt); + if ($j->type != "error") + q("INSERT INTO `oembed` (`url`, `content`, `created`) VALUES ('%s', '%s', '%s') + ON DUPLICATE KEY UPDATE `content` = '%s', `created` = '%s'", + dbesc(normalise_link($embedurl)), + dbesc($txt), dbesc(datetime_convert()), + dbesc($txt), dbesc(datetime_convert())); + + Cache::set($a->videowidth.$embedurl,$txt, CACHE_DAY); + } } $j = json_decode($txt); @@ -85,7 +100,7 @@ function oembed_fetch_url($embedurl, $no_rich_type = false){ // If fetching information doesn't work, then improve via internal functions if (($j->type == "error") OR ($no_rich_type AND ($j->type == "rich"))) { require_once("mod/parse_url.php"); - $data = parseurl_getsiteinfo($embedurl, true, false); + $data = parseurl_getsiteinfo_cached($embedurl, true, false); $j->type = $data["type"]; if ($j->type == "photo") {