Move Object\Image static methods to Util\Images

- Optimize imports in modified files
This commit is contained in:
Hypolite Petovan 2019-10-17 21:26:15 -04:00
parent b543ee8ac7
commit 03bf1dcbd3
15 changed files with 322 additions and 217 deletions

View file

@ -27,6 +27,7 @@ use Friendica\Network\Probe;
use Friendica\Object\Image;
use Friendica\Protocol\ActivityNamespace;
use Friendica\Util\DateTimeFormat;
use Friendica\Util\Images;
use Friendica\Util\Network;
use Friendica\Util\Proxy as ProxyUtils;
use Friendica\Util\Strings;
@ -1389,7 +1390,7 @@ class OStatus
switch ($siteinfo["type"]) {
case 'photo':
if (!empty($siteinfo["image"])) {
$imgdata = Image::getInfoFromURL($siteinfo["image"]);
$imgdata = Images::getInfoFromURLCached($siteinfo["image"]);
if ($imgdata) {
$attributes = ["rel" => "enclosure",
"href" => $siteinfo["image"],
@ -1413,7 +1414,7 @@ class OStatus
}
if (!Config::get('system', 'ostatus_not_attach_preview') && ($siteinfo["type"] != "photo") && isset($siteinfo["image"])) {
$imgdata = Image::getInfoFromURL($siteinfo["image"]);
$imgdata = Images::getInfoFromURLCached($siteinfo["image"]);
if ($imgdata) {
$attributes = ["rel" => "enclosure",
"href" => $siteinfo["image"],